diff mbox

[U-Boot,v2] sunxi: add NanoPi NEO Air defconfig

Message ID 20170212152140.5671-1-jelle@vdwaa.nl
State Accepted
Delegated to: Jagannadha Sutradharudu Teki
Headers show

Commit Message

Jelle van der Waa Feb. 12, 2017, 3:21 p.m. UTC
Add support for the NanoPi NEO Air H3 board from friendlyarm.com . This
board contains WiFi, Bluetooth, 8GB eMMC storage and 512 MB DDR3 ram.

Signed-off-by: Jelle van der Waa <jelle@vdwaa.nl>
---
 arch/arm/dts/Makefile                    |  3 +-
 arch/arm/dts/sun8i-h3-nanopi-neo-air.dts | 97 ++++++++++++++++++++++++++++++++
 configs/nanopi_neo_air_defconfig         | 17 ++++++
 3 files changed, 116 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/dts/sun8i-h3-nanopi-neo-air.dts
 create mode 100644 configs/nanopi_neo_air_defconfig

Comments

Maxime Ripard Feb. 13, 2017, 7:52 a.m. UTC | #1
On Sun, Feb 12, 2017 at 04:21:40PM +0100, Jelle van der Waa wrote:
> Add support for the NanoPi NEO Air H3 board from friendlyarm.com . This
> board contains WiFi, Bluetooth, 8GB eMMC storage and 512 MB DDR3 ram.
> 
> Signed-off-by: Jelle van der Waa <jelle@vdwaa.nl>

Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>

Thanks,
Maxime
Jagan Teki Feb. 25, 2017, 8:26 a.m. UTC | #2
On Mon, Feb 13, 2017 at 1:22 PM, Maxime Ripard
<maxime.ripard@free-electrons.com> wrote:
> On Sun, Feb 12, 2017 at 04:21:40PM +0100, Jelle van der Waa wrote:
>> Add support for the NanoPi NEO Air H3 board from friendlyarm.com . This
>> board contains WiFi, Bluetooth, 8GB eMMC storage and 512 MB DDR3 ram.
>>
>> Signed-off-by: Jelle van der Waa <jelle@vdwaa.nl>
>
> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>

Fixed, error while 'git am' and

Applied to u-boot-sunxi/master

thanks!
Chen-Yu Tsai March 1, 2017, 7:33 a.m. UTC | #3
On Sat, Feb 25, 2017 at 4:26 PM, Jagan Teki <jagan@openedev.com> wrote:
> On Mon, Feb 13, 2017 at 1:22 PM, Maxime Ripard
> <maxime.ripard@free-electrons.com> wrote:
>> On Sun, Feb 12, 2017 at 04:21:40PM +0100, Jelle van der Waa wrote:
>>> Add support for the NanoPi NEO Air H3 board from friendlyarm.com . This
>>> board contains WiFi, Bluetooth, 8GB eMMC storage and 512 MB DDR3 ram.
>>>
>>> Signed-off-by: Jelle van der Waa <jelle@vdwaa.nl>
>>
>> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
>
> Fixed, error while 'git am' and
>
> Applied to u-boot-sunxi/master

This is missing an entry to boards/sunxi/MAINTAINERS though.

Jelle, can you send another patch adding yourself as a board maintainer?

ChenYu
Jelle van der Waa March 1, 2017, 9:09 a.m. UTC | #4
On 03/01/17 at 03:33pm, Chen-Yu Tsai wrote:
> On Sat, Feb 25, 2017 at 4:26 PM, Jagan Teki <jagan@openedev.com> wrote:
> > On Mon, Feb 13, 2017 at 1:22 PM, Maxime Ripard
> > <maxime.ripard@free-electrons.com> wrote:
> >> On Sun, Feb 12, 2017 at 04:21:40PM +0100, Jelle van der Waa wrote:
> >>> Add support for the NanoPi NEO Air H3 board from friendlyarm.com . This
> >>> board contains WiFi, Bluetooth, 8GB eMMC storage and 512 MB DDR3 ram.
> >>>
> >>> Signed-off-by: Jelle van der Waa <jelle@vdwaa.nl>
> >>
> >> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> >
> > Fixed, error while 'git am' and
> >
> > Applied to u-boot-sunxi/master
> 
> This is missing an entry to boards/sunxi/MAINTAINERS though.
> 
> Jelle, can you send another patch adding yourself as a board maintainer?

Sure, will do.
diff mbox

Patch

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index eb68c204bb..d3ded5a58e 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -293,7 +293,8 @@  dtb-$(CONFIG_MACH_SUN8I_H3) += \
 	sun8i-h3-orangepi-pc-plus.dtb \
 	sun8i-h3-orangepi-plus.dtb \
 	sun8i-h3-orangepi-plus2e.dtb \
-	sun8i-h3-nanopi-neo.dtb
+	sun8i-h3-nanopi-neo.dtb \
+	sun8i-h3-nanopi-neo-air.dtb
 dtb-$(CONFIG_MACH_SUN50I) += \
 	sun50i-a64-pine64-plus.dtb \
 	sun50i-a64-pine64.dtb
diff --git a/arch/arm/dts/sun8i-h3-nanopi-neo-air.dts b/arch/arm/dts/sun8i-h3-nanopi-neo-air.dts
new file mode 100644
index 0000000000..3ba081c1f5
--- /dev/null
+++ b/arch/arm/dts/sun8i-h3-nanopi-neo-air.dts
@@ -0,0 +1,97 @@ 
+/*
+ * Copyright (C) 2017 Jelle van der Waa <jelle@vdwaa.nl>
+ *
+ * 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-h3.dtsi"
+#include "sunxi-common-regulators.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/pinctrl/sun4i-a10.h>
+
+/ {
+	model = "FriendlyARM NanoPi NEO Air";
+	compatible = "friendlyarm,nanopi-neo-air", "allwinner,sun8i-h3";
+
+	aliases {
+		serial0 = &uart0;
+	};
+
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		pwr {
+			label = "nanopi:green:pwr";
+			gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */
+			default-state = "on";
+		};
+
+		status {
+			label = "nanopi:blue:status";
+			gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>; /* PA10 */
+		};
+	};
+};
+
+&mmc0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
+	vmmc-supply = <&reg_vcc3v3>;
+	bus-width = <4>;
+	cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */
+	cd-inverted;
+	status = "okay";
+};
+
+&uart0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart0_pins_a>;
+	status = "okay";
+};
+
+&usbphy {
+	/* USB VBUS is always on */
+	status = "okay";
+};
diff --git a/configs/nanopi_neo_air_defconfig b/configs/nanopi_neo_air_defconfig
new file mode 100644
index 0000000000..9598bd5cd5
--- /dev/null
+++ b/configs/nanopi_neo_air_defconfig
@@ -0,0 +1,17 @@ 
+CONFIG_ARM=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_MACH_SUN8I_H3=y
+CONFIG_DRAM_CLK=408
+CONFIG_DRAM_ZQ=3881979
+CONFIG_DRAM_ODT_EN=y
+CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-neo-air"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_CONSOLE_MUX=y
+CONFIG_SPL=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_SPL_DOS_PARTITION is not set
+# CONFIG_SPL_ISO_PARTITION is not set
+# CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_USB_EHCI_HCD=y