[U-Boot] [PATCH] sunxi: Add support for NanoPi M1 board
Mylene Josserand
mylene.josserand at free-electrons.com
Wed Apr 19 20:55:54 UTC 2017
Hi Maxime,
Thank you for the review!
On 19/04/2017 16:57, Maxime Ripard wrote:
> Hi Mylene,
>
> On Wed, Apr 19, 2017 at 04:20:40PM +0200, Mylène Josserand wrote:
>> NanoPi M1 is a board based on Allwinner H3 CPU.
>>
>> This commit adds the support for this platform with:
>> - a device tree which enables UART, LEDs, GPIO key switch,
>> 3 USB host ports and the SD-card
>> - a defconfig file for minimal support
>> - a section in MAINTAINERS (add myself)
>>
>> Based on the orangepi-pc and the device tree from the kernel.
>>
>> Signed-off-by: Mylène Josserand <mylene.josserand at free-electrons.com>
>> ---
>> arch/arm/dts/Makefile | 1 +
>> arch/arm/dts/sun8i-h3-nanopi-m1.dts | 163 ++++++++++++++++++++++++++++++++++++
>> board/sunxi/MAINTAINERS | 5 ++
>> configs/nanopi_m1_defconfig | 18 ++++
>> 4 files changed, 187 insertions(+)
>> create mode 100644 arch/arm/dts/sun8i-h3-nanopi-m1.dts
>> create mode 100644 configs/nanopi_m1_defconfig
>>
>> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
>> index ce34e3eeff..a0d9c2724a 100644
>> --- a/arch/arm/dts/Makefile
>> +++ b/arch/arm/dts/Makefile
>> @@ -302,6 +302,7 @@ dtb-$(CONFIG_MACH_SUN8I_H3) += \
>> sun8i-h3-orangepi-pc-plus.dtb \
>> sun8i-h3-orangepi-plus.dtb \
>> sun8i-h3-orangepi-plus2e.dtb \
>> + sun8i-h3-nanopi-m1.dtb \
>> sun8i-h3-nanopi-neo.dtb \
>> sun8i-h3-nanopi-neo-air.dtb
>> dtb-$(CONFIG_MACH_SUN50I_H5) += \
>> diff --git a/arch/arm/dts/sun8i-h3-nanopi-m1.dts b/arch/arm/dts/sun8i-h3-nanopi-m1.dts
>> new file mode 100644
>> index 0000000000..05b533051c
>> --- /dev/null
>> +++ b/arch/arm/dts/sun8i-h3-nanopi-m1.dts
>> @@ -0,0 +1,163 @@
>> +/*
>> + * Copyright (C) 2017 Mylène Josserand <mylene.josserand at free-electrons.com>
>> + *
>> + * 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/input/input.h>
>> +#include <dt-bindings/pinctrl/sun4i-a10.h>
>> +
>> +/ {
>> + model = "FriendlyArm NanoPi M1";
>> + compatible = "friendlyarm,nanopi-m1", "allwinner,sun8i-h3";
>> +
>> + aliases {
>> + serial0 = &uart0;
>> + };
>> +
>> + chosen {
>> + stdout-path = "serial0:115200n8";
>> + };
>> +
>> + leds {
>> + compatible = "gpio-leds";
>> + pinctrl-names = "default";
>> + pinctrl-0 = <&leds_npi>, <&leds_r_npi>;
>> +
>> + status {
>> + label = "nanopi:blue:status";
>> + gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>;
>> + linux,default-trigger = "heartbeat";
>> + };
>> +
>> + pwr {
>> + label = "nanopi:green:pwr";
>> + gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>;
>> + default-state = "on";
>> + };
>> + };
>> +
>> + r_gpio_keys {
>> + compatible = "gpio-keys";
>> + input-name = "k1";
>> + pinctrl-names = "default";
>> + pinctrl-0 = <&sw_r_npi>;
>> +
>> + k1 at 0 {
>> + label = "k1";
>> + linux,code = <KEY_POWER>;
>> + gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>;
>> + };
>> + };
>> +};
>> +
>> +&ehci1 {
>> + status = "okay";
>> +};
>> +
>> +&ehci2 {
>> + status = "okay";
>> +};
>> +
>> +&ehci3 {
>> + status = "okay";
>> +};
>> +
>> +&mmc0 {
>> + bus-width = <4>;
>> + cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */
>> + cd-inverted;
>> + pinctrl-names = "default";
>> + pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
>> + status = "okay";
>> + vmmc-supply = <®_vcc3v3>;
>> +};
>> +
>> +&ohci1 {
>> + status = "okay";
>> +};
>> +
>> +&ohci2 {
>> + status = "okay";
>> +};
>> +
>> +&ohci3 {
>> + status = "okay";
>> +};
>> +
>> +&pio {
>> + leds_npi: led_pins at 0 {
>> + allwinner,pins = "PA10";
>> + allwinner,function = "gpio_out";
>> + allwinner,drive = <SUN4I_PINCTRL_10_MA>;
>> + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
>> + };
>> +};
>> +
>> +&r_pio {
>> + leds_r_npi: led_pins at 0 {
>> + allwinner,pins = "PL10";
>> + allwinner,function = "gpio_out";
>> + allwinner,drive = <SUN4I_PINCTRL_10_MA>;
>> + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
>> + };
>> +
>> + sw_r_npi: key_pins at 0 {
>> + allwinner,pins = "PL3";
>> + allwinner,function = "gpio_in";
>> + allwinner,drive = <SUN4I_PINCTRL_10_MA>;
>> + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
>> + };
>> +};
>> +
>> +&uart0 {
>> + pinctrl-names = "default";
>> + pinctrl-0 = <&uart0_pins_a>;
>> + status = "okay";
>> +};
>> +
>> +&usbphy {
>> + /* USB VBUS is always on */
>> + status = "okay";
>> +};
>
> The way we usually handle things is by syncing the DT with the
> kernel's. We already have a device tree in the kernel for this board,
> so this would mean bringing it to U-Boot, and then adding your device
> tree.
I based it on the one from the kernel but as it handles a nanopi.dtsi, I
"merged" the nanopi-m1.dts and nanopi.dtsi files to this one. Should I
create a nanopi.dtsi and update also the nanopi-neo to include it?
>
> And I would love to see any patch improving the Linux DT ;)
Sure :)
>
>> diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS
>> index 2a712fe4b5..f916160ef9 100644
>> --- a/board/sunxi/MAINTAINERS
>> +++ b/board/sunxi/MAINTAINERS
>> @@ -227,6 +227,11 @@ M: Siarhei Siamashka <siarhei.siamashka at gmail.com>
>> S: Maintained
>> F: configs/MSI_Primo81_defconfig
>>
>> +NANOPI-M1 BOARD
>> +M: Mylène Josserand <mylene.josserand at free-electrons.com>
>> +S: Maintained
>> +F: configs/nanopi_m1_defconfig
>> +
>> NANOPI-NEO BOARD
>> M: Jelle van der Waa <jelle at vdwaa.nl>
>> S: Maintained
>> diff --git a/configs/nanopi_m1_defconfig b/configs/nanopi_m1_defconfig
>> new file mode 100644
>> index 0000000000..611c089df0
>> --- /dev/null
>> +++ b/configs/nanopi_m1_defconfig
>> @@ -0,0 +1,18 @@
>> +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-m1"
>> +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>> +CONFIG_CONSOLE_MUX=y
>
> What do you need that option for?
Right, I do not think it is needed. I will remove it.
--
Mylène Josserand, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
More information about the U-Boot
mailing list