projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 64cf626)
ARM: dts: qcom-msm8974*: Rename msmgpio to tlmm
authorKonrad Dybcio <konrad.dybcio@somainline.org>
Fri, 15 Apr 2022 11:56:17 +0000 (13:56 +0200)
committerBjorn Andersson <bjorn.andersson@linaro.org>
Tue, 19 Apr 2022 23:22:16 +0000 (18:22 -0500)
Rename the label to match new the style used in newer DTs.

Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220415115633.575010-8-konrad.dybcio@somainline.org
arch/arm/boot/dts/qcom-apq8074-dragonboard.dts patch | blob | history
arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts patch | blob | history
arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts patch | blob | history
arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts patch | blob | history
arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine-amami.dts patch | blob | history
arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine-honami.dts patch | blob | history
arch/arm/boot/dts/qcom-msm8974-sony-xperia-shinano-castor.dts patch | blob | history
arch/arm/boot/dts/qcom-msm8974.dtsi patch | blob | history

diff --git a/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts b/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
index e2b4e4fc63770fdfb515935932ace715bc7cddd3..9076a24408c6ff9e1f933f20d52cfd183f00c8cd 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
+++ b/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
@@ -35,7 +35,7 @@
                };
 
                sdhci@f98a4900 {
-                       cd-gpios = <&msmgpio 62 0x1>;
+                       cd-gpios = <&tlmm 62 0x1>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&sdhc2_pin_a>, <&sdhc2_cd_pin_a>;
                        bus-width = <4>;
diff --git a/arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts b/arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts
index 9dbfc9f8646aae9d87f2479d1f4185b7c31f735c..1e947bab06b65a451064a92b8000a3678791f299 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts
+++ b/arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts
@@ -51,7 +51,7 @@
 
        vibrator {
                compatible = "gpio-vibrator";
-               enable-gpios = <&msmgpio 86 GPIO_ACTIVE_HIGH>;
+               enable-gpios = <&tlmm 86 GPIO_ACTIVE_HIGH>;
                vcc-supply = <&pm8941_l18>;
        };
 
diff --git a/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts b/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts
index dd2d0647d4be6ebac128670a4be5360092d466fe..4154ffb207ac37e8bf659b6a11a05132f894c91e 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts
+++ b/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts
@@ -250,7 +250,7 @@
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
 
-               gpio = <&msmgpio 26 GPIO_ACTIVE_HIGH>;
+               gpio = <&tlmm 26 GPIO_ACTIVE_HIGH>;
                enable-active-high;
 
                pinctrl-names = "default";
@@ -482,9 +482,9 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&bt_pin>;
 
-                       host-wakeup-gpios = <&msmgpio 42 GPIO_ACTIVE_HIGH>;
-                       device-wakeup-gpios = <&msmgpio 62 GPIO_ACTIVE_HIGH>;
-                       shutdown-gpios = <&msmgpio 41 GPIO_ACTIVE_HIGH>;
+                       host-wakeup-gpios = <&tlmm 42 GPIO_ACTIVE_HIGH>;
+                       device-wakeup-gpios = <&tlmm 62 GPIO_ACTIVE_HIGH>;
+                       shutdown-gpios = <&tlmm 41 GPIO_ACTIVE_HIGH>;
                };
        };
 
