Commit 9f440d17 authored by Konrad Dybcio's avatar Konrad Dybcio Committed by Bjorn Andersson
Browse files

ARM: dts: qcom-apq8074-dragonboard: Use &labels 



Use &labels to align with the style used in new DTS and apply tiny
style fixes.

Signed-off-by: default avatarKonrad Dybcio <konrad.dybcio@somainline.org>
[bjorn: Rebased ontop of Krzysztof's underscore fixes]
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220415115633.575010-9-konrad.dybcio@somainline.org
parent 087c9704

arch/arm/boot/dts/qcom-apq8074-dragonboard.dts

+295 −310
Original line number Diff line number Diff line
@@ -16,37 +16,30 @@ aliases { 
	chosen {

		stdout-path = "serial0:115200n8";

	};

};



	soc {

		serial@f991e000 {

&blsp1_uart2 {

	status = "okay";

};



		sdhci@f9824900 {

			bus-width = <8>;

			non-removable;

&blsp2_i2c5 {

	status = "okay";

	clock-frequency = <200000>;



			vmmc-supply = <&pm8941_l20>;

			vqmmc-supply = <&pm8941_s3>;



			pinctrl-names = "default";

			pinctrl-0 = <&sdhc1_pin_a>;

		};



		sdhci@f98a4900 {

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

	pinctrl-0 = <&i2c11_pins>;

	pinctrl-names = "default";

			pinctrl-0 = <&sdhc2_pin_a>, <&sdhc2_cd_pin_a>;

			bus-width = <4>;

			status = "okay";



			vmmc-supply = <&pm8941_l21>;

			vqmmc-supply = <&pm8941_l13>;

	eeprom: eeprom@52 {

		compatible = "atmel,24c128";

		reg = <0x52>;

		pagesize = <32>;

		read-only;

	};

};



		usb@f9a55000 {

&otg {

	status = "okay";



	phys = <&usb_hs2_phy>;

	phy-select = <&tcsr 0xb000 1>;

	extcon = <&smbb>, <&usb_id>;
@@ -54,6 +47,7 @@ usb@f9a55000 { 
	hnp-disable;

	srp-disable;

	adp-disable;



	ulpi {

		phy@b {

			status = "okay";
@@ -65,106 +59,24 @@ phy@b { 
	};

};





		pinctrl@fd510000 {

			i2c11_pins: i2c11 {

				mux {

					pins = "gpio83", "gpio84";

					function = "blsp_i2c11";

				};

			};



			spi8_default: spi8_default {

				mosi {

					pins = "gpio45";

					function = "blsp_spi8";

				};

				miso {

					pins = "gpio46";

					function = "blsp_spi8";

				};

				cs {

					pins = "gpio47";

					function = "blsp_spi8";

				};

				clk {

					pins = "gpio48";

					function = "blsp_spi8";

				};

			};



			sdhc1_pin_a: sdhc1-pin-active {

				clk {

					pins = "sdc1_clk";

					drive-strength = <16>;

					bias-disable;

				};



				cmd-data {

					pins = "sdc1_cmd", "sdc1_data";

					drive-strength = <10>;

					bias-pull-up;

				};

			};



			sdhc2_cd_pin_a: sdhc2-cd-pin-active {

				pins = "gpio62";

				function = "gpio";



				drive-strength = <2>;

				bias-disable;

			};



			sdhc2_pin_a: sdhc2-pin-active {

				clk {

					pins = "sdc2_clk";

					drive-strength = <10>;

					bias-disable;

				};



				cmd-data {

					pins = "sdc2_cmd", "sdc2_data";

					drive-strength = <6>;

					bias-pull-up;

				};

			};

		};



		i2c@f9967000 {

			status = "okay";

			clock-frequency = <200000>;

			pinctrl-0 = <&i2c11_pins>;

			pinctrl-names = "default";



			eeprom: eeprom@52 {

				compatible = "atmel,24c128";

				reg = <0x52>;

				pagesize = <32>;

				read-only;

			};

		};

	};



	smd {

		rpm {

			rpm-requests {

&rpm_requests {

	pm8841-regulators {

					s1 {

		pm8841_s1: s1 {

			regulator-min-microvolt = <675000>;

			regulator-max-microvolt = <1050000>;

		};



					s2 {

		pm8841_s2: s2 {

			regulator-min-microvolt = <500000>;

			regulator-max-microvolt = <1050000>;

		};



					s3 {

		pm8841_s3: s3 {

			regulator-min-microvolt = <500000>;

			regulator-max-microvolt = <1050000>;

		};



					s4 {

		pm8841_s4: s4 {

			regulator-min-microvolt = <500000>;

			regulator-max-microvolt = <1050000>;

		};
@@ -178,169 +90,242 @@ pm8941-regulators { 
		vdd_l6_l12_l14_l15-supply = <&pm8941_s2>;

		vin_5vs-supply = <&pm8941_5v>;



					s1 {

		pm8941_s1: s1 {

			regulator-min-microvolt = <1300000>;

			regulator-max-microvolt = <1300000>;

			regulator-always-on;

			regulator-boot-on;

		};



					s2 {

		pm8941_s2: s2 {

			regulator-min-microvolt = <2150000>;

			regulator-max-microvolt = <2150000>;

			regulator-boot-on;

		};



					s3 {

		pm8941_s3: s3 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			regulator-always-on;

			regulator-boot-on;

		};



					l1 {

		pm8941_l1: l1 {

			regulator-min-microvolt = <1225000>;

			regulator-max-microvolt = <1225000>;



			regulator-always-on;

			regulator-boot-on;

		};



					l2 {

		pm8941_l2: l2 {

			regulator-min-microvolt = <1200000>;

			regulator-max-microvolt = <1200000>;

		};



					l3 {

		pm8941_l3: l3 {

			regulator-min-microvolt = <1225000>;

			regulator-max-microvolt = <1225000>;

		};



					l4 {

		pm8941_l4: l4 {

			regulator-min-microvolt = <1225000>;

			regulator-max-microvolt = <1225000>;

		};



					l5 {

		pm8941_l5: l5 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

		};



					l6 {

		pm8941_l6: l6 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;



			regulator-boot-on;

		};



					l7 {

		pm8941_l7: l7 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;



			regulator-boot-on;

		};



					l8 {

		pm8941_l8: l8 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

		};



					l9 {

		pm8941_l9: l9 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <2950000>;

		};



					l10 {

		pm8941_l10: l10 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			regulator-always-on;

		};



					l11 {

		pm8941_l11: l11 {

			regulator-min-microvolt = <1300000>;

			regulator-max-microvolt = <1300000>;

		};



					l12 {

		pm8941_l12: l12 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;



			regulator-always-on;

			regulator-boot-on;

		};



					l13 {

		pm8941_l13: l13 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <2950000>;



			regulator-boot-on;

		};



					l14 {

		pm8941_l14: l14 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

		};



					l15 {

		pm8941_l15: l15 {

			regulator-min-microvolt = <2050000>;

			regulator-max-microvolt = <2050000>;

		};



					l16 {

		pm8941_l16: l16 {

			regulator-min-microvolt = <2700000>;

			regulator-max-microvolt = <2700000>;

		};



					l17 {

		pm8941_l17: l17 {

			regulator-min-microvolt = <2700000>;

			regulator-max-microvolt = <2700000>;

		};



					l18 {

		pm8941_l18: l18 {

			regulator-min-microvolt = <2850000>;

			regulator-max-microvolt = <2850000>;

		};



					l19 {

		pm8941_l19: l19 {

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

			regulator-always-on;

		};



					l20 {

		pm8941_l20: l20 {

			regulator-min-microvolt = <2950000>;

			regulator-max-microvolt = <2950000>;



			regulator-system-load = <200000>;

			regulator-allow-set-load;

			regulator-boot-on;

						regulator-system-load = <200000>;

		};



					l21 {

		pm8941_l21: l21 {

			regulator-min-microvolt = <2950000>;

			regulator-max-microvolt = <2950000>;



			regulator-boot-on;

		};



					l22 {

		pm8941_l22: l22 {

			regulator-min-microvolt = <3000000>;

			regulator-max-microvolt = <3000000>;

		};



					l23 {

		pm8941_l23: l23 {

			regulator-min-microvolt = <3000000>;

			regulator-max-microvolt = <3000000>;

		};



					l24 {

		pm8941_l24: l24 {

			regulator-min-microvolt = <3075000>;

			regulator-max-microvolt = <3075000>;



			regulator-boot-on;

		};

	};

};



&sdhc_1 {

	status = "okay";



	vmmc-supply = <&pm8941_l20>;

	vqmmc-supply = <&pm8941_s3>;



	pinctrl-names = "default";

	pinctrl-0 = <&sdhc1_pin_a>;

};



&sdhc_2 {

	status = "okay";

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

	pinctrl-names = "default";

	pinctrl-0 = <&sdhc2_pin_a>, <&sdhc2_cd_pin_a>;



	vmmc-supply = <&pm8941_l21>;

	vqmmc-supply = <&pm8941_l13>;

};



&tlmm {

	i2c11_pins: i2c11 {

		mux {

			pins = "gpio83", "gpio84";

			function = "blsp_i2c11";

		};

	};



	spi8_default: spi8_default {

		mosi {

			pins = "gpio45";

			function = "blsp_spi8";

		};

		miso {

			pins = "gpio46";

			function = "blsp_spi8";

		};

		cs {

			pins = "gpio47";

			function = "blsp_spi8";

		};

		clk {

			pins = "gpio48";

			function = "blsp_spi8";

		};

	};



	sdhc1_pin_a: sdhc1-pin-active {

		clk {

			pins = "sdc1_clk";

			drive-strength = <16>;

			bias-disable;

		};



		cmd-data {

			pins = "sdc1_cmd", "sdc1_data";

			drive-strength = <10>;

			bias-pull-up;

		};

	};



	sdhc2_cd_pin_a: sdhc2-cd-pin-active {

		pins = "gpio62";

		function = "gpio";



		drive-strength = <2>;

		bias-disable;

	};



	sdhc2_pin_a: sdhc2-pin-active {

		clk {

			pins = "sdc2_clk";

			drive-strength = <10>;

			bias-disable;

		};



		cmd-data {

			pins = "sdc2_cmd", "sdc2_data";

			drive-strength = <6>;

			bias-pull-up;

		};

	};

};

arch/arm/boot/dts/qcom-msm8974.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -1610,7 +1610,7 @@ rpm { 
			qcom,ipc = <&apcs 8 0>;

			qcom,smd-edge = <15>;



			rpm-requests {

			rpm_requests: rpm-requests {

				compatible = "qcom,rpm-msm8974";

				qcom,smd-channels = "rpm_requests";