ARM: dts: qcom: msm8960: rename msmgpio node to tlmm

Rename the GPIO controller node from "msmgpio" to "tlmm" to match the
convention used by other Qualcomm SoCs.

Suggested-by: Shinjo Park <peremen@gmail.com>
Signed-off-by: Antony Kurniawan Soemardi <linux@smankusors.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20250921-msm8960-reorder-v2-5-26c478366d21@smankusors.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts b/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts
index 36f4c997b0b3aa8c9bbbee78906f03dad0a73e7e..1df078d7d89b839b45d9f9c56fee9d4ea9615c6e 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts
+++ b/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts
@@ -19,7 +19,7 @@
        ext_l2: gpio-regulator {
                compatible = "regulator-fixed";
                regulator-name = "ext_l2";
-               gpio = <&msmgpio 91 0>;
+               gpio = <&tlmm 91 0>;
                startup-delay-us = <10000>;
                enable-active-high;
        };
@@ -38,12 +38,12 @@
        ethernet@0 {
                compatible = "micrel,ks8851";
                reg = <0>;
-               interrupt-parent = <&msmgpio>;
+               interrupt-parent = <&tlmm>;
                interrupts = <90 IRQ_TYPE_LEVEL_LOW>;
                spi-max-frequency = <5400000>;
                vdd-supply = <&ext_l2>;
                vdd-io-supply = <&pm8921_lvs6>;
-               reset-gpios = <&msmgpio 89 0>;
+               reset-gpios = <&tlmm 89 0>;
        };
 };
 
@@ -56,7 +56,7 @@
        status = "okay";
 };
 
-&msmgpio {
+&tlmm {
        spi1_default: spi1-default-state {
                 mosi-pins {
                        pins = "gpio6";
@@ -90,7 +90,7 @@
 };
 
 &pm8921 {
-       interrupts-extended = <&msmgpio 104 IRQ_TYPE_LEVEL_LOW>;
+       interrupts-extended = <&tlmm 104 IRQ_TYPE_LEVEL_LOW>;
 };
 
 &pm8921_keypad {

diff --git a/arch/arm/boot/dts/qcom/qcom-msm8960-samsung-expressatt.dts b/arch/arm/boot/dts/qcom/qcom-msm8960-samsung-expressatt.dts
index 49d117ea033a0ef73c134d1225982786fbded2c2..5ee919dce75b31a977e8e1ebd0d02413b20b6270 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-msm8960-samsung-expressatt.dts
+++ b/arch/arm/boot/dts/qcom/qcom-msm8960-samsung-expressatt.dts
@@ -31,7 +31,7 @@
 
                key-home {
                        label = "Home";
-                       gpios = <&msmgpio 40 GPIO_ACTIVE_LOW>;
+                       gpios = <&tlmm 40 GPIO_ACTIVE_LOW>;
                        debounce-interval = <5>;
                        linux,code = <KEY_HOMEPAGE>;
                        wakeup-event-action = <EV_ACT_ASSERTED>;
@@ -40,14 +40,14 @@
 
                key-volume-up {
                        label = "Volume Up";
-                       gpios = <&msmgpio 50 GPIO_ACTIVE_LOW>;
+                       gpios = <&tlmm 50 GPIO_ACTIVE_LOW>;
                        debounce-interval = <5>;
                        linux,code = <KEY_VOLUMEUP>;
                };
 
                key-volume-down {
                        label = "Volume Down";
-                       gpios = <&msmgpio 81 GPIO_ACTIVE_LOW>;
+                       gpios = <&tlmm 81 GPIO_ACTIVE_LOW>;
                        debounce-interval = <5>;
                        linux,code = <KEY_VOLUMEDOWN>;
                };
@@ -102,7 +102,7 @@
        touchscreen@4a {
                compatible = "atmel,maxtouch";
                reg = <0x4a>;
-               interrupt-parent = <&msmgpio>;
+               interrupt-parent = <&tlmm>;
                interrupts = <11 IRQ_TYPE_EDGE_FALLING>;
                vdda-supply = <&pm8921_lvs6>;
                vdd-supply = <&pm8921_l17>;
@@ -111,7 +111,7 @@
        };
 };
 
-&msmgpio {
+&tlmm {
        spi1_default: spi1-default-state {
                mosi-pins {
                        pins = "gpio6";
@@ -160,7 +160,7 @@
 };
 
 &pm8921 {
-       interrupts-extended = <&msmgpio 104 IRQ_TYPE_LEVEL_LOW>;
+       interrupts-extended = <&tlmm 104 IRQ_TYPE_LEVEL_LOW>;
 };
 
 &rpm {

diff --git a/arch/arm/boot/dts/qcom/qcom-msm8960-sony-huashan.dts b/arch/arm/boot/dts/qcom/qcom-msm8960-sony-huashan.dts
index f2f59fc8b9b61e18b0ec4ed1fc2d813585a75f15..591dc837e6003680d5841a6e29b8862996e1e5ca 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-msm8960-sony-huashan.dts
+++ b/arch/arm/boot/dts/qcom/qcom-msm8960-sony-huashan.dts
@@ -54,7 +54,7 @@
 };
 
 &pm8921 {
-       interrupts-extended = <&msmgpio 104 IRQ_TYPE_LEVEL_LOW>;
+       interrupts-extended = <&tlmm 104 IRQ_TYPE_LEVEL_LOW>;
 };
 
 &pm8921_gpio {

diff --git a/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
index 0aaf60dcda647dc2f7ce11ae7cde05a0bcd35716..38bd4fd8dda5cc9c66f4e03ed4c1088b559ee04a 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
@@ -121,11 +121,11 @@
                        };
                };
 
-               msmgpio: pinctrl@800000 {
+               tlmm: pinctrl@800000 {
                        compatible = "qcom,msm8960-pinctrl";
                        reg = <0x800000 0x4000>;
                        gpio-controller;
-                       gpio-ranges = <&msmgpio 0 0 152>;
+                       gpio-ranges = <&tlmm 0 0 152>;
                        #gpio-cells = <2>;
                        interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
                        interrupt-controller;
@@ -533,7 +533,7 @@
                                #address-cells = <1>;
                                #size-cells = <0>;
                                interrupts = <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>;
-                               cs-gpios = <&msmgpio 8 0>;
+                               cs-gpios = <&tlmm 8 0>;
                                clocks = <&gcc GSBI1_QUP_CLK>,
                                         <&gcc GSBI1_H_CLK>;
                                clock-names = "core",