Commit cb9d7639 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Bjorn Andersson
Browse files

ARM: dts: qcom: msm8960: override nodes by label 



Using node paths to extend or override a device tree node is error
prone.  If there was a typo error, a new node will be created instead of
extending the existing node.  This will lead to run-time errors that
could be hard to detect.

A mistyped label on the other hand, will cause a dtc compile error
(during build time).  This also reduces the indentation making the code
easier to read.

The pre/post DTBS are the same.

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20220810080516.166866-1-krzysztof.kozlowski@linaro.org
parent 12e62136

arch/arm/boot/dts/qcom-msm8960-cdp.dts

+311 −312
Original line number Diff line number Diff line
@@ -15,28 +15,98 @@ chosen { 
		stdout-path = "serial0:115200n8";

	};



	soc {

		gsbi@16400000 {

	regulators {

		compatible = "simple-bus";



		ext_l2: gpio-regulator@91 {

			compatible = "regulator-fixed";

			regulator-name = "ext_l2";

			gpio = <&msmgpio 91 0>;

			startup-delay-us = <10000>;

			enable-active-high;

		};

	};

};



&gsbi1 {

	qcom,mode = <GSBI_PROT_SPI>;

	pinctrl-names = "default";

	pinctrl-0 = <&spi1_default>;

	status = "okay";

			qcom,mode = <GSBI_PROT_I2C_UART>;

			serial@16440000 {

};



&gsbi1_spi {

	status = "okay";



	ethernet@0 {

		compatible = "micrel,ks8851";

		reg = <0>;

		interrupt-parent = <&msmgpio>;

		interrupts = <90 8>;

		spi-max-frequency = <5400000>;

		vdd-supply = <&ext_l2>;

		vdd-io-supply = <&pm8921_lvs6>;

		reset-gpios = <&msmgpio 89 0>;

	};

};



		amba {

			/* eMMC */

			sdcc1: mmc@12400000 {

&gsbi5 {

	qcom,mode = <GSBI_PROT_I2C_UART>;

	status = "okay";

};



			/* External micro SD card */

			sdcc3: mmc@12180000 {

&gsbi5_serial {

	status = "okay";

};



&msmgpio {

	spi1_default: spi1_default {

		 mux {

			pins = "gpio6", "gpio7", "gpio9";

			function = "gsbi1";

		 };



		 mosi {

			pins = "gpio6";

			drive-strength = <12>;

			bias-disable;

		 };



		 miso {

			pins = "gpio7";

			drive-strength = <12>;

			bias-disable;

		 };



		 cs {

			pins = "gpio8";

			drive-strength = <12>;

			bias-disable;

			output-low;

		 };



		 clk {

			pins = "gpio9";

			drive-strength = <12>;

			bias-disable;

		 };

	};

};



&pmicintc {

	keypad@148 {

		linux,keymap = <

			MATRIX_KEY(0, 0, KEY_VOLUMEUP)

			MATRIX_KEY(0, 1, KEY_VOLUMEDOWN)

			MATRIX_KEY(0, 2, KEY_CAMERA_FOCUS)

			MATRIX_KEY(0, 3, KEY_CAMERA)

			>;

		keypad,num-rows = <1>;

		keypad,num-columns = <5>;

	};

};



		rpm@108000 {

&rpm {

	regulators {

		compatible = "qcom,rpm-pm8921-regulators";

		vin_lvs1_3_6-supply = <&pm8921_s4>;
@@ -272,83 +342,12 @@ pm8921_ncp: ncp { 
	};

};



		gsbi@16000000 {

			status = "okay";

			qcom,mode = <GSBI_PROT_SPI>;

			pinctrl-names = "default";

			pinctrl-0 = <&spi1_default>;

			spi@16080000 {

/* eMMC */

&sdcc1 {

	status = "okay";

				ethernet@0 {

					compatible = "micrel,ks8851";

					reg = <0>;

					interrupt-parent = <&msmgpio>;

					interrupts = <90 8>;

					spi-max-frequency = <5400000>;

					vdd-supply = <&ext_l2>;

					vdd-io-supply = <&pm8921_lvs6>;

					reset-gpios = <&msmgpio 89 0>;

				};

			};

		};



		pinctrl@800000 {

			spi1_default: spi1_default {

				mux {

					pins = "gpio6", "gpio7", "gpio9";

					function = "gsbi1";

				};



				mosi {

					pins = "gpio6";

					drive-strength = <12>;

					bias-disable;

				};



				miso {

					pins = "gpio7";

					drive-strength = <12>;

					bias-disable;

				};



				cs {

					pins = "gpio8";

					drive-strength = <12>;

					bias-disable;

					output-low;

				};



				clk {

					pins = "gpio9";

					drive-strength = <12>;

					bias-disable;

				};

			};

		};

	};



	regulators {

		compatible = "simple-bus";



		ext_l2: gpio-regulator@91 {

			compatible = "regulator-fixed";

			regulator-name = "ext_l2";

			gpio = <&msmgpio 91 0>;

			startup-delay-us = <10000>;

			enable-active-high;

		};

	};

};



&pmicintc {

	keypad@148 {

		linux,keymap = <

			MATRIX_KEY(0, 0, KEY_VOLUMEUP)

			MATRIX_KEY(0, 1, KEY_VOLUMEDOWN)

			MATRIX_KEY(0, 2, KEY_CAMERA_FOCUS)

			MATRIX_KEY(0, 3, KEY_CAMERA)

			>;

		keypad,num-rows = <1>;

		keypad,num-columns = <5>;

	};

/* External micro SD card */

&sdcc3 {

	status = "okay";

};

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

+3 −3
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ l2cc: clock-controller@2011000 { 
			reg = <0x2011000 0x1000>;

		};



		rpm@108000 {

		rpm: rpm@108000 {

			compatible = "qcom,rpm-msm8960";

			reg = <0x108000 0x1000>;

			qcom,ipc = <&l2cc 0x8 2>;
@@ -307,7 +307,7 @@ tcsr: syscon@1a400000 { 
			reg = <0x1a400000 0x100>;

		};



		gsbi@16000000 {

		gsbi1: gsbi@16000000 {

			compatible = "qcom,gsbi-v1.0.0";

			cell-index = <1>;

			reg = <0x16000000 0x100>;
@@ -317,7 +317,7 @@ gsbi@16000000 { 
			#size-cells = <1>;

			ranges;



			spi@16080000 {

			gsbi1_spi: spi@16080000 {

				compatible = "qcom,spi-qup-v1.1.1";

				#address-cells = <1>;

				#size-cells = <0>;