ARM: dts: ux500: Totally separate TVK R2 and R3

There is no point in sharing any definitions between
the R2 and R3 versions of the TVK1281618 UIB. The
proximity sensor collides with the touchscreen etc,
it is less confusing to get rid of the overarching
TVK1281618 UIB file and just use one for each.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi b/arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi
index 9bbf69717851f633735552e8273ef87feb17975a..8d59202cebd6fa799423d52e33336d56e1d86471 100644 (file)
--- a/arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi
+++ b/arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi
@@ -3,10 +3,32 @@
  * Device Tree for the TVK1281618 R2 user interface board (UIB)
  */
 
+#include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/input/input.h>
-#include "ste-href-tvk1281618.dtsi"
 
 / {
+       gpio_keys {
+               compatible = "gpio-keys";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               vdd-supply = <&ab8500_ldo_aux1_reg>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&prox_tvk_mode>, <&hall_tvk_mode>;
+
+               button@139 {
+                       /* Proximity sensor */
+                       gpios = <&gpio6 25 GPIO_ACTIVE_HIGH>;
+                       linux,code = <11>; /* SW_FRONT_PROXIMITY */
+                       label = "SFH7741 Proximity Sensor";
+               };
+               button@145 {
+                       /* Hall sensor */
+                       gpios = <&gpio4 17 GPIO_ACTIVE_HIGH>;
+                       linux,code = <0>; /* SW_LID */
+                       label = "HED54XXU11 Hall Effect Sensor";
+               };
+       };
+
        soc {
                i2c@80004000 {
                        tc35893@44 {
@@ -195,6 +217,22 @@
                        };
                };
                pinctrl {
+                       prox {
+                               prox_tvk_mode: prox_tvk {
+                                       tvk_cfg {
+                                               pins = "GPIO217_AH12";
+                                               ste,config = <&gpio_in_pu>;
+                                       };
+                               };
+                       };
+                       hall {
+                               hall_tvk_mode: hall_tvk {
+                                       tvk_cfg {
+                                               pins = "GPIO145_C13";
+                                               ste,config = <&gpio_in_pu>;
+                                       };
+                               };
+                       };
                        tc35893 {
                                /* IRQ from the TC35893 */
                                tc35893_tvk_mode: tc35893_tvk {

diff --git a/arch/arm/boot/dts/ste-href-tvk1281618-r3.dtsi b/arch/arm/boot/dts/ste-href-tvk1281618-r3.dtsi
index 0951896f5e01fcc70bd8b19a5f7c11b2813c3aec..707d453dd6a5f8f6cdcf172e8f4eac0002fbfa30 100644 (file)
--- a/arch/arm/boot/dts/ste-href-tvk1281618-r3.dtsi
+++ b/arch/arm/boot/dts/ste-href-tvk1281618-r3.dtsi
@@ -4,10 +4,26 @@
  * also known as the "CYTTSP board"
  */
 
+#include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/input/input.h>
-#include "ste-href-tvk1281618.dtsi"
 
 / {
+       gpio_keys {
+               compatible = "gpio-keys";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               vdd-supply = <&ab8500_ldo_aux1_reg>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&hall_tvk_mode>;
+
+               button@145 {
+                       /* Hall sensor */
+                       gpios = <&gpio4 17 GPIO_ACTIVE_HIGH>;
+                       linux,code = <0>; /* SW_LID */
+                       label = "HED54XXU11 Hall Effect Sensor";
+               };
+       };
+
        soc {
                i2c@80004000 {
                        tc35893@44 {
@@ -116,6 +132,14 @@
                };
 
                pinctrl {
+                       hall {
+                               hall_tvk_mode: hall_tvk {
+                                       tvk_cfg {
+                                               pins = "GPIO145_C13";
+                                               ste,config = <&gpio_in_pu>;
+                                       };
+                               };
+                       };
                        tc35893 {
                                /* IRQ from the TC35893 */
                                tc35893_tvk_mode: tc35893_tvk {

diff --git a/arch/arm/boot/dts/ste-href-tvk1281618.dtsi b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi
deleted file mode 100644 (file)
index a94ba34..0000000
--- a/arch/arm/boot/dts/ste-href-tvk1281618.dtsi
+++ /dev/null
@@ -1,53 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright 2012 ST-Ericsson AB
- *
- * Device Tree for the TVK1281618 family of UIBs
- */
-
-#include <dt-bindings/interrupt-controller/irq.h>
-
-/ {
-       gpio_keys {
-               compatible = "gpio-keys";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               vdd-supply = <&ab8500_ldo_aux1_reg>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&prox_tvk_mode>, <&hall_tvk_mode>;
-
-               button@139 {
-                       /* Proximity sensor */
-                       gpios = <&gpio6 25 GPIO_ACTIVE_HIGH>;
-                       linux,code = <11>; /* SW_FRONT_PROXIMITY */
-                       label = "SFH7741 Proximity Sensor";
-               };
-               button@145 {
-                       /* Hall sensor */
-                       gpios = <&gpio4 17 GPIO_ACTIVE_HIGH>;
-                       linux,code = <0>; /* SW_LID */
-                       label = "HED54XXU11 Hall Effect Sensor";
-               };
-       };
-
-       soc {
-               pinctrl {
-                       prox {
-                               prox_tvk_mode: prox_tvk {
-                                       tvk_cfg {
-                                               pins = "GPIO217_AH12";
-                                               ste,config = <&gpio_in_pu>;
-                                       };
-                               };
-                       };
-                       hall {
-                               hall_tvk_mode: hall_tvk {
-                                       tvk_cfg {
-                                               pins = "GPIO145_C13";
-                                               ste,config = <&gpio_in_pu>;
-                                       };
-                               };
-                       };
-               };
-       };
-};