[U-Boot] [PATCH v2 0/4] sunxi: Add support for NanoPi M1

[U-Boot] [PATCH v2 0/4] sunxi: Add support for NanoPi M1

[Mylène Josserand]

Hi everyone,

Here is a V2 of the support of the Sun8i NanoPi M1 platform.
I created a patch serie instead on a standalone patch
because the kernel device tree for Nanopi uses a dtsi file
that does not exist in u-boot. This dtsi will be added in
this serie.

Changes since V1:
	- Added the NanoPi dtsi from the kernel device tree
	- Updated the NanoPi Neo device tree to use the dtsi
	- Updated the dtsi from the kernel reference to remove the
	gpio-keys to be able to use this dtsi file for the
	NanoPi Neo Air. I will send this patch to the kernel if this
	modification make sense.
	- Updated the NanoPi Neo Air to use the dtsi

Patch01: Add the support of the NanoPi M1 platform. Based from the kernel
device tree so the NanoPi dtsi file is also added.
Patch02: Update the NanoPi Neo to use the dtsi to be close to the one from
the kernel.
Patch03: Move the gpio-keys to the dts file to have a generic dtsi file and
be able to use it for the NanoPi Neo Air.
Patch04: Update the NanoPi Neo Air device tree file to use the dtsi one.

Thank you in advance for your reviews/comments.

Best regards,

Mylène Josserand (4):
  sunxi: Add support for NanoPi M1
  sunxi: Update NanoPi Neo to use dtsi
  sunxi: Move gpio-keys from NanoPi dtsi to dts
  sunxi: Update NanoPi Neo Air to use dtsi

 arch/arm/dts/Makefile                    |   1 +
 arch/arm/dts/sun8i-h3-nanopi-m1.dts      |  77 +++++++++++++++++++
 arch/arm/dts/sun8i-h3-nanopi-neo-air.dts |  51 +------------
 arch/arm/dts/sun8i-h3-nanopi-neo.dts     |  82 +++-----------------
 arch/arm/dts/sun8i-h3-nanopi.dtsi        | 124 +++++++++++++++++++++++++++++++
 board/sunxi/MAINTAINERS                  |   5 ++
 configs/nanopi_m1_defconfig              |  16 ++++
 7 files changed, 233 insertions(+), 123 deletions(-)
 create mode 100644 arch/arm/dts/sun8i-h3-nanopi-m1.dts
 create mode 100644 arch/arm/dts/sun8i-h3-nanopi.dtsi
 create mode 100644 configs/nanopi_m1_defconfig

-- 
2.11.0

[U-Boot] [PATCH v2 1/4] sunxi: Add support for NanoPi M1

[Mylène Josserand]

NanoPi M1 is a board based on Allwinner H3 CPU.

This commit adds the support for this platform with:
   - an include device tree which enables UART, LEDs, GPIO key switch,
   1 USB host ports and the SD-card as a dtsi file.
   - a device tree specific to this board that enables the
   2 additional USB ports
   - a defconfig file for minimal support
   - a section in MAINTAINERS (add myself)

