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

Commit 3a3cf6c4 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Kukjin Kim
Browse files

ARM: dts: Use labels for overriding nodes in exynos542x 



Usage of labels instead of full paths reduces possible mistakes when
overriding nodes. Additionally remove duplicated serial and uart labels
for serial.

Signed-off-by: default avatarKrzysztof Kozlowski <k.kozlowski.k@gmail.com>
Signed-off-by: default avatarKukjin Kim <kgene@kernel.org>
parent 5e6b2889

arch/arm/boot/dts/exynos5420-peach-pit.dts

+1 −1
Original line number Original line Diff line number Diff line
@@ -1027,7 +1027,7 @@ 
	};

	};

};

};





&uart_3 {

&serial_3 {

	status = "okay";

	status = "okay";

};

};

arch/arm/boot/dts/exynos5420.dtsi

+41 −41
Original line number Original line Diff line number Diff line
@@ -323,13 +323,6 @@ 
		interrupts = <0 47 0>;

		interrupts = <0 47 0>;

	};

	};





	rtc: rtc@101E0000 {

		clocks = <&clock CLK_RTC>;

		clock-names = "rtc";

		interrupt-parent = <&pmu_system_controller>;

		status = "disabled";

	};



	amba {

	amba {

		#address-cells = <1>;

		#address-cells = <1>;

		#size-cells = <1>;

		#size-cells = <1>;
@@ -500,26 +493,6 @@ 
		status = "disabled";

		status = "disabled";

	};

	};





	uart_0: serial@12C00000 {

		clocks = <&clock CLK_UART0>, <&clock CLK_SCLK_UART0>;

		clock-names = "uart", "clk_uart_baud0";

	};



	uart_1: serial@12C10000 {

		clocks = <&clock CLK_UART1>, <&clock CLK_SCLK_UART1>;

		clock-names = "uart", "clk_uart_baud0";

	};



	uart_2: serial@12C20000 {

		clocks = <&clock CLK_UART2>, <&clock CLK_SCLK_UART2>;

		clock-names = "uart", "clk_uart_baud0";

	};



	uart_3: serial@12C30000 {

		clocks = <&clock CLK_UART3>, <&clock CLK_SCLK_UART3>;

		clock-names = "uart", "clk_uart_baud0";

	};



	pwm: pwm@12dd0000 {

	pwm: pwm@12dd0000 {

		compatible = "samsung,exynos4210-pwm";

		compatible = "samsung,exynos4210-pwm";

		reg = <0x12dd0000 0x100>;

		reg = <0x12dd0000 0x100>;
@@ -535,14 +508,6 @@ 
		#phy-cells = <0>;

		#phy-cells = <0>;

	};

	};





	dp: dp-controller@145B0000 {

		clocks = <&clock CLK_DP1>;

		clock-names = "dp";

		phys = <&dp_phy>;

		phy-names = "dp";

		power-domains = <&disp_pd>;

	};



	mipi_phy: video-phy@10040714 {

	mipi_phy: video-phy@10040714 {

		compatible = "samsung,s5pv210-mipi-video-phy";

		compatible = "samsung,s5pv210-mipi-video-phy";

		syscon = <&pmu_system_controller>;

		syscon = <&pmu_system_controller>;
@@ -562,12 +527,6 @@ 
		status = "disabled";

		status = "disabled";

	};

	};





	fimd: fimd@14400000 {

		clocks = <&clock CLK_SCLK_FIMD1>, <&clock CLK_FIMD1>;

		clock-names = "sclk_fimd", "fimd";

		power-domains = <&disp_pd>;

	};



	adc: adc@12D10000 {

	adc: adc@12D10000 {

		compatible = "samsung,exynos-adc-v2";

		compatible = "samsung,exynos-adc-v2";

		reg = <0x12D10000 0x100>;

		reg = <0x12D10000 0x100>;
@@ -967,3 +926,44 @@ 
		samsung,pmureg-phandle = <&pmu_system_controller>;

		samsung,pmureg-phandle = <&pmu_system_controller>;

	};

	};

};

};



&dp {

	clocks = <&clock CLK_DP1>;

	clock-names = "dp";

	phys = <&dp_phy>;

	phy-names = "dp";

	power-domains = <&disp_pd>;

};



&fimd {

	clocks = <&clock CLK_SCLK_FIMD1>, <&clock CLK_FIMD1>;

	clock-names = "sclk_fimd", "fimd";

	power-domains = <&disp_pd>;

};



&rtc {

	clocks = <&clock CLK_RTC>;

	clock-names = "rtc";

	interrupt-parent = <&pmu_system_controller>;

	status = "disabled";

};



&serial_0 {

	clocks = <&clock CLK_UART0>, <&clock CLK_SCLK_UART0>;

	clock-names = "uart", "clk_uart_baud0";

};



&serial_1 {

	clocks = <&clock CLK_UART1>, <&clock CLK_SCLK_UART1>;

	clock-names = "uart", "clk_uart_baud0";

};



&serial_2 {

	clocks = <&clock CLK_UART2>, <&clock CLK_SCLK_UART2>;

	clock-names = "uart", "clk_uart_baud0";

};



&serial_3 {

	clocks = <&clock CLK_UART3>, <&clock CLK_SCLK_UART3>;

	clock-names = "uart", "clk_uart_baud0";

};

arch/arm/boot/dts/exynos5800-peach-pi.dts

+1 −1
Original line number Original line Diff line number Diff line
@@ -990,7 +990,7 @@ 
	};

	};

};

};





&uart_3 {

&serial_3 {

	status = "okay";

	status = "okay";

};

};