kernel: update 3.18 to 3.18.14
[15.05/openwrt.git] / target / linux / mvebu / patches-3.18 / 300-add_missing_labels.patch
1 --- a/arch/arm/boot/dts/armada-38x.dtsi
2 +++ b/arch/arm/boot/dts/armada-38x.dtsi
3 @@ -173,7 +173,7 @@
4                                 status = "disabled";
5                         };
6  
7 -                       serial@12000 {
8 +                       uart0: serial@12000 {
9                                 compatible = "snps,dw-apb-uart";
10                                 reg = <0x12000 0x100>;
11                                 reg-shift = <2>;
12 @@ -193,7 +193,7 @@
13                                 status = "disabled";
14                         };
15  
16 -                       pinctrl@18000 {
17 +                       pinctrl: pinctrl@18000 {
18                                 compatible = "marvell,mv88f6820-pinctrl";
19                                 reg = <0x18000 0x20>;
20  
21 @@ -412,7 +412,7 @@
22                                 status = "disabled";
23                         };
24  
25 -                       mdio@72004 {
26 +                       mdio: mdio@72004 {
27                                 #address-cells = <1>;
28                                 #size-cells = <0>;
29                                 compatible = "marvell,orion-mdio";