Synchronized with the kernel device tree, from commits:
sun8i-nanopi.dtsi: 85d2913614d9ab899d23b7ab7d22d23cf45bd1de
sun8i-h3-nanopi-m1.dts: 10efbf5f16336b7540ad6a16aa1cb0b26bab033b

Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com>
---
 arch/arm/dts/Makefile               |   1 +
 arch/arm/dts/sun8i-h3-nanopi-m1.dts |  64 +++++++++++++++++
 arch/arm/dts/sun8i-h3-nanopi.dtsi   | 137 ++++++++++++++++++++++++++++++++++++
 board/sunxi/MAINTAINERS             |   5 ++
 configs/nanopi_m1_defconfig         |  16 +++++
 5 files changed, 223 insertions(+)
 create mode 100644 arch/arm/dts/sun8i-h3-nanopi-m1.dts
 create mode 100644 arch/arm/dts/sun8i-h3-nanopi.dtsi
 create mode 100644 configs/nanopi_m1_defconfig

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 4d656ce4cc..9d41cde025 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -304,6 +304,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_SUN8I_R40) += \
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..ec63d104b4
--- /dev/null
+++ b/arch/arm/dts/sun8i-h3-nanopi-m1.dts
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2016 Milo Kim <woogyom.kim@gmail.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.
+ */
+
+#include "sun8i-h3-nanopi.dtsi"
+
+/ {
+	model = "FriendlyArm NanoPi M1";
+	compatible = "friendlyarm,nanopi-m1", "allwinner,sun8i-h3";
+};
+
+&ehci1 {
+	status = "okay";
+};
+
+&ehci2 {
+	status = "okay";
+};
+
+&ohci1 {
+	status = "okay";
+};
+
+&ohci2 {
+	status = "okay";
+};
diff --git a/arch/arm/dts/sun8i-h3-nanopi.dtsi b/arch/arm/dts/sun8i-h3-nanopi.dtsi
new file mode 100644
index 0000000000..c6decee41a
--- /dev/null
+++ b/arch/arm/dts/sun8i-h3-nanopi.dtsi
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2016 James Pettigrew <james@innovum.com.au>
+ * Copyright (C) 2016 Milo Kim <woogyom.kim@gmail.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>
+
+/ {
+	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>;
+		};
+	};
+};
+
+&ehci3 {
+	status = "okay";
+};
+
+&mmc0 {
+	bus-width = <4>;
+	cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;
+	cd-inverted;
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
+	status = "okay";
+	vmmc-supply = <&reg_vcc3v3>;
+};
+
+&ohci3 {
+	status = "okay";
+};
+
+&pio {
+	leds_npi: led_pins at 0 {
+		pins = "PA10";
+		function = "gpio_out";
+	};
+};
+
+&r_pio {
+	leds_r_npi: led_pins at 0 {
+		pins = "PL10";
+		function = "gpio_out";
+	};
+
+	sw_r_npi: key_pins at 0 {
+		pins = "PL3";
+		function = "gpio_in";
+	};
+};
+
+&uart0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart0_pins_a>;
+	status = "okay";
+};
+
+&usbphy {
+	status = "okay";
+};
diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS
index 1c8817375d..8c1ba7f831 100644
--- a/board/sunxi/MAINTAINERS
+++ b/board/sunxi/MAINTAINERS
@@ -238,6 +238,11 @@ M:	Siarhei Siamashka <siarhei.siamashka@gmail.com>
 S:	Maintained
 F:	configs/MSI_Primo81_defconfig
 
+NANOPI-M1 BOARD
+M:	Mylène Josserand <mylene.josserand@free-electrons.com>
+S:	Maintained
+F:	configs/nanopi_m1_defconfig
+
 NANOPI-NEO BOARD
 M:	Jelle van der Waa <jelle@vdwaa.nl>
 S:	Maintained
diff --git a/configs/nanopi_m1_defconfig b/configs/nanopi_m1_defconfig
new file mode 100644
index 0000000000..498496b1e7
--- /dev/null
+++ b/configs/nanopi_m1_defconfig
@@ -0,0 +1,16 @@
+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_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
-- 
2.11.0

[U-Boot] [PATCH v2 2/4] sunxi: Update NanoPi Neo to use dtsi

[Mylène Josserand]

Update the NanoPi Neo device tree file to use the NanoPi dtsi.

Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com>
---
 arch/arm/dts/sun8i-h3-nanopi-neo.dts | 79 +-----------------------------------
 1 file changed, 1 insertion(+), 78 deletions(-)

diff --git a/arch/arm/dts/sun8i-h3-nanopi-neo.dts b/arch/arm/dts/sun8i-h3-nanopi-neo.dts
index 096ff0b5a5..5113059098 100644
--- a/arch/arm/dts/sun8i-h3-nanopi-neo.dts
+++ b/arch/arm/dts/sun8i-h3-nanopi-neo.dts
@@ -40,88 +40,11 @@
  *     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>