@@ -522,7 +522,7 @@
                mpu6515@68 {
                        compatible = "invensense,mpu6515";
                        reg = <0x68>;
-                       interrupts-extended = <&msmgpio 73 IRQ_TYPE_EDGE_FALLING>;
+                       interrupts-extended = <&tlmm 73 IRQ_TYPE_EDGE_FALLING>;
                        vddio-supply = <&pm8941_lvs1>;
 
                        pinctrl-names = "default";
@@ -538,7 +538,7 @@
                                ak8963@f {
                                        compatible = "asahi-kasei,ak8963";
                                        reg = <0x0f>;
-                                       gpios = <&msmgpio 67 0>;
+                                       gpios = <&tlmm 67 0>;
                                        vid-supply = <&pm8941_lvs1>;
                                        vdd-supply = <&pm8941_l17>;
                                };
@@ -577,7 +577,7 @@
                        maxim,double-soc;
                        maxim,rcomp = /bits/ 8 <0x4d>;
 
-                       interrupt-parent = <&msmgpio>;
+                       interrupt-parent = <&tlmm>;
                        interrupts = <9 IRQ_TYPE_LEVEL_LOW>;
 
                        pinctrl-names = "default";
@@ -600,7 +600,7 @@
                        compatible = "syna,rmi4-i2c";
                        reg = <0x70>;
 
-                       interrupts-extended = <&msmgpio 5 IRQ_TYPE_EDGE_FALLING>;
+                       interrupts-extended = <&tlmm 5 IRQ_TYPE_EDGE_FALLING>;
                        vdd-supply = <&pm8941_l22>;
                        vio-supply = <&pm8941_lvs3>;
 
@@ -632,7 +632,7 @@
                avago_apds993@39 {
                        compatible = "avago,apds9930";
                        reg = <0x39>;
-                       interrupts-extended = <&msmgpio 61 IRQ_TYPE_EDGE_FALLING>;
+                       interrupts-extended = <&tlmm 61 IRQ_TYPE_EDGE_FALLING>;
                        vdd-supply = <&pm8941_l17>;
                        vddio-supply = <&pm8941_lvs1>;
                        led-max-microamp = <100000>;
diff --git a/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts b/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts
index 3ee2508b20fb9ca147366ff5caa6cbd729fa3167..60244e0c37baa15b825d909800c66296647566fa 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts
+++ b/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts
@@ -247,8 +247,8 @@
                compatible = "i2c-gpio";
                #address-cells = <1>;
                #size-cells = <0>;
-               sda-gpios = <&msmgpio 95 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
-               scl-gpios = <&msmgpio 96 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+               sda-gpios = <&tlmm 95 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+               scl-gpios = <&tlmm 96 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                pinctrl-names = "default";
                pinctrl-0 = <&i2c_touchkey_pins>;
 
@@ -272,8 +272,8 @@
                compatible = "i2c-gpio";
                #address-cells = <1>;
                #size-cells = <0>;
-               scl-gpios = <&msmgpio 121 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
-               sda-gpios = <&msmgpio 120 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+               scl-gpios = <&tlmm 121 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+               sda-gpios = <&tlmm 120 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                pinctrl-names = "default";
                pinctrl-0 = <&i2c_led_gpioex_pins>;
 
@@ -291,7 +291,7 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&gpioex_pin>;
 
-                       reset-gpios = <&msmgpio 145 GPIO_ACTIVE_LOW>;
+                       reset-gpios = <&tlmm 145 GPIO_ACTIVE_LOW>;
                };
 
                led-controller@30 {
@@ -371,9 +371,9 @@
                        max-speed = <3000000>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&bt_pins>;
-                       device-wakeup-gpios = <&msmgpio 91 GPIO_ACTIVE_HIGH>;
+                       device-wakeup-gpios = <&tlmm 91 GPIO_ACTIVE_HIGH>;
                        shutdown-gpios = <&gpio_expander 9 GPIO_ACTIVE_HIGH>;
-                       interrupt-parent = <&msmgpio>;
+                       interrupt-parent = <&tlmm>;
                        interrupts = <75 IRQ_TYPE_LEVEL_HIGH>;
                        interrupt-names = "host-wakeup";
                };
@@ -563,7 +563,7 @@
                 */
                pinctrl-names = "default";
                pinctrl-0 = <&sdhc2_pin_a /* &sdhc2_cd_pin */>;
-               // cd-gpios = <&msmgpio 62 GPIO_ACTIVE_LOW>;
+               // cd-gpios = <&tlmm 62 GPIO_ACTIVE_LOW>;
        };
 
        sdhci@f98a4900 {
@@ -587,7 +587,7 @@
                        reg = <1>;
                        compatible = "brcm,bcm4329-fmac";
 
-                       interrupt-parent = <&msmgpio>;
+                       interrupt-parent = <&tlmm>;
                        interrupts = <92 IRQ_TYPE_LEVEL_HIGH>;
                        interrupt-names = "host-wake";
 
@@ -818,7 +818,7 @@
                                vddr-supply = <&vreg_panel>;
 
                                reset-gpios = <&pma8084_gpios 17 GPIO_ACTIVE_LOW>;
-                               te-gpios = <&msmgpio 12 GPIO_ACTIVE_HIGH>;
+                               te-gpios = <&tlmm 12 GPIO_ACTIVE_HIGH>;
 
                                port {
                                        panel_in: endpoint {
diff --git a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine-amami.dts b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine-amami.dts
index 8cace789fb26e371211b3ba8bea979fb150547c7..6545917dd489a5d87075b9db7d8c1aa934ed2358 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine-amami.dts
+++ b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine-amami.dts
@@ -280,7 +280,7 @@
                vmmc-supply = <&pm8941_l21>;
                vqmmc-supply = <&pm8941_l13>;
 
-               cd-gpios = <&msmgpio 62 GPIO_ACTIVE_LOW>;
+               cd-gpios = <&tlmm 62 GPIO_ACTIVE_LOW>;
 
                pinctrl-names = "default";
                pinctrl-0 = <&sdhc2_pin_a>, <&sdhc2_cd_pin_a>;
diff --git a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine-honami.dts b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine-honami.dts
index f4a2e256077790aa5f63e02811cc186c96c603ba..313c755f590f42e86acc3deb1d25818681ef5eef 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine-honami.dts
+++ b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine-honami.dts
@@ -305,7 +305,7 @@
                vmmc-supply = <&pm8941_l21>;
                vqmmc-supply = <&pm8941_l13>;
 
-               cd-gpios = <&msmgpio 62 GPIO_ACTIVE_LOW>;
+               cd-gpios = <&tlmm 62 GPIO_ACTIVE_LOW>;
 
                pinctrl-names = "default";
                pinctrl-0 = <&sdhc2_pin_a>, <&sdhc2_cd_pin_a>;
@@ -331,7 +331,7 @@
                        compatible = "syna,rmi4-i2c";
                        reg = <0x2c>;
 
-                       interrupts-extended = <&msmgpio 61 IRQ_TYPE_EDGE_FALLING>;
+                       interrupts-extended = <&tlmm 61 IRQ_TYPE_EDGE_FALLING>;
 
                        #address-cells = <1>;
                        #size-cells = <0>;
diff --git a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-shinano-castor.dts
index e27b360951fda1276f6a9dc890ffd35fb8a36e10..352689237140bc5a51d73f5fc4231b91dd2fb0e0 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-shinano-castor.dts
+++ b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-shinano-castor.dts
@@ -239,7 +239,7 @@
                regulator-min-microvolt = <3150000>;
                regulator-max-microvolt = <3150000>;
 
-               gpio = <&msmgpio 69 0>;
+               gpio = <&tlmm 69 0>;
                enable-active-high;
 
                vin-supply = <&pm8941_s3>;
@@ -323,7 +323,7 @@
                vmmc-supply = <&pm8941_l21>;
                vqmmc-supply = <&pm8941_l13>;
 
-               cd-gpios = <&msmgpio 62 GPIO_ACTIVE_LOW>;
+               cd-gpios = <&tlmm 62 GPIO_ACTIVE_LOW>;
 
                pinctrl-names = "default";
                pinctrl-0 = <&sdhc2_pin_a>, <&sdhc2_cd_pin_a>;
@@ -351,8 +351,8 @@
                                    <&bt_dev_wake_pin>,
                                    <&bt_reg_on_pin>;
 
-                       host-wakeup-gpios = <&msmgpio 95 GPIO_ACTIVE_HIGH>;
-                       device-wakeup-gpios = <&msmgpio 96 GPIO_ACTIVE_HIGH>;
+                       host-wakeup-gpios = <&tlmm 95 GPIO_ACTIVE_HIGH>;
+                       device-wakeup-gpios = <&tlmm 96 GPIO_ACTIVE_HIGH>;
                        shutdown-gpios = <&pm8941_gpios 16 GPIO_ACTIVE_HIGH>;
                };
        };
@@ -566,7 +566,7 @@
                        compatible = "syna,rmi4-i2c";
                        reg = <0x2c>;
 
-                       interrupt-parent = <&msmgpio>;
+                       interrupt-parent = <&tlmm>;
                        interrupts = <86 IRQ_TYPE_EDGE_FALLING>;
 
                        #address-cells = <1>;
diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
index 49b22392fd5e0ba20dcafff5cb0c31db580f2eca..df72c4432fc5c4d6daa353124cfbeb7ef83d5c6d 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
@@ -953,11 +953,11 @@
                        };
                };
 
-               msmgpio: pinctrl@fd510000 {
+               tlmm: pinctrl@fd510000 {
                        compatible = "qcom,msm8974-pinctrl";
                        reg = <0xfd510000 0x4000>;
                        gpio-controller;
-                       gpio-ranges = <&msmgpio 0 0 146>;
+                       gpio-ranges = <&tlmm 0 0 146>;
                        #gpio-cells = <2>;
                        interrupt-controller;
                        #interrupt-cells = <2>;
ep93xx device tree rework repo: git://git.maquefel.me/linux.git