Skip to contentSkip to conversation

ARM: dts: rockchip: fix swapped Radxa Rock pinctrl references

PATCH New Heiko Stübner 1 participant 2 messages Sep 16, 2014 Device tree bindings

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 ARM: dts: rockchip: fix swapped Radxa Rock pinctrl references

The host and otg regulator pinctrl settings got swapped, making the host reference the otg pinctrl and the other way round. The actual pins are correct (gpio0-3 for host and gpio2-31 for otg).

---
 arch/arm/boot/dts/rk3188-radxarock.dts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/rk3188-radxarock.dts +2 -2
index 1be0c34..c08744d 100644
@@ -70,7 +70,7 @@
 		enable-active-high;
 		gpio = <&gpio2 31 GPIO_ACTIVE_HIGH>;
 		pinctrl-names = "default";
-		pinctrl-0 = <&host_vbus_drv>;
+		pinctrl-0 = <&otg_vbus_drv>;
 		regulator-name = "otg-vbus";
 		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
@@ -93,7 +93,7 @@
 		enable-active-high;
 		gpio = <&gpio0 3 GPIO_ACTIVE_HIGH>;
 		pinctrl-names = "default";
-		pinctrl-0 = <&otg_vbus_drv>;
+		pinctrl-0 = <&host_vbus_drv>;
 		regulator-name = "host-pwr";
 		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
Signature · 1 line
2.0.1
#1 lore raw

PATCH 2/2 ARM: dts: rockchip: fix rk3188 emmc pull references

Fix a copy'n'paste error making the rk3188 emmc pinctrl nodes reference the pcfg_pull_default setting that is not available on rk3188.

---
 arch/arm/boot/dts/rk3188.dtsi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/rk3188.dtsi +3 -3
index 9a1ff0b..82732f5 100644
@@ -149,15 +149,15 @@
 
 		emmc {
 			emmc_clk: emmc-clk {
-				rockchip,pins = <RK_GPIO0 24 RK_FUNC_2 &pcfg_pull_default>;
+				rockchip,pins = <RK_GPIO0 24 RK_FUNC_2 &pcfg_pull_none>;
 			};
 
 			emmc_cmd: emmc-cmd {
-				rockchip,pins = <RK_GPIO0 26 RK_FUNC_2 &pcfg_pull_default>;
+				rockchip,pins = <RK_GPIO0 26 RK_FUNC_2 &pcfg_pull_up>;
 			};
 
 			emmc_rst: emmc-rst {
-				rockchip,pins = <RK_GPIO0 27 RK_FUNC_2 &pcfg_pull_default>;
+				rockchip,pins = <RK_GPIO0 27 RK_FUNC_2 &pcfg_pull_none>;
 			};
 
 			/*
Signature · 1 line
2.0.1