diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2013-09-26 09:09:14 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2013-09-26 09:10:27 -0400 |
commit | c90c36e4bceed4cb61853c3382abbc765ad46ef5 (patch) | |
tree | a2e0fea1206fd2decf431e28aa46177588496bd4 | |
parent | 385d61ce267ce5ff09dec17bff2ef03098aaf725 (diff) |
ARM: ux500 enable the AB8500 gpio for all HREFs
The AB8500 GPIO was only registered for the pre-v60 HREF but should
be made available on all HREF variants, move the DT entry to the
common file.
Cc: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r-- | arch/arm/boot/dts/ste-href.dtsi | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/ste-hrefprev60.dts | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/ste-href.dtsi b/arch/arm/boot/dts/ste-href.dtsi index 5e7cf4bf5afb..d6753261796b 100644 --- a/arch/arm/boot/dts/ste-href.dtsi +++ b/arch/arm/boot/dts/ste-href.dtsi | |||
@@ -169,6 +169,10 @@ | |||
169 | 169 | ||
170 | prcmu@80157000 { | 170 | prcmu@80157000 { |
171 | ab8500 { | 171 | ab8500 { |
172 | ab8500-gpio { | ||
173 | compatible = "stericsson,ab8500-gpio"; | ||
174 | }; | ||
175 | |||
172 | ab8500-regulators { | 176 | ab8500-regulators { |
173 | ab8500_ldo_aux1_reg: ab8500_ldo_aux1 { | 177 | ab8500_ldo_aux1_reg: ab8500_ldo_aux1 { |
174 | regulator-name = "V-DISPLAY"; | 178 | regulator-name = "V-DISPLAY"; |
diff --git a/arch/arm/boot/dts/ste-hrefprev60.dts b/arch/arm/boot/dts/ste-hrefprev60.dts index d8d3b99ab007..767fa21e4881 100644 --- a/arch/arm/boot/dts/ste-hrefprev60.dts +++ b/arch/arm/boot/dts/ste-hrefprev60.dts | |||
@@ -25,14 +25,6 @@ | |||
25 | }; | 25 | }; |
26 | 26 | ||
27 | soc { | 27 | soc { |
28 | prcmu@80157000 { | ||
29 | ab8500@5 { | ||
30 | ab8500-gpio { | ||
31 | compatible = "stericsson,ab8500-gpio"; | ||
32 | }; | ||
33 | }; | ||
34 | }; | ||
35 | |||
36 | i2c@80004000 { | 28 | i2c@80004000 { |
37 | tps61052@33 { | 29 | tps61052@33 { |
38 | compatible = "tps61052"; | 30 | compatible = "tps61052"; |