From a805b7e5da479a21fdac666237a11687de21b5e6 Mon Sep 17 00:00:00 2001
From: Chen-Yu Tsai <wens@csie.org>
Date: Tue, 9 Dec 2014 16:56:53 +0800
Subject: [PATCH] sun6i: Add new board Merrii Hummingbird A31

The Merrii Hummingbird A31 is a A31 based development board with 1G
RAM, 8G NAND, AP6210 WiFi+BT, gigabit ethernet, USB OTG, 2 USB 2.0
ports connected to a USB hub chip, HDMI, VGA, TV and stereo in/out.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 board/sunxi/Kconfig               |  4 ++++
 board/sunxi/MAINTAINERS           |  5 +++++
 configs/Hummingbird_A31_defconfig | 19 +++++++++++++++++++
 3 files changed, 28 insertions(+)
 create mode 100644 configs/Hummingbird_A31_defconfig

diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index f7da7042f4..88f09fb349 100644
--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
@@ -111,6 +111,10 @@ config TARGET_CUBIETRUCK
 	bool "CUBIETRUCK"
 	depends on MACH_SUN7I
 
+config TARGET_HUMMINGBIRD_A31
+	bool "HUMMINGBIRD_A31"
+	depends on MACH_SUN6I
+
 config TARGET_IPPO_Q8H_V5
 	bool "IPPO_Q8H_V5"
 	depends on MACH_SUN8I
diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS
index 013d485135..1a1814c33b 100644
--- a/board/sunxi/MAINTAINERS
+++ b/board/sunxi/MAINTAINERS
@@ -55,6 +55,11 @@ M:	Maxime Ripard <maxime.ripard@free-electrons.com>
 S:	Maintained
 F:	configs/Colombus_defconfig
 
+HUMMINIGBIRD-A31 BOARD
+M:	Chen-Yu Tsai <wens@csie.org>
+S:	Maintained
+F:	configs/Hummingbird_A31_defconfig
+
 IPPO-Q8H-V5 BOARD
 M:	Chen-Yu Tsai <wens@csie.org>
 S:	Maintained
diff --git a/configs/Hummingbird_A31_defconfig b/configs/Hummingbird_A31_defconfig
new file mode 100644
index 0000000000..b60d579e4b
--- /dev/null
+++ b/configs/Hummingbird_A31_defconfig
@@ -0,0 +1,19 @@
+CONFIG_SPL=y
+CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPA(21)"
+CONFIG_FDTFILE="sun6i-a31-hummingbird.dtb"
++S:CONFIG_ARM=y
++S:CONFIG_ARCH_SUNXI=y
++S:CONFIG_MACH_SUN6I=y
++S:CONFIG_TARGET_HUMMINGBIRD_A31=y
++S:CONFIG_DRAM_CLK=312
++S:CONFIG_DRAM_ZQ=251
+# Wifi power
++S:CONFIG_AXP221_ALDO1_VOLT=3300
+# PM-CPUS GPIO power
++S:CONFIG_AXP221_ALDO2_VOLT=1800
+# SoC IR, PLL and Analog power (must be 3.0V)
++S:CONFIG_AXP221_ALDO3_VOLT=3000
+# Vbus gpio for usb1
++S:CONFIG_USB1_VBUS_PIN="PH24"
+# No Vbus gpio for usb2
++S:CONFIG_USB2_VBUS_PIN=""
-- 
2.39.5