diff mbox series

[U-Boot,v2,2/2] board: sunxi: sun8i-v4: Add Bananapi M2 Berry support

Message ID 20180427120342.32341-2-jagan@amarulasolutions.com
State Accepted
Delegated to: Jagannadha Sutradharudu Teki
Headers show
Series [U-Boot,v2,1/2] ARM: dts: sun8i: Sync r40 dtsi from Linux | expand

Commit Message

Jagan Teki April 27, 2018, 12:03 p.m. UTC
Banana Pi BPI-M2 Berry is a quad-core mini single board computer
built with Allwinner V40 SoC. It features
- Quad Core ARM Cortex A7 CPU V40
- 1GB of RAM .
- microSD/SATA port..
- onboard WiFi and BT
- 4 USB A 2.0 ports
- 1 USB OTG port
- 1 HDMI port
- 1 audio jack
- DC power port

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
Changes for v2:
- Reused R40 configs for V40 SOC

 arch/arm/dts/Makefile                        |   3 +-
 arch/arm/dts/sun8i-v40-bananapi-m2-berry.dts | 132 +++++++++++++++++++++++++++
 board/sunxi/MAINTAINERS                      |   5 +
 configs/bananapi_m2_berry_defconfig          |  14 +++
 4 files changed, 153 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/dts/sun8i-v40-bananapi-m2-berry.dts
 create mode 100644 configs/bananapi_m2_berry_defconfig

Comments

Maxime Ripard May 2, 2018, 9:16 a.m. UTC | #1
On Fri, Apr 27, 2018 at 05:33:42PM +0530, Jagan Teki wrote:
> Banana Pi BPI-M2 Berry is a quad-core mini single board computer
> built with Allwinner V40 SoC. It features
> - Quad Core ARM Cortex A7 CPU V40
> - 1GB of RAM .
> - microSD/SATA port..
> - onboard WiFi and BT
> - 4 USB A 2.0 ports
> - 1 USB OTG port
> - 1 HDMI port
> - 1 audio jack
> - DC power port
> 
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>

There's a typo in your commit title, it should be v40 and not
v4. Otherwise it looks good,
Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>

for both patches, thanks!
Maxime
Jagan Teki May 9, 2018, 10:58 a.m. UTC | #2
On Wed, May 2, 2018 at 2:46 PM, Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> On Fri, Apr 27, 2018 at 05:33:42PM +0530, Jagan Teki wrote:
>> Banana Pi BPI-M2 Berry is a quad-core mini single board computer
>> built with Allwinner V40 SoC. It features
>> - Quad Core ARM Cortex A7 CPU V40
>> - 1GB of RAM .
>> - microSD/SATA port..
>> - onboard WiFi and BT
>> - 4 USB A 2.0 ports
>> - 1 USB OTG port
>> - 1 HDMI port
>> - 1 audio jack
>> - DC power port
>>
>> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
>
> There's a typo in your commit title, it should be v40 and not
> v4. Otherwise it looks good,
> Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>

Fixed and Applied to u-boot-sunxi/master
Alan Beard Aug. 14, 2018, 9:52 p.m. UTC | #3
Hi Maxine and team,

I want to run Fedora linux, from here:
https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Spins/armhfp
/images/

on the Banana Pi BPI-M2 Berry. (works fine on a Banana Pi original)

I've waited six months for the patches to filter through to the Fedora team 
but, so far nothing.

I've downloaded the code from the denx.de website but I cannot see a way to
just generate the u-boot-sunxi-with-spl.bin file for the Berry.
There is a u-boot-sunxi-with-spl.bin file in the Fedora distribution for
the Berry but it doesn't work.
This also doesn't work:
https://github.com/BPI-SINOVOIP/BPI-Mainline-uboot.git
I suspect they check the chip-id and barf if it's not 0x1701 the R40.

I chose the Banana Pi BPI-M2 Berry over the Ultra because I didn't need
the extra ram or other bells and whistles. I want to embed a BPi Berry in
an amateur radio project where I need a board with a SATA port for an SSD.

Keep up the good work.

Alan

