Skip to contentSkip to conversation

ARM: dts: sun7i: Add Merrii A20 Hummingbird support

PATCH New Wills Wang 2 participants 5 messages Aug 19, 2014

Subsystems (3)
Device tree bindings Arm/Allwinner sunXi SoC support Arm and arm64 SoC sub-architectures (common parts)
lore
Share & tools
lore

Wills Wang

author
#0 lore raw

v6 cover ARM: dts: sun7i: Add Merrii A20 Hummingbird support

Changes since v5:
- add generic pinmux spi2_pins_b
- remove redundant newline

Changes since v4:
- move generic pinmux into a20 dtsi
- add the board name as suffix

Changes since v3:
- adjust dtb file in alphabetic order

Changes since v2:
- fixed mistake about uart3/4/5 pinctrl config

Changes since v1:
- add Signed-off-by and commit msg
- add uart2/3/4/5, i2c3 and spi2
- remove pwm1 node
- use reg_vcc3v0 according to board schematic
- add comment for gpio pin
- remove unused pull-up pin setting

Wills Wang (2):
ARM: dts: sun7i: Add uart3/4/5, i2c3 and spi2 pinmux
ARM: dts: sun7i: Add Merrii A20 Hummingbird board

 arch/arm/boot/dts/Makefile                  |   1 +
 arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 236 ++++++++++++++++++++++++++++
 arch/arm/boot/dts/sun7i-a20.dtsi            |  35 +++++
 3 files changed, 272 insertions(+)
 create mode 100644 arch/arm/boot/dts/sun7i-a20-hummingbird.dts
Signature · 1 line
1.8.3.2
author
#1 lore raw

PATCH v6 1/2 ARM: dts: sun7i: Add uart3/4/5, i2c3 and spi2 pinmux

This patch add generic dts node for uart3/4/5, i2c3 and spi2.

Reviewed-by Chen-Yu Tsai <[email protected]>
Signed-off-by Wills Wang <[email protected]>
---
 arch/arm/boot/dts/sun7i-a20.dtsi | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
arch/arm/boot/dts/sun7i-a20.dtsi +35 -0
index c658e34..9f16074 100644
@@ -634,6 +634,27 @@
 				allwinner,pull = <0>;
 			};
 
+			uart3_pins_a: uart3 at 0 {
+				allwinner,pins = "PG6", "PG7", "PG8", "PG9";
+				allwinner,function = "uart3";
+				allwinner,drive = <0>;
+				allwinner,pull = <0>;
+			};
+
+			uart4_pins_a: uart4 at 0 {
+				allwinner,pins = "PG10", "PG11";
+				allwinner,function = "uart4";
+				allwinner,drive = <0>;
+				allwinner,pull = <0>;
+			};
+
+			uart5_pins_a: uart5 at 0 {
+				allwinner,pins = "PI10", "PI11";
+				allwinner,function = "uart5";
+				allwinner,drive = <0>;
+				allwinner,pull = <0>;
+			};
+
 			uart6_pins_a: uart6 at 0 {
 				allwinner,pins = "PI12", "PI13";
 				allwinner,function = "uart6";

@@ -669,6 +690,13 @@
 				allwinner,pull = <0>;
 			};
 
+			i2c3_pins_a: i2c3 at 0 {
+				allwinner,pins = "PI0", "PI1";
+				allwinner,function = "i2c3";
+				allwinner,drive = <0>;
+				allwinner,pull = <0>;
+			};
+
 			emac_pins_a: emac0 at 0 {
 				allwinner,pins = "PA0", "PA1", "PA2",
 						"PA3", "PA4", "PA5", "PA6",

@@ -734,6 +762,13 @@
 				allwinner,pull = <0>;
 			};
 
+			spi2_pins_b: spi2 at 1 {
+				allwinner,pins = "PB14", "PB15", "PB16", "PB17";
+				allwinner,function = "spi2";
+				allwinner,drive = <0>;
+				allwinner,pull = <0>;
+			};
+
 			mmc0_pins_a: mmc0 at 0 {
 				allwinner,pins = "PF0","PF1","PF2","PF3","PF4","PF5";
 				allwinner,function = "mmc0";
Signature · 1 line
1.8.3.2
Applied
#2 lore raw

PATCH v6 1/2 ARM: dts: sun7i: Add uart3/4/5, i2c3 and spi2 pinmux

Quoted 4 lines · Wills Wang

This patch add generic dts node for uart3/4/5, i2c3 and spi2.

Reviewed-by Chen-Yu Tsai <[email protected]>
Signed-off-by Wills Wang <[email protected]>

Applied, thanks!

Maxime

Signature · 10 lines
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: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140819/37771053/attachment-0001.sig>
author
#3 lore raw

PATCH v6 2/2 ARM: dts: sun7i: Add Merrii A20 Hummingbird board

In reply to Wills Wang

This adds support for the A20 Hummingbird:
http://www.merrii.com/en/pla_d.asp?id=171

This patch enable most on-board peripherals supported on current kernel, such as uart, i2c, spi, pwm, ohci/ehci, gmac and mmc.

Reviewed-by Chen-Yu Tsai <[email protected]>
Signed-off-by Wills Wang <[email protected]>
---
 arch/arm/boot/dts/Makefile                  |   1 +
 arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 236 ++++++++++++++++++++++++++++
 2 files changed, 237 insertions(+)
 create mode 100644 arch/arm/boot/dts/sun7i-a20-hummingbird.dts
arch/arm/boot/dts/Makefile +1 -0
index b8c5cd3..490b462 100644
@@ -416,6 +416,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \
 dtb-$(CONFIG_MACH_SUN7I) += \
 	sun7i-a20-cubieboard2.dtb \
 	sun7i-a20-cubietruck.dtb \
+	sun6i-a20-hummingbird.dtb \
 	sun7i-a20-i12-tvbox.dtb \
 	sun7i-a20-olinuxino-micro.dtb \
 	sun7i-a20-pcduino3.dtb
arch/arm/boot/dts/sun7i-a20-hummingbird.dts new file +236 -0

236 lines not on this page · raw message

Signature · 1 line
1.8.3.2
Applied
#4 lore raw

PATCH v6 2/2 ARM: dts: sun7i: Add Merrii A20 Hummingbird board

Quoted 8 lines · Wills Wang

This adds support for the A20 Hummingbird:
http://www.merrii.com/en/pla_d.asp?id=171

This patch enable most on-board peripherals supported on current kernel, such as uart, i2c, spi, pwm, ohci/ehci, gmac and mmc.

Reviewed-by Chen-Yu Tsai <[email protected]>
Signed-off-by Wills Wang <[email protected]>

Applied, thanks!
Maxime

Signature · 10 lines
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: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140819/4847ae34/attachment.sig>