Commit 59ebbe88 authored by Maxime Ripard's avatar Maxime Ripard

ARM: sunxi: DT: Add stdout-path property

Add UART aliases and stdout-path property for all the Allwinner boards so that
we won't have to rely on the bootargs' console= value, while working with
legacy bootloaders.

While we're at it, also remove the mentions of earlyprintk in the bootargs,
that will remove our default bootargs entirely, and allow the kernel to boot on
a system even if DEBUG_LL is configured for another system.
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
parent b14c1123
...@@ -58,6 +58,14 @@ / { ...@@ -58,6 +58,14 @@ / {
model = "Mele A1000"; model = "Mele A1000";
compatible = "mele,a1000", "allwinner,sun4i-a10"; compatible = "mele,a1000", "allwinner,sun4i-a10";
aliases {
serial0 = &uart0;
};
chosen {
stdout-path = "serial0:115200n8";
};
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -54,6 +54,14 @@ ...@@ -54,6 +54,14 @@
/ { / {
model = "BA10 tvbox"; model = "BA10 tvbox";
compatible = "allwinner,ba10-tvbox", "allwinner,sun4i-a10"; compatible = "allwinner,ba10-tvbox", "allwinner,sun4i-a10";
aliases {
serial0 = &uart0;
};
chosen {
stdout-path = "serial0:115200n8";
};
}; };
&ehci0 { &ehci0 {
......
...@@ -54,6 +54,14 @@ ...@@ -54,6 +54,14 @@
/ { / {
model = "Chuwi V7 CW0825"; model = "Chuwi V7 CW0825";
compatible = "chuwi,v7-cw0825", "allwinner,sun4i-a10"; compatible = "chuwi,v7-cw0825", "allwinner,sun4i-a10";
aliases {
serial0 = &uart0;
};
chosen {
stdout-path = "serial0:115200n8";
};
}; };
&ehci1 { &ehci1 {
......
...@@ -57,6 +57,14 @@ / { ...@@ -57,6 +57,14 @@ / {
model = "Cubietech Cubieboard"; model = "Cubietech Cubieboard";
compatible = "cubietech,a10-cubieboard", "allwinner,sun4i-a10"; compatible = "cubietech,a10-cubieboard", "allwinner,sun4i-a10";
aliases {
serial0 = &uart0;
};
chosen {
stdout-path = "serial0:115200n8";
};
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -56,6 +56,14 @@ ...@@ -56,6 +56,14 @@
/ { / {
model = "Gemei G9 Tablet"; model = "Gemei G9 Tablet";
compatible = "gemei,g9", "allwinner,sun4i-a10"; compatible = "gemei,g9", "allwinner,sun4i-a10";
aliases {
serial0 = &uart0;
};
chosen {
stdout-path = "serial0:115200n8";
};
}; };
/* /*
......
...@@ -58,6 +58,14 @@ / { ...@@ -58,6 +58,14 @@ / {
model = "Miniand Hackberry"; model = "Miniand Hackberry";
compatible = "miniand,hackberry", "allwinner,sun4i-a10"; compatible = "miniand,hackberry", "allwinner,sun4i-a10";
aliases {
serial0 = &uart0;
};
chosen {
stdout-path = "serial0:115200n8";
};
reg_emac_3v3: emac-3v3 { reg_emac_3v3: emac-3v3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "emac-3v3"; regulator-name = "emac-3v3";
......
...@@ -53,6 +53,14 @@ ...@@ -53,6 +53,14 @@
/ { / {
model = "Hyundai A7HD"; model = "Hyundai A7HD";
compatible = "hyundai,a7hd", "allwinner,sun4i-a10"; compatible = "hyundai,a7hd", "allwinner,sun4i-a10";
aliases {
serial0 = &uart0;
};
chosen {
stdout-path = "serial0:115200n8";
};
}; };
&ehci1 { &ehci1 {
......
...@@ -56,6 +56,14 @@ ...@@ -56,6 +56,14 @@
/ { / {
model = "INet-97F Rev 02"; model = "INet-97F Rev 02";
compatible = "primux,inet97fv2", "allwinner,sun4i-a10"; compatible = "primux,inet97fv2", "allwinner,sun4i-a10";
aliases {
serial0 = &uart0;
};
chosen {
stdout-path = "serial0:115200n8";
};
}; };
&ehci0 { &ehci0 {
......
...@@ -57,6 +57,14 @@ / { ...@@ -57,6 +57,14 @@ / {
model = "HAOYU Electronics Marsboard A10"; model = "HAOYU Electronics Marsboard A10";
compatible = "haoyu,a10-marsboard", "allwinner,sun4i-a10"; compatible = "haoyu,a10-marsboard", "allwinner,sun4i-a10";
aliases {
serial0 = &uart0;
};
chosen {
stdout-path = "serial0:115200n8";
};
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -57,6 +57,14 @@ ...@@ -57,6 +57,14 @@
/ { / {
model = "PineRiver Mini X-Plus"; model = "PineRiver Mini X-Plus";
compatible = "pineriver,mini-xplus", "allwinner,sun4i-a10"; compatible = "pineriver,mini-xplus", "allwinner,sun4i-a10";
aliases {
serial0 = &uart0;
};
chosen {
stdout-path = "serial0:115200n8";
};
}; };
&ehci0 { &ehci0 {
......
...@@ -53,6 +53,14 @@ ...@@ -53,6 +53,14 @@
/ { / {
model = "MK802"; model = "MK802";
compatible = "allwinner,mk802", "allwinner,sun4i-a10"; compatible = "allwinner,mk802", "allwinner,sun4i-a10";
aliases {
serial0 = &uart0;
};
chosen {
stdout-path = "serial0:115200n8";
};
}; };
&ehci0 { &ehci0 {
......
...@@ -53,6 +53,14 @@ ...@@ -53,6 +53,14 @@
/ { / {
model = "MK802ii"; model = "MK802ii";
compatible = "allwinner,mk802ii", "allwinner,sun4i-a10"; compatible = "allwinner,mk802ii", "allwinner,sun4i-a10";
aliases {
serial0 = &uart0;
};
chosen {
stdout-path = "serial0:115200n8";
};
}; };
&ehci0 { &ehci0 {
......
...@@ -56,6 +56,14 @@ / { ...@@ -56,6 +56,14 @@ / {
model = "Olimex A10-OLinuXino-LIME"; model = "Olimex A10-OLinuXino-LIME";
compatible = "olimex,a10-olinuxino-lime", "allwinner,sun4i-a10"; compatible = "olimex,a10-olinuxino-lime", "allwinner,sun4i-a10";
aliases {
serial0 = &uart0;
};
chosen {
stdout-path = "serial0:115200n8";
};
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -58,6 +58,13 @@ / { ...@@ -58,6 +58,13 @@ / {
model = "LinkSprite pcDuino"; model = "LinkSprite pcDuino";
compatible = "linksprite,a10-pcduino", "allwinner,sun4i-a10"; compatible = "linksprite,a10-pcduino", "allwinner,sun4i-a10";
aliases {
serial0 = &uart0;
};
chosen {
stdout-path = "serial0:115200n8";
};
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
......
...@@ -55,6 +55,14 @@ / { ...@@ -55,6 +55,14 @@ / {
model = "Auxtek t004 A10s hdmi tv-stick"; model = "Auxtek t004 A10s hdmi tv-stick";
compatible = "allwinner,auxtek-t004", "allwinner,sun5i-a10s"; compatible = "allwinner,auxtek-t004", "allwinner,sun5i-a10s";
aliases {
serial0 = &uart0;
};
chosen {
stdout-path = "serial0:115200n8";
};
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -54,6 +54,14 @@ / { ...@@ -54,6 +54,14 @@ / {
model = "MK802-A10s"; model = "MK802-A10s";
compatible = "allwinner,a10s-mk802", "allwinner,sun5i-a10s"; compatible = "allwinner,a10s-mk802", "allwinner,sun5i-a10s";
aliases {
serial0 = &uart0;
};
chosen {
stdout-path = "serial0:115200n8";
};
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -65,6 +65,10 @@ aliases { ...@@ -65,6 +65,10 @@ aliases {
serial2 = &uart3; serial2 = &uart3;
}; };
chosen {
stdout-path = "serial0:115200n8";
};
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -56,6 +56,14 @@ / { ...@@ -56,6 +56,14 @@ / {
model = "R7 A10s hdmi tv-stick"; model = "R7 A10s hdmi tv-stick";
compatible = "allwinner,r7-tv-dongle", "allwinner,sun5i-a10s"; compatible = "allwinner,r7-tv-dongle", "allwinner,sun5i-a10s";
aliases {
serial0 = &uart0;
};
chosen {
stdout-path = "serial0:115200n8";
};
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -59,6 +59,10 @@ / { ...@@ -59,6 +59,10 @@ / {
aliases { aliases {
serial0 = &uart1; serial0 = &uart1;
}; };
chosen {
stdout-path = "serial0:115200n8";
};
}; };
&cpu0 { &cpu0 {
......
...@@ -61,6 +61,10 @@ aliases { ...@@ -61,6 +61,10 @@ aliases {
serial0 = &uart1; serial0 = &uart1;
}; };
chosen {
stdout-path = "serial0:115200n8";
};
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -63,6 +63,10 @@ aliases { ...@@ -63,6 +63,10 @@ aliases {
serial0 = &uart1; serial0 = &uart1;
}; };
chosen {
stdout-path = "serial0:115200n8";
};
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -58,8 +58,12 @@ / { ...@@ -58,8 +58,12 @@ / {
model = "Allwinner A31 APP4 EVB1 Evaluation Board"; model = "Allwinner A31 APP4 EVB1 Evaluation Board";
compatible = "allwinner,app4-evb1", "allwinner,sun6i-a31"; compatible = "allwinner,app4-evb1", "allwinner,sun6i-a31";
aliases {
serial0 = &uart0;
};
chosen { chosen {
bootargs = "earlyprintk console=ttyS0,115200"; stdout-path = "serial0:115200n8";
}; };
}; };
......
...@@ -58,8 +58,12 @@ / { ...@@ -58,8 +58,12 @@ / {
model = "WITS A31 Colombus Evaluation Board"; model = "WITS A31 Colombus Evaluation Board";
compatible = "wits,colombus", "allwinner,sun6i-a31"; compatible = "wits,colombus", "allwinner,sun6i-a31";
aliases {
serial0 = &uart0;
};
chosen { chosen {
bootargs = "earlyprintk console=ttyS0,115200"; stdout-path = "serial0:115200n8";
}; };
}; };
......
...@@ -58,8 +58,12 @@ / { ...@@ -58,8 +58,12 @@ / {
model = "Merrii A31 Hummingbird"; model = "Merrii A31 Hummingbird";
compatible = "merrii,a31-hummingbird", "allwinner,sun6i-a31"; compatible = "merrii,a31-hummingbird", "allwinner,sun6i-a31";
aliases {
serial0 = &uart0;
};
chosen { chosen {
bootargs = "earlyprintk console=ttyS0,115200"; stdout-path = "serial0:115200n8";
}; };
wifi_pwrseq: wifi_pwrseq { wifi_pwrseq: wifi_pwrseq {
......
...@@ -56,8 +56,12 @@ / { ...@@ -56,8 +56,12 @@ / {
model = "Mele I7 Quad top set box"; model = "Mele I7 Quad top set box";
compatible = "mele,i7", "allwinner,sun6i-a31"; compatible = "mele,i7", "allwinner,sun6i-a31";
aliases {
serial0 = &uart0;
};
chosen { chosen {
bootargs = "console=ttyS0,115200"; stdout-path = "serial0:115200n8";
}; };
leds { leds {
......
...@@ -56,8 +56,12 @@ / { ...@@ -56,8 +56,12 @@ / {
model = "Mele M9 / A1000G Quad top set box"; model = "Mele M9 / A1000G Quad top set box";
compatible = "mele,m9", "allwinner,sun6i-a31"; compatible = "mele,m9", "allwinner,sun6i-a31";
aliases {
serial0 = &uart0;
};
chosen { chosen {
bootargs = "earlyprintk console=ttyS0,115200"; stdout-path = "serial0:115200n8";
}; };
leds { leds {
......
...@@ -53,6 +53,14 @@ ...@@ -53,6 +53,14 @@
/ { / {
model = "CSQ CS908 top set box"; model = "CSQ CS908 top set box";
compatible = "csq,cs908", "allwinner,sun6i-a31s"; compatible = "csq,cs908", "allwinner,sun6i-a31s";
aliases {
serial0 = &uart0;
};
chosen {
stdout-path = "serial0:115200n8";
};
}; };
&ehci0 { &ehci0 {
......
...@@ -65,6 +65,10 @@ aliases { ...@@ -65,6 +65,10 @@ aliases {
serial2 = &uart7; serial2 = &uart7;
}; };
chosen {
stdout-path = "serial0:115200n8";
};
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -55,6 +55,16 @@ / { ...@@ -55,6 +55,16 @@ / {
model = "LeMaker Banana Pro"; model = "LeMaker Banana Pro";
compatible = "lemaker,bananapro", "allwinner,sun7i-a20"; compatible = "lemaker,bananapro", "allwinner,sun7i-a20";
aliases {
serial0 = &uart0;
serial1 = &uart2;
serial2 = &uart7;
};
chosen {
stdout-path = "serial0:115200n8";
};
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -59,6 +59,14 @@ / { ...@@ -59,6 +59,14 @@ / {
model = "Cubietech Cubieboard2"; model = "Cubietech Cubieboard2";
compatible = "cubietech,cubieboard2", "allwinner,sun7i-a20"; compatible = "cubietech,cubieboard2", "allwinner,sun7i-a20";
aliases {
serial0 = &uart0;
};
chosen {
stdout-path = "serial0:115200n8";
};
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -59,6 +59,14 @@ / { ...@@ -59,6 +59,14 @@ / {
model = "Cubietech Cubietruck"; model = "Cubietech Cubietruck";
compatible = "cubietech,cubietruck", "allwinner,sun7i-a20"; compatible = "cubietech,cubietruck", "allwinner,sun7i-a20";
aliases {
serial0 = &uart0;
};
chosen {
stdout-path = "serial0:115200n8";
};
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -67,6 +67,10 @@ aliases { ...@@ -67,6 +67,10 @@ aliases {
serial4 = &uart5; serial4 = &uart5;
}; };
chosen {
stdout-path = "serial0:115200n8";
};
reg_mmc3_vdd: mmc3_vdd { reg_mmc3_vdd: mmc3_vdd {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -57,6 +57,14 @@ / { ...@@ -57,6 +57,14 @@ / {
model = "I12 / Q5 / QT840A A20 tvbox"; model = "I12 / Q5 / QT840A A20 tvbox";
compatible = "allwinner,i12-tvbox", "allwinner,sun7i-a20"; compatible = "allwinner,i12-tvbox", "allwinner,sun7i-a20";
aliases {
serial0 = &uart0;
};
chosen {
stdout-path = "serial0:115200n8";
};
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -59,6 +59,14 @@ / { ...@@ -59,6 +59,14 @@ / {
model = "Mele M3"; model = "Mele M3";
compatible = "mele,m3", "allwinner,sun7i-a20"; compatible = "mele,m3", "allwinner,sun7i-a20";
aliases {
serial0 = &uart0;
};
chosen {
stdout-path = "serial0:115200n8";
};
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -60,6 +60,14 @@ / { ...@@ -60,6 +60,14 @@ / {
model = "Olimex A20-OLinuXino-LIME"; model = "Olimex A20-OLinuXino-LIME";
compatible = "olimex,a20-olinuxino-lime", "allwinner,sun7i-a20"; compatible = "olimex,a20-olinuxino-lime", "allwinner,sun7i-a20";
aliases {
serial0 = &uart0;
};
chosen {
stdout-path = "serial0:115200n8";
};
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -57,6 +57,14 @@ / { ...@@ -57,6 +57,14 @@ / {
model = "Olimex A20-OLinuXino-LIME2"; model = "Olimex A20-OLinuXino-LIME2";
compatible = "olimex,a20-olinuxino-lime2", "allwinner,sun7i-a20"; compatible = "olimex,a20-olinuxino-lime2", "allwinner,sun7i-a20";
aliases {
serial0 = &uart0;
};
chosen {
stdout-path = "serial0:115200n8";
};
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -68,6 +68,10 @@ aliases { ...@@ -68,6 +68,10 @@ aliases {
spi1 = &spi2; spi1 = &spi2;
}; };
chosen {
stdout-path = "serial0:115200n8";
};
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -55,6 +55,14 @@ / { ...@@ -55,6 +55,14 @@ / {
model = "LinkSprite pcDuino3 Nano"; model = "LinkSprite pcDuino3 Nano";
compatible = "linksprite,pcduino3-nano", "allwinner,sun7i-a20"; compatible = "linksprite,pcduino3-nano", "allwinner,sun7i-a20";
aliases {
serial0 = &uart0;
};
chosen {
stdout-path = "serial0:115200n8";
};
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -59,6 +59,14 @@ / { ...@@ -59,6 +59,14 @@ / {
model = "LinkSprite pcDuino3"; model = "LinkSprite pcDuino3";
compatible = "linksprite,pcduino3", "allwinner,sun7i-a20"; compatible = "linksprite,pcduino3", "allwinner,sun7i-a20";
aliases {
serial0 = &uart0;
};
chosen {
stdout-path = "serial0:115200n8";
};
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -57,6 +57,14 @@ ...@@ -57,6 +57,14 @@
/ { / {
model = "Wexler TAB7200"; model = "Wexler TAB7200";
compatible = "wexler,tab7200", "allwinner,sun7i-a20"; compatible = "wexler,tab7200", "allwinner,sun7i-a20";
aliases {
serial0 = &uart0;
};
chosen {
stdout-path = "serial0:115200n8";
};
}; };
&cpu0 { &cpu0 {
......
...@@ -64,7 +64,7 @@ aliases { ...@@ -64,7 +64,7 @@ aliases {
}; };
chosen { chosen {
bootargs = "earlyprintk console=ttyS0,115200"; stdout-path = "serial0:115200n8";
}; };
}; };
......
...@@ -64,7 +64,7 @@ aliases { ...@@ -64,7 +64,7 @@ aliases {
}; };
chosen { chosen {
bootargs = "earlyprintk console=ttyS0,115200"; stdout-path = "serial0:115200n8";
}; };
leds { leds {
......
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