On Wed, 2 May 2018 11:16:30 +0200, Maxime Ripard wrote
> On Fri, Apr 27, 2018 at 05:33:42PM +0530, Jagan Teki wrote:
> > Banana Pi BPI-M2 Berry is a quad-core mini single board computer
> > built with Allwinner V40 SoC. It features
> > - Quad Core ARM Cortex A7 CPU V40
> > - 1GB of RAM .
> > - microSD/SATA port..
> > - onboard WiFi and BT
> > - 4 USB A 2.0 ports
> > - 1 USB OTG port
> > - 1 HDMI port
> > - 1 audio jack
> > - DC power port
> > 
> > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
> 
> There's a typo in your commit title, it should be v40 and not
> v4. Otherwise it looks good,
> Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>
> 
> for both patches, thanks!
> Maxime
> 
> -- 
> Maxime Ripard, Bootlin (formerly Free Electrons)
> Embedded Linux and Kernel engineering
> https://bootlin.com


Alan

Evil flourishes when good men do nothing.
Consider the Christmas child.
---------------------------------------------------------------------------
Alan Beard               Unix Support Technician from 1984 to today
70 Wedmore Rd.           Sun Solaris, AIX, HP/UX, Linux, SCO, MIPS
Emu Heights N.S.W. 2750  Routers, terminal servers, printers, terminals etc..
+61 2 47353013 (h)       Support Programming, shell scripting, "C", assembler
0414 353013 (mobile)     After uni, electronics tech
Jagan Teki Aug. 15, 2018, 5:59 a.m. UTC | #4
On Wed, Aug 15, 2018 at 3:22 AM, Alan Beard <beardal@unixservice.com.au> wrote:
> Hi Maxine and team,
>
> I want to run Fedora linux, from here:
> https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Spins/armhfp
> /images/
>
> on the Banana Pi BPI-M2 Berry. (works fine on a Banana Pi original)
>
> I've waited six months for the patches to filter through to the Fedora team
> but, so far nothing.
>
> I've downloaded the code from the denx.de website but I cannot see a way to
> just generate the u-boot-sunxi-with-spl.bin file for the Berry.
> There is a u-boot-sunxi-with-spl.bin file in the Fedora distribution for
> the Berry but it doesn't work.
> This also doesn't work:
> https://github.com/BPI-SINOVOIP/BPI-Mainline-uboot.git
> I suspect they check the chip-id and barf if it's not 0x1701 the R40.
>
> I chose the Banana Pi BPI-M2 Berry over the Ultra because I didn't need
> the extra ram or other bells and whistles. I want to embed a BPi Berry in
> an amateur radio project where I need a board with a SATA port for an SSD.

I'm not clear what exactly you are asking?

u-boot-sunxi-with-spl.bin is by default created with u-boot build and
SATA support is enabled recently on commit:
dddc4b4af3a444ef78d1a3d983aae71179a0d92c
diff mbox series

Patch

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index ac7667b1e8..ab0b2568ea 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -366,7 +366,8 @@  dtb-$(CONFIG_MACH_SUN8I_H3) += \
 	sun8i-h3-nanopi-neo.dtb \
 	sun8i-h3-nanopi-neo-air.dtb
 dtb-$(CONFIG_MACH_SUN8I_R40) += \
-	sun8i-r40-bananapi-m2-ultra.dtb
+	sun8i-r40-bananapi-m2-ultra.dtb \
+	sun8i-v40-bananapi-m2-berry.dtb
 dtb-$(CONFIG_MACH_SUN8I_V3S) += \
 	sun8i-v3s-licheepi-zero.dtb
 dtb-$(CONFIG_MACH_SUN50I_H5) += \
