github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-31 10:33:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

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

Browse Source 
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>
This commit is contained in:
Antony Kurniawan Soemardi 2025-09-21 03:08:15 +00:00 committed by Bjorn Andersson
parent 47f46fa732
commit d35984295d
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts
View File

@ -19,7 +19,7 @@ chosen {
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 @@ &gsbi1_spi {
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 @@ &gsbi5_serial {
status = "okay";
};
&msmgpio {
&tlmm {
spi1_default: spi1-default-state {
mosi-pins {
pins = "gpio6";
@ -90,7 +90,7 @@ clk-pins {
};
&pm8921 {
interrupts-extended = <&msmgpio 104 IRQ_TYPE_LEVEL_LOW>;
interrupts-extended = <&tlmm 104 IRQ_TYPE_LEVEL_LOW>;
};
&pm8921_keypad {

12
arch/arm/boot/dts/qcom/qcom-msm8960-samsung-expressatt.dts
View File

@ -31,7 +31,7 @@ gpio-keys {
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-home {
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 @@ &gsbi3_i2c {
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 @@ touchscreen@4a {
};
};
&msmgpio {
&tlmm {
spi1_default: spi1-default-state {
mosi-pins {
pins = "gpio6";
@ -160,7 +160,7 @@ touchscreen: touchscreen-int-state {
};
&pm8921 {
interrupts-extended = <&msmgpio 104 IRQ_TYPE_LEVEL_LOW>;
interrupts-extended = <&tlmm 104 IRQ_TYPE_LEVEL_LOW>;
};
&rpm {

2
arch/arm/boot/dts/qcom/qcom-msm8960-sony-huashan.dts
View File

@ -54,7 +54,7 @@ &gsbi8_serial {
};
&pm8921 {
interrupts-extended = <&msmgpio 104 IRQ_TYPE_LEVEL_LOW>;
interrupts-extended = <&tlmm 104 IRQ_TYPE_LEVEL_LOW>;
};
&pm8921_gpio {

6
arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
View File

@ -121,11 +121,11 @@ tsens_backup: backup-calib@414 {
};
};
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 @@ gsbi1_spi: spi@16080000 {
#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",