ARM: dts: ux500: Push TC35893 defines to each UIB

The TC35893 is connected to different GPIOs in different
UIBs so just bite the bullet and push this info down
into respective UIB so we can avoid confusion when
reading the DTS files.

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 b9b85ff..9bbf697 100644 (file)
--- a/arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi
+++ b/arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi
@@ -1,12 +1,65 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 /*
- * Device Tree for the TVK1281618 R2 UIB
+ * Device Tree for the TVK1281618 R2 user interface board (UIB)
  */
 
+#include <dt-bindings/input/input.h>
 #include "ste-href-tvk1281618.dtsi"
 
 / {
        soc {
+               i2c@80004000 {
+                       tc35893@44 {
+                               compatible = "toshiba,tc35893";
+                               reg = <0x44>;
+                               interrupt-parent = <&gpio6>;
+                               interrupts = <26 IRQ_TYPE_EDGE_RISING>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&tc35893_tvk_mode>;
+
+                               interrupt-controller;
+                               #interrupt-cells = <1>;
+                               status = "disabled";
+
+                               tc3589x_gpio {
+                                       compatible = "toshiba,tc3589x-gpio";
+                                       interrupts = <0>;
+
+                                       interrupt-controller;
+                                       #interrupt-cells = <2>;
+                                       gpio-controller;
+                                       #gpio-cells = <2>;
+                               };
+                               tc3589x_keypad {
+                                       compatible = "toshiba,tc3589x-keypad";
+                                       interrupts = <6>;
+                                       debounce-delay-ms = <4>;
+                                       keypad,num-columns = <8>;
+                                       keypad,num-rows = <8>;
+                                       linux,no-autorepeat;
+                                       wakeup-source;
+                                       linux,keymap = <MATRIX_KEY(3, 1, KEY_END)>,
+                                                      <MATRIX_KEY(4, 1, KEY_HOME)>,
+                                                      <MATRIX_KEY(6, 4, KEY_VOLUMEDOWN)>,
+                                                      <MATRIX_KEY(4, 2, KEY_EMAIL)>,
+                                                      <MATRIX_KEY(3, 3, KEY_RIGHT)>,
+                                                      <MATRIX_KEY(2, 5, KEY_BACKSPACE)>,
+                                                      <MATRIX_KEY(6, 7, KEY_MENU)>,
+                                                      <MATRIX_KEY(5, 0, KEY_ENTER)>,
+                                                      <MATRIX_KEY(4, 3, KEY_0)>,
+                                                      <MATRIX_KEY(3, 4, KEY_DOT)>,
+                                                      <MATRIX_KEY(5, 2, KEY_UP)>,
+                                                      <MATRIX_KEY(3, 5, KEY_DOWN)>,
+                                                      <MATRIX_KEY(4, 5, KEY_SEND)>,
+                                                      <MATRIX_KEY(0, 5, KEY_BACK)>,
+                                                      <MATRIX_KEY(6, 2, KEY_VOLUMEUP)>,
+                                                      <MATRIX_KEY(1, 3, KEY_SPACE)>,
+                                                      <MATRIX_KEY(7, 6, KEY_LEFT)>,
+                                                      <MATRIX_KEY(5, 5, KEY_SEARCH)>;
+                               };
+                       };
+               };
+
                i2c@80128000 {
                        accelerometer@18 {
                                /* Accelerometer */
@@ -142,6 +195,15 @@
                        };
                };
                pinctrl {
+                       tc35893 {
+                               /* IRQ from the TC35893 */
+                               tc35893_tvk_mode: tc35893_tvk {
+                                       tvk_cfg {
+                                               pins = "GPIO218_AH11";
+                                               ste,config = <&gpio_in_pu>;
+                                       };
+                               };
+                       };
                        accelerometer {
                                accel_tvk_mode: accel_tvk {
                                        /* Accelerometer interrupt lines 1 & 2 */

diff --git a/arch/arm/boot/dts/ste-href-tvk1281618-r3.dtsi b/arch/arm/boot/dts/ste-href-tvk1281618-r3.dtsi
index b580397..0951896 100644 (file)
--- a/arch/arm/boot/dts/ste-href-tvk1281618-r3.dtsi
+++ b/arch/arm/boot/dts/ste-href-tvk1281618-r3.dtsi
@@ -1,12 +1,66 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 /*
- * Device Tree for the TVK1281618 R2 UIB
+ * Device Tree for the TVK1281618 R3 user interface board (UIB)
+ * also known as the "CYTTSP board"
  */
 
+#include <dt-bindings/input/input.h>
 #include "ste-href-tvk1281618.dtsi"
 
 / {
        soc {
+               i2c@80004000 {
+                       tc35893@44 {
+                               compatible = "toshiba,tc35893";
+                               reg = <0x44>;
+                               interrupt-parent = <&gpio2>;
+                               interrupts = <0 IRQ_TYPE_EDGE_RISING>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&tc35893_tvk_mode>;
+
+                               interrupt-controller;
+                               #interrupt-cells = <1>;
+                               status = "disabled";
+
+                               tc3589x_gpio {
+                                       compatible = "toshiba,tc3589x-gpio";
+                                       interrupts = <0>;
+
+                                       interrupt-controller;
+                                       #interrupt-cells = <2>;
+                                       gpio-controller;
+                                       #gpio-cells = <2>;
+                               };
+                               tc3589x_keypad {
+                                       compatible = "toshiba,tc3589x-keypad";
+                                       interrupts = <6>;
+                                       debounce-delay-ms = <4>;
+                                       keypad,num-columns = <8>;
+                                       keypad,num-rows = <8>;
+                                       linux,no-autorepeat;
+                                       wakeup-source;
+                                       linux,keymap = <MATRIX_KEY(3, 1, KEY_END)>,
+                                                      <MATRIX_KEY(4, 1, KEY_HOME)>,
+                                                      <MATRIX_KEY(6, 4, KEY_VOLUMEDOWN)>,
+                                                      <MATRIX_KEY(4, 2, KEY_EMAIL)>,
+                                                      <MATRIX_KEY(3, 3, KEY_RIGHT)>,
+                                                      <MATRIX_KEY(2, 5, KEY_BACKSPACE)>,
+                                                      <MATRIX_KEY(6, 7, KEY_MENU)>,
+                                                      <MATRIX_KEY(5, 0, KEY_ENTER)>,
+                                                      <MATRIX_KEY(4, 3, KEY_0)>,
+                                                      <MATRIX_KEY(3, 4, KEY_DOT)>,
+                                                      <MATRIX_KEY(5, 2, KEY_UP)>,
+                                                      <MATRIX_KEY(3, 5, KEY_DOWN)>,
+                                                      <MATRIX_KEY(4, 5, KEY_SEND)>,
+                                                      <MATRIX_KEY(0, 5, KEY_BACK)>,
+                                                      <MATRIX_KEY(6, 2, KEY_VOLUMEUP)>,
+                                                      <MATRIX_KEY(1, 3, KEY_SPACE)>,
+                                                      <MATRIX_KEY(7, 6, KEY_LEFT)>,
+                                                      <MATRIX_KEY(5, 5, KEY_SEARCH)>;
+                               };
+                       };
+               };
+
                i2c@80128000 {
                        accelerometer@19 {
                                compatible = "st,lsm303dlhc-accel";
@@ -62,6 +116,15 @@
                };
 
                pinctrl {
+                       tc35893 {
+                               /* IRQ from the TC35893 */
+                               tc35893_tvk_mode: tc35893_tvk {
+                                       tvk_cfg {
+                                               pins = "GPIO64_F3";
+                                               ste,config = <&gpio_in_pu>;
+                                       };
+                               };
+                       };
                        accelerometer {
                                accel_tvk_mode: accel_tvk {
                                        /* Accelerometer interrupt lines 1 & 2 */

diff --git a/arch/arm/boot/dts/ste-href-tvk1281618.dtsi b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi
index aa68224..a94ba34 100644 (file)
--- a/arch/arm/boot/dts/ste-href-tvk1281618.dtsi
+++ b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi
@@ -31,67 +31,7 @@
        };
 
        soc {
-               i2c@80004000 {
-                       tc35893@44 {
-                               compatible = "toshiba,tc35893";
-                               reg = <0x44>;
-                               interrupt-parent = <&gpio6>;
-                               interrupts = <26 IRQ_TYPE_EDGE_RISING>;
-                               pinctrl-names = "default";
-                               pinctrl-0 = <&tc35893_tvk_mode>;
-
-                               interrupt-controller;
-                               #interrupt-cells = <1>;
-
-                               tc3589x_gpio {
-                                       compatible = "toshiba,tc3589x-gpio";
-                                       interrupts = <0>;
-
-                                       interrupt-controller;
-                                       #interrupt-cells = <2>;
-                                       gpio-controller;
-                                       #gpio-cells = <2>;
-                               };
-                               tc3589x_keypad {
-                                       compatible = "toshiba,tc3589x-keypad";
-                                       interrupts = <6>;
-                                       debounce-delay-ms = <4>;
-                                       keypad,num-columns = <8>;
-                                       keypad,num-rows = <8>;
-                                       linux,no-autorepeat;
-                                       wakeup-source;
-                                       linux,keymap = <0x0301006b
-                                                       0x04010066
-                                                       0x06040072
-                                                       0x040200d7
-                                                       0x0303006a
-                                                       0x0205000e
-                                                       0x0607008b
-                                                       0x0500001c
-                                                       0x0403000b
-                                                       0x03040034
-                                                       0x05020067
-                                                       0x0305006c
-                                                       0x040500e7
-                                                       0x0005009e
-                                                       0x06020073
-                                                       0x01030039
-                                                       0x07060069
-                                                       0x050500d9>;
-                               };
-                       };
-               };
-
                pinctrl {
-                       /* Pull up this GPIO pin */
-                       tc35893 {
-                               tc35893_tvk_mode: tc35893_tvk {
-                                       tvk_cfg {
-                                               pins = "GPIO218_AH11";
-                                               ste,config = <&gpio_in_pu>;
-                                       };
-                               };
-                       };
                        prox {
                                prox_tvk_mode: prox_tvk {
                                        tvk_cfg {