diff options
-rw-r--r-- | arch/arm/boot/dts/exynos3250.dtsi | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/exynos4.dtsi | 12 | ||||
-rw-r--r-- | arch/arm/boot/dts/exynos5.dtsi | 15 | ||||
-rw-r--r-- | arch/arm/boot/dts/exynos5260.dtsi | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/exynos5410.dtsi | 6 | ||||
-rw-r--r-- | arch/arm/boot/dts/exynos5440.dtsi | 6 | ||||
-rw-r--r-- | arch/arm/boot/dts/s3c2416.dtsi | 6 | ||||
-rw-r--r-- | arch/arm/boot/dts/s3c24xx.dtsi | 9 | ||||
-rw-r--r-- | arch/arm/boot/dts/s3c64xx.dtsi | 4 |
9 files changed, 50 insertions, 14 deletions
diff --git a/arch/arm/boot/dts/exynos3250.dtsi b/arch/arm/boot/dts/exynos3250.dtsi index 3e678fa335bf..f4b54117d22e 100644 --- a/arch/arm/boot/dts/exynos3250.dtsi +++ b/arch/arm/boot/dts/exynos3250.dtsi | |||
@@ -39,6 +39,8 @@ | |||
39 | i2c5 = &i2c_5; | 39 | i2c5 = &i2c_5; |
40 | i2c6 = &i2c_6; | 40 | i2c6 = &i2c_6; |
41 | i2c7 = &i2c_7; | 41 | i2c7 = &i2c_7; |
42 | serial0 = &serial_0; | ||
43 | serial1 = &serial_1; | ||
42 | }; | 44 | }; |
43 | 45 | ||
44 | cpus { | 46 | cpus { |
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi index fbaf426d2daa..536d3c3553b2 100644 --- a/arch/arm/boot/dts/exynos4.dtsi +++ b/arch/arm/boot/dts/exynos4.dtsi | |||
@@ -44,6 +44,10 @@ | |||
44 | fimc1 = &fimc_1; | 44 | fimc1 = &fimc_1; |
45 | fimc2 = &fimc_2; | 45 | fimc2 = &fimc_2; |
46 | fimc3 = &fimc_3; | 46 | fimc3 = &fimc_3; |
47 | serial0 = &serial_0; | ||
48 | serial1 = &serial_1; | ||
49 | serial2 = &serial_2; | ||
50 | serial3 = &serial_3; | ||
47 | }; | 51 | }; |
48 | 52 | ||
49 | clock_audss: clock-controller@03810000 { | 53 | clock_audss: clock-controller@03810000 { |
@@ -363,7 +367,7 @@ | |||
363 | status = "disabled"; | 367 | status = "disabled"; |
364 | }; | 368 | }; |
365 | 369 | ||
366 | serial@13800000 { | 370 | serial_0: serial@13800000 { |
367 | compatible = "samsung,exynos4210-uart"; | 371 | compatible = "samsung,exynos4210-uart"; |
368 | reg = <0x13800000 0x100>; | 372 | reg = <0x13800000 0x100>; |
369 | interrupts = <0 52 0>; | 373 | interrupts = <0 52 0>; |
@@ -372,7 +376,7 @@ | |||
372 | status = "disabled"; | 376 | status = "disabled"; |
373 | }; | 377 | }; |
374 | 378 | ||
375 | serial@13810000 { | 379 | serial_1: serial@13810000 { |
376 | compatible = "samsung,exynos4210-uart"; | 380 | compatible = "samsung,exynos4210-uart"; |
377 | reg = <0x13810000 0x100>; | 381 | reg = <0x13810000 0x100>; |
378 | interrupts = <0 53 0>; | 382 | interrupts = <0 53 0>; |
@@ -381,7 +385,7 @@ | |||
381 | status = "disabled"; | 385 | status = "disabled"; |
382 | }; | 386 | }; |
383 | 387 | ||
384 | serial@13820000 { | 388 | serial_2: serial@13820000 { |
385 | compatible = "samsung,exynos4210-uart"; | 389 | compatible = "samsung,exynos4210-uart"; |
386 | reg = <0x13820000 0x100>; | 390 | reg = <0x13820000 0x100>; |
387 | interrupts = <0 54 0>; | 391 | interrupts = <0 54 0>; |
@@ -390,7 +394,7 @@ | |||
390 | status = "disabled"; | 394 | status = "disabled"; |
391 | }; | 395 | }; |
392 | 396 | ||
393 | serial@13830000 { | 397 | serial_3: serial@13830000 { |
394 | compatible = "samsung,exynos4210-uart"; | 398 | compatible = "samsung,exynos4210-uart"; |
395 | reg = <0x13830000 0x100>; | 399 | reg = <0x13830000 0x100>; |
396 | interrupts = <0 55 0>; | 400 | interrupts = <0 55 0>; |
diff --git a/arch/arm/boot/dts/exynos5.dtsi b/arch/arm/boot/dts/exynos5.dtsi index 79d0608d6dcc..ff2d2cb0f79e 100644 --- a/arch/arm/boot/dts/exynos5.dtsi +++ b/arch/arm/boot/dts/exynos5.dtsi | |||
@@ -18,6 +18,13 @@ | |||
18 | / { | 18 | / { |
19 | interrupt-parent = <&gic>; | 19 | interrupt-parent = <&gic>; |
20 | 20 | ||
21 | aliases { | ||
22 | serial0 = &serial_0; | ||
23 | serial1 = &serial_1; | ||
24 | serial2 = &serial_2; | ||
25 | serial3 = &serial_3; | ||
26 | }; | ||
27 | |||
21 | chipid@10000000 { | 28 | chipid@10000000 { |
22 | compatible = "samsung,exynos4210-chipid"; | 29 | compatible = "samsung,exynos4210-chipid"; |
23 | reg = <0x10000000 0x100>; | 30 | reg = <0x10000000 0x100>; |
@@ -50,25 +57,25 @@ | |||
50 | interrupts = <1 9 0xf04>; | 57 | interrupts = <1 9 0xf04>; |
51 | }; | 58 | }; |
52 | 59 | ||
53 | serial@12C00000 { | 60 | serial_0: serial@12C00000 { |
54 | compatible = "samsung,exynos4210-uart"; | 61 | compatible = "samsung,exynos4210-uart"; |
55 | reg = <0x12C00000 0x100>; | 62 | reg = <0x12C00000 0x100>; |
56 | interrupts = <0 51 0>; | 63 | interrupts = <0 51 0>; |
57 | }; | 64 | }; |
58 | 65 | ||
59 | serial@12C10000 { | 66 | serial_1: serial@12C10000 { |
60 | compatible = "samsung,exynos4210-uart"; | 67 | compatible = "samsung,exynos4210-uart"; |
61 | reg = <0x12C10000 0x100>; | 68 | reg = <0x12C10000 0x100>; |
62 | interrupts = <0 52 0>; | 69 | interrupts = <0 52 0>; |
63 | }; | 70 | }; |
64 | 71 | ||
65 | serial@12C20000 { | 72 | serial_2: serial@12C20000 { |
66 | compatible = "samsung,exynos4210-uart"; | 73 | compatible = "samsung,exynos4210-uart"; |
67 | reg = <0x12C20000 0x100>; | 74 | reg = <0x12C20000 0x100>; |
68 | interrupts = <0 53 0>; | 75 | interrupts = <0 53 0>; |
69 | }; | 76 | }; |
70 | 77 | ||
71 | serial@12C30000 { | 78 | serial_3: serial@12C30000 { |
72 | compatible = "samsung,exynos4210-uart"; | 79 | compatible = "samsung,exynos4210-uart"; |
73 | reg = <0x12C30000 0x100>; | 80 | reg = <0x12C30000 0x100>; |
74 | interrupts = <0 54 0>; | 81 | interrupts = <0 54 0>; |
diff --git a/arch/arm/boot/dts/exynos5260.dtsi b/arch/arm/boot/dts/exynos5260.dtsi index 5398a60207ca..4539a0ae714d 100644 --- a/arch/arm/boot/dts/exynos5260.dtsi +++ b/arch/arm/boot/dts/exynos5260.dtsi | |||
@@ -21,6 +21,10 @@ | |||
21 | pinctrl0 = &pinctrl_0; | 21 | pinctrl0 = &pinctrl_0; |
22 | pinctrl1 = &pinctrl_1; | 22 | pinctrl1 = &pinctrl_1; |
23 | pinctrl2 = &pinctrl_2; | 23 | pinctrl2 = &pinctrl_2; |
24 | serial0 = &uart0; | ||
25 | serial1 = &uart1; | ||
26 | serial2 = &uart2; | ||
27 | serial3 = &uart3; | ||
24 | }; | 28 | }; |
25 | 29 | ||
26 | cpus { | 30 | cpus { |
diff --git a/arch/arm/boot/dts/exynos5410.dtsi b/arch/arm/boot/dts/exynos5410.dtsi index 3839c26f467f..52070e54589a 100644 --- a/arch/arm/boot/dts/exynos5410.dtsi +++ b/arch/arm/boot/dts/exynos5410.dtsi | |||
@@ -20,6 +20,12 @@ | |||
20 | compatible = "samsung,exynos5410", "samsung,exynos5"; | 20 | compatible = "samsung,exynos5410", "samsung,exynos5"; |
21 | interrupt-parent = <&gic>; | 21 | interrupt-parent = <&gic>; |
22 | 22 | ||
23 | aliases { | ||
24 | serial0 = &uart0; | ||
25 | serial1 = &uart1; | ||
26 | serial2 = &uart2; | ||
27 | }; | ||
28 | |||
23 | cpus { | 29 | cpus { |
24 | #address-cells = <1>; | 30 | #address-cells = <1>; |
25 | #size-cells = <0>; | 31 | #size-cells = <0>; |
diff --git a/arch/arm/boot/dts/exynos5440.dtsi b/arch/arm/boot/dts/exynos5440.dtsi index ae3a17c791f6..8f3373cd7b87 100644 --- a/arch/arm/boot/dts/exynos5440.dtsi +++ b/arch/arm/boot/dts/exynos5440.dtsi | |||
@@ -18,6 +18,8 @@ | |||
18 | interrupt-parent = <&gic>; | 18 | interrupt-parent = <&gic>; |
19 | 19 | ||
20 | aliases { | 20 | aliases { |
21 | serial0 = &serial_0; | ||
22 | serial1 = &serial_1; | ||
21 | spi0 = &spi_0; | 23 | spi0 = &spi_0; |
22 | tmuctrl0 = &tmuctrl_0; | 24 | tmuctrl0 = &tmuctrl_0; |
23 | tmuctrl1 = &tmuctrl_1; | 25 | tmuctrl1 = &tmuctrl_1; |
@@ -102,7 +104,7 @@ | |||
102 | >; | 104 | >; |
103 | }; | 105 | }; |
104 | 106 | ||
105 | serial@B0000 { | 107 | serial_0: serial@B0000 { |
106 | compatible = "samsung,exynos4210-uart"; | 108 | compatible = "samsung,exynos4210-uart"; |
107 | reg = <0xB0000 0x1000>; | 109 | reg = <0xB0000 0x1000>; |
108 | interrupts = <0 2 0>; | 110 | interrupts = <0 2 0>; |
@@ -110,7 +112,7 @@ | |||
110 | clock-names = "uart", "clk_uart_baud0"; | 112 | clock-names = "uart", "clk_uart_baud0"; |
111 | }; | 113 | }; |
112 | 114 | ||
113 | serial@C0000 { | 115 | serial_1: serial@C0000 { |
114 | compatible = "samsung,exynos4210-uart"; | 116 | compatible = "samsung,exynos4210-uart"; |
115 | reg = <0xC0000 0x1000>; | 117 | reg = <0xC0000 0x1000>; |
116 | interrupts = <0 3 0>; | 118 | interrupts = <0 3 0>; |
diff --git a/arch/arm/boot/dts/s3c2416.dtsi b/arch/arm/boot/dts/s3c2416.dtsi index 955e4a4f8c31..30b8f7e47454 100644 --- a/arch/arm/boot/dts/s3c2416.dtsi +++ b/arch/arm/boot/dts/s3c2416.dtsi | |||
@@ -16,6 +16,10 @@ | |||
16 | model = "Samsung S3C2416 SoC"; | 16 | model = "Samsung S3C2416 SoC"; |
17 | compatible = "samsung,s3c2416"; | 17 | compatible = "samsung,s3c2416"; |
18 | 18 | ||
19 | aliases { | ||
20 | serial3 = &uart3; | ||
21 | }; | ||
22 | |||
19 | cpus { | 23 | cpus { |
20 | #address-cells = <1>; | 24 | #address-cells = <1>; |
21 | #size-cells = <0>; | 25 | #size-cells = <0>; |
@@ -68,7 +72,7 @@ | |||
68 | <&clocks SCLK_UART>; | 72 | <&clocks SCLK_UART>; |
69 | }; | 73 | }; |
70 | 74 | ||
71 | serial@5000C000 { | 75 | uart3: serial@5000C000 { |
72 | compatible = "samsung,s3c2440-uart"; | 76 | compatible = "samsung,s3c2440-uart"; |
73 | reg = <0x5000C000 0x4000>; | 77 | reg = <0x5000C000 0x4000>; |
74 | interrupts = <1 18 24 4>, <1 18 25 4>; | 78 | interrupts = <1 18 24 4>, <1 18 25 4>; |
diff --git a/arch/arm/boot/dts/s3c24xx.dtsi b/arch/arm/boot/dts/s3c24xx.dtsi index 2d1d7dc9418a..5ed43b857cc4 100644 --- a/arch/arm/boot/dts/s3c24xx.dtsi +++ b/arch/arm/boot/dts/s3c24xx.dtsi | |||
@@ -16,6 +16,9 @@ | |||
16 | 16 | ||
17 | aliases { | 17 | aliases { |
18 | pinctrl0 = &pinctrl_0; | 18 | pinctrl0 = &pinctrl_0; |
19 | serial0 = &uart0; | ||
20 | serial1 = &uart1; | ||
21 | serial2 = &uart2; | ||
19 | }; | 22 | }; |
20 | 23 | ||
21 | intc:interrupt-controller@4a000000 { | 24 | intc:interrupt-controller@4a000000 { |
@@ -46,21 +49,21 @@ | |||
46 | #pwm-cells = <4>; | 49 | #pwm-cells = <4>; |
47 | }; | 50 | }; |
48 | 51 | ||
49 | serial@50000000 { | 52 | uart0: serial@50000000 { |
50 | compatible = "samsung,s3c2410-uart"; | 53 | compatible = "samsung,s3c2410-uart"; |
51 | reg = <0x50000000 0x4000>; | 54 | reg = <0x50000000 0x4000>; |
52 | interrupts = <1 28 0 4>, <1 28 1 4>; | 55 | interrupts = <1 28 0 4>, <1 28 1 4>; |
53 | status = "disabled"; | 56 | status = "disabled"; |
54 | }; | 57 | }; |
55 | 58 | ||
56 | serial@50004000 { | 59 | uart1: serial@50004000 { |
57 | compatible = "samsung,s3c2410-uart"; | 60 | compatible = "samsung,s3c2410-uart"; |
58 | reg = <0x50004000 0x4000>; | 61 | reg = <0x50004000 0x4000>; |
59 | interrupts = <1 23 3 4>, <1 23 4 4>; | 62 | interrupts = <1 23 3 4>, <1 23 4 4>; |
60 | status = "disabled"; | 63 | status = "disabled"; |
61 | }; | 64 | }; |
62 | 65 | ||
63 | serial@50008000 { | 66 | uart2: serial@50008000 { |
64 | compatible = "samsung,s3c2410-uart"; | 67 | compatible = "samsung,s3c2410-uart"; |
65 | reg = <0x50008000 0x4000>; | 68 | reg = <0x50008000 0x4000>; |
66 | interrupts = <1 15 6 4>, <1 15 7 4>; | 69 | interrupts = <1 15 6 4>, <1 15 7 4>; |
diff --git a/arch/arm/boot/dts/s3c64xx.dtsi b/arch/arm/boot/dts/s3c64xx.dtsi index 4e3be4d3493d..ff5bdaac987a 100644 --- a/arch/arm/boot/dts/s3c64xx.dtsi +++ b/arch/arm/boot/dts/s3c64xx.dtsi | |||
@@ -23,6 +23,10 @@ | |||
23 | aliases { | 23 | aliases { |
24 | i2c0 = &i2c0; | 24 | i2c0 = &i2c0; |
25 | pinctrl0 = &pinctrl0; | 25 | pinctrl0 = &pinctrl0; |
26 | serial0 = &uart0; | ||
27 | serial1 = &uart1; | ||
28 | serial2 = &uart2; | ||
29 | serial3 = &uart3; | ||
26 | }; | 30 | }; |
27 | 31 | ||
28 | cpus { | 32 | cpus { |