Commit 1e64f48e authored by Tomasz Figa's avatar Tomasz Figa Committed by Greg Kroah-Hartman

ARM: dts: SAMSUNG: Add aliases of UART nodes

This patch adds alias entries for UART nodes of all SoCs using
samsung-uart compatible UART controllers, so that the dependency on
probe order is removed and deterministic device naming is assured.
Signed-off-by: default avatarTomasz Figa <t.figa@samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 13a9f6c6
...@@ -39,6 +39,8 @@ aliases { ...@@ -39,6 +39,8 @@ aliases {
i2c5 = &i2c_5; i2c5 = &i2c_5;
i2c6 = &i2c_6; i2c6 = &i2c_6;
i2c7 = &i2c_7; i2c7 = &i2c_7;
serial0 = &serial_0;
serial1 = &serial_1;
}; };
cpus { cpus {
......
...@@ -44,6 +44,10 @@ aliases { ...@@ -44,6 +44,10 @@ aliases {
fimc1 = &fimc_1; fimc1 = &fimc_1;
fimc2 = &fimc_2; fimc2 = &fimc_2;
fimc3 = &fimc_3; fimc3 = &fimc_3;
serial0 = &serial_0;
serial1 = &serial_1;
serial2 = &serial_2;
serial3 = &serial_3;
}; };
clock_audss: clock-controller@03810000 { clock_audss: clock-controller@03810000 {
...@@ -363,7 +367,7 @@ mfc: codec@13400000 { ...@@ -363,7 +367,7 @@ mfc: codec@13400000 {
status = "disabled"; status = "disabled";
}; };
serial@13800000 { serial_0: serial@13800000 {
compatible = "samsung,exynos4210-uart"; compatible = "samsung,exynos4210-uart";
reg = <0x13800000 0x100>; reg = <0x13800000 0x100>;
interrupts = <0 52 0>; interrupts = <0 52 0>;
...@@ -372,7 +376,7 @@ serial@13800000 { ...@@ -372,7 +376,7 @@ serial@13800000 {
status = "disabled"; status = "disabled";
}; };
serial@13810000 { serial_1: serial@13810000 {
compatible = "samsung,exynos4210-uart"; compatible = "samsung,exynos4210-uart";
reg = <0x13810000 0x100>; reg = <0x13810000 0x100>;
interrupts = <0 53 0>; interrupts = <0 53 0>;
...@@ -381,7 +385,7 @@ serial@13810000 { ...@@ -381,7 +385,7 @@ serial@13810000 {
status = "disabled"; status = "disabled";
}; };
serial@13820000 { serial_2: serial@13820000 {
compatible = "samsung,exynos4210-uart"; compatible = "samsung,exynos4210-uart";
reg = <0x13820000 0x100>; reg = <0x13820000 0x100>;
interrupts = <0 54 0>; interrupts = <0 54 0>;
...@@ -390,7 +394,7 @@ serial@13820000 { ...@@ -390,7 +394,7 @@ serial@13820000 {
status = "disabled"; status = "disabled";
}; };
serial@13830000 { serial_3: serial@13830000 {
compatible = "samsung,exynos4210-uart"; compatible = "samsung,exynos4210-uart";
reg = <0x13830000 0x100>; reg = <0x13830000 0x100>;
interrupts = <0 55 0>; interrupts = <0 55 0>;
......
...@@ -18,6 +18,13 @@ ...@@ -18,6 +18,13 @@
/ { / {
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
aliases {
serial0 = &serial_0;
serial1 = &serial_1;
serial2 = &serial_2;
serial3 = &serial_3;
};
chipid@10000000 { chipid@10000000 {
compatible = "samsung,exynos4210-chipid"; compatible = "samsung,exynos4210-chipid";
reg = <0x10000000 0x100>; reg = <0x10000000 0x100>;
...@@ -50,25 +57,25 @@ gic: interrupt-controller@10481000 { ...@@ -50,25 +57,25 @@ gic: interrupt-controller@10481000 {
interrupts = <1 9 0xf04>; interrupts = <1 9 0xf04>;
}; };
serial@12C00000 { serial_0: serial@12C00000 {
compatible = "samsung,exynos4210-uart"; compatible = "samsung,exynos4210-uart";
reg = <0x12C00000 0x100>; reg = <0x12C00000 0x100>;
interrupts = <0 51 0>; interrupts = <0 51 0>;
}; };
serial@12C10000 { serial_1: serial@12C10000 {
compatible = "samsung,exynos4210-uart"; compatible = "samsung,exynos4210-uart";
reg = <0x12C10000 0x100>; reg = <0x12C10000 0x100>;
interrupts = <0 52 0>; interrupts = <0 52 0>;
}; };
serial@12C20000 { serial_2: serial@12C20000 {
compatible = "samsung,exynos4210-uart"; compatible = "samsung,exynos4210-uart";
reg = <0x12C20000 0x100>; reg = <0x12C20000 0x100>;
interrupts = <0 53 0>; interrupts = <0 53 0>;
}; };
serial@12C30000 { serial_3: serial@12C30000 {
compatible = "samsung,exynos4210-uart"; compatible = "samsung,exynos4210-uart";
reg = <0x12C30000 0x100>; reg = <0x12C30000 0x100>;
interrupts = <0 54 0>; interrupts = <0 54 0>;
......
...@@ -21,6 +21,10 @@ aliases { ...@@ -21,6 +21,10 @@ aliases {
pinctrl0 = &pinctrl_0; pinctrl0 = &pinctrl_0;
pinctrl1 = &pinctrl_1; pinctrl1 = &pinctrl_1;
pinctrl2 = &pinctrl_2; pinctrl2 = &pinctrl_2;
serial0 = &uart0;
serial1 = &uart1;
serial2 = &uart2;
serial3 = &uart3;
}; };
cpus { cpus {
......
...@@ -20,6 +20,12 @@ / { ...@@ -20,6 +20,12 @@ / {
compatible = "samsung,exynos5410", "samsung,exynos5"; compatible = "samsung,exynos5410", "samsung,exynos5";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
aliases {
serial0 = &uart0;
serial1 = &uart1;
serial2 = &uart2;
};
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
......
...@@ -18,6 +18,8 @@ / { ...@@ -18,6 +18,8 @@ / {
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
aliases { aliases {
serial0 = &serial_0;
serial1 = &serial_1;
spi0 = &spi_0; spi0 = &spi_0;
tmuctrl0 = &tmuctrl_0; tmuctrl0 = &tmuctrl_0;
tmuctrl1 = &tmuctrl_1; tmuctrl1 = &tmuctrl_1;
...@@ -102,7 +104,7 @@ cpufreq@160000 { ...@@ -102,7 +104,7 @@ cpufreq@160000 {
>; >;
}; };
serial@B0000 { serial_0: serial@B0000 {
compatible = "samsung,exynos4210-uart"; compatible = "samsung,exynos4210-uart";
reg = <0xB0000 0x1000>; reg = <0xB0000 0x1000>;
interrupts = <0 2 0>; interrupts = <0 2 0>;
...@@ -110,7 +112,7 @@ serial@B0000 { ...@@ -110,7 +112,7 @@ serial@B0000 {
clock-names = "uart", "clk_uart_baud0"; clock-names = "uart", "clk_uart_baud0";
}; };
serial@C0000 { serial_1: serial@C0000 {
compatible = "samsung,exynos4210-uart"; compatible = "samsung,exynos4210-uart";
reg = <0xC0000 0x1000>; reg = <0xC0000 0x1000>;
interrupts = <0 3 0>; interrupts = <0 3 0>;
......
...@@ -16,6 +16,10 @@ / { ...@@ -16,6 +16,10 @@ / {
model = "Samsung S3C2416 SoC"; model = "Samsung S3C2416 SoC";
compatible = "samsung,s3c2416"; compatible = "samsung,s3c2416";
aliases {
serial3 = &uart3;
};
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -68,7 +72,7 @@ serial@50008000 { ...@@ -68,7 +72,7 @@ serial@50008000 {
<&clocks SCLK_UART>; <&clocks SCLK_UART>;
}; };
serial@5000C000 { uart3: serial@5000C000 {
compatible = "samsung,s3c2440-uart"; compatible = "samsung,s3c2440-uart";
reg = <0x5000C000 0x4000>; reg = <0x5000C000 0x4000>;
interrupts = <1 18 24 4>, <1 18 25 4>; interrupts = <1 18 24 4>, <1 18 25 4>;
......
...@@ -16,6 +16,9 @@ / { ...@@ -16,6 +16,9 @@ / {
aliases { aliases {
pinctrl0 = &pinctrl_0; pinctrl0 = &pinctrl_0;
serial0 = &uart0;
serial1 = &uart1;
serial2 = &uart2;
}; };
intc:interrupt-controller@4a000000 { intc:interrupt-controller@4a000000 {
...@@ -46,21 +49,21 @@ timer@51000000 { ...@@ -46,21 +49,21 @@ timer@51000000 {
#pwm-cells = <4>; #pwm-cells = <4>;
}; };
serial@50000000 { uart0: serial@50000000 {
compatible = "samsung,s3c2410-uart"; compatible = "samsung,s3c2410-uart";
reg = <0x50000000 0x4000>; reg = <0x50000000 0x4000>;
interrupts = <1 28 0 4>, <1 28 1 4>; interrupts = <1 28 0 4>, <1 28 1 4>;
status = "disabled"; status = "disabled";
}; };
serial@50004000 { uart1: serial@50004000 {
compatible = "samsung,s3c2410-uart"; compatible = "samsung,s3c2410-uart";
reg = <0x50004000 0x4000>; reg = <0x50004000 0x4000>;
interrupts = <1 23 3 4>, <1 23 4 4>; interrupts = <1 23 3 4>, <1 23 4 4>;
status = "disabled"; status = "disabled";
}; };
serial@50008000 { uart2: serial@50008000 {
compatible = "samsung,s3c2410-uart"; compatible = "samsung,s3c2410-uart";
reg = <0x50008000 0x4000>; reg = <0x50008000 0x4000>;
interrupts = <1 15 6 4>, <1 15 7 4>; interrupts = <1 15 6 4>, <1 15 7 4>;
......
...@@ -23,6 +23,10 @@ / { ...@@ -23,6 +23,10 @@ / {
aliases { aliases {
i2c0 = &i2c0; i2c0 = &i2c0;
pinctrl0 = &pinctrl0; pinctrl0 = &pinctrl0;
serial0 = &uart0;
serial1 = &uart1;
serial2 = &uart2;
serial3 = &uart3;
}; };
cpus { cpus {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment