Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f685fa0 authored by Bjorn Andersson's avatar Bjorn Andersson Committed by Sasha Levin
Browse files

arm64: dts: qcom: msm8996: Use node references in db820c 



[ Upstream commit 75b77d6492eb5e582e17618b71f62140faf2de29 ]

Instead of mimicing the structure of the platform, reference nodes by
their label in apq8096-db820c.dtsi. Add labels in msm8996.dtsi where
necessary.

Acked-by: default avatarVinod Koul <vkoul@kernel.org>
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Stable-dep-of: 68c4c20848d7 ("arm64: dts: qcom: msm8996: Define UFS UniPro clock limits")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent adcf4eeb

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

+339 −352
Original line number Diff line number Diff line
@@ -77,9 +77,9 @@ 
			enable-gpios = <&pm8994_gpios 15 0>;

		};

	};

};



	soc {

		serial@7570000 {

&blsp1_uart1 {

	label = "BT-UART";

	status = "okay";

	pinctrl-names = "default", "sleep";
@@ -96,7 +96,7 @@ 
	};

};



		serial@75b0000 {

&blsp2_uart1 {

	label = "LS-UART1";

	status = "okay";

	pinctrl-names = "default", "sleep";
@@ -104,7 +104,7 @@ 
	pinctrl-1 = <&blsp2_uart1_2pins_sleep>;

};



		serial@75b1000 {

&blsp2_uart2 {

	label = "LS-UART0";

	status = "disabled";

	pinctrl-names = "default", "sleep";
@@ -112,37 +112,37 @@ 
	pinctrl-1 = <&blsp2_uart2_4pins_sleep>;

};



		i2c@7577000 {

&blsp1_i2c2 {

	/* On Low speed expansion */

	label = "LS-I2C0";

	status = "okay";

};



		i2c@75b6000 {

&blsp2_i2c1 {

	/* On Low speed expansion */

	label = "LS-I2C1";

	status = "okay";

};



		spi@7575000 {

&blsp1_spi0 {

	/* On Low speed expansion */

	label = "LS-SPI0";

	status = "okay";

};



		i2c@75b5000 {

&blsp2_i2c0 {

	/* On High speed expansion */

	label = "HS-I2C2";

	status = "okay";

};



		spi@75ba000{

&blsp2_spi5 {

	/* On High speed expansion */

	label = "HS-SPI1";

	status = "okay";

};



		sdhci@74a4900 {

&sdhc2 {

	/* External SD card */

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

	pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;
@@ -153,15 +153,15 @@ 
	status = "okay";

};



		phy@627000 {

&ufsphy {

	status = "okay";

};



		ufshc@624000 {

&ufshc {

	status = "okay";

};



		pinctrl@1010000 {

&msmgpio {

	gpio-line-names =

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

		"[SPI0_DIN]", /* GPIO_1, BLSP1_SPI_MISO, LSEC pin 10 */
@@ -315,9 +315,7 @@ 
		"NC"; /* GPIO_149 */

};



		qcom,spmi@400f000 {

			pmic@0 {

				gpios@c000 {

&pm8994_gpios {

	gpio-line-names =

		"NC",

		"KEY_VOLP_N",
@@ -343,7 +341,7 @@ 
		"USB_VBUS_DET";

};



				mpps@a000 {

&pm8994_mpps {

	gpio-line-names =

		"VDDPX_BIAS",

		"WIFI_LED",
@@ -354,10 +352,8 @@ 
		"PM_MPP07",

		"NC";

};

			};



			pmic@2 {

				gpios@c000 {

&pmi8994_gpios {

	gpio-line-names =

		"NC",

		"SPKR_AMP_EN1",
@@ -370,26 +366,24 @@ 
		"NC",

		"NC";

};

			};

		};



		phy@34000 {

&pcie_phy {

	status = "okay";

};



		phy@7410000 {

&usb3phy {

	status = "okay";

};



		phy@7411000 {

&hsusb_phy1 {

	status = "okay";

};



		phy@7412000 {

&hsusb_phy2 {

	status = "okay";

};



		usb@6af8800 {

&usb3 {

	status = "okay";

	extcon = <&usb3_id>;
@@ -399,7 +393,7 @@ 
	};

};



		usb@76f8800 {

&usb2 {

	status = "okay";

	extcon = <&usb2_id>;
@@ -410,42 +404,37 @@ 
	};

};



		agnoc@0 {

			pcie@600000 {

&pcie0 {

	status = "okay";

	perst-gpio = <&msmgpio 35 GPIO_ACTIVE_LOW>;

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

};



			pcie@608000 {

&pcie1 {

	status = "okay";

	perst-gpio = <&msmgpio 130 GPIO_ACTIVE_LOW>;

};



			pcie@610000 {

&pcie2 {

	status = "okay";

	perst-gpio = <&msmgpio 114 GPIO_ACTIVE_LOW>;

};

		};



		slim_msm: slim@91c0000 {

			ngd@1 {

				wcd9335: codec@1{

&wcd9335 {

	clock-names = "mclk", "slimbus";

	clocks = <&div1_mclk>,

		 <&rpmcc RPM_SMD_BB_CLK1>;

};

			};

		};



		mdss@900000 {

&mdss {

	status = "okay";

};



			mdp@901000 {

&mdp {

	status = "okay";

};



			hdmi-phy@9a0600 {

&hdmi_phy {

	status = "okay";



	vddio-supply = <&pm8994_l12>;
@@ -453,7 +442,7 @@ 
	#phy-cells = <0>;

};



			hdmi-tx@9a0000 {

&hdmi {

	status = "okay";



	pinctrl-names = "default", "sleep";
@@ -463,10 +452,8 @@ 
	core-vdda-supply = <&pm8994_l12>;

	core-vcc-supply = <&pm8994_s4>;

};

		};

	};





/ {

	gpio_keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

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

+2 −2
Original line number Diff line number Diff line
@@ -1464,7 +1464,7 @@ 
			};

		};



		phy@34000 {

		pcie_phy: phy@34000 {

			compatible = "qcom,msm8996-qmp-pcie-phy";

			reg = <0x34000 0x488>;

			#clock-cells = <1>;
@@ -1526,7 +1526,7 @@ 
			};

		};



		phy@7410000 {

		usb3phy: phy@7410000 {

			compatible = "qcom,msm8996-qmp-usb3-phy";

			reg = <0x7410000 0x1c4>;

			#clock-cells = <1>;