ARM: dts: ux500: Fix STMPE device nodes

The STMPE device nodes need to be augmented to fit with current
naming policies.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20230508070811.965762-1-linus.walleij@linaro.org

diff --git a/arch/arm/boot/dts/ste-href-stuib.dtsi b/arch/arm/boot/dts/ste-href-stuib.dtsi
index e32d0c36feb8f9ce1341a2efe84d6d43d4d9d978..79c2be36acae7e17fcfe4459feefc06843905711 100644 (file)
--- a/arch/arm/boot/dts/ste-href-stuib.dtsi
+++ b/arch/arm/boot/dts/ste-href-stuib.dtsi
@@ -30,12 +30,11 @@
 
        soc {
                i2c@80004000 {
-                       stmpe1601: stmpe1601@40 {
+                       stmpe1601: port-expander@40 {
                                compatible = "st,stmpe1601";
                                reg = <0x40>;
                                interrupts = <26 IRQ_TYPE_EDGE_FALLING>;
                                interrupt-parent = <&gpio6>;
-                               interrupt-controller;
                                vcc-supply = <&db8500_vsmps2_reg>;
                                vio-supply = <&db8500_vsmps2_reg>;
                                pinctrl-names = "default";
@@ -44,7 +43,7 @@
                                wakeup-source;
                                st,autosleep-timeout = <1024>;
 
-                               stmpe_keypad {
+                               keyboard-controller {
                                        compatible = "st,stmpe-keypad";
 
                                        debounce-interval = <64>;

diff --git a/arch/arm/boot/dts/ste-nomadik-nhk15.dts b/arch/arm/boot/dts/ste-nomadik-nhk15.dts
index 4d741adc16cd9ac07fee4d72f74d9fa9c638087d..1cba130dde8f21b2a5bad6db36b23966ffd453df 100644 (file)
--- a/arch/arm/boot/dts/ste-nomadik-nhk15.dts
+++ b/arch/arm/boot/dts/ste-nomadik-nhk15.dts
@@ -99,17 +99,16 @@
                        pinctrl-names = "default";
                        reg = <0x1d>;
                };
-               stmpe0: stmpe2401@43 {
+               stmpe0: port-expander@43 {
                        compatible = "st,stmpe2401";
                        reg = <0x43>;
                        reset-gpios = <&gpio2 13 GPIO_ACTIVE_LOW>; // GPIO77
                        interrupts = <12 IRQ_TYPE_EDGE_FALLING>; // GPIO76
                        interrupt-parent = <&gpio2>;
-                       interrupt-controller;
                        wakeup-source;
                        pinctrl-names = "default";
                        pinctrl-0 = <&stmpe2401_1_nhk_mode>;
-                       stmpe_gpio43: stmpe_gpio {
+                       stmpe_gpio43: gpio {
                                compatible = "st,stmpe-gpio";
                                gpio-controller;
                                #gpio-cells = <2>;
@@ -118,7 +117,7 @@
                                /* Some pins in alternate functions */
                                st,norequest-mask = <0xf0f002>;
                        };
-                       stmpe_keypad {
+                       keyboard-controller {
                                compatible = "st,stmpe-keypad";
                                debounce-interval = <64>;
                                st,scan-count = <8>;
@@ -140,22 +139,21 @@
                                                0x03020067 // Up
                                                0x0303006c>; // Down
                        };
-                       stmpe0_pwm: stmpe_pwm {
+                       stmpe0_pwm: pwm {
                                compatible = "st,stmpe-pwm";
                                #pwm-cells = <2>;
                        };
                };
-               stmpe1: stmpe2401@44 {
+               stmpe1: port-expander@44 {
                        compatible = "st,stmpe2401";
                        reg = <0x44>;
                        reset-gpios = <&gpio2 15 GPIO_ACTIVE_LOW>; // GPIO79
                        interrupts = <14 IRQ_TYPE_EDGE_FALLING>; // GPIO78
                        interrupt-parent = <&gpio2>;
-                       interrupt-controller;
                        wakeup-source;
                        pinctrl-names = "default";
                        pinctrl-0 = <&stmpe2401_2_nhk_mode>;
-                       stmpe_gpio44: stmpe_gpio {
+                       stmpe_gpio44: gpio {
                                compatible = "st,stmpe-gpio";
                                gpio-controller;
                                #gpio-cells = <2>;
@@ -165,7 +163,7 @@
                                 * This will turn off SATA so that MMC/SD
                                 * can thrive
                                 */
-                               mmcsd-gpio {
+                               mmcsd-hog {
                                        gpio-hog;
                                        gpios = <2 0x0>;
                                        output-low;