diff --git a/arch/arm/dts/sun8i-v40-bananapi-m2-berry.dts b/arch/arm/dts/sun8i-v40-bananapi-m2-berry.dts
new file mode 100644
index 0000000000..193d9b29ec
--- /dev/null
+++ b/arch/arm/dts/sun8i-v40-bananapi-m2-berry.dts
@@ -0,0 +1,132 @@ 
+/*
+ * Copyright (C) 2017 Icenowy Zheng <icenowy@aosc.io>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/dts-v1/;
+#include "sun8i-r40.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+	model = "Banana Pi M2 Berry";
+	compatible = "sinovoip,bpi-m2-berry", "allwinner,sun8i-r40";
+
+	aliases {
+		serial0 = &uart0;
+	};
+
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+};
+
+&i2c0 {
+	status = "okay";
+
+	axp22x: pmic@68 {
+		compatible = "x-powers,axp221";
+		reg = <0x34>;
+		interrupt-parent = <&nmi_intc>;
+		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+	};
+};
+
+#include "axp22x.dtsi"
+
+&reg_aldo3 {
+	regulator-always-on;
+	regulator-min-microvolt = <2700000>;
+	regulator-max-microvolt = <3300000>;
+	regulator-name = "avcc";
+};
+
+&reg_dcdc1 {
+	regulator-always-on;
+	regulator-min-microvolt = <3000000>;
+	regulator-max-microvolt = <3000000>;
+	regulator-name = "vcc-3v0";
+};
+
+&reg_dcdc2 {
+	regulator-always-on;
+	regulator-min-microvolt = <1000000>;
+	regulator-max-microvolt = <1300000>;
+	regulator-name = "vdd-cpu";
+};
+
+&reg_dcdc3 {
+	regulator-always-on;
+	regulator-min-microvolt = <1000000>;
+	regulator-max-microvolt = <1300000>;
+	regulator-name = "vdd-sys";
+};
+
+&reg_dcdc5 {
+	regulator-always-on;
+	regulator-min-microvolt = <1500000>;
+	regulator-max-microvolt = <1500000>;
+	regulator-name = "vcc-dram";
+};
+
+&reg_dldo1 {
+	regulator-min-microvolt = <1800000>;
+	regulator-max-microvolt = <3300000>;
+	regulator-name = "vcc-wifi-io";
+};
+
+&reg_dldo2 {
+	regulator-min-microvolt = <3300000>;
+	regulator-max-microvolt = <3300000>;
+	regulator-name = "vcc-wifi";
+};
+
+&mmc0 {
+	vmmc-supply = <&reg_dcdc1>;
+	bus-width = <4>;
+	cd-gpios = <&pio 7 13 GPIO_ACTIVE_LOW>; /* PH13 */
+	status = "okay";
+};
+
+&uart0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart0_pb_pins>;
+	status = "okay";
+};
diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS
index 6dd48c0265..5d31bcbdcd 100644
--- a/board/sunxi/MAINTAINERS
+++ b/board/sunxi/MAINTAINERS
@@ -126,6 +126,11 @@  M:	Jagan Teki <jagan@amarulasolutions.com>
 S:	Maintained
 F:	configs/bananapi_m1_plus_defconfig
 
+BANANAPI M2 BERRY
+M:	Jagan Teki <jagan@amarulasolutions.com>
+S:	Maintained
+F:	configs/bananapi_m2_berry_defconfig
+
 BANANAPI M2 ULTRA BOARD
 M:	Chen-Yu Tsai <wens@csie.org>
 S:	Maintained
diff --git a/configs/bananapi_m2_berry_defconfig b/configs/bananapi_m2_berry_defconfig
new file mode 100644
index 0000000000..9d75108d04
--- /dev/null
+++ b/configs/bananapi_m2_berry_defconfig
@@ -0,0 +1,14 @@ 
+CONFIG_ARM=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_SPL=y
+CONFIG_MACH_SUN8I_R40=y
+CONFIG_DRAM_CLK=576
+CONFIG_DRAM_ZQ=3881979
+CONFIG_DRAM_ODT_EN=y
+CONFIG_MMC0_CD_PIN="PH13"
+CONFIG_DEFAULT_DEVICE_TREE="sun8i-v40-bananapi-m2-berry"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_SPL_I2C_SUPPORT=y
+# CONFIG_CMD_FLASH is not set
+CONFIG_AXP_DLDO4_VOLT=2500
+CONFIG_AXP_ELDO3_VOLT=1200