From c90c36e4bceed4cb61853c3382abbc765ad46ef5 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Thu, 26 Sep 2013 15:09:14 +0200 Subject: [PATCH] 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 Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ste-href.dtsi | 4 ++++ 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 @@ prcmu@80157000 { ab8500 { + ab8500-gpio { + compatible = "stericsson,ab8500-gpio"; + }; + ab8500-regulators { ab8500_ldo_aux1_reg: ab8500_ldo_aux1 { 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 @@ }; soc { - prcmu@80157000 { - ab8500@5 { - ab8500-gpio { - compatible = "stericsson,ab8500-gpio"; - }; - }; - }; - i2c@80004000 { tps61052@33 { compatible = "tps61052"; -- 2.34.1