arm64: dts: qcom: msm8916: Rename &msmgpio -> &tlmm

MSM8916 is the only ARM64 Qualcomm SoC that is still using the old
&msmgpio name. Change this to &tlmm to avoid confusion.

Note that the node ordering does not change because the MSM8916 device
trees have pinctrl separated at the bottom (similar to sc7180).

Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230525-msm8916-labels-v1-1-bec0f5fb46fb@gerhold.net

diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
index 1c5d55854893225d32aaba729ac6f05458bf6e37..82f141b55eb3ca7ab8157f2346db11abf88bdfb0 100644 (file)
--- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
+++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
@@ -75,7 +75,7 @@
 
        usb_id: usb-id {
                compatible = "linux,extcon-usb-gpio";
-               id-gpio = <&msmgpio 121 GPIO_ACTIVE_HIGH>;
+               id-gpio = <&tlmm 121 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&usb_id_default>;
        };
@@ -101,13 +101,13 @@
                button {
                        label = "Volume Up";
                        linux,code = <KEY_VOLUMEUP>;
-                       gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>;
+                       gpios = <&tlmm 107 GPIO_ACTIVE_LOW>;
                };
        };
 
        leds {
                pinctrl-names = "default";
-               pinctrl-0 = <&msmgpio_leds>,
+               pinctrl-0 = <&tlmm_leds>,
                            <&pm8916_gpios_leds>,
                            <&pm8916_mpps_leds>;
 
@@ -117,7 +117,7 @@
                        label = "apq8016-sbc:green:user1";
                        function = LED_FUNCTION_HEARTBEAT;
                        color = <LED_COLOR_ID_GREEN>;
-                       gpios = <&msmgpio 21 GPIO_ACTIVE_HIGH>;
+                       gpios = <&tlmm 21 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "heartbeat";
                        default-state = "off";
                };
@@ -126,7 +126,7 @@
                        label = "apq8016-sbc:green:user2";
                        function = LED_FUNCTION_DISK_ACTIVITY;
                        color = <LED_COLOR_ID_GREEN>;
-                       gpios = <&msmgpio 120 GPIO_ACTIVE_HIGH>;
+                       gpios = <&tlmm 120 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "mmc0";
                        default-state = "off";
                };
@@ -186,14 +186,14 @@
                compatible = "adi,adv7533";
                reg = <0x39>;
 
-               interrupt-parent = <&msmgpio>;
+               interrupt-parent = <&tlmm>;
                interrupts = <31 IRQ_TYPE_EDGE_FALLING>;
 
                adi,dsi-lanes = <4>;
                clocks = <&rpmcc RPM_SMD_BB_CLK2>;
                clock-names = "cec";
 
-               pd-gpios = <&msmgpio 32 GPIO_ACTIVE_HIGH>;
+               pd-gpios = <&tlmm 32 GPIO_ACTIVE_HIGH>;
 
                avdd-supply = <&pm8916_l6>;
                v1p2-supply = <&pm8916_l6>;
@@ -276,8 +276,8 @@
                compatible = "ovti,ov5640";
                reg = <0x3b>;
 
-               enable-gpios = <&msmgpio 34 GPIO_ACTIVE_HIGH>;
-               reset-gpios = <&msmgpio 35 GPIO_ACTIVE_LOW>;
+               enable-gpios = <&tlmm 34 GPIO_ACTIVE_HIGH>;
+               reset-gpios = <&tlmm 35 GPIO_ACTIVE_LOW>;
                pinctrl-names = "default";
                pinctrl-0 = <&camera_rear_default>;
 
@@ -373,7 +373,7 @@
        pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;
        pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
 
