From b00adbe07181a4ae265e8d757b3ad5e0a56e194c Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 18 Mar 2013 10:54:49 +0100 Subject: ARM: sunxi: Rename uart nodes to serial The other architecture use serial@address for their uart nodes, so rename our uart dt nodes to be consistent Signed-off-by: Maxime Ripard --- arch/arm/boot/dts/sun4i-a10-hackberry.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/boot/dts/sun4i-a10-hackberry.dts') diff --git a/arch/arm/boot/dts/sun4i-a10-hackberry.dts b/arch/arm/boot/dts/sun4i-a10-hackberry.dts index f84549a..9ab6875 100644 --- a/arch/arm/boot/dts/sun4i-a10-hackberry.dts +++ b/arch/arm/boot/dts/sun4i-a10-hackberry.dts @@ -23,7 +23,7 @@ }; soc { - uart0: uart@01c28000 { + uart0: serial@01c28000 { status = "okay"; }; }; -- cgit v1.1 From 0dfd1dfc96dee8ac1aacfc836de11ec52300218d Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 5 Mar 2013 22:18:03 +0100 Subject: ARM: sunxi: hackberry: Add UART muxing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We previously relied on the bootloader to do the muxing of the UART for the Hackberry. Don't rely on it anymore and use pinctrl. Signed-off-by: Maxime Ripard Acked-by: Emilio López --- arch/arm/boot/dts/sun4i-a10-hackberry.dts | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch/arm/boot/dts/sun4i-a10-hackberry.dts') diff --git a/arch/arm/boot/dts/sun4i-a10-hackberry.dts b/arch/arm/boot/dts/sun4i-a10-hackberry.dts index 9ab6875..2046000 100644 --- a/arch/arm/boot/dts/sun4i-a10-hackberry.dts +++ b/arch/arm/boot/dts/sun4i-a10-hackberry.dts @@ -24,6 +24,8 @@ soc { uart0: serial@01c28000 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pins_a>; status = "okay"; }; }; -- cgit v1.1 From 69144e3baf3dec9efae6fb197bbe21ed2b56323f Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 13 Mar 2013 20:07:37 +0100 Subject: ARM: sunxi: dt: Reorganize the dtsi In the early days, the A10 and A13 shared quite some code. Nowadays it shares less and less code, the A31 diverging even more, so it doesn't make much sense to continue to maintain this structure, just use one DTSI for every SoC, and that's it. Signed-off-by: Maxime Ripard --- arch/arm/boot/dts/sun4i-a10-hackberry.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/boot/dts/sun4i-a10-hackberry.dts') diff --git a/arch/arm/boot/dts/sun4i-a10-hackberry.dts b/arch/arm/boot/dts/sun4i-a10-hackberry.dts index 2046000..b9efac1 100644 --- a/arch/arm/boot/dts/sun4i-a10-hackberry.dts +++ b/arch/arm/boot/dts/sun4i-a10-hackberry.dts @@ -22,7 +22,7 @@ bootargs = "earlyprintk console=ttyS0,115200"; }; - soc { + soc@01c20000 { uart0: serial@01c28000 { pinctrl-names = "default"; pinctrl-0 = <&uart0_pins_a>; -- cgit v1.1