UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: dts: push MMC/SD to board and add comments 

This moves the enable-active-high setting from the SoC to the
board for the VMMCQ regulators. It should at least be in the
vicinity of the GPIO line it is defined for.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2016-10-07 09:30:46 +02:00
parent 7ce7d89f48
commit adef953bbc
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/ste-href.dtsi
View File

@ -111,6 +111,7 @@
pinctrl-1 = <&i2c3_sleep_mode>; pinctrl-1 = <&i2c3_sleep_mode>;
}; };
/* ST6G3244ME level translator for 1.8/2.9 V */
vmmci: regulator-gpio { vmmci: regulator-gpio {
compatible = "regulator-gpio"; compatible = "regulator-gpio";
@ -120,7 +121,6 @@
regulator-type = "voltage"; regulator-type = "voltage";
startup-delay-us = <100>; startup-delay-us = <100>;
enable-active-high;
states = <1800000 0x1 states = <1800000 0x1
2900000 0x0>; 2900000 0x0>;

1
arch/arm/boot/dts/ste-hrefprev60.dtsi
View File

@ -74,6 +74,7 @@
vmmci: regulator-gpio { vmmci: regulator-gpio {
gpios = <&tc3589x_gpio 18 GPIO_ACTIVE_HIGH>; gpios = <&tc3589x_gpio 18 GPIO_ACTIVE_HIGH>;
enable-gpio = <&tc3589x_gpio 17 GPIO_ACTIVE_HIGH>; enable-gpio = <&tc3589x_gpio 17 GPIO_ACTIVE_HIGH>;
enable-active-high;
}; };
pinctrl { pinctrl {

1
arch/arm/boot/dts/ste-hrefv60plus.dtsi
View File

@ -146,6 +146,7 @@
vmmci: regulator-gpio { vmmci: regulator-gpio {
gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>;
enable-gpio = <&gpio5 9 GPIO_ACTIVE_HIGH>; enable-gpio = <&gpio5 9 GPIO_ACTIVE_HIGH>;
enable-active-high;
}; };
pinctrl { pinctrl {

6
arch/arm/boot/dts/ste-snowball.dts
View File

@ -216,11 +216,15 @@
}; };
}; };
/* ST6G3244ME level translator for 1.8/2.9 V */
vmmci: regulator-gpio { vmmci: regulator-gpio {
compatible = "regulator-gpio"; compatible = "regulator-gpio";
/* GPIO228 SD_SEL */
gpios = <&gpio7 4 GPIO_ACTIVE_HIGH>; gpios = <&gpio7 4 GPIO_ACTIVE_HIGH>;
/* GPIO217 MMC_EN */
enable-gpio = <&gpio6 25 GPIO_ACTIVE_HIGH>; enable-gpio = <&gpio6 25 GPIO_ACTIVE_HIGH>;
enable-active-high;
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2900000>; regulator-max-microvolt = <2900000>;
@ -228,7 +232,6 @@
regulator-type = "voltage"; regulator-type = "voltage";
startup-delay-us = <100>; startup-delay-us = <100>;
enable-active-high;
states = <1800000 0x1 states = <1800000 0x1
2900000 0x0>; 2900000 0x0>;
@ -546,6 +549,7 @@
sdi0_default_mode: sdi0_default { sdi0_default_mode: sdi0_default {
snowball_mux { snowball_mux {
function = "mc0"; function = "mc0";
/* Add the DAT31 pin even if it is not really used */
groups = "mc0dat31dir_a_1"; groups = "mc0dat31dir_a_1";
}; };
snowball_cfg1 { snowball_cfg1 {