summaryrefslogtreecommitdiff
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2017-06-30 14:26:16 +0200
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2017-06-30 16:23:16 +0200
commit82f0f4f012a646a735d6b44de77b7c9d0712c714 (patch)
treefd8009ee23097ed0205e53067928fa75e5ac2e2c /arch/arm/boot
parent71d7b33c3b3a898bb0c2a97ac1a17b84611e5cab (diff)
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Acked-by: Dominik Sliwa <dominik.sliwa@toradex.com>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/imx7-colibri-aster.dtsi1
-rw-r--r--arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi3
-rw-r--r--arch/arm/boot/dts/imx7-colibri.dtsi4
3 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/imx7-colibri-aster.dtsi b/arch/arm/boot/dts/imx7-colibri-aster.dtsi
index d99208746b70..152cb3db1ea5 100644
--- a/arch/arm/boot/dts/imx7-colibri-aster.dtsi
+++ b/arch/arm/boot/dts/imx7-colibri-aster.dtsi
@@ -249,7 +249,6 @@
pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_cd_usdhc1>;
pinctrl-1 = <&pinctrl_usdhc1_100mhz &pinctrl_cd_usdhc1>;
pinctrl-2 = <&pinctrl_usdhc1_200mhz &pinctrl_cd_usdhc1>;
- vmmc-supply = <&reg_3p3v>;
vqmmc-supply = <&reg_LDO2>;
#else
pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
index 1db5aa5365b2..b46fea022d06 100644
--- a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
+++ b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
@@ -1,5 +1,5 @@
/*
- * Copyright 2016 Toradex AG
+ * Copyright 2016-2017 Toradex AG
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -305,7 +305,6 @@
pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_cd_usdhc1>;
pinctrl-1 = <&pinctrl_usdhc1_100mhz &pinctrl_cd_usdhc1>;
pinctrl-2 = <&pinctrl_usdhc1_200mhz &pinctrl_cd_usdhc1>;
- vmmc-supply = <&reg_3p3v>;
vqmmc-supply = <&reg_LDO2>;
#else
pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi
index 0d0a31e74784..dddc15bf7392 100644
--- a/arch/arm/boot/dts/imx7-colibri.dtsi
+++ b/arch/arm/boot/dts/imx7-colibri.dtsi
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2015 Freescale Semiconductor, Inc.
- * Copyright (C) 2016 Toradex AG
+ * Copyright (C) 2016-2017 Toradex AG
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -754,5 +754,5 @@
};
&usdhc1 {
- vmmc-supply = <&reg_LDO2>;
+ vmmc-supply = <&reg_module_3v3>;
};