Commit 41e22c2f authored by Stephan Gerhold's avatar Stephan Gerhold Committed by Bjorn Andersson
Browse files

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: default avatarStephan Gerhold <stephan@gerhold.net>
Reviewed-by: default avatarBryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230525-msm8916-labels-v1-1-bec0f5fb46fb@gerhold.net
parent eaa53a85

arch/arm64/boot/dts/qcom/apq8016-sbc.dts

+12 −12
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ usb2513 { 


	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 @@ gpio-keys { 
		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 @@ led@1 { 
			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 @@ led@2 { 
			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 @@ adv_bridge: bridge@39 { 
		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 @@ camera_rear@3b { 
		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 @@ &sdhc_2 { 
	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 @@ &i2c6_default { 
 * 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 @@ &msmgpio { 
		"USR_LED_2_CTRL", /* GPIO 120 */

		"SB_HS_ID";



	msmgpio_leds: msmgpio-leds-state {

	tlmm_leds: tlmm-leds-state {

		pins = "gpio21", "gpio120";

		function = "gpio";

arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts

+7 −7
Original line number Diff line number Diff line
@@ -39,14 +39,14 @@ gpio-keys { 


		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 @@ &blsp_i2c2 { 
	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 @@ touchscreen@38 { 
		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 @@ &sdhc_2 { 
	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 @@ &wcnss_iris { 
	compatible = "qcom,wcn3620";

};



&msmgpio {

&tlmm {

	accel_int_default: accel-int-default-state {

		pins = "gpio115";

		function = "gpio";

arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts

+12 −12
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ gpio-keys { 


		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 @@ gpio-leds { 
		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 @@ led-0 { 


	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 @@ &blsp_i2c4 { 
	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 @@ magnetometer@c { 
		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 @@ accelerometer@f { 
		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 @@ accelerometer@f { 
	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 @@ gyroscope@68 { 
		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 @@ &blsp_i2c6 { 
	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 @@ &sdhc_2 { 
	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 @@ &wcnss_iris { 
	compatible = "qcom,wcn3620";

};



&msmgpio {

&tlmm {

	accel_int_default: accel-int-default-state {

		pins = "gpio31";

		function = "gpio";

arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts

+10 −10
Original line number Diff line number Diff line
@@ -30,14 +30,14 @@ gpio-keys { 


		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 @@ reg_sd_vmmc: regulator-sdcard-vmmc { 
		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 @@ reg_sd_vmmc: regulator-sdcard-vmmc { 


	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 @@ magnetometer@c { 
		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 @@ imu@68 { 
		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 @@ touchscreen@38 { 
		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 @@ &sdhc_2 { 
	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 @@ &wcnss_iris { 
	compatible = "qcom,wcn3620";

};



&msmgpio {

&tlmm {

	gpio_keys_default: gpio-keys-default-state {

		pins = "gpio107", "gpio117";

		function = "gpio";

arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts

+10 −10
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ chosen { 
	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 @@ gpio-keys { 


		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 @@ gpio-leds { 
		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 @@ touchscreen@38 { 
		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 @@ &sdhc_2 { 
	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 @@ &wcnss_iris { 
	compatible = "qcom,wcn3620";

};



&msmgpio {

&tlmm {

	camera_flash_default: camera-flash-default-state {

		pins = "gpio31", "gpio32";

		function = "gpio";