+#include "sun8i-h3-nanopi.dtsi"
 
 / {
 	model = "FriendlyARM NanoPi NEO";
 	compatible = "friendlyarm,nanopi-neo", "allwinner,sun8i-h3";
-
-	aliases {
-		serial0 = &uart0;
-	};
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
-
-	leds {
-		compatible = "gpio-leds";
-		pinctrl-names = "default";
-		pinctrl-0 = <&leds_opc>, <&leds_r_opc>;
-
-		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 */
-		};
-	};
-};
-
-&ehci3 {
-	status = "okay";
-};
-
-&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";
-};
-
-&ohci3 {
-	status = "okay";
-};
-
-&pio {
-	leds_opc: led-pins {
-		allwinner,pins = "PA10";
-		allwinner,function = "gpio_out";
-		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
-	};
-};
-
-&r_pio {
-	leds_r_opc: led-pins {
-		allwinner,pins = "PL10";
-		allwinner,function = "gpio_out";
-		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";
 };
 
 &emac {
-- 
2.11.0

[U-Boot] [PATCH v2 3/4] sunxi: Move gpio-keys from NanoPi dtsi to dts

[Mylène Josserand]

Move the gpio-keys node from the NanoPi dtsi to NanoPi
Neo and NanoPi M1 dts files. It allows to have a more generic
dtsi file to be able to use it for other NanoPi platforms.

Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com>
---
 arch/arm/dts/sun8i-h3-nanopi-m1.dts  | 13 +++++++++++++
 arch/arm/dts/sun8i-h3-nanopi-neo.dts | 13 +++++++++++++
 arch/arm/dts/sun8i-h3-nanopi.dtsi    | 13 -------------
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/arch/arm/dts/sun8i-h3-nanopi-m1.dts b/arch/arm/dts/sun8i-h3-nanopi-m1.dts
index ec63d104b4..5e1d756cf6 100644
--- a/arch/arm/dts/sun8i-h3-nanopi-m1.dts
+++ b/arch/arm/dts/sun8i-h3-nanopi-m1.dts
@@ -45,6 +45,19 @@
 / {
 	model = "FriendlyArm NanoPi M1";
 	compatible = "friendlyarm,nanopi-m1", "allwinner,sun8i-h3";
+
+	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 {
diff --git a/arch/arm/dts/sun8i-h3-nanopi-neo.dts b/arch/arm/dts/sun8i-h3-nanopi-neo.dts
index 5113059098..80a1b18a64 100644
--- a/arch/arm/dts/sun8i-h3-nanopi-neo.dts
+++ b/arch/arm/dts/sun8i-h3-nanopi-neo.dts
@@ -45,6 +45,19 @@
 / {
 	model = "FriendlyARM NanoPi NEO";
 	compatible = "friendlyarm,nanopi-neo", "allwinner,sun8i-h3";
+
+	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>;
+		};
+	};
 };
 
 &emac {
diff --git a/arch/arm/dts/sun8i-h3-nanopi.dtsi b/arch/arm/dts/sun8i-h3-nanopi.dtsi
index c6decee41a..5b9a39aa55 100644
--- a/arch/arm/dts/sun8i-h3-nanopi.dtsi
+++ b/arch/arm/dts/sun8i-h3-nanopi.dtsi
@@ -74,19 +74,6 @@
 			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>;
-		};
-	};
 };
 
 &ehci3 {
-- 
2.11.0

[U-Boot] [PATCH v2 4/4] sunxi: Update NanoPi Neo Air to use dtsi

[Mylène Josserand]

Update the NanoPi Neo Air device tree to use the NanoPi dtsi.

Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com>
---
 arch/arm/dts/sun8i-h3-nanopi-neo-air.dts | 51 +-------------------------------
 1 file changed, 1 insertion(+), 50 deletions(-)

diff --git a/arch/arm/dts/sun8i-h3-nanopi-neo-air.dts b/arch/arm/dts/sun8i-h3-nanopi-neo-air.dts
index 3ba081c1f5..1b269e88d8 100644
--- a/arch/arm/dts/sun8i-h3-nanopi-neo-air.dts
+++ b/arch/arm/dts/sun8i-h3-nanopi-neo-air.dts
@@ -40,58 +40,9 @@
  *     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>
+#include "sun8i-h3-nanopi.dtsi"
 
 / {
 	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";
 };
-- 
2.11.0

[U-Boot] [PATCH v2 0/4] sunxi: Add support for NanoPi M1

[Maxime Ripard]

Hi Mylene,

On Wed, May 10, 2017 at 08:26:06AM +0200, Mylène Josserand wrote:
> Here is a V2 of the support of the Sun8i NanoPi M1 platform.
> I created a patch serie instead on a standalone patch
> because the kernel device tree for Nanopi uses a dtsi file
> that does not exist in u-boot. This dtsi will be added in
> this serie.
> 
> Changes since V1:
> 	- Added the NanoPi dtsi from the kernel device tree
> 	- Updated the NanoPi Neo device tree to use the dtsi
> 	- Updated the dtsi from the kernel reference to remove the
> 	gpio-keys to be able to use this dtsi file for the
> 	NanoPi Neo Air. I will send this patch to the kernel if this
> 	modification make sense.
> 	- Updated the NanoPi Neo Air to use the dtsi
> 
> Patch01: Add the support of the NanoPi M1 platform. Based from the kernel
> device tree so the NanoPi dtsi file is also added.
> Patch02: Update the NanoPi Neo to use the dtsi to be close to the one from
> the kernel.
> Patch03: Move the gpio-keys to the dts file to have a generic dtsi file and
> be able to use it for the NanoPi Neo Air.
> Patch04: Update the NanoPi Neo Air device tree file to use the dtsi one.

(we already discussed this face to face, but I'm sending it on the ML
for reference).

While all those patches are good, they should be contributed to
upstream's kernel first. Once they are merged, you can then sync
U-Boot to use whatever has been merged.

Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170510/14f1c568/attachment.sig>

[U-Boot] [PATCH v2 0/4] sunxi: Add support for NanoPi M1

[Jagan Teki]

On Wed, May 10, 2017 at 11:56 AM, Mylène Josserand
<mylene.josserand@free-electrons.com> wrote:
> Hi everyone,
>
> Here is a V2 of the support of the Sun8i NanoPi M1 platform.
> I created a patch serie instead on a standalone patch
> because the kernel device tree for Nanopi uses a dtsi file
> that does not exist in u-boot. This dtsi will be added in
> this serie.
>
> Changes since V1:
>         - Added the NanoPi dtsi from the kernel device tree
>         - Updated the NanoPi Neo device tree to use the dtsi
>         - Updated the dtsi from the kernel reference to remove the
>         gpio-keys to be able to use this dtsi file for the
>         NanoPi Neo Air. I will send this patch to the kernel if this
>         modification make sense.
>         - Updated the NanoPi Neo Air to use the dtsi
>
> Patch01: Add the support of the NanoPi M1 platform. Based from the kernel
> device tree so the NanoPi dtsi file is also added.
> Patch02: Update the NanoPi Neo to use the dtsi to be close to the one from
> the kernel.
> Patch03: Move the gpio-keys to the dts file to have a generic dtsi file and
> be able to use it for the NanoPi Neo Air.
> Patch04: Update the NanoPi Neo Air device tree file to use the dtsi one.
>
> Thank you in advance for your reviews/comments.
>
> Best regards,
>
> Mylène Josserand (4):
>   sunxi: Add support for NanoPi M1
>   sunxi: Update NanoPi Neo to use dtsi

These two are IN at linux-next and look good.

Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>

thanks!
-- 
Jagan Teki
Free Software Engineer | www.openedev.com
U-Boot, Linux | Upstream Maintainer
Hyderabad, India.

[U-Boot] [PATCH v2 0/4] sunxi: Add support for NanoPi M1

[Jagan Teki]

On Tue, May 23, 2017 at 10:51 PM, Jagan Teki <jagannadh.teki@gmail.com> wrote:
> On Wed, May 10, 2017 at 11:56 AM, Mylène Josserand
> <mylene.josserand@free-electrons.com> wrote:
>> Hi everyone,
>>
>> Here is a V2 of the support of the Sun8i NanoPi M1 platform.
>> I created a patch serie instead on a standalone patch
>> because the kernel device tree for Nanopi uses a dtsi file
>> that does not exist in u-boot. This dtsi will be added in
>> this serie.
>>
>> Changes since V1:
>>         - Added the NanoPi dtsi from the kernel device tree
>>         - Updated the NanoPi Neo device tree to use the dtsi
>>         - Updated the dtsi from the kernel reference to remove the
>>         gpio-keys to be able to use this dtsi file for the
>>         NanoPi Neo Air. I will send this patch to the kernel if this
>>         modification make sense.
>>         - Updated the NanoPi Neo Air to use the dtsi
>>
>> Patch01: Add the support of the NanoPi M1 platform. Based from the kernel
>> device tree so the NanoPi dtsi file is also added.
>> Patch02: Update the NanoPi Neo to use the dtsi to be close to the one from
>> the kernel.
>> Patch03: Move the gpio-keys to the dts file to have a generic dtsi file and
>> be able to use it for the NanoPi Neo Air.
>> Patch04: Update the NanoPi Neo Air device tree file to use the dtsi one.
>>
>> Thank you in advance for your reviews/comments.
>>
>> Best regards,
>>
>> Mylène Josserand (4):
>>   sunxi: Add support for NanoPi M1
>>   sunxi: Update NanoPi Neo to use dtsi
>
> These two are IN at linux-next and look good.
>
> Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>

First two patches,

Applied to u-boot-sunxi/master

thanks!
-- 
Jagan Teki
Free Software Engineer | www.openedev.com
U-Boot, Linux | Upstream Maintainer
Hyderabad, India.