* [PATCH 1/2] ARM: sun4i: dt: Move the aliases to the DTSI
@ 2013-12-20 21:53 Maxime Ripard
2013-12-20 21:53 ` [PATCH 2/2] ARM: sun4i: dt: Remove chosen nodes Maxime Ripard
2013-12-29 22:36 ` [PATCH 1/2] ARM: sun4i: dt: Move the aliases to the DTSI Maxime Ripard
0 siblings, 2 replies; 4+ messages in thread
From: Maxime Ripard @ 2013-12-20 21:53 UTC (permalink / raw)
To: linux-arm-kernel
The aliases are shared across boards are really belong to the DTSI.
Move them there.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
arch/arm/boot/dts/sun4i-a10-a1000.dts | 4 ----
arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 5 -----
arch/arm/boot/dts/sun4i-a10.dtsi | 2 ++
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/arch/arm/boot/dts/sun4i-a10-a1000.dts b/arch/arm/boot/dts/sun4i-a10-a1000.dts
index eb4d73b..d4b081d 100644
--- a/arch/arm/boot/dts/sun4i-a10-a1000.dts
+++ b/arch/arm/boot/dts/sun4i-a10-a1000.dts
@@ -18,10 +18,6 @@
model = "Mele A1000";
compatible = "mele,a1000", "allwinner,sun4i-a10";
- aliases {
- serial0 = &uart0;
- };
-
soc at 01c00000 {
emac: ethernet at 01c0b000 {
pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
index 425a7db..f1c77e0 100644
--- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
+++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
@@ -17,11 +17,6 @@
model = "Cubietech Cubieboard";
compatible = "cubietech,a10-cubieboard", "allwinner,sun4i-a10";
- aliases {
- serial0 = &uart0;
- serial1 = &uart1;
- };
-
chosen {
bootargs = "earlyprintk console=ttyS0,115200";
};
diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
index 0bf70ee..c164d6c 100644
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
@@ -17,6 +17,8 @@
aliases {
ethernet0 = &emac;
+ serial0 = &uart0;
+ serial1 = &uart1;
};
cpus {
--
1.8.4.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] ARM: sun4i: dt: Remove chosen nodes
2013-12-20 21:53 [PATCH 1/2] ARM: sun4i: dt: Move the aliases to the DTSI Maxime Ripard
@ 2013-12-20 21:53 ` Maxime Ripard
2013-12-29 22:36 ` Maxime Ripard
2013-12-29 22:36 ` [PATCH 1/2] ARM: sun4i: dt: Move the aliases to the DTSI Maxime Ripard
1 sibling, 1 reply; 4+ messages in thread
From: Maxime Ripard @ 2013-12-20 21:53 UTC (permalink / raw)
To: linux-arm-kernel
The chosen nodes are nowadays pretty useless, since they will be overriden by
the bootloader anyway.
We can thus safely remove them.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 4 ----
arch/arm/boot/dts/sun4i-a10-hackberry.dts | 4 ----
arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 4 ----
arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 4 ----
4 files changed, 16 deletions(-)
diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
index f1c77e0..b139ee6 100644
--- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
+++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
@@ -17,10 +17,6 @@
model = "Cubietech Cubieboard";
compatible = "cubietech,a10-cubieboard", "allwinner,sun4i-a10";
- chosen {
- bootargs = "earlyprintk console=ttyS0,115200";
- };
-
soc at 01c00000 {
emac: ethernet at 01c0b000 {
pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/sun4i-a10-hackberry.dts b/arch/arm/boot/dts/sun4i-a10-hackberry.dts
index b3ae51f..3a1595f 100644
--- a/arch/arm/boot/dts/sun4i-a10-hackberry.dts
+++ b/arch/arm/boot/dts/sun4i-a10-hackberry.dts
@@ -18,10 +18,6 @@
model = "Miniand Hackberry";
compatible = "miniand,hackberry", "allwinner,sun4i-a10";
- chosen {
- bootargs = "earlyprintk console=ttyS0,115200";
- };
-
soc at 01c00000 {
emac: ethernet at 01c0b000 {
pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts b/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
index 0c1447c..70b3323 100644
--- a/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
+++ b/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
@@ -18,10 +18,6 @@
model = "PineRiver Mini X-Plus";
compatible = "pineriver,mini-xplus", "allwinner,sun4i-a10";
- chosen {
- bootargs = "earlyprintk console=ttyS0,115200";
- };
-
soc at 01c00000 {
uart0: serial at 01c28000 {
pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
index 9e508dc..a4ba5ff 100644
--- a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
+++ b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
@@ -18,10 +18,6 @@
model = "Olimex A13-Olinuxino";
compatible = "olimex,a13-olinuxino", "allwinner,sun5i-a13";
- chosen {
- bootargs = "earlyprintk console=ttyS0,115200";
- };
-
soc at 01c00000 {
pinctrl at 01c20800 {
led_pins_olinuxino: led_pins at 0 {
--
1.8.4.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 1/2] ARM: sun4i: dt: Move the aliases to the DTSI
2013-12-20 21:53 [PATCH 1/2] ARM: sun4i: dt: Move the aliases to the DTSI Maxime Ripard
2013-12-20 21:53 ` [PATCH 2/2] ARM: sun4i: dt: Remove chosen nodes Maxime Ripard
@ 2013-12-29 22:36 ` Maxime Ripard
1 sibling, 0 replies; 4+ messages in thread
From: Maxime Ripard @ 2013-12-29 22:36 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Dec 20, 2013 at 10:53:06PM +0100, Maxime Ripard wrote:
> The aliases are shared across boards are really belong to the DTSI.
> Move them there.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Merged in sunxi/dt-for-3.14.
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131229/1b60639a/attachment.sig>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-12-29 22:36 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-20 21:53 [PATCH 1/2] ARM: sun4i: dt: Move the aliases to the DTSI Maxime Ripard
2013-12-20 21:53 ` [PATCH 2/2] ARM: sun4i: dt: Remove chosen nodes Maxime Ripard
2013-12-29 22:36 ` Maxime Ripard
2013-12-29 22:36 ` [PATCH 1/2] ARM: sun4i: dt: Move the aliases to the DTSI Maxime Ripard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.