-       cd-gpios = <&msmgpio 38 GPIO_ACTIVE_LOW>;
+       cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
 };
 
 &sound {
@@ -515,7 +515,7 @@
  * ones actually used for GPIO.
  */
 
-&msmgpio {
+&tlmm {
        gpio-line-names =
                "[UART0_TX]", /* GPIO_0, LSEC pin 5 */
                "[UART0_RX]", /* GPIO_1, LSEC pin 7 */
@@ -640,7 +640,7 @@
                "USR_LED_2_CTRL", /* GPIO 120 */
                "SB_HS_ID";
 
-       msmgpio_leds: msmgpio-leds-state {
+       tlmm_leds: tlmm-leds-state {
                pins = "gpio21", "gpio120";
                function = "gpio";
 

diff --git a/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts b/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts
index 753413b48751a69ebf2eca79c4fd4f472d7f5e05..7b77a80f049c64eb4068bd4d2059589bc668b938 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts
@@ -39,14 +39,14 @@
 
                button-volume-up {
                        label = "Volume Up";
-                       gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>;
+                       gpios = <&tlmm 107 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_VOLUMEUP>;
                };
        };
 
        usb_id: usb-id {
                compatible = "linux,extcon-usb-gpio";
-               id-gpio = <&msmgpio 110 GPIO_ACTIVE_HIGH>;
+               id-gpio = <&tlmm 110 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&usb_id_default>;
        };
@@ -58,7 +58,7 @@
        accelerometer@10 {
                compatible = "bosch,bmc150_accel";
                reg = <0x10>;
-               interrupt-parent = <&msmgpio>;
+               interrupt-parent = <&tlmm>;
                interrupts = <115 IRQ_TYPE_EDGE_RISING>;
 
                vdd-supply = <&pm8916_l17>;
@@ -89,10 +89,10 @@
                compatible = "edt,edt-ft5406";
                reg = <0x38>;
 
-               interrupt-parent = <&msmgpio>;
+               interrupt-parent = <&tlmm>;
                interrupts = <13 IRQ_TYPE_LEVEL_LOW>;
 
-               reset-gpios = <&msmgpio 12 GPIO_ACTIVE_LOW>;
+               reset-gpios = <&tlmm 12 GPIO_ACTIVE_LOW>;
 
                vcc-supply = <&pm8916_l16>;
                iovcc-supply = <&pm8916_l6>;
@@ -143,7 +143,7 @@
        pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on>;
        pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>;
 
-       cd-gpios = <&msmgpio 38 GPIO_ACTIVE_HIGH>;
+       cd-gpios = <&tlmm 38 GPIO_ACTIVE_HIGH>;
 
        status = "okay";
 };
@@ -165,7 +165,7 @@
        compatible = "qcom,wcn3620";
 };
 
-&msmgpio {
+&tlmm {
        accel_int_default: accel-int-default-state {
                pins = "gpio115";
                function = "gpio";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
index 4bfbad669b1ea15a79a8ac962be31edff99d5ce1..d2abbdec5fe6815d51a94272232fff9aa28e4bb6 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
@@ -30,7 +30,7 @@
 
                button-volume-up {
                        label = "Volume Up";
-                       gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>;
+                       gpios = <&tlmm 107 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_VOLUMEUP>;
                };
        };
@@ -42,7 +42,7 @@
                pinctrl-0 = <&gpio_leds_default>;
 
                led-0 {
-                       gpios = <&msmgpio 32 GPIO_ACTIVE_HIGH>;
+                       gpios = <&tlmm 32 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "torch";
                        function = LED_FUNCTION_TORCH;
                };
@@ -50,7 +50,7 @@
 
        usb_id: usb-id {
                compatible = "linux,extcon-usb-gpio";
-               id-gpio = <&msmgpio 69 GPIO_ACTIVE_HIGH>;
+               id-gpio = <&tlmm 69 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&usb_id_default>;
        };
@@ -66,9 +66,9 @@
        touchscreen@26 {
                compatible = "mstar,msg2638";
                reg = <0x26>;
-               interrupt-parent = <&msmgpio>;
+               interrupt-parent = <&tlmm>;
                interrupts = <13 IRQ_TYPE_EDGE_FALLING>;
-               reset-gpios = <&msmgpio 100 GPIO_ACTIVE_LOW>;
+               reset-gpios = <&tlmm 100 GPIO_ACTIVE_LOW>;
                pinctrl-names = "default";
                pinctrl-0 = <&ts_int_reset_default>;
                vdd-supply = <&pm8916_l17>;
@@ -86,7 +86,7 @@
                reg = <0x0c>;
                vdd-supply = <&pm8916_l17>;
                vid-supply = <&pm8916_l6>;
-               reset-gpios = <&msmgpio 8 GPIO_ACTIVE_LOW>;
+               reset-gpios = <&tlmm 8 GPIO_ACTIVE_LOW>;
                pinctrl-names = "default";
                pinctrl-0 = <&mag_reset_default>;
                mount-matrix = "0", "1", "0",
@@ -99,7 +99,7 @@
                reg = <0x0f>;
                vdd-supply = <&pm8916_l17>;
                vddio-supply = <&pm8916_l6>;
-               interrupt-parent = <&msmgpio>;
+               interrupt-parent = <&tlmm>;
                interrupts = <31 IRQ_TYPE_EDGE_RISING>;
                pinctrl-names = "default";
                pinctrl-0 = <&accel_int_default>;
@@ -111,7 +111,7 @@
        proximity@48 {
                compatible = "sensortek,stk3310";
                reg = <0x48>;
-               interrupt-parent = <&msmgpio>;
+               interrupt-parent = <&tlmm>;
                interrupts = <12 IRQ_TYPE_EDGE_FALLING>;
                pinctrl-names = "default";
                pinctrl-0 = <&proximity_int_default>;
@@ -122,7 +122,7 @@
                reg = <0x68>;
                vdd-supply = <&pm8916_l17>;
                vddio-supply = <&pm8916_l6>;
-               interrupt-parent = <&msmgpio>;
+               interrupt-parent = <&tlmm>;
                interrupts = <97 IRQ_TYPE_EDGE_RISING>,
                             <98 IRQ_TYPE_EDGE_RISING>;
                pinctrl-names = "default";
@@ -136,7 +136,7 @@
        led-controller@68 {
                compatible = "si-en,sn3190";
                reg = <0x68>;
-               shutdown-gpios = <&msmgpio 89 GPIO_ACTIVE_HIGH>;
+               shutdown-gpios = <&tlmm 89 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&led_enable_default &led_shutdown_default>;
                #address-cells = <1>;
@@ -182,7 +182,7 @@
        pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;
        pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
 
-       cd-gpios = <&msmgpio 38 GPIO_ACTIVE_LOW>;
+       cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
 };
 
 &usb {
@@ -202,7 +202,7 @@
        compatible = "qcom,wcn3620";
 };
 
-&msmgpio {
+&tlmm {
        accel_int_default: accel-int-default-state {
                pins = "gpio31";
                function = "gpio";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
index 37755e8853958f40bed3f2dd88285091d1bc1f6a..c58a70fdf36fb4f986bd388418d2007850645f54 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
@@ -30,14 +30,14 @@
 
                button-volume-up {
                        label = "Volume Up";
-                       gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>;
+                       gpios = <&tlmm 107 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_VOLUMEUP>;
                        debounce-interval = <15>;
                };
 
                button-volume-down {
                        label = "Volume Down";
-                       gpios = <&msmgpio 117 GPIO_ACTIVE_LOW>;
+                       gpios = <&tlmm 117 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_VOLUMEDOWN>;
                        debounce-interval = <15>;
                };
@@ -49,7 +49,7 @@
                regulator-min-microvolt = <2950000>;
                regulator-max-microvolt = <2950000>;
 
-               gpio = <&msmgpio 87 GPIO_ACTIVE_HIGH>;
+               gpio = <&tlmm 87 GPIO_ACTIVE_HIGH>;
                enable-active-high;
 
                startup-delay-us = <200>;
@@ -60,7 +60,7 @@
 
        usb_id: usb-id {
                compatible = "linux,extcon-usb-gpio";
-               id-gpios = <&msmgpio 110 GPIO_ACTIVE_HIGH>;
+               id-gpios = <&tlmm 110 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&usb_id_default>;
        };
@@ -76,7 +76,7 @@
                vdd-supply = <&pm8916_l8>;
                vid-supply = <&pm8916_l6>;
 
-               reset-gpios = <&msmgpio 112 GPIO_ACTIVE_LOW>;
+               reset-gpios = <&tlmm 112 GPIO_ACTIVE_LOW>;
 
                pinctrl-names = "default";
                pinctrl-0 = <&mag_reset_default>;
@@ -86,7 +86,7 @@
                compatible = "invensense,mpu6515";
                reg = <0x68>;
 
-               interrupt-parent = <&msmgpio>;
+               interrupt-parent = <&tlmm>;
                interrupts = <36 IRQ_TYPE_EDGE_RISING>;
 
                vdd-supply = <&pm8916_l17>;
@@ -108,10 +108,10 @@
                compatible = "edt,edt-ft5306";
                reg = <0x38>;
 
-               interrupt-parent = <&msmgpio>;
+               interrupt-parent = <&tlmm>;
                interrupts = <13 IRQ_TYPE_EDGE_FALLING>;
 
-               reset-gpios = <&msmgpio 12 GPIO_ACTIVE_LOW>;
+               reset-gpios = <&tlmm 12 GPIO_ACTIVE_LOW>;
 
                vcc-supply = <&pm8916_l11>;
                iovcc-supply = <&pm8916_l6>;
@@ -150,7 +150,7 @@
        pinctrl-names = "default", "sleep";
        pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;
        pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
-       cd-gpios = <&msmgpio 38 GPIO_ACTIVE_LOW>;
+       cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
 };
 
 &usb {
@@ -170,7 +170,7 @@
        compatible = "qcom,wcn3620";
 };
 
-&msmgpio {
+&tlmm {
        gpio_keys_default: gpio-keys-default-state {
                pins = "gpio107", "gpio117";
                function = "gpio";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts b/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts
index 4a6bf99c755fd49f845a22dfa95969b281358e75..221db7edec5ef6a37160a174a25d2ca15c205a63 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts
@@ -24,8 +24,8 @@
        flash-led-controller {
                /* Actually qcom,leds-gpio-flash */
                compatible = "sgmicro,sgm3140";
-               enable-gpios = <&msmgpio 31 GPIO_ACTIVE_HIGH>;
-               flash-gpios = <&msmgpio 32 GPIO_ACTIVE_HIGH>;
+               enable-gpios = <&tlmm 31 GPIO_ACTIVE_HIGH>;
+               flash-gpios = <&tlmm 32 GPIO_ACTIVE_HIGH>;
 
                pinctrl-0 = <&camera_flash_default>;
                pinctrl-names = "default";
@@ -45,7 +45,7 @@
 
                button-volume-up {
                        label = "Volume Up";
-                       gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>;
+                       gpios = <&tlmm 107 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_VOLUMEUP>;
                };
        };
@@ -59,21 +59,21 @@
                led-red {
                        function = LED_FUNCTION_CHARGING;
                        color = <LED_COLOR_ID_RED>;
-                       gpios = <&msmgpio 117 GPIO_ACTIVE_HIGH>;
+                       gpios = <&tlmm 117 GPIO_ACTIVE_HIGH>;
                        retain-state-suspended;
                };
 
                led-green {
                        function = LED_FUNCTION_CHARGING;
                        color = <LED_COLOR_ID_GREEN>;
-                       gpios = <&msmgpio 118 GPIO_ACTIVE_HIGH>;
+                       gpios = <&tlmm 118 GPIO_ACTIVE_HIGH>;
                        retain-state-suspended;
                };
        };
 
        usb_id: usb-id {
                compatible = "linux,extcon-usb-gpio";
-               id-gpio = <&msmgpio 110 GPIO_ACTIVE_HIGH>;
+               id-gpio = <&tlmm 110 GPIO_ACTIVE_HIGH>;
                pinctrl-0 = <&usb_id_default>;
                pinctrl-names = "default";
        };
@@ -87,10 +87,10 @@
                compatible = "edt,edt-ft5406";
                reg = <0x38>;
 
-               interrupt-parent = <&msmgpio>;
+               interrupt-parent = <&tlmm>;
                interrupts = <13 IRQ_TYPE_EDGE_FALLING>;
 
-               reset-gpios = <&msmgpio 12 GPIO_ACTIVE_LOW>;
+               reset-gpios = <&tlmm 12 GPIO_ACTIVE_LOW>;
 
                vcc-supply = <&pm8916_l17>;
                iovcc-supply = <&pm8916_l6>;
@@ -138,7 +138,7 @@
        pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>;
        pinctrl-names = "default", "sleep";
 
-       cd-gpios = <&msmgpio 38 GPIO_ACTIVE_LOW>;
+       cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
 
        status = "okay";
 };
@@ -160,7 +160,7 @@
        compatible = "qcom,wcn3620";
 };
 
-&msmgpio {
+&tlmm {
        camera_flash_default: camera-flash-default-state {
                pins = "gpio31", "gpio32";
                function = "gpio";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
index 29aaa35438a3694e896fb3f941c7d6fd2381378e..b02e8f9a8ca0d8454dba9b988378d241c7f6912c 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
@@ -43,7 +43,7 @@
 
                button-volume-up {
                        label = "Volume Up";
-                       gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>;
+                       gpios = <&tlmm 107 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_VOLUMEUP>;
                };
        };
@@ -55,21 +55,21 @@
                pinctrl-0 = <&gpio_leds_default>;
 
                led-0 {
-                       gpios = <&msmgpio 8 GPIO_ACTIVE_HIGH>;
+                       gpios = <&tlmm 8 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_RED>;
                        default-state = "off";
                        function = LED_FUNCTION_INDICATOR;
                };
 
                led-1 {
-                       gpios = <&msmgpio 9 GPIO_ACTIVE_HIGH>;
+                       gpios = <&tlmm 9 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_GREEN>;
                        default-state = "off";
                        function = LED_FUNCTION_INDICATOR;
                };
 
                led-2 {
-                       gpios = <&msmgpio 10 GPIO_ACTIVE_HIGH>;
+                       gpios = <&tlmm 10 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_BLUE>;
                        default-state = "off";
                        function = LED_FUNCTION_INDICATOR;
@@ -78,7 +78,7 @@
 
        usb_id: usb-id {
                compatible = "linux,extcon-usb-gpio";
-               id-gpio = <&msmgpio 117 GPIO_ACTIVE_HIGH>;
+               id-gpio = <&tlmm 117 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&usb_id_default>;
        };
@@ -94,7 +94,7 @@
                vdd-supply = <&pm8916_l17>;
                vid-supply = <&pm8916_l6>;
 
-               reset-gpios = <&msmgpio 36 GPIO_ACTIVE_LOW>;
+               reset-gpios = <&tlmm 36 GPIO_ACTIVE_LOW>;
 
                pinctrl-names = "default";
                pinctrl-0 = <&mag_reset_default>;
@@ -104,7 +104,7 @@
                compatible = "kionix,kx023-1025";
                reg = <0x1e>;
 
-               interrupt-parent = <&msmgpio>;
+               interrupt-parent = <&tlmm>;
                interrupts = <115 IRQ_TYPE_EDGE_RISING>;
 
                vdd-supply = <&pm8916_l17>;
@@ -122,7 +122,7 @@
                compatible = "avago,apds9930";
                reg = <0x39>;
 
-               interrupt-parent = <&msmgpio>;
+               interrupt-parent = <&tlmm>;
                interrupts = <113 IRQ_TYPE_EDGE_FALLING>;
 
                vdd-supply = <&pm8916_l17>;
@@ -146,7 +146,7 @@
                        regulator-name = "outp";
                        regulator-min-microvolt = <5400000>;
                        regulator-max-microvolt = <5400000>;
-                       enable-gpios = <&msmgpio 97 GPIO_ACTIVE_HIGH>;
+                       enable-gpios = <&tlmm 97 GPIO_ACTIVE_HIGH>;
                        regulator-active-discharge = <1>;
                };
 
@@ -154,7 +154,7 @@
                        regulator-name = "outn";
                        regulator-min-microvolt = <5400000>;
                        regulator-max-microvolt = <5400000>;
-                       enable-gpios = <&msmgpio 32 GPIO_ACTIVE_HIGH>;
+                       enable-gpios = <&tlmm 32 GPIO_ACTIVE_HIGH>;
                        regulator-active-discharge = <1>;
                };
        };
@@ -169,7 +169,7 @@
                #address-cells = <1>;
                #size-cells = <0>;
 
-               interrupt-parent = <&msmgpio>;
+               interrupt-parent = <&tlmm>;
                interrupts = <13 IRQ_TYPE_EDGE_FALLING>;
 
                vdd-supply = <&pm8916_l17>;
@@ -199,11 +199,11 @@
                compatible = "nxp,pn547", "nxp,nxp-nci-i2c";
                reg = <0x28>;
 
-               interrupt-parent = <&msmgpio>;
+               interrupt-parent = <&tlmm>;
                interrupts = <21 IRQ_TYPE_EDGE_RISING>;
 
-               enable-gpios = <&msmgpio 20 GPIO_ACTIVE_HIGH>;
-               firmware-gpios = <&msmgpio 2 GPIO_ACTIVE_HIGH>;
+               enable-gpios = <&tlmm 20 GPIO_ACTIVE_HIGH>;
+               firmware-gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>;
 
                pinctrl-names = "default";
                pinctrl-0 = <&nfc_default>;
@@ -264,7 +264,7 @@
        pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdhc2_cd_default>;
 
        /*
-        * The Huawei device tree sets cd-gpios = <&msmgpio 38 GPIO_ACTIVE_HIGH>.
+        * The Huawei device tree sets cd-gpios = <&tlmm 38 GPIO_ACTIVE_HIGH>.
         * However, gpio38 does not change its state when inserting/removing the
         * SD card, it's just low all the time. The Huawei kernel seems to use
         * polling for SD card detection instead.
@@ -276,7 +276,7 @@
         * Maybe Huawei decided to replace the second SIM card slot with the
         * SD card slot and forgot to re-route to gpio38.
         */
-       cd-gpios = <&msmgpio 56 GPIO_ACTIVE_LOW>;
+       cd-gpios = <&tlmm 56 GPIO_ACTIVE_LOW>;
 };
 
 &sound {
@@ -338,7 +338,7 @@
        compatible = "qcom,wcn3620";
 };
 
-&msmgpio {
+&tlmm {
        accel_irq_default: accel-irq-default-state {
                pins = "gpio115";
                function = "gpio";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
index b7b1f1ceaf1f34450d52b49f0d691b9383eadd6f..56f74a8927640e98e596910c5c55fc8f07ab3211 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
@@ -41,7 +41,7 @@
 
                button-volume-up {
                        label = "Volume Up";
-                       gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>;
+                       gpios = <&tlmm 107 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_VOLUMEUP>;
                };
        };
@@ -53,7 +53,7 @@
                regulator-min-microvolt = <2800000>;
                regulator-max-microvolt = <2800000>;
 
-               gpio = <&msmgpio 17 GPIO_ACTIVE_HIGH>;
+               gpio = <&tlmm 17 GPIO_ACTIVE_HIGH>;
                enable-active-high;
 
                pinctrl-names = "default";
@@ -62,8 +62,8 @@
 
        flash-led-controller {
                compatible = "sgmicro,sgm3140";
-               flash-gpios = <&msmgpio 31 GPIO_ACTIVE_HIGH>;
-               enable-gpios = <&msmgpio 32 GPIO_ACTIVE_HIGH>;
+               flash-gpios = <&tlmm 31 GPIO_ACTIVE_HIGH>;
+               enable-gpios = <&tlmm 32 GPIO_ACTIVE_HIGH>;
 
                pinctrl-names = "default";
                pinctrl-0 = <&camera_flash_default>;
@@ -122,7 +122,7 @@
                 * to the BMC156. However, there are two pads next to the chip
                 * that can be shorted to make it work if needed.
                 *
-                * interrupt-parent = <&msmgpio>;
+                * interrupt-parent = <&tlmm>;
                 * interrupts = <116 IRQ_TYPE_EDGE_RISING>;
                 */
 
@@ -141,7 +141,7 @@
                compatible = "bosch,bmc156_magn";
                reg = <0x12>;
 
-               interrupt-parent = <&msmgpio>;
+               interrupt-parent = <&tlmm>;
                interrupts = <113 IRQ_TYPE_EDGE_RISING>;
 
                pinctrl-names = "default";
@@ -156,7 +156,7 @@
                reg = <0x23>;
                proximity-near-level = <75>;
 
-               interrupt-parent = <&msmgpio>;
+               interrupt-parent = <&tlmm>;
                interrupts = <115 IRQ_TYPE_EDGE_FALLING>;
 
                pinctrl-names = "default";
@@ -170,7 +170,7 @@
                compatible = "bosch,bmg160";
                reg = <0x68>;
 
-               interrupt-parent = <&msmgpio>;
+               interrupt-parent = <&tlmm>;
                interrupts = <23 IRQ_TYPE_EDGE_RISING>,
                             <22 IRQ_TYPE_EDGE_RISING>;
 
@@ -191,7 +191,7 @@
                #address-cells = <1>;
                #size-cells = <0>;
 
-               interrupt-parent = <&msmgpio>;
+               interrupt-parent = <&tlmm>;
                interrupts = <13 IRQ_TYPE_EDGE_FALLING>;
 
                vdd-supply = <&reg_ctp>;
@@ -274,7 +274,7 @@
        compatible = "qcom,wcn3620";
 };
 
-&msmgpio {
+&tlmm {
        accel_int_default: accel-int-default-state {
                pins = "gpio116";
                function = "gpio";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
index 630727ed1ed5ad3e8a84df176c58cae184991212..a1208c8e06203faa417e5597303ad7e8b59d5dec 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
@@ -22,8 +22,8 @@
 
        flash-led-controller {
                compatible = "ocs,ocp8110";
-               enable-gpios = <&msmgpio 49 GPIO_ACTIVE_HIGH>;
-               flash-gpios = <&msmgpio 119 GPIO_ACTIVE_HIGH>;
+               enable-gpios = <&tlmm 49 GPIO_ACTIVE_HIGH>;
+               flash-gpios = <&tlmm 119 GPIO_ACTIVE_HIGH>;
 
                pinctrl-0 = <&camera_front_flash_default>;
                pinctrl-names = "default";
@@ -45,7 +45,7 @@
 
                button-volume-up {
                        label = "Volume Up";
-                       gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>;
+                       gpios = <&tlmm 107 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_VOLUMEUP>;
                };
        };
@@ -54,7 +54,7 @@
                compatible = "gpio-leds";
 
                led-0 {
-                       gpios = <&msmgpio 17 GPIO_ACTIVE_HIGH>;
+                       gpios = <&tlmm 17 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_WHITE>;
                        default-state = "off";
                        function = LED_FUNCTION_KBD_BACKLIGHT;
@@ -66,7 +66,7 @@
 
        usb_id: usb-id {
                compatible = "linux,extcon-usb-gpio";
-               id-gpio = <&msmgpio 110 GPIO_ACTIVE_HIGH>;
+               id-gpio = <&tlmm 110 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&usb_id_default>;
        };
@@ -82,7 +82,7 @@
                vdd-supply = <&pm8916_l17>;
                vid-supply = <&pm8916_l6>;
 
-               reset-gpios = <&msmgpio 111 GPIO_ACTIVE_LOW>;
+               reset-gpios = <&tlmm 111 GPIO_ACTIVE_LOW>;
 
                pinctrl-names = "default";
                pinctrl-0 = <&mag_reset_default>;
@@ -136,7 +136,7 @@
        pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;
        pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
 
-       cd-gpios = <&msmgpio 38 GPIO_ACTIVE_LOW>;
+       cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
 };
 
 &usb {
@@ -156,7 +156,7 @@
        compatible = "qcom,wcn3620";
 };
 
-&msmgpio {
+&tlmm {
        button_backlight_default: button-backlight-default-state {
                pins = "gpio17";
                function = "gpio";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi b/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi
index 33dfcf318a81bebb3e619c7c6696d64f08d25066..1e07f70768f41ff549b370823566d6fc7b4f3a9c 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi
@@ -3,7 +3,7 @@
  * Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
  */
 
-&msmgpio {
+&tlmm {
 
        blsp1_uart1_default: blsp1-uart1-default-state {
                /* TX, RX, CTS_N, RTS_N */

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
index 37a872949851b0401650aceeb1cc9a44f59ae02e..550ba6b9d4cd81ae77f653f9832931a640112b61 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
@@ -44,13 +44,13 @@
 
                button-volume-up {
                        label = "Volume Up";
-                       gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>;
+                       gpios = <&tlmm 107 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_VOLUMEUP>;
                };
 
                button-home {
                        label = "Home";
-                       gpios = <&msmgpio 109 GPIO_ACTIVE_LOW>;
+                       gpios = <&tlmm 109 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_HOMEPAGE>;
                };
        };
@@ -65,7 +65,7 @@
 
                event-hall-sensor {
                        label = "Hall Effect Sensor";
-                       gpios = <&msmgpio 52 GPIO_ACTIVE_LOW>;
+                       gpios = <&tlmm 52 GPIO_ACTIVE_LOW>;
                        linux,input-type = <EV_SW>;
                        linux,code = <SW_LID>;
                        linux,can-disable;
@@ -83,7 +83,7 @@
                regulator-min-microvolt = <3000000>;
                regulator-max-microvolt = <3000000>;
 
-               gpio = <&msmgpio 76 GPIO_ACTIVE_HIGH>;
+               gpio = <&tlmm 76 GPIO_ACTIVE_HIGH>;
                enable-active-high;
 
                pinctrl-names = "default";
@@ -96,7 +96,7 @@
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
 
-               gpio = <&msmgpio 73 GPIO_ACTIVE_HIGH>;
+               gpio = <&tlmm 73 GPIO_ACTIVE_HIGH>;
                enable-active-high;
 
                pinctrl-names = "default";
@@ -105,8 +105,8 @@
 
        i2c-muic {
                compatible = "i2c-gpio";
-               sda-gpios = <&msmgpio 105 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
-               scl-gpios = <&msmgpio 106 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
+               sda-gpios = <&tlmm 105 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
+               scl-gpios = <&tlmm 106 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
 
                pinctrl-names = "default";
                pinctrl-0 = <&muic_i2c_default>;
@@ -118,7 +118,7 @@
                        compatible = "siliconmitus,sm5502-muic";
 
                        reg = <0x25>;
-                       interrupt-parent = <&msmgpio>;
+                       interrupt-parent = <&tlmm>;
                        interrupts = <12 IRQ_TYPE_EDGE_FALLING>;
 
                        pinctrl-names = "default";
@@ -128,8 +128,8 @@
 
        i2c-tkey {
                compatible = "i2c-gpio";
-               sda-gpios = <&msmgpio 16 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
-               scl-gpios = <&msmgpio 17 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
+               sda-gpios = <&tlmm 16 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
+               scl-gpios = <&tlmm 17 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
 
                pinctrl-names = "default";
                pinctrl-0 = <&tkey_i2c_default>;
@@ -142,7 +142,7 @@
                        compatible = "coreriver,tc360-touchkey";
                        reg = <0x20>;
 
-                       interrupt-parent = <&msmgpio>;
+                       interrupt-parent = <&tlmm>;
                        interrupts = <98 IRQ_TYPE_EDGE_FALLING>;
 
                        /* vcc/vdd-supply are board-specific */
@@ -157,8 +157,8 @@
 
        i2c-nfc {
                compatible = "i2c-gpio";
-               sda-gpios = <&msmgpio 0 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
-               scl-gpios = <&msmgpio 1 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
+               sda-gpios = <&tlmm 0 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
+               scl-gpios = <&tlmm 1 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
 
                pinctrl-names = "default";
                pinctrl-0 = <&nfc_i2c_default>;
@@ -170,11 +170,11 @@
                        compatible = "samsung,s3fwrn5-i2c";
                        reg = <0x27>;
 
-                       interrupt-parent = <&msmgpio>;
+                       interrupt-parent = <&tlmm>;
                        interrupts = <21 IRQ_TYPE_EDGE_RISING>;
 
-                       en-gpios = <&msmgpio 20 GPIO_ACTIVE_LOW>;
-                       wake-gpios = <&msmgpio 49 GPIO_ACTIVE_HIGH>;
+                       en-gpios = <&tlmm 20 GPIO_ACTIVE_LOW>;
+                       wake-gpios = <&tlmm 49 GPIO_ACTIVE_HIGH>;
 
                        clocks = <&rpmcc RPM_SMD_BB_CLK2_PIN>;
 
@@ -200,7 +200,7 @@
        accelerometer: accelerometer@10 {
                compatible = "bosch,bmc150_accel";
                reg = <0x10>;
-               interrupt-parent = <&msmgpio>;
+               interrupt-parent = <&tlmm>;
                interrupts = <115 IRQ_TYPE_EDGE_RISING>;
 
                vdd-supply = <&pm8916_l17>;
@@ -225,7 +225,7 @@
        battery@35 {
                compatible = "richtek,rt5033-battery";
                reg = <0x35>;
-               interrupt-parent = <&msmgpio>;
+               interrupt-parent = <&tlmm>;
                interrupts = <121 IRQ_TYPE_EDGE_BOTH>;
 
                pinctrl-names = "default";
@@ -274,7 +274,7 @@
        pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;
        pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
 
-       cd-gpios = <&msmgpio 38 GPIO_ACTIVE_LOW>;
+       cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
 };
 
 &usb {
@@ -286,7 +286,7 @@
        extcon = <&muic>;
 };
 
-&msmgpio {
+&tlmm {
        accel_int_default: accel-int-default-state {
                pins = "gpio115";
                function = "gpio";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts
index a1ca4d88342013003ab5f054a02c5acb33cf5472..9068aa6f7b293cbce4a1c1187b129a61b6082b0f 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts
@@ -15,7 +15,7 @@
                regulator-min-microvolt = <1800000>;
                regulator-max-microvolt = <1800000>;
 
-               gpio = <&msmgpio 9 GPIO_ACTIVE_HIGH>;
+               gpio = <&tlmm 9 GPIO_ACTIVE_HIGH>;
                enable-active-high;
 
                pinctrl-names = "default";
@@ -28,7 +28,7 @@
                regulator-min-microvolt = <2800000>;
                regulator-max-microvolt = <2800000>;
 
-               gpio = <&msmgpio 86 GPIO_ACTIVE_HIGH>;
+               gpio = <&tlmm 86 GPIO_ACTIVE_HIGH>;
                enable-active-high;
 
                pinctrl-names = "default";
@@ -41,7 +41,7 @@
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
 
-               gpio = <&msmgpio 60 GPIO_ACTIVE_HIGH>;
+               gpio = <&tlmm 60 GPIO_ACTIVE_HIGH>;
                enable-active-high;
 
                pinctrl-names = "default";
@@ -67,7 +67,7 @@
                compatible = "zinitix,bt541";
 
                reg = <0x20>;
-               interrupt-parent = <&msmgpio>;
+               interrupt-parent = <&tlmm>;
                interrupts = <13 IRQ_TYPE_EDGE_FALLING>;
 
                touchscreen-size-x = <540>;
@@ -93,7 +93,7 @@
 
                vdd3-supply = <&reg_panel_vdd3>;
                vci-supply = <&pm8916_l17>;
-               reset-gpios = <&msmgpio 25 GPIO_ACTIVE_HIGH>;
+               reset-gpios = <&tlmm 25 GPIO_ACTIVE_HIGH>;
 
                port {
                        panel_in: endpoint {
@@ -120,7 +120,7 @@
        compatible = "qcom,wcn3620";
 };
 
-&msmgpio {
+&tlmm {
        panel_vdd3_default: panel-vdd3-default-state {
                pins = "gpio9";
                function = "gpio";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts
index 4e10b8a5e9f9c0d60124a2eacfa9e039051f3851..388482a1e3d9fa7d8c5f1c61b160774efcc3334f 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts
@@ -15,7 +15,7 @@
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
 
-               gpio = <&msmgpio 97 GPIO_ACTIVE_HIGH>;
+               gpio = <&tlmm 97 GPIO_ACTIVE_HIGH>;
                enable-active-high;
 
                pinctrl-names = "default";
@@ -36,7 +36,7 @@
                compatible = "melfas,mms345l";
 
                reg = <0x48>;
-               interrupt-parent = <&msmgpio>;
+               interrupt-parent = <&tlmm>;
                interrupts = <13 IRQ_TYPE_EDGE_FALLING>;
 
                touchscreen-size-x = <720>;
@@ -71,7 +71,7 @@
        compatible = "qcom,wcn3660b";
 };
 
-&msmgpio {
+&tlmm {
        tkey_en_default: tkey-en-default-state {
                pins = "gpio97";
                function = "gpio";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi
index f6c4a011fdfd2506a3ce0ae7b73207d5a68fcf78..0cdd6af7817f4b7571d32847b70805ea3bcd135c 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi
@@ -18,7 +18,7 @@
                        compatible = "siliconmitus,sm5504-muic";
                        reg = <0x14>;
 
-                       interrupt-parent = <&msmgpio>;
+                       interrupt-parent = <&tlmm>;
                        interrupts = <12 IRQ_TYPE_EDGE_FALLING>;
 
                        pinctrl-names = "default";
@@ -32,7 +32,7 @@
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
 
-               gpio = <&msmgpio 97 GPIO_ACTIVE_HIGH>;
+               gpio = <&tlmm 97 GPIO_ACTIVE_HIGH>;
                enable-active-high;
 
                pinctrl-names = "default";
@@ -66,7 +66,7 @@
        compatible = "qcom,wcn3620";
 };
 
-&msmgpio {
+&tlmm {
        tkey_en_default: tkey-en-default-state {
                pins = "gpio97";
                function = "gpio";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-grandmax.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-grandmax.dts
index 4cbd68b8944815f2b36a3b1bc3eacdf8bac9f11f..3f145dde4059f86992a40002496a7bc7ec59bb4b 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-grandmax.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-grandmax.dts
@@ -33,7 +33,7 @@
                        function = LED_FUNCTION_KBD_BACKLIGHT;
                        color = <LED_COLOR_ID_WHITE>;
 
-                       gpios = <&msmgpio 60 GPIO_ACTIVE_HIGH>;
+                       gpios = <&tlmm 60 GPIO_ACTIVE_HIGH>;
 
                        pinctrl-names = "default";
                        pinctrl-0 = <&gpio_leds_default>;
@@ -42,14 +42,14 @@
 };
 
 &reg_motor_vdd {
-       gpio = <&msmgpio 72 GPIO_ACTIVE_HIGH>;
+       gpio = <&tlmm 72 GPIO_ACTIVE_HIGH>;
 };
 
 &reg_touch_key {
        status = "disabled";
 };
 
-&msmgpio {
+&tlmm {
        gpio_leds_default: gpio-led-default-state {
                pins = "gpio60";
                function = "gpio";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
index a49e1641e59b827b9f8e87ba2bd0181a8d57d8aa..cb1b6318a246d81455cc050abad9cc6c53b54a82 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
@@ -34,13 +34,13 @@
 
                volume-up-button {
                        label = "Volume Up";
-                       gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>;
+                       gpios = <&tlmm 107 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_VOLUMEUP>;
                };
 
                home-button {
                        label = "Home";
-                       gpios = <&msmgpio 109 GPIO_ACTIVE_LOW>;
+                       gpios = <&tlmm 109 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_HOMEPAGE>;
                };
        };
@@ -55,7 +55,7 @@
 
                hall-sensor-switch {
                        label = "Hall Effect Sensor";
-                       gpios = <&msmgpio 52 GPIO_ACTIVE_LOW>;
+                       gpios = <&tlmm 52 GPIO_ACTIVE_LOW>;
                        linux,input-type = <EV_SW>;
                        linux,code = <SW_LID>;
                        linux,can-disable;
@@ -74,7 +74,7 @@
                maxim,over-heat-temp = <600>;
                maxim,over-volt = <4400>;
 
-               interrupt-parent = <&msmgpio>;
+               interrupt-parent = <&tlmm>;
                interrupts = <121 IRQ_TYPE_EDGE_FALLING>;
 
                pinctrl-0 = <&fuelgauge_int_default>;
@@ -97,7 +97,7 @@
                vdd-supply = <&pm8916_l17>;
                vddio-supply = <&pm8916_l5>;
 
-               interrupt-parent = <&msmgpio>;
+               interrupt-parent = <&tlmm>;
                interrupts = <115 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "INT1";
 
@@ -145,7 +145,7 @@
        pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
        pinctrl-names = "default", "sleep";
 
-       cd-gpios = <&msmgpio 38 GPIO_ACTIVE_LOW>;
+       cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
 
        status = "okay";
 };
@@ -169,7 +169,7 @@
        compatible = "qcom,wcn3660b";
 };
 
-&msmgpio {
+&tlmm {
        accel_int_default: accel-int-default-state {
                pins = "gpio115";
                function = "gpio";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt510.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt510.dts
index 607a5dc8a5341ab5bbb9e9ff9ef6382d555040ee..48111c6a2c78fb5d2e2e535247dbb949a736c316 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt510.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt510.dts
@@ -25,7 +25,7 @@
                regulator-min-microvolt = <3000000>;
                regulator-max-microvolt = <3000000>;
 
-               gpio = <&msmgpio 76 GPIO_ACTIVE_HIGH>;
+               gpio = <&tlmm 76 GPIO_ACTIVE_HIGH>;
                enable-active-high;
 
                pinctrl-0 = <&motor_en_default>;
@@ -38,7 +38,7 @@
                regulator-min-microvolt = <1800000>;
                regulator-max-microvolt = <1800000>;
 
-               gpio = <&msmgpio 73 GPIO_ACTIVE_HIGH>;
+               gpio = <&tlmm 73 GPIO_ACTIVE_HIGH>;
                enable-active-high;
 
                pinctrl-0 = <&tsp_en_default>;
@@ -51,7 +51,7 @@
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
 
-               gpio = <&msmgpio 73 GPIO_ACTIVE_HIGH>;
+               gpio = <&tlmm 73 GPIO_ACTIVE_HIGH>;
                enable-active-high;
        };
 
@@ -71,20 +71,20 @@
        touchscreen@4a {
                compatible = "atmel,maxtouch";
                reg = <0x4a>;
-               interrupt-parent = <&msmgpio>;
+               interrupt-parent = <&tlmm>;
                interrupts = <13 IRQ_TYPE_LEVEL_LOW>;
 
                vdd-supply = <&reg_tsp_1p8v>;
                vdda-supply = <&reg_tsp_3p3v>;
 
-               reset-gpios = <&msmgpio 114 GPIO_ACTIVE_LOW>;
+               reset-gpios = <&tlmm 114 GPIO_ACTIVE_LOW>;
 
                pinctrl-0 = <&tsp_int_rst_default>;
                pinctrl-names = "default";
        };
 };
 
-&msmgpio {
+&tlmm {
        motor_en_default: motor-en-default-state {
                pins = "gpio76";
                function = "gpio";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt58.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt58.dts
index 5d6f8383306bb9c3497bc7987eff4a3cc409ccff..98ceaad7fcea903f2ff5b54dc51e9df50703aef9 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt58.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt58.dts
@@ -15,7 +15,7 @@
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
 
-               gpio = <&msmgpio 73 GPIO_ACTIVE_HIGH>;
+               gpio = <&tlmm 73 GPIO_ACTIVE_HIGH>;
                enable-active-high;
 
                pinctrl-0 = <&reg_tsp_en_default>;
@@ -24,7 +24,7 @@
 
        vibrator {
                compatible = "gpio-vibrator";
-               enable-gpios = <&msmgpio 76 GPIO_ACTIVE_HIGH>;
+               enable-gpios = <&tlmm 76 GPIO_ACTIVE_HIGH>;
 
                pinctrl-0 = <&vibrator_en_default>;
                pinctrl-names = "default";
@@ -37,7 +37,7 @@
        touchscreen@20 {
                compatible = "zinitix,bt532";
                reg = <0x20>;
-               interrupt-parent = <&msmgpio>;
+               interrupt-parent = <&tlmm>;
                interrupts = <13 IRQ_TYPE_EDGE_FALLING>;
 
                touchscreen-size-x = <768>;
@@ -51,7 +51,7 @@
        };
 };
 
-&msmgpio {
+&tlmm {
        reg_tsp_en_default: reg-tsp-en-default-state {
                pins = "gpio73";
                function = "gpio";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi
index 6192d04a58ae4c012da8be416d42ea8927b9bd71..b2d2bc205ef27fd87a544db16de7183f22170520 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi
@@ -32,7 +32,7 @@
 
                event-hall-sensor {
                        label = "Hall Effect Sensor";
-                       gpios = <&msmgpio 52 GPIO_ACTIVE_LOW>;
+                       gpios = <&tlmm 52 GPIO_ACTIVE_LOW>;
                        linux,input-type = <EV_SW>;
                        linux,code = <SW_LID>;
                        linux,can-disable;
@@ -49,21 +49,21 @@
 
                button-volume-up {
                        label = "Volume Up";
-                       gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>;
+                       gpios = <&tlmm 107 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_VOLUMEUP>;
                };
 
                button-home {
                        label = "Home Key";
-                       gpios = <&msmgpio 109 GPIO_ACTIVE_LOW>;
+                       gpios = <&tlmm 109 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_HOMEPAGE>;
                };
        };
 
        i2c_muic: i2c-muic {
                compatible = "i2c-gpio";
-               sda-gpios = <&msmgpio 105 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
-               scl-gpios = <&msmgpio 106 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
+               sda-gpios = <&tlmm 105 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
+               scl-gpios = <&tlmm 106 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
 
                pinctrl-names = "default";
                pinctrl-0 = <&muic_i2c_default>;
@@ -75,7 +75,7 @@
                        compatible = "siliconmitus,sm5703-muic";
                        reg = <0x25>;
 
-                       interrupt-parent = <&msmgpio>;
+                       interrupt-parent = <&tlmm>;
                        interrupts = <12 IRQ_TYPE_EDGE_FALLING>;
 
                        pinctrl-names = "default";
@@ -108,7 +108,7 @@
        pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;
        pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
 
-       cd-gpios = <&msmgpio 38 GPIO_ACTIVE_LOW>;
+       cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
 };
 
 &usb {
@@ -128,7 +128,7 @@
        compatible = "qcom,wcn3620";
 };
 
-&msmgpio {
+&tlmm {
        gpio_hall_sensor_default: gpio-hall-sensor-default-state {
                pins = "gpio52";
                function = "gpio";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
index fc4c61c4e1e6c1ee78d92c8c0c4fe3a2c3ec6d1a..13a1d8828447bf17f9efa7dcde00176872e6e413 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
@@ -53,13 +53,13 @@
 
                button-volume-up {
                        label = "Volume Up";
-                       gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>;
+                       gpios = <&tlmm 107 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_VOLUMEUP>;
                };
 
                button-home {
                        label = "Home";
-                       gpios = <&msmgpio 109 GPIO_ACTIVE_LOW>;
+                       gpios = <&tlmm 109 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_HOMEPAGE>;
                };
        };
@@ -74,7 +74,7 @@
 
                event-hall-sensor {
                        label = "Hall Effect Sensor";
-                       gpios = <&msmgpio 52 GPIO_ACTIVE_LOW>;
+                       gpios = <&tlmm 52 GPIO_ACTIVE_LOW>;
                        linux,input-type = <EV_SW>;
                        linux,code = <SW_LID>;
                        linux,can-disable;
@@ -87,7 +87,7 @@
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
 
-               gpio = <&msmgpio 73 GPIO_ACTIVE_HIGH>;
+               gpio = <&tlmm 73 GPIO_ACTIVE_HIGH>;
                enable-active-high;
 
                pinctrl-names = "default";
@@ -100,7 +100,7 @@
                regulator-min-microvolt = <2800000>;
                regulator-max-microvolt = <2800000>;
 
-               gpio = <&msmgpio 86 GPIO_ACTIVE_HIGH>;
+               gpio = <&tlmm 86 GPIO_ACTIVE_HIGH>;
                enable-active-high;
 
                pinctrl-names = "default";
@@ -113,7 +113,7 @@
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
 
-               gpio = <&msmgpio 60 GPIO_ACTIVE_HIGH>;
+               gpio = <&tlmm 60 GPIO_ACTIVE_HIGH>;
                enable-active-high;
 
                pinctrl-names = "default";
@@ -122,8 +122,8 @@
 
        i2c-muic {
                compatible = "i2c-gpio";
-               sda-gpios = <&msmgpio 105 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
-               scl-gpios = <&msmgpio 106 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
+               sda-gpios = <&tlmm 105 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
+               scl-gpios = <&tlmm 106 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
 
                pinctrl-names = "default";
                pinctrl-0 = <&muic_i2c_default>;
@@ -135,7 +135,7 @@
                        compatible = "siliconmitus,sm5504-muic";
                        reg = <0x14>;
 
-                       interrupt-parent = <&msmgpio>;
+                       interrupt-parent = <&tlmm>;
                        interrupts = <12 IRQ_TYPE_EDGE_FALLING>;
 
                        pinctrl-names = "default";
@@ -145,8 +145,8 @@
 
        i2c-tkey {
                compatible = "i2c-gpio";
-               sda-gpios = <&msmgpio 16 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
-               scl-gpios = <&msmgpio 17 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
+               sda-gpios = <&tlmm 16 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
+               scl-gpios = <&tlmm 17 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
 
                pinctrl-names = "default";
                pinctrl-0 = <&tkey_i2c_default>;
@@ -158,7 +158,7 @@
                        compatible = "coreriver,tc360-touchkey";
                        reg = <0x20>;
 
-                       interrupt-parent = <&msmgpio>;
+                       interrupt-parent = <&tlmm>;
                        interrupts = <98 IRQ_TYPE_EDGE_FALLING>;
 
                        vcc-supply = <&reg_touch_key>;
@@ -174,8 +174,8 @@
 
        i2c-nfc {
                compatible = "i2c-gpio";
-               sda-gpios = <&msmgpio 0 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
-               scl-gpios = <&msmgpio 1 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
+               sda-gpios = <&tlmm 0 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
+               scl-gpios = <&tlmm 1 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
 
                pinctrl-names = "default";
                pinctrl-0 = <&nfc_i2c_default>;
@@ -187,11 +187,11 @@
                        compatible = "nxp,pn547", "nxp,nxp-nci-i2c";
                        reg = <0x2b>;
 
-                       interrupt-parent = <&msmgpio>;
+                       interrupt-parent = <&tlmm>;
                        interrupts = <21 IRQ_TYPE_EDGE_RISING>;
 
-                       enable-gpios = <&msmgpio 20 GPIO_ACTIVE_HIGH>;
-                       firmware-gpios = <&msmgpio 49 GPIO_ACTIVE_HIGH>;
+                       enable-gpios = <&tlmm 20 GPIO_ACTIVE_HIGH>;
+                       firmware-gpios = <&tlmm 49 GPIO_ACTIVE_HIGH>;
 
                        pinctrl-names = "default";
                        pinctrl-0 = <&nfc_default>;
@@ -206,7 +206,7 @@
                compatible = "st,lsm6ds3";
                reg = <0x6b>;
 
-               interrupt-parent = <&msmgpio>;
+               interrupt-parent = <&tlmm>;
                interrupts = <115 IRQ_TYPE_EDGE_RISING>;
 
                pinctrl-names = "default";
@@ -230,7 +230,7 @@
                compatible = "richtek,rt5033-battery";
                reg = <0x35>;
 
-               interrupt-parent = <&msmgpio>;
+               interrupt-parent = <&tlmm>;
                interrupts = <121 IRQ_TYPE_EDGE_FALLING>;
 
                pinctrl-names = "default";
@@ -245,7 +245,7 @@
                compatible = "zinitix,bt541";
                reg = <0x20>;
 
-               interrupt-parent = <&msmgpio>;
+               interrupt-parent = <&tlmm>;
                interrupts = <13 IRQ_TYPE_EDGE_FALLING>;
 
                touchscreen-size-x = <540>;
@@ -320,7 +320,7 @@
        compatible = "qcom,wcn3660b";
 };
 
-&msmgpio {
+&tlmm {
        fg_alert_default: fg-alert-default-state {
                pins = "gpio121";
                function = "gpio";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-thwc-uf896.dts b/arch/arm64/boot/dts/qcom/msm8916-thwc-uf896.dts
index 82e260375174d1b86608db45876ff363ff1acd52..6fe1850ba20e9ebde315642f1c620e9a4deb7146 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-thwc-uf896.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-thwc-uf896.dts
@@ -10,19 +10,19 @@
 };
 
 &button_restart {
-       gpios = <&msmgpio 35 GPIO_ACTIVE_LOW>;
+       gpios = <&tlmm 35 GPIO_ACTIVE_LOW>;
 };
 
 &led_r {
-       gpios = <&msmgpio 82 GPIO_ACTIVE_HIGH>;
+       gpios = <&tlmm 82 GPIO_ACTIVE_HIGH>;
 };
 
 &led_g {
-       gpios = <&msmgpio 83 GPIO_ACTIVE_HIGH>;
+       gpios = <&tlmm 83 GPIO_ACTIVE_HIGH>;
 };
 
 &led_b {
-       gpios = <&msmgpio 81 GPIO_ACTIVE_HIGH>;
+       gpios = <&tlmm 81 GPIO_ACTIVE_HIGH>;
 };
 
 &button_default {

diff --git a/arch/arm64/boot/dts/qcom/msm8916-thwc-ufi001c.dts b/arch/arm64/boot/dts/qcom/msm8916-thwc-ufi001c.dts
index 978f0abcdf8ff712d41b1ab67b5d15f6aa47eacd..16d4a91022be6f9897c73abd1b56f0d860b1692d 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-thwc-ufi001c.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-thwc-ufi001c.dts
@@ -10,19 +10,19 @@
 };
 
 &button_restart {
-       gpios = <&msmgpio 37 GPIO_ACTIVE_HIGH>;
+       gpios = <&tlmm 37 GPIO_ACTIVE_HIGH>;
 };
 
 &led_r {
-       gpios = <&msmgpio 22 GPIO_ACTIVE_HIGH>;
+       gpios = <&tlmm 22 GPIO_ACTIVE_HIGH>;
 };
 
 &led_g {
-       gpios = <&msmgpio 21 GPIO_ACTIVE_HIGH>;
+       gpios = <&tlmm 21 GPIO_ACTIVE_HIGH>;
 };
 
 &led_b {
-       gpios = <&msmgpio 20 GPIO_ACTIVE_HIGH>;
+       gpios = <&tlmm 20 GPIO_ACTIVE_HIGH>;
 };
 
 &mpss {
@@ -40,7 +40,7 @@
 };
 
 /* This selects the external SIM card slot by default */
-&msmgpio {
+&tlmm {
        sim_ctrl_default: sim-ctrl-default-state {
                esim-sel-pins {
                        pins = "gpio0", "gpio3";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi b/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi
index 6a92190395720e3840be8fa5bec9e2c17b13e5db..f5613107ad1fe4cbebcb623370dc73b301dbc855 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi
@@ -126,7 +126,7 @@
        compatible = "qcom,wcn3620";
 };
 
-&msmgpio {
+&tlmm {
        /* pins are board-specific */
        button_default: button-default-state {
                function = "gpio";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
index 323590598113b4bf59b578476cc927c4720ac66a..12ce4dc236c63229d589a260a2e314a46e980d7f 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
@@ -25,8 +25,8 @@
 
        flash-led-controller {
                compatible = "ocs,ocp8110";
-               enable-gpios = <&msmgpio 31 GPIO_ACTIVE_HIGH>;
-               flash-gpios = <&msmgpio 32 GPIO_ACTIVE_HIGH>;
+               enable-gpios = <&tlmm 31 GPIO_ACTIVE_HIGH>;
+               flash-gpios = <&tlmm 32 GPIO_ACTIVE_HIGH>;
 
                pinctrl-names = "default";
                pinctrl-0 = <&camera_flash_default>;
@@ -47,14 +47,14 @@
 
                button-volume-up {
                        label = "Volume Up";
-                       gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>;
+                       gpios = <&tlmm 107 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_VOLUMEUP>;
                };
        };
 
        usb_id: usb-id {
                compatible = "linux,extcon-usb-gpio";
-               id-gpio = <&msmgpio 110 GPIO_ACTIVE_HIGH>;
+               id-gpio = <&tlmm 110 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&usb_id_default>;
        };
@@ -67,7 +67,7 @@
                compatible = "invensense,mpu6880";
                reg = <0x68>;
 
-               interrupt-parent = <&msmgpio>;
+               interrupt-parent = <&tlmm>;
                interrupts = <115 IRQ_TYPE_EDGE_RISING>;
 
                vdd-supply = <&pm8916_l17>;
@@ -90,10 +90,10 @@
                compatible = "edt,edt-ft5506";
                reg = <0x38>;
 
-               interrupt-parent = <&msmgpio>;
+               interrupt-parent = <&tlmm>;
                interrupts = <13 IRQ_TYPE_EDGE_FALLING>;
 
-               reset-gpios = <&msmgpio 12 GPIO_ACTIVE_LOW>;
+               reset-gpios = <&tlmm 12 GPIO_ACTIVE_LOW>;
 
                vcc-supply = <&pm8916_l17>;
                iovcc-supply = <&pm8916_l6>;
@@ -204,7 +204,7 @@
        compatible = "qcom,wcn3620";
 };
 
-&msmgpio {
+&tlmm {
        camera_flash_default: camera-flash-default-state {
                pins = "gpio31", "gpio32";
                function = "gpio";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-yiming-uz801v3.dts b/arch/arm64/boot/dts/qcom/msm8916-yiming-uz801v3.dts
index 74ce6563be183f685678abb925ad71eb3c37602b..5e6ba8c58bb577274dfb3b0253bfef7ee6c3f211 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-yiming-uz801v3.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-yiming-uz801v3.dts
@@ -10,19 +10,19 @@
 };
 
 &button_restart {
-       gpios = <&msmgpio 23 GPIO_ACTIVE_LOW>;
+       gpios = <&tlmm 23 GPIO_ACTIVE_LOW>;
 };
 
 &led_r {
-       gpios = <&msmgpio 7 GPIO_ACTIVE_HIGH>;
+       gpios = <&tlmm 7 GPIO_ACTIVE_HIGH>;
 };
 
 &led_g {
-       gpios = <&msmgpio 8 GPIO_ACTIVE_HIGH>;
+       gpios = <&tlmm 8 GPIO_ACTIVE_HIGH>;
 };
 
 &led_b {
-       gpios = <&msmgpio 6 GPIO_ACTIVE_HIGH>;
+       gpios = <&tlmm 6 GPIO_ACTIVE_HIGH>;
 };
 
 &button_default {

diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index 92552f3641da093496e9f995f4c9bb08d51d7bf5..a363be2d48e9239373dc552e7fcfc981d3c8b783 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -992,12 +992,12 @@
                        };
                };
 
-               msmgpio: pinctrl@1000000 {
+               tlmm: pinctrl@1000000 {
                        compatible = "qcom,msm8916-pinctrl";
                        reg = <0x01000000 0x300000>;
                        interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>;
                        gpio-controller;
-                       gpio-ranges = <&msmgpio 0 0 122>;
+                       gpio-ranges = <&tlmm 0 0 122>;
                        #gpio-cells = <2>;
                        interrupt-controller;
                        #interrupt-cells = <2>;