Message ID | 1418115413-547-1-git-send-email-wens@csie.org |
---|---|
State | Accepted |
Delegated to: | Hans de Goede |
Headers | show |
Hi, On 09-12-14 09:56, Chen-Yu Tsai wrote: > 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> Thanks, queued up for v2015.04 in u-boot-sunxi/next . Regards, Hans > --- > board/sunxi/Kconfig | 4 ++++ > configs/Hummingbird_A31_defconfig | 19 +++++++++++++++++++ > 2 files changed, 23 insertions(+) > create mode 100644 configs/Hummingbird_A31_defconfig > > diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig > index 6162227..5bb2f58 100644 > --- a/board/sunxi/Kconfig > +++ b/board/sunxi/Kconfig > @@ -112,6 +112,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/configs/Hummingbird_A31_defconfig b/configs/Hummingbird_A31_defconfig > new file mode 100644 > index 0000000..73855c5 > --- /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_MERRII_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=""
p.s. On 09-12-14 09:56, Chen-Yu Tsai wrote: > 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> > --- > board/sunxi/Kconfig | 4 ++++ > configs/Hummingbird_A31_defconfig | 19 +++++++++++++++++++ > 2 files changed, 23 insertions(+) > create mode 100644 configs/Hummingbird_A31_defconfig > > diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig > index 6162227..5bb2f58 100644 > --- a/board/sunxi/Kconfig > +++ b/board/sunxi/Kconfig > @@ -112,6 +112,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/configs/Hummingbird_A31_defconfig b/configs/Hummingbird_A31_defconfig > new file mode 100644 > index 0000000..73855c5 > --- /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_MERRII_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 Interesting where did you get this info from ? > ++S:CONFIG_AXP221_ALDO2_VOLT=1800 > +# SoC IR, PLL and Analog power (must be 3.0V) Idem, I think we should probably make 3000 the default in Kconfig then, agreed ? > ++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="" Regards, Hans
Hi, On Tue, Dec 9, 2014 at 5:10 PM, Hans de Goede <hdegoede@redhat.com> wrote: > p.s. > > On 09-12-14 09:56, Chen-Yu Tsai wrote: >> >> 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> >> --- >> board/sunxi/Kconfig | 4 ++++ >> configs/Hummingbird_A31_defconfig | 19 +++++++++++++++++++ >> 2 files changed, 23 insertions(+) >> create mode 100644 configs/Hummingbird_A31_defconfig >> >> diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig >> index 6162227..5bb2f58 100644 >> --- a/board/sunxi/Kconfig >> +++ b/board/sunxi/Kconfig >> @@ -112,6 +112,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/configs/Hummingbird_A31_defconfig >> b/configs/Hummingbird_A31_defconfig >> new file mode 100644 >> index 0000000..73855c5 >> --- /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_MERRII_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 > > > Interesting where did you get this info from ? I have the schematics for the board, downloaded from Merrii's forum. It has all the outputs of the PMIC, what they're connected to, assigned voltage, etc.. >> ++S:CONFIG_AXP221_ALDO2_VOLT=1800 > > >> +# SoC IR, PLL and Analog power (must be 3.0V) > > Idem, I think we should probably make 3000 the default > in Kconfig then, agreed ? I think it's a safe bet. That part of the schematic matches the one found in Olimex's repository. >> ++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="" ChenYu
On Tue, 2014-12-09 at 10:06 +0100, Hans de Goede wrote: > Hi, > > On 09-12-14 09:56, Chen-Yu Tsai wrote: > > 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> > > Thanks, queued up for v2015.04 in u-boot-sunxi/next . It's missing an entry in board/sunxi/MAINTAINERS. Chen-Yu could you send a follow up to add yourself please (at least, assuming you have one of these). Thanks, Ian.
diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index 6162227..5bb2f58 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -112,6 +112,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/configs/Hummingbird_A31_defconfig b/configs/Hummingbird_A31_defconfig new file mode 100644 index 0000000..73855c5 --- /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_MERRII_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=""
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> --- board/sunxi/Kconfig | 4 ++++ configs/Hummingbird_A31_defconfig | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 configs/Hummingbird_A31_defconfig