From 385d61ce267ce5ff09dec17bff2ef03098aaf725 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Sun, 15 Sep 2013 12:01:07 +0200 Subject: [PATCH 01/10] ARM: ux500: add default trigger on HREF LED This adds a heartbeat on the first LED on the ux500 HREF boards. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ste-href.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/boot/dts/ste-href.dtsi b/arch/arm/boot/dts/ste-href.dtsi index f88a659aea3b..5e7cf4bf5afb 100644 --- a/arch/arm/boot/dts/ste-href.dtsi +++ b/arch/arm/boot/dts/ste-href.dtsi @@ -72,6 +72,7 @@ chan0 { led-cur = /bits/ 8 <0x2f>; max-cur = /bits/ 8 <0x5f>; + linux,default-trigger = "heartbeat"; }; chan1 { led-cur = /bits/ 8 <0x2f>; From c90c36e4bceed4cb61853c3382abbc765ad46ef5 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Thu, 26 Sep 2013 15:09:14 +0200 Subject: [PATCH 02/10] 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"; From 7e9dee0ca27f0bcedb4fad728bb0dc86da0863c7 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Wed, 2 Oct 2013 13:40:09 +0200 Subject: [PATCH 03/10] ARM: ux500: correct I2C address of ambient light sensor The ambient light sensor is places at address 0x29 nothing else. This patch makes the ambient light sensor probe again. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ste-href.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/ste-href.dtsi b/arch/arm/boot/dts/ste-href.dtsi index d6753261796b..a561bc39e6ab 100644 --- a/arch/arm/boot/dts/ste-href.dtsi +++ b/arch/arm/boot/dts/ste-href.dtsi @@ -103,7 +103,7 @@ }; bh1780@29 { compatible = "rohm,bh1780gli"; - reg = <0x33>; + reg = <0x29>; }; }; From 0ca3399fc822ff65120f6a59f6d4b82ff462559f Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Wed, 2 Oct 2013 14:56:49 +0200 Subject: [PATCH 04/10] ARM: ux500: fix proximity sensor button The proximity sensor is connected to pin AH12 on newer HREFs, that corresponds to pin offset 25 on gpio5, not gpio6. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ste-hrefv60plus.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/ste-hrefv60plus.dts b/arch/arm/boot/dts/ste-hrefv60plus.dts index bb3cfc7280e8..111546802667 100644 --- a/arch/arm/boot/dts/ste-hrefv60plus.dts +++ b/arch/arm/boot/dts/ste-hrefv60plus.dts @@ -20,7 +20,7 @@ gpio_keys { button@1 { - gpios = <&gpio6 25 0x4>; + gpios = <&gpio5 25 0x4>; }; }; From bf7a9b6f2fd31745e6ba532da37f68416312a688 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Wed, 2 Oct 2013 16:12:52 +0200 Subject: [PATCH 05/10] ARM: ux500: correct CD for micro SD on hrev60plus This correct the card detect line for the HREF v60 and later reference designs. This is connected directly to the Nomadik GPIO block, line 95 at offset 31 on the third instance. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ste-hrefv60plus.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/ste-hrefv60plus.dts b/arch/arm/boot/dts/ste-hrefv60plus.dts index 111546802667..b82ae5015121 100644 --- a/arch/arm/boot/dts/ste-hrefv60plus.dts +++ b/arch/arm/boot/dts/ste-hrefv60plus.dts @@ -40,7 +40,7 @@ mmc-cap-mmc-highspeed; vmmc-supply = <&ab8500_ldo_aux3_reg>; - cd-gpios = <&tc3589x_gpio 3 0x4>; + cd-gpios = <&gpio2 31 0x4>; // 95 status = "okay"; }; From d62407b0a68370c0eef9f4a508d846570ff6d38e Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Wed, 2 Oct 2013 16:03:31 +0200 Subject: [PATCH 06/10] ARM: ux500: move TC35892 at 0x42 to hrefprev60 The TC35892 was mounted as a GPIO expander on the HREF prior to v60 and not in later versions, which instead use the Nomadik GPIO directly, so move it over to the hrefprev60 DTS file. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ste-href.dtsi | 22 ---------------------- arch/arm/boot/dts/ste-hrefprev60.dts | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/arch/arm/boot/dts/ste-href.dtsi b/arch/arm/boot/dts/ste-href.dtsi index a561bc39e6ab..aa3f02060fdd 100644 --- a/arch/arm/boot/dts/ste-href.dtsi +++ b/arch/arm/boot/dts/ste-href.dtsi @@ -41,28 +41,6 @@ status = "okay"; }; - i2c@80004000 { - tc3589x@42 { - compatible = "tc3589x"; - reg = <0x42>; - interrupt-parent = <&gpio6>; - interrupts = <25 IRQ_TYPE_EDGE_RISING>; - - interrupt-controller; - #interrupt-cells = <2>; - - tc3589x_gpio: tc3589x_gpio { - compatible = "tc3589x-gpio"; - interrupts = <0 IRQ_TYPE_EDGE_RISING>; - - interrupt-controller; - #interrupt-cells = <2>; - gpio-controller; - #gpio-cells = <2>; - }; - }; - }; - i2c@80128000 { lp5521@33 { compatible = "national,lp5521"; diff --git a/arch/arm/boot/dts/ste-hrefprev60.dts b/arch/arm/boot/dts/ste-hrefprev60.dts index 767fa21e4881..5016dc93d98e 100644 --- a/arch/arm/boot/dts/ste-hrefprev60.dts +++ b/arch/arm/boot/dts/ste-hrefprev60.dts @@ -30,6 +30,26 @@ compatible = "tps61052"; reg = <0x33>; }; + + tc3589x@42 { + compatible = "tc3589x"; + reg = <0x42>; + interrupt-parent = <&gpio6>; + interrupts = <25 IRQ_TYPE_EDGE_RISING>; + + interrupt-controller; + #interrupt-cells = <2>; + + tc3589x_gpio: tc3589x_gpio { + compatible = "tc3589x-gpio"; + interrupts = <0 IRQ_TYPE_EDGE_RISING>; + + interrupt-controller; + #interrupt-cells = <2>; + gpio-controller; + #gpio-cells = <2>; + }; + }; }; i2c@80110000 { From 9c19cfa93a43803c5f40054f96bca28d439e0847 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Thu, 26 Sep 2013 15:34:02 +0200 Subject: [PATCH 07/10] ARM: ux500: split HREF UIB files Create two different UIB (User Interface Board) include files: one per UIB simply. The include files now only handle the devices on that very UIB. Signed-off-by: Linus Walleij --- .../{ste-stuib.dtsi => ste-href-stuib.dtsi} | 0 arch/arm/boot/dts/ste-href-tvk1281618.dtsi | 20 +++++++++++++++++++ arch/arm/boot/dts/ste-hrefprev60.dts | 3 ++- arch/arm/boot/dts/ste-hrefv60plus.dts | 3 ++- 4 files changed, 24 insertions(+), 2 deletions(-) rename arch/arm/boot/dts/{ste-stuib.dtsi => ste-href-stuib.dtsi} (100%) create mode 100644 arch/arm/boot/dts/ste-href-tvk1281618.dtsi diff --git a/arch/arm/boot/dts/ste-stuib.dtsi b/arch/arm/boot/dts/ste-href-stuib.dtsi similarity index 100% rename from arch/arm/boot/dts/ste-stuib.dtsi rename to arch/arm/boot/dts/ste-href-stuib.dtsi diff --git a/arch/arm/boot/dts/ste-href-tvk1281618.dtsi b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi new file mode 100644 index 000000000000..89e1485a3850 --- /dev/null +++ b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi @@ -0,0 +1,20 @@ +/* + * Copyright 2012 ST-Ericsson AB + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + * + * Device Tree for the TVK1281618 UIB + */ + +#include + +/ { + soc { + /* Add Synaptics touch screen, TC35892 keypad etc here */ + }; +}; diff --git a/arch/arm/boot/dts/ste-hrefprev60.dts b/arch/arm/boot/dts/ste-hrefprev60.dts index 5016dc93d98e..85c6dd4ab37e 100644 --- a/arch/arm/boot/dts/ste-hrefprev60.dts +++ b/arch/arm/boot/dts/ste-hrefprev60.dts @@ -12,7 +12,8 @@ /dts-v1/; #include "ste-dbx5x0.dtsi" #include "ste-href.dtsi" -#include "ste-stuib.dtsi" +#include "ste-href-stuib.dtsi" +#include "ste-href-tvk1281618.dtsi" / { model = "ST-Ericsson HREF (pre-v60) platform with Device Tree"; diff --git a/arch/arm/boot/dts/ste-hrefv60plus.dts b/arch/arm/boot/dts/ste-hrefv60plus.dts index b82ae5015121..0f222e16f0b3 100644 --- a/arch/arm/boot/dts/ste-hrefv60plus.dts +++ b/arch/arm/boot/dts/ste-hrefv60plus.dts @@ -12,7 +12,8 @@ /dts-v1/; #include "ste-dbx5x0.dtsi" #include "ste-href.dtsi" -#include "ste-stuib.dtsi" +#include "ste-href-stuib.dtsi" +#include "ste-href-tvk1281618.dtsi" / { model = "ST-Ericsson HREF (v60+) platform with Device Tree"; From 01dc909fa1be6259cdbbc9fd6933df4fbe26ea5a Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Wed, 2 Oct 2013 15:42:59 +0200 Subject: [PATCH 08/10] ARM: ux500: split the HREF DTS files from two to four As the device tree conversion did away with the ability to auto-detect the UIB (User Interface Board) version from attempting to read an I2C address, we now have to pass the knowledge of what UIB is mounted through the device tree. This gives rise to four possible board permutations: - HREF prior to v60, ST UIB (hrefprev60-stuib) - HREF prior to v60, TVK1281618 UIB (hrefprev60-tvk) - HREF v60 and later, ST UIB (href60plus-stuib) - HREF v60 and later, TVK1281618 UIB (hrefv60plus-tvk) Signed-off-by: Linus Walleij --- arch/arm/boot/dts/Makefile | 6 ++-- arch/arm/boot/dts/ste-hrefprev60-stuib.dts | 28 +++++++++++++++++ arch/arm/boot/dts/ste-hrefprev60-tvk.dts | 19 ++++++++++++ ...ste-hrefprev60.dts => ste-hrefprev60.dtsi} | 8 ++--- arch/arm/boot/dts/ste-hrefv60plus-stuib.dts | 30 +++++++++++++++++++ arch/arm/boot/dts/ste-hrefv60plus-tvk.dts | 21 +++++++++++++ ...e-hrefv60plus.dts => ste-hrefv60plus.dtsi} | 3 -- 7 files changed, 104 insertions(+), 11 deletions(-) create mode 100644 arch/arm/boot/dts/ste-hrefprev60-stuib.dts create mode 100644 arch/arm/boot/dts/ste-hrefprev60-tvk.dts rename arch/arm/boot/dts/{ste-hrefprev60.dts => ste-hrefprev60.dtsi} (85%) create mode 100644 arch/arm/boot/dts/ste-hrefv60plus-stuib.dts create mode 100644 arch/arm/boot/dts/ste-hrefv60plus-tvk.dts rename arch/arm/boot/dts/{ste-hrefv60plus.dts => ste-hrefv60plus.dtsi} (95%) diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index cc0f1fb61753..f1163a4c55d3 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -189,8 +189,10 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \ - ste-hrefprev60.dtb \ - ste-hrefv60plus.dtb \ + ste-hrefprev60-stuib.dtb \ + ste-hrefprev60-tvk.dtb \ + ste-hrefv60plus-stuib.dtb \ + ste-hrefv60plus-tvk.dtb \ ste-ccu8540.dtb \ ste-ccu9540.dtb dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb diff --git a/arch/arm/boot/dts/ste-hrefprev60-stuib.dts b/arch/arm/boot/dts/ste-hrefprev60-stuib.dts new file mode 100644 index 000000000000..3e1b974b43a1 --- /dev/null +++ b/arch/arm/boot/dts/ste-hrefprev60-stuib.dts @@ -0,0 +1,28 @@ +/* + * Copyright 2012 ST-Ericsson AB + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +/dts-v1/; +#include "ste-hrefprev60.dtsi" +#include "ste-href-stuib.dtsi" + +/ { + model = "ST-Ericsson HREF (pre-v60) and ST UIB"; + compatible = "st-ericsson,mop500", "st-ericsson,u8500"; + + soc { + /* Reset line for the BU21013 touchscreen */ + i2c@80110000 { + bu21013_tp@5c { + reset-gpio = <&tc3589x_gpio 13 0x4>; + }; + }; + }; +}; diff --git a/arch/arm/boot/dts/ste-hrefprev60-tvk.dts b/arch/arm/boot/dts/ste-hrefprev60-tvk.dts new file mode 100644 index 000000000000..59523f866812 --- /dev/null +++ b/arch/arm/boot/dts/ste-hrefprev60-tvk.dts @@ -0,0 +1,19 @@ +/* + * Copyright 2012 ST-Ericsson AB + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +/dts-v1/; +#include "ste-hrefprev60.dtsi" +#include "ste-href-tvk1281618.dtsi" + +/ { + model = "ST-Ericsson HREF (pre-v60) and TVK1281618 UIB"; + compatible = "st-ericsson,mop500", "st-ericsson,u8500"; +}; diff --git a/arch/arm/boot/dts/ste-hrefprev60.dts b/arch/arm/boot/dts/ste-hrefprev60.dtsi similarity index 85% rename from arch/arm/boot/dts/ste-hrefprev60.dts rename to arch/arm/boot/dts/ste-hrefprev60.dtsi index 85c6dd4ab37e..de6b0a0c5a54 100644 --- a/arch/arm/boot/dts/ste-hrefprev60.dts +++ b/arch/arm/boot/dts/ste-hrefprev60.dtsi @@ -7,18 +7,14 @@ * * http://www.opensource.org/licenses/gpl-license.html * http://www.gnu.org/copyleft/gpl.html + * + * Device Tree for the HREF+ prior to the v60 variant. */ -/dts-v1/; #include "ste-dbx5x0.dtsi" #include "ste-href.dtsi" -#include "ste-href-stuib.dtsi" -#include "ste-href-tvk1281618.dtsi" / { - model = "ST-Ericsson HREF (pre-v60) platform with Device Tree"; - compatible = "st-ericsson,mop500", "st-ericsson,u8500"; - gpio_keys { button@1 { gpios = <&tc3589x_gpio 7 0x4>; diff --git a/arch/arm/boot/dts/ste-hrefv60plus-stuib.dts b/arch/arm/boot/dts/ste-hrefv60plus-stuib.dts new file mode 100644 index 000000000000..4da49e7988e9 --- /dev/null +++ b/arch/arm/boot/dts/ste-hrefv60plus-stuib.dts @@ -0,0 +1,30 @@ +/* + * Copyright 2012 ST-Ericsson AB + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + * + * Device Tree for the HREF version 60 or later with the ST UIB + */ + +/dts-v1/; +#include "ste-hrefv60plus.dtsi" +#include "ste-href-stuib.dtsi" + +/ { + model = "ST-Ericsson HREF (v60+) and ST UIB"; + compatible = "st-ericsson,hrefv60+", "st-ericsson,u8500"; + + soc { + /* Reset line for the BU21013 touchscreen */ + i2c@80110000 { + bu21013_tp@0x5c { + reset-gpio = <&gpio4 15 0x4>; + }; + }; + }; +}; diff --git a/arch/arm/boot/dts/ste-hrefv60plus-tvk.dts b/arch/arm/boot/dts/ste-hrefv60plus-tvk.dts new file mode 100644 index 000000000000..d53cccdce776 --- /dev/null +++ b/arch/arm/boot/dts/ste-hrefv60plus-tvk.dts @@ -0,0 +1,21 @@ +/* + * Copyright 2012 ST-Ericsson AB + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + * + * Device Tree for the HREF version 60 or later with the TVK1281618 UIB + */ + +/dts-v1/; +#include "ste-hrefv60plus.dtsi" +#include "ste-href-tvk1281618.dtsi" + +/ { + model = "ST-Ericsson HREF (v60+) and TVK1281618 UIB"; + compatible = "st-ericsson,hrefv60+", "st-ericsson,u8500"; +}; diff --git a/arch/arm/boot/dts/ste-hrefv60plus.dts b/arch/arm/boot/dts/ste-hrefv60plus.dtsi similarity index 95% rename from arch/arm/boot/dts/ste-hrefv60plus.dts rename to arch/arm/boot/dts/ste-hrefv60plus.dtsi index 0f222e16f0b3..d0f116555c0e 100644 --- a/arch/arm/boot/dts/ste-hrefv60plus.dts +++ b/arch/arm/boot/dts/ste-hrefv60plus.dtsi @@ -9,11 +9,8 @@ * http://www.gnu.org/copyleft/gpl.html */ -/dts-v1/; #include "ste-dbx5x0.dtsi" #include "ste-href.dtsi" -#include "ste-href-stuib.dtsi" -#include "ste-href-tvk1281618.dtsi" / { model = "ST-Ericsson HREF (v60+) platform with Device Tree"; From 84919b96feebaf95f1739232c2984d69c2ee0802 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Thu, 3 Oct 2013 10:18:36 +0200 Subject: [PATCH 09/10] ARM: ux500: register the tc35892 GPIO on the TVK UIB The TVK1281618 UIB has a TC35892 GPIO expander on it, which has in the past probably been confused with the GPIO expander on the older HREF plus previous to v60, which is on an entirely different part of the system with another I2C address. Register the expander in the right place. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ste-href-tvk1281618.dtsi | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/arch/arm/boot/dts/ste-href-tvk1281618.dtsi b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi index 89e1485a3850..76d3ef13175f 100644 --- a/arch/arm/boot/dts/ste-href-tvk1281618.dtsi +++ b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi @@ -16,5 +16,26 @@ / { soc { /* Add Synaptics touch screen, TC35892 keypad etc here */ + i2c@80004000 { + tc3589x@44 { + compatible = "tc3589x"; + reg = <0x44>; + interrupt-parent = <&gpio6>; + interrupts = <26 IRQ_TYPE_EDGE_RISING>; + + interrupt-controller; + #interrupt-cells = <2>; + + tc3589x_gpio { + compatible = "tc3589x-gpio"; + interrupts = <0 IRQ_TYPE_EDGE_RISING>; + + interrupt-controller; + #interrupt-cells = <2>; + gpio-controller; + #gpio-cells = <2>; + }; + }; + }; }; }; From 741a6c4c59cfa1266bc75aca9f66bdc6e421b0d5 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Thu, 3 Oct 2013 10:29:24 +0200 Subject: [PATCH 10/10] ARM: ux500: move BU21013 touchpad GPIOs into top-level DTS The BU21013 touchscreen GPIOs have been pretty confused, correct them per board, and move the GPIO assignments up to the top level DTS file so we can control it from there, and avoid defining the GPIO assignments for non-ST UIB equipped boards. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ste-href-stuib.dtsi | 2 -- arch/arm/boot/dts/ste-hrefprev60-stuib.dts | 6 ++++++ arch/arm/boot/dts/ste-hrefprev60.dtsi | 6 ------ arch/arm/boot/dts/ste-hrefv60plus-stuib.dts | 10 ++++++++-- arch/arm/boot/dts/ste-hrefv60plus.dtsi | 6 ------ 5 files changed, 14 insertions(+), 16 deletions(-) diff --git a/arch/arm/boot/dts/ste-href-stuib.dtsi b/arch/arm/boot/dts/ste-href-stuib.dtsi index 524e33240ad4..76704ec0ffcc 100644 --- a/arch/arm/boot/dts/ste-href-stuib.dtsi +++ b/arch/arm/boot/dts/ste-href-stuib.dtsi @@ -57,7 +57,6 @@ bu21013_tp@5c { compatible = "rohm,bu21013_tp"; reg = <0x5c>; - touch-gpio = <&gpio2 20 0x4>; avdd-supply = <&ab8500_ldo_aux1_reg>; rohm,touch-max-x = <384>; @@ -68,7 +67,6 @@ bu21013_tp@5d { compatible = "rohm,bu21013_tp"; reg = <0x5d>; - touch-gpio = <&gpio2 20 0x4>; avdd-supply = <&ab8500_ldo_aux1_reg>; rohm,touch-max-x = <384>; diff --git a/arch/arm/boot/dts/ste-hrefprev60-stuib.dts b/arch/arm/boot/dts/ste-hrefprev60-stuib.dts index 3e1b974b43a1..2b1cb5b584b6 100644 --- a/arch/arm/boot/dts/ste-hrefprev60-stuib.dts +++ b/arch/arm/boot/dts/ste-hrefprev60-stuib.dts @@ -20,7 +20,13 @@ soc { /* Reset line for the BU21013 touchscreen */ i2c@80110000 { + /* Only one of these will be used */ bu21013_tp@5c { + touch-gpio = <&gpio2 12 0x4>; + reset-gpio = <&tc3589x_gpio 13 0x4>; + }; + bu21013_tp@5d { + touch-gpio = <&gpio2 12 0x4>; reset-gpio = <&tc3589x_gpio 13 0x4>; }; }; diff --git a/arch/arm/boot/dts/ste-hrefprev60.dtsi b/arch/arm/boot/dts/ste-hrefprev60.dtsi index de6b0a0c5a54..b2cd7bc2752f 100644 --- a/arch/arm/boot/dts/ste-hrefprev60.dtsi +++ b/arch/arm/boot/dts/ste-hrefprev60.dtsi @@ -49,12 +49,6 @@ }; }; - i2c@80110000 { - bu21013_tp@5c { - reset-gpio = <&tc3589x_gpio 13 0x4>; - }; - }; - vmmci: regulator-gpio { gpios = <&tc3589x_gpio 18 0x4>; enable-gpio = <&tc3589x_gpio 17 0x4>; diff --git a/arch/arm/boot/dts/ste-hrefv60plus-stuib.dts b/arch/arm/boot/dts/ste-hrefv60plus-stuib.dts index 4da49e7988e9..8c6a2de56cf1 100644 --- a/arch/arm/boot/dts/ste-hrefv60plus-stuib.dts +++ b/arch/arm/boot/dts/ste-hrefv60plus-stuib.dts @@ -22,8 +22,14 @@ soc { /* Reset line for the BU21013 touchscreen */ i2c@80110000 { - bu21013_tp@0x5c { - reset-gpio = <&gpio4 15 0x4>; + /* Only one of these will be used */ + bu21013_tp@5c { + touch-gpio = <&gpio2 20 0x4>; + reset-gpio = <&gpio4 17 0x4>; + }; + bu21013_tp@5d { + touch-gpio = <&gpio2 20 0x4>; + reset-gpio = <&gpio4 17 0x4>; }; }; }; diff --git a/arch/arm/boot/dts/ste-hrefv60plus.dtsi b/arch/arm/boot/dts/ste-hrefv60plus.dtsi index d0f116555c0e..aed511b47a9e 100644 --- a/arch/arm/boot/dts/ste-hrefv60plus.dtsi +++ b/arch/arm/boot/dts/ste-hrefv60plus.dtsi @@ -23,12 +23,6 @@ }; soc { - i2c@80110000 { - bu21013_tp@0x5c { - reset-gpio = <&gpio4 15 0x4>; - }; - }; - // External Micro SD slot sdi0_per1@80126000 { arm,primecell-periphid = <0x10480180>;