Commit 35a4a8b6 authored by Konrad Dybcio's avatar Konrad Dybcio Committed by Bjorn Andersson
Browse files

arm64: dts: qcom: msm8996: Sanitize pins 



In order to prepare for feature development, the DTs
have to be workable with.. To achieve that:

- Rename msmgpio to tlmm (consistency with newer DTs)
- Rid msm8996-pins.dtsi and add the contents to msm8996.dtsi
- Modernize the pin nodes, make them more concise
- Add generic pin configuration for some hardware
- Fix up some names in preparation for BLSP/UART name cleaning..

Signed-off-by: default avatarKonrad Dybcio <konrad.dybcio@somainline.org>
Link: https://lore.kernel.org/r/20210228130831.203765-1-konrad.dybcio@somainline.org


Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent 1ed34da6

arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi

+11 −11
Original line number Diff line number Diff line
@@ -188,16 +188,16 @@ &blsp2_uart1 { 
	label = "LS-UART1";

	status = "okay";

	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&blsp2_uart1_2pins_default>;

	pinctrl-1 = <&blsp2_uart1_2pins_sleep>;

	pinctrl-0 = <&blsp2_uart2_2pins_default>;

	pinctrl-1 = <&blsp2_uart2_2pins_sleep>;

};



&blsp2_uart2 {

	label = "LS-UART0";

	status = "disabled";

	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&blsp2_uart2_4pins_default>;

	pinctrl-1 = <&blsp2_uart2_4pins_sleep>;

	pinctrl-0 = <&blsp2_uart3_4pins_default>;

	pinctrl-1 = <&blsp2_uart3_4pins_sleep>;

};



&camss {
@@ -249,7 +249,7 @@ &mmcc { 
	vdd-gfx-supply = <&vdd_gfx>;

};



&msmgpio {

&tlmm {

	gpio-line-names =

		"[SPI0_DOUT]", /* GPIO_0, BLSP1_SPI_MOSI, LSEC pin 14 */

		"[SPI0_DIN]", /* GPIO_1, BLSP1_SPI_MISO, LSEC pin 10 */
@@ -509,20 +509,20 @@ config { 


&pcie0 {

	status = "okay";

	perst-gpio = <&msmgpio 35 GPIO_ACTIVE_LOW>;

	perst-gpio = <&tlmm 35 GPIO_ACTIVE_LOW>;

	vddpe-3v3-supply = <&wlan_en>;

	vdda-supply = <&vreg_l28a_0p925>;

};



&pcie1 {

	status = "okay";

	perst-gpio = <&msmgpio 130 GPIO_ACTIVE_LOW>;

	perst-gpio = <&tlmm 130 GPIO_ACTIVE_LOW>;

	vdda-supply = <&vreg_l28a_0p925>;

};



&pcie2 {

	status = "okay";

	perst-gpio = <&msmgpio 114 GPIO_ACTIVE_LOW>;

	perst-gpio = <&tlmm 114 GPIO_ACTIVE_LOW>;

	vdda-supply = <&vreg_l28a_0p925>;

};
@@ -933,9 +933,9 @@ vreg_s1b_1p025: s1 { 
&sdhc2 {

	/* External SD card */

	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 0x1>;

	pinctrl-0 = <&sdc2_state_on &sdc2_cd_on>;

	pinctrl-1 = <&sdc2_state_off &sdc2_cd_off>;

	cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;

	vmmc-supply = <&vreg_l21a_2p95>;

	vqmmc-supply = <&vreg_l13a_2p95>;

	status = "okay";

arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts

+4 −4
Original line number Diff line number Diff line
@@ -84,11 +84,11 @@ vph_pwr: vph-pwr-regulator { 
&blsp2_uart1 {

	status = "okay";

	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&blsp2_uart1_2pins_default>;

	pinctrl-1 = <&blsp2_uart1_2pins_sleep>;

	pinctrl-0 = <&blsp2_uart2_2pins_default>;

	pinctrl-1 = <&blsp2_uart2_2pins_sleep>;

};



&msmgpio {

&tlmm {

	sdc2_pins_default: sdc2-pins-default {

		clk {

			pins = "sdc2_clk";
@@ -352,7 +352,7 @@ &sdhc2 { 


	bus-width = <4>;



	cd-gpios = <&msmgpio 38 0x1>;

	cd-gpios = <&tlmm 38 0x1>;



	vmmc-supply = <&vreg_l21a_2p95>;

	vqmmc-supply = <&vreg_l13a_2p95>;

arch/arm64/boot/dts/qcom/msm8996-pins.dtsi

deleted100644 → 0
+0 −653
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.

 */



&msmgpio {



	wcd9xxx_intr {

		wcd_intr_default: wcd_intr_default{

			mux {

				pins = "gpio54";

				function = "gpio";

			};



			config {

				pins = "gpio54";

				drive-strength = <2>; /* 2 mA */

				bias-pull-down; /* pull down */

				input-enable;

			};

		};

	};



	cdc_reset_ctrl {

		cdc_reset_sleep: cdc_reset_sleep {

			mux {

				pins = "gpio64";

				function = "gpio";

			};

			config {

				pins = "gpio64";

				drive-strength = <16>;

				bias-disable;

				output-low;

			};

		};

		cdc_reset_active:cdc_reset_active {

			mux {

				pins = "gpio64";

				function = "gpio";

			};

			config {

				pins = "gpio64";

				drive-strength = <16>;

				bias-pull-down;

				output-high;

			};

		};

	};



	blsp1_spi0_default: blsp1_spi0_default {

		pinmux {

			function = "blsp_spi1";

			pins = "gpio0", "gpio1", "gpio3";

		};

		pinmux_cs {

			function = "gpio";

			pins = "gpio2";

		};

		pinconf {

			pins = "gpio0", "gpio1", "gpio3";

			drive-strength = <12>;

			bias-disable;

		};

		pinconf_cs {

			pins = "gpio2";

			drive-strength = <16>;

			bias-disable;

			output-high;

		};

	};



	blsp1_spi0_sleep: blsp1_spi0_sleep {

		pinmux {

			function = "gpio";

			pins = "gpio0", "gpio1", "gpio2", "gpio3";

		};

		pinconf {

			pins = "gpio0", "gpio1", "gpio2", "gpio3";

			drive-strength = <2>;

			bias-pull-down;

		};

	};



	blsp1_i2c2_default: blsp1_i2c2_default {

		pinmux {

			function = "blsp_i2c3";

			pins = "gpio47", "gpio48";

		};

		pinconf {

			pins = "gpio47", "gpio48";

			drive-strength = <16>;

			bias-disable = <0>;

		};

	};



	blsp1_i2c2_sleep: blsp1_i2c2_sleep {

		pinmux {

			function = "gpio";

			pins = "gpio47", "gpio48";

		};

		pinconf {

			pins = "gpio47", "gpio48";

			drive-strength = <2>;

			bias-disable = <0>;

		};

	};



	blsp2_i2c0_default: blsp2_i2c0 {

		pinmux {

			function = "blsp_i2c7";

			pins = "gpio55", "gpio56";

		};

		pinconf {

			pins = "gpio55", "gpio56";

			drive-strength = <16>;

			bias-disable;

		};

	};



	blsp2_i2c0_sleep: blsp2_i2c0_sleep {

		pinmux {

			function = "gpio";

			pins = "gpio55", "gpio56";

		};

		pinconf {

			pins = "gpio55", "gpio56";

			drive-strength = <2>;

			bias-disable;

		};

	};



	blsp2_uart1_2pins_default: blsp2_uart1_2pins {

		pinmux {

			function = "blsp_uart8";

			pins = "gpio4", "gpio5";

		};

		pinconf {

			pins = "gpio4", "gpio5";

			drive-strength = <16>;

			bias-disable;

		};

	};



	blsp2_uart1_2pins_sleep: blsp2_uart1_2pins_sleep {

		pinmux {

			function = "gpio";

			pins = "gpio4", "gpio5";

		};

		pinconf {

			pins = "gpio4", "gpio5";

			drive-strength = <2>;

			bias-disable;

		};

	};



	blsp2_uart1_4pins_default: blsp2_uart1_4pins {

		pinmux {

			function = "blsp_uart8";

			pins = "gpio4", "gpio5", "gpio6", "gpio7";

		};



		pinconf {

			pins = "gpio4", "gpio5", "gpio6", "gpio7";

			drive-strength = <16>;

			bias-disable;

		};

	};



	blsp2_uart1_4pins_sleep: blsp2_uart1_4pins_sleep {

		pinmux {

			function = "gpio";

			pins = "gpio4", "gpio5", "gpio6", "gpio7";

		};



		pinconf {

			pins = "gpio4", "gpio5", "gpio6", "gpio7";

			drive-strength = <2>;

			bias-disable;

		};

	};



	blsp2_i2c1_default: blsp2_i2c1 {

		pinmux {

			function = "blsp_i2c8";

			pins = "gpio6", "gpio7";

		};

		pinconf {

			pins = "gpio6", "gpio7";

			drive-strength = <16>;

			bias-disable;

		};

	};



	blsp2_i2c1_sleep: blsp2_i2c1_sleep {

		pinmux {

			function = "gpio";

			pins = "gpio6", "gpio7";

		};

		pinconf {

			pins = "gpio6", "gpio7";

			drive-strength = <2>;

			bias-disable;

		};

	};



	blsp2_uart2_2pins_default: blsp2_uart2_2pins {

		pinmux {

			function = "blsp_uart9";

			pins = "gpio49", "gpio50";

		};

		pinconf {

			pins = "gpio49", "gpio50";

			drive-strength = <16>;

			bias-disable;

		};

	};



	blsp2_uart2_2pins_sleep: blsp2_uart2_2pins_sleep {

		pinmux {

			function = "gpio";

			pins = "gpio49", "gpio50";

		};

		pinconf {

			pins = "gpio49", "gpio50";

			drive-strength = <2>;

			bias-disable;

		};

	};



	blsp2_uart2_4pins_default: blsp2_uart2_4pins {

		pinmux {

			function = "blsp_uart9";

			pins = "gpio49", "gpio50", "gpio51", "gpio52";

		};



		pinconf {

			pins = "gpio49", "gpio50", "gpio51", "gpio52";

			drive-strength = <16>;

			bias-disable;

		};

	};



	blsp2_uart2_4pins_sleep: blsp2_uart2_4pins_sleep {

		pinmux {

			function = "gpio";

			pins = "gpio49", "gpio50", "gpio51", "gpio52";

		};



		pinconf {

			pins = "gpio49", "gpio50", "gpio51", "gpio52";

			drive-strength = <2>;

			bias-disable;

		};

	};



	blsp2_spi5_default: blsp2_spi5_default {

		pinmux {

			function = "blsp_spi12";

			pins = "gpio85", "gpio86", "gpio88";

		};

		pinmux_cs {

			function = "gpio";

			pins = "gpio87";

		};

		pinconf {

			pins = "gpio85", "gpio86", "gpio88";

			drive-strength = <12>;

			bias-disable;

		};

		pinconf_cs {

			pins = "gpio87";

			drive-strength = <16>;

			bias-disable;

			output-high;

		};

	};



	blsp2_spi5_sleep: blsp2_spi5_sleep {

		pinmux {

			function = "gpio";

			pins = "gpio85", "gpio86", "gpio87", "gpio88";

		};

		pinconf {

			pins = "gpio85", "gpio86", "gpio87", "gpio88";

			drive-strength = <2>;

			bias-pull-down;

		};

	};



	sdc2_clk_on: sdc2_clk_on {

		config {

			pins = "sdc2_clk";

			bias-disable;		/* NO pull */

			drive-strength = <16>;	/* 16 MA */

		};

	};



	sdc2_clk_off: sdc2_clk_off {

		config {

			pins = "sdc2_clk";

			bias-disable;		/* NO pull */

			drive-strength = <2>;	/* 2 MA */

		};

	};



	sdc2_cmd_on: sdc2_cmd_on {

		config {

			pins = "sdc2_cmd";

			bias-pull-up;		/* pull up */

			drive-strength = <10>;	/* 10 MA */

		};

	};



	sdc2_cmd_off: sdc2_cmd_off {

		config {

			pins = "sdc2_cmd";

			bias-pull-up;		/* pull up */

			drive-strength = <2>;	/* 2 MA */

		};

	};



	sdc2_data_on: sdc2_data_on {

		config {

			pins = "sdc2_data";

			bias-pull-up;		/* pull up */

			drive-strength = <10>;	/* 10 MA */

		};

	};



	sdc2_data_off: sdc2_data_off {

		config {

			pins = "sdc2_data";

			bias-pull-up;		/* pull up */

			drive-strength = <2>;	/* 2 MA */

		};

	};



	pcie0_clkreq_default: pcie0_clkreq_default {

		mux {

			pins = "gpio36";

			function = "pci_e0";

		};



		config {

			pins = "gpio36";

			drive-strength = <2>;

			bias-pull-up;

		};

	};



	pcie0_perst_default: pcie0_perst_default {

		mux {

			pins = "gpio35";

			function = "gpio";

		};



		config {

			pins = "gpio35";

			drive-strength = <2>;

			bias-pull-down;

		};

	};



	pcie0_wake_default: pcie0_wake_default {

		mux {

			pins = "gpio37";

			function = "gpio";

		};



		config {

			pins = "gpio37";

			drive-strength = <2>;

			bias-pull-up;

		};

	};



	pcie0_clkreq_sleep: pcie0_clkreq_sleep {

		mux {

			pins = "gpio36";

			function = "gpio";

		};



		config {

			pins = "gpio36";

			drive-strength = <2>;

			bias-disable;

		};

	};



	pcie0_wake_sleep: pcie0_wake_sleep {

		mux {

			pins = "gpio37";

			function = "gpio";

		};



		config {

			pins = "gpio37";

			drive-strength = <2>;

			bias-disable;

		};

	};



	pcie1_clkreq_default: pcie1_clkreq_default {

		mux {

			pins = "gpio131";

			function = "pci_e1";

		};



		config {

			pins = "gpio131";

			drive-strength = <2>;

			bias-pull-up;

		};

	};



	pcie1_perst_default: pcie1_perst_default {

		mux {

			pins = "gpio130";

			function = "gpio";

		};



		config {

			pins = "gpio130";

			drive-strength = <2>;

			bias-pull-down;

		};

	};



	pcie1_wake_default: pcie1_wake_default {

		mux {

			pins = "gpio132";

			function = "gpio";

		};



		config {

			pins = "gpio132";

			drive-strength = <2>;

			bias-pull-down;

		};

	};



	pcie1_clkreq_sleep: pcie1_clkreq_sleep {

		mux {

			pins = "gpio131";

			function = "gpio";

		};



		config {

			pins = "gpio131";

			drive-strength = <2>;

			bias-disable;

		};

	};



	pcie1_wake_sleep: pcie1_wake_sleep {

		mux {

			pins = "gpio132";

			function = "gpio";

		};



		config {

			pins = "gpio132";

			drive-strength = <2>;

			bias-disable;

		};

	};



	pcie2_clkreq_default: pcie2_clkreq_default {

		mux {

			pins = "gpio115";

			function = "pci_e2";

		};



		config {

			pins = "gpio115";

			drive-strength = <2>;

			bias-pull-up;

		};

	};



	pcie2_perst_default: pcie2_perst_default {

		mux {

			pins = "gpio114";

			function = "gpio";

		};



		config {

			pins = "gpio114";

			drive-strength = <2>;

			bias-pull-down;

		};

	};



	pcie2_wake_default: pcie2_wake_default {

		mux {

			pins = "gpio116";

			function = "gpio";

		};



		config {

			pins = "gpio116";

			drive-strength = <2>;

			bias-pull-down;

		};

	};



	pcie2_clkreq_sleep: pcie2_clkreq_sleep {

		mux {

			pins = "gpio115";

			function = "gpio";

		};



		config {

			pins = "gpio115";

			drive-strength = <2>;

			bias-disable;

		};

	};



	pcie2_wake_sleep: pcie2_wake_sleep {

		mux {

			pins = "gpio116";

			function = "gpio";

		};



		config {

			pins = "gpio116";

			drive-strength = <2>;

			bias-disable;

		};

	};



	cci0_default: cci0_default {

		pinmux {

			function = "cci_i2c";

			pins = "gpio17", "gpio18";

		};

		pinconf {

			pins = "gpio17", "gpio18";

			drive-strength = <16>;

			bias-disable;

		};

	};



	cci1_default: cci1_default {

		pinmux {

			function = "cci_i2c";

			pins = "gpio19", "gpio20";

		};

		pinconf {

			pins = "gpio19", "gpio20";

			drive-strength = <16>;

			bias-disable;

		};

	};



	camera_board_default: camera_board_default {

		mux_pwdn {

			function = "gpio";

			pins = "gpio98";

		};

		config_pwdn {

			pins = "gpio98";

			drive-strength = <16>;

			bias-disable;

		};



		mux_rst {

			function = "gpio";

			pins = "gpio104";

		};

		config_rst {

			pins = "gpio104";

			drive-strength = <16>;

			bias-disable;

		};



		mux_mclk1 {

			function = "cam_mclk";

			pins = "gpio14";

		};

		config_mclk1 {

			pins = "gpio14";

			drive-strength = <16>;

			bias-disable;

		};

	};



	camera_front_default: camera_front_default {

		mux_pwdn {

			function = "gpio";

			pins = "gpio133";

		};

		config_pwdn {

			pins = "gpio133";

			drive-strength = <16>;

			bias-disable;

		};



		mux_rst {

			function = "gpio";

			pins = "gpio23";

		};

		config_rst {

			pins = "gpio23";

			drive-strength = <16>;

			bias-disable;

		};



		mux_mclk2 {

			function = "cam_mclk";

			pins = "gpio15";

		};

		config_mclk2 {

			pins = "gpio15";

			drive-strength = <16>;

			bias-disable;

		};

	};



	camera_rear_default: camera_rear_default {

		mux_pwdn {

			function = "gpio";

			pins = "gpio26";

		};

		config_pwdn {

			pins = "gpio26";

			drive-strength = <16>;

			bias-disable;

		};



		mux_rst {

			function = "gpio";

			pins = "gpio25";

		};

		config_rst {

			pins = "gpio25";

			drive-strength = <16>;

			bias-disable;

		};



		mux_mclk0 {

			function = "cam_mclk";

			pins = "gpio13";

		};

		config_mclk0 {

			pins = "gpio13";

			drive-strength = <16>;

			bias-disable;

		};

	};

};

arch/arm64/boot/dts/qcom/msm8996.dtsi

+487 −21

File changed.

Preview size limit exceeded, changes collapsed.