kernel: update 3.18 to 3.18.14
[15.05/openwrt.git] / target / linux / mvebu / patches-3.18 / 014-add_uartx_labels.patch
1 From 181d9b28cbc9ae10e1467e2d013033b672d91d4b Mon Sep 17 00:00:00 2001
2 From: Arnaud Ebalard <arno@natisbad.org>
3 Date: Sat, 22 Nov 2014 00:45:35 +0100
4 Subject: arm: mvebu: add uartX labels for Armada SoC serial nodes
5
6 This patch adds uartX labels for Armada SoC serial nodes. This is
7 a preliminary work to be able to easily reference the serial lines
8 in Device Tree files. One expected use is when providing stdout-path
9 property for barebox.
10
11 Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
12 Acked-by: Andrew Lunn <andrew@lunn.ch>
13 Signed-off-by: Arnaud Ebalard <arno@natisbad.org>
14 Link: https://lkml.kernel.org/r/0683d1a823fe9b75849f3dafcf1cf6ee291cdca6.1416613429.git.arno@natisbad.org
15 Signed-off-by: Jason Cooper <jason@lakedaemon.net>
16
17 --- a/arch/arm/boot/dts/armada-370-xp.dtsi
18 +++ b/arch/arm/boot/dts/armada-370-xp.dtsi
19 @@ -151,7 +151,7 @@
20                                 status = "disabled";
21                         };
22  
23 -                       serial@12000 {
24 +                       uart0: serial@12000 {
25                                 compatible = "snps,dw-apb-uart";
26                                 reg = <0x12000 0x100>;
27                                 reg-shift = <2>;
28 @@ -160,7 +160,8 @@
29                                 clocks = <&coreclk 0>;
30                                 status = "disabled";
31                         };
32 -                       serial@12100 {
33 +
34 +                       uart1: serial@12100 {
35                                 compatible = "snps,dw-apb-uart";
36                                 reg = <0x12100 0x100>;
37                                 reg-shift = <2>;
38 --- a/arch/arm/boot/dts/armada-xp.dtsi
39 +++ b/arch/arm/boot/dts/armada-xp.dtsi
40 @@ -53,7 +53,7 @@
41                                 reg = <0x11100 0x100>;
42                         };
43  
44 -                       serial@12200 {
45 +                       uart2: serial@12200 {
46                                 compatible = "snps,dw-apb-uart";
47                                 reg = <0x12200 0x100>;
48                                 reg-shift = <2>;
49 @@ -62,7 +62,8 @@
50                                 clocks = <&coreclk 0>;
51                                 status = "disabled";
52                         };
53 -                       serial@12300 {
54 +
55 +                       uart3: serial@12300 {
56                                 compatible = "snps,dw-apb-uart";
57                                 reg = <0x12300 0x100>;
58                                 reg-shift = <2>;