summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2012-11-15 13:07:02 +0000
committerLee Jones <lee.jones@linaro.org>2012-11-27 10:58:27 +0000
commit8ad49c65f551c15af3f1049d10ccbdcd376a295d (patch)
tree9dcc493f31fa484b98ab54a07af8874e9c30aa2e
parentc94a4ab7af3f07424e3db0c77f6b532d0a7202de (diff)
downloadlinux-3.10-8ad49c65f551c15af3f1049d10ccbdcd376a295d.tar.gz
linux-3.10-8ad49c65f551c15af3f1049d10ccbdcd376a295d.tar.bz2
linux-3.10-8ad49c65f551c15af3f1049d10ccbdcd376a295d.zip
ARM: ux500: Move board specific GPIO info out to subordinate DTS files
GPIO numbers for the newly created gpio-regulator will differ from board to board. Therefore it's not sensible to leave this information in the top level DTSI file. Let's move them out to the DTS files where they can correctly vary. Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Lee Jones <lee.jones@linaro.org>
-rw-r--r--arch/arm/boot/dts/dbx5x0.dtsi2
-rw-r--r--arch/arm/boot/dts/hrefprev60.dts7
2 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi
index d8ba489e32c..9f553630242 100644
--- a/arch/arm/boot/dts/dbx5x0.dtsi
+++ b/arch/arm/boot/dts/dbx5x0.dtsi
@@ -638,8 +638,6 @@
regulator-name = "mmci-reg";
regulator-type = "voltage";
- gpios = <&tc3589x_gpio 18 0x4>;
- gpio-enable = <&tc3589x_gpio 17 0x4>;
states = <1800000 0x1
2900000 0x0>;
diff --git a/arch/arm/boot/dts/hrefprev60.dts b/arch/arm/boot/dts/hrefprev60.dts
index b398946fd64..eec29c4a86d 100644
--- a/arch/arm/boot/dts/hrefprev60.dts
+++ b/arch/arm/boot/dts/hrefprev60.dts
@@ -37,5 +37,12 @@
reset-gpio = <&tc3589x_gpio 13 0x4>;
};
};
+
+ vmmci: regulator-gpio {
+ gpios = <&tc3589x_gpio 18 0x4>;
+ gpio-enable = <&tc3589x_gpio 17 0x4>;
+
+ status = "okay";
+ };
};
};