p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: Krzysztof Kozlowski <k.kozlowski.k@gmail.com>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
This commit is contained in:
Krzysztof Kozlowski 2015-04-12 20:57:36 +09:00 committed by Kukjin Kim
parent 5e6b288942
commit 3a3cf6c4bb
3 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/exynos5420-peach-pit.dts
View File

@ -1027,7 +1027,7 @@ charger {
}; };
}; };
&uart_3 { &serial_3 {
status = "okay"; status = "okay";
}; };

82
arch/arm/boot/dts/exynos5420.dtsi
View File

@ -323,13 +323,6 @@ pinctrl_4: pinctrl@03860000 {
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 @@ spi_2: spi@12d40000 {
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 @@ dp_phy: video-phy@10040728 {
#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 @@ dsi@14500000 {
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 @@ usb2_phy: phy@12130000 {
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";
};

2
arch/arm/boot/dts/exynos5800-peach-pi.dts
View File

@ -990,7 +990,7 @@ charger {
}; };
}; };
&uart_3 { &serial_3 {
status = "okay"; status = "okay";
}; };