* [U-Boot] [PATCH] sun50i: h5: Add NanoPi Neo Plus2 DT initial support
2017-09-21 15:22 [U-Boot] [PATCH] sun50i: h5: Add NanoPi Neo Plus2 DT initial support Antony Antony
@ 2017-09-22 7:37 ` Maxime Ripard
2017-09-22 13:09 ` [U-Boot] [PATCH v2] " Antony Antony
` (5 subsequent siblings)
6 siblings, 0 replies; 33+ messages in thread
From: Maxime Ripard @ 2017-09-22 7:37 UTC (permalink / raw)
To: u-boot
Hi Antony,
On Thu, Sep 21, 2017 at 03:22:17PM +0000, Antony Antony wrote:
> Add initial DT for NanoPi NEO Plus2 by FriendlyARM
> - Allwinner quad core H5 Cortex A53 with an ARM Mali-450MP GPU
> - 1 GB DDR3 RAM
> - 8GB eMMC flash (Samsung KLM8G1WEPD-B031)
> - micro SD card slot
> - Gigabit Ethernet (external RTL8211E-VB-CG chip)
> - 802.11 b/g/n WiFi, Bluetooth 4.0 (Ampak AP6212A module)
> - 2x USB 2.0 host ports
>
> Signed-off-by: Antony Antony <antony@phenome.org>
> Tested-by: Antony Antony <antony@phenome.org>
You don't really need the tested-by, we kind of expect you to have
tested it already :)
> ---
> arch/arm/dts/Makefile | 1 +
> arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts | 113 ++++++++++++++++++++++++++++
> configs/nanopi_neo_plus2_defconfig | 21 ++++++
> 3 files changed, 135 insertions(+)
> create mode 100644 arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
> create mode 100644 configs/nanopi_neo_plus2_defconfig
>
> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index fee4680..295a675 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -333,6 +333,7 @@ dtb-$(CONFIG_MACH_SUN8I_V3S) += \
> sun8i-v3s-licheepi-zero.dtb
> dtb-$(CONFIG_MACH_SUN50I_H5) += \
> sun50i-h5-nanopi-neo2.dtb \
> + sun50i-h5-nanopi-neo-plus2.dtb \
> sun50i-h5-orangepi-pc2.dtb \
> sun50i-h5-orangepi-prime.dtb \
> sun50i-h5-orangepi-zero-plus2.dtb
> diff --git a/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
> new file mode 100644
> index 0000000..7d12774
> --- /dev/null
> +++ b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
> @@ -0,0 +1,113 @@
> +/*
> + * Copyright (C) 2017 Antony Antony <antony@phenome.org>
> + * Copyright (c) 2016 ARM Ltd.
> + *
> + * 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 library 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 library 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 "sun50i-h5.dtsi"
> +
> +#include <dt-bindings/gpio/gpio.h>
> +
> +/ {
> + model = "FriendlyARM NanoPi NEO Plus 2";
> + compatible = "friendlyarm,nanopi-neo-plus2", "allwinner,sun50i-h5";
> +
> + aliases {
> + serial0 = &uart0;
> + };
> +
> + chosen {
> + stdout-path = "serial0:115200n8";
> + };
> +
> + memory {
> + reg = <0x40000000 0x40000000>;
> + };
That is going to be automatically added, there's no need for it.
> + reg_vcc3v3: vcc3v3 {
> + compatible = "regulator-fixed";
> + regulator-name = "vcc3v3";
> + regulator-min-microvolt = <3300000>;
> + regulator-max-microvolt = <3300000>;
> + };
> +};
> +
> +&ehci1 {
> + status = "okay";
> +};
> +
> +&mmc0 {
> + compatible = "allwinner,sun50i-h5-mmc",
> + "allwinner,sun50i-a64-mmc",
> + "allwinner,sun5i-a13-mmc";
It's not compatible with the A13.
> + pinctrl-names = "default";
> + pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
> + vmmc-supply = <®_vcc3v3>;
> + bus-width = <4>;
> + cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;
> + cd-inverted;
> + status = "okay";
> +};
> +
> +&mmc2 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&mmc2_8bit_pins>;
> + vmmc-supply = <®_vcc3v3>;
> + bus-width = <8>;
> + non-removable;
> + cap-mmc-hw-reset;
> + status = "okay";
> +};
> +
> +&ohci1 {
> + status = "okay";
> +};
> +
> +&uart0 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&uart0_pins_a>;
> + status = "okay";
> +};
> +
> +&usbphy {
> + status = "okay";
> +};
> diff --git a/configs/nanopi_neo_plus2_defconfig b/configs/nanopi_neo_plus2_defconfig
> new file mode 100644
> index 0000000..ff99213
> --- /dev/null
> +++ b/configs/nanopi_neo_plus2_defconfig
> @@ -0,0 +1,21 @@
> +CONFIG_ARM=y
> +CONFIG_ARCH_SUNXI=y
> +CONFIG_SPL_SPI_FLASH_SUPPORT=y
I'd like to make it more trivial to select this from the boards.
One way would be to select that option from SPL_SPI_SUNXI.
> +CONFIG_MACH_SUN50I_H5=y
> +CONFIG_DRAM_CLK=408
> +CONFIG_DRAM_ZQ=3881977
> +CONFIG_MACPWR="PD6"
> +CONFIG_DEFAULT_DEVICE_TREE="sun50i-h5-nanopi-neo-plus2"
> +# 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_SPL_SPI_SUNXI=y
> +CONFIG_SUN8I_EMAC=y
> +CONFIG_USB_EHCI_HCD=y
> +CONFIG_MMC_SUNXI_SLOT_EXTRA=2
> +CONFIG_SD_BOOT=y
We don't use SD_BOOT.
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/20170922/f31f903d/attachment.sig>
^ permalink raw reply [flat|nested] 33+ messages in thread* [U-Boot] [PATCH v2] sun50i: h5: Add NanoPi Neo Plus2 DT initial support
2017-09-21 15:22 [U-Boot] [PATCH] sun50i: h5: Add NanoPi Neo Plus2 DT initial support Antony Antony
2017-09-22 7:37 ` Maxime Ripard
@ 2017-09-22 13:09 ` Antony Antony
2017-09-22 15:34 ` Maxime Ripard
2017-09-23 17:59 ` [U-Boot] [PATCH v3] " Antony Antony
` (4 subsequent siblings)
6 siblings, 1 reply; 33+ messages in thread
From: Antony Antony @ 2017-09-22 13:09 UTC (permalink / raw)
To: u-boot
Add initial DT for NanoPi NEO Plus2 by FriendlyARM
- Allwinner quad core H5 Cortex A53 with an ARM Mali-450MP GPU
- 1 GB DDR3 RAM
- 8GB eMMC flash (Samsung KLM8G1WEPD-B031)
- micro SD card slot
- Gigabit Ethernet (external RTL8211E-VB-CG chip)
- 802.11 b/g/n WiFi, Bluetooth 4.0 (Ampak AP6212A module)
- 2x USB 2.0 host ports
Signed-off-by: Antony Antony <antony@phenome.org>
---
Changes v1->v2
removed memory {}, compatible ="allwinner,sun5i-a13-mmc"
remove CONFIG_SPL_SPI_FLASH_SUPPORT=y and CONFIG_SPL_SPI_SUNXI=y (no SPI)
remove CONFIG_SD_BOOT=y
---
arch/arm/dts/Makefile | 1 +
arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts | 108 ++++++++++++++++++++++++++++
configs/nanopi_neo_plus2_defconfig | 18 +++++
3 files changed, 127 insertions(+)
create mode 100644 arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
create mode 100644 configs/nanopi_neo_plus2_defconfig
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index fee4680..295a675 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -333,6 +333,7 @@ dtb-$(CONFIG_MACH_SUN8I_V3S) += \
sun8i-v3s-licheepi-zero.dtb
dtb-$(CONFIG_MACH_SUN50I_H5) += \
sun50i-h5-nanopi-neo2.dtb \
+ sun50i-h5-nanopi-neo-plus2.dtb \
sun50i-h5-orangepi-pc2.dtb \
sun50i-h5-orangepi-prime.dtb \
sun50i-h5-orangepi-zero-plus2.dtb
diff --git a/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
new file mode 100644
index 0000000..fce0d6c
--- /dev/null
+++ b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
@@ -0,0 +1,108 @@
+/*
+ * Copyright (C) 2017 Antony Antony <antony@phenome.org>
+ * Copyright (c) 2016 ARM Ltd.
+ *
+ * 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 library 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 library 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 "sun50i-h5.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+ model = "FriendlyARM NanoPi NEO Plus 2";
+ compatible = "friendlyarm,nanopi-neo-plus2", "allwinner,sun50i-h5";
+
+ aliases {
+ serial0 = &uart0;
+ };
+
+ chosen {
+ stdout-path = "serial0:115200n8";
+ };
+
+ reg_vcc3v3: vcc3v3 {
+ compatible = "regulator-fixed";
+ regulator-name = "vcc3v3";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ };
+};
+
+&ehci1 {
+ status = "okay";
+};
+
+&mmc0 {
+ compatible = "allwinner,sun50i-h5-mmc",
+ "allwinner,sun50i-a64-mmc";
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
+ vmmc-supply = <®_vcc3v3>;
+ bus-width = <4>;
+ cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;
+ cd-inverted;
+ status = "okay";
+};
+
+&mmc2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc2_8bit_pins>;
+ vmmc-supply = <®_vcc3v3>;
+ bus-width = <8>;
+ non-removable;
+ cap-mmc-hw-reset;
+ status = "okay";
+};
+
+&ohci1 {
+ status = "okay";
+};
+
+&uart0 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart0_pins_a>;
+ status = "okay";
+};
+
+&usbphy {
+ status = "okay";
+};
diff --git a/configs/nanopi_neo_plus2_defconfig b/configs/nanopi_neo_plus2_defconfig
new file mode 100644
index 0000000..83a8dff
--- /dev/null
+++ b/configs/nanopi_neo_plus2_defconfig
@@ -0,0 +1,18 @@
+CONFIG_ARM=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_MACH_SUN50I_H5=y
+CONFIG_DRAM_CLK=408
+CONFIG_DRAM_ZQ=3881977
+CONFIG_MACPWR="PD6"
+CONFIG_DEFAULT_DEVICE_TREE="sun50i-h5-nanopi-neo-plus2"
+# 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_SUN8I_EMAC=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_MMC_SUNXI_SLOT_EXTRA=2
--
2.7.4
^ permalink raw reply related [flat|nested] 33+ messages in thread* [U-Boot] [PATCH v2] sun50i: h5: Add NanoPi Neo Plus2 DT initial support
2017-09-22 13:09 ` [U-Boot] [PATCH v2] " Antony Antony
@ 2017-09-22 15:34 ` Maxime Ripard
0 siblings, 0 replies; 33+ messages in thread
From: Maxime Ripard @ 2017-09-22 15:34 UTC (permalink / raw)
To: u-boot
Hi Antony,
On Fri, Sep 22, 2017 at 01:09:05PM +0000, Antony Antony wrote:
> +&mmc0 {
> + compatible = "allwinner,sun50i-h5-mmc",
> + "allwinner,sun50i-a64-mmc";
Sorry for missing that out earlier, but why do you need to override
the compatible here?
Is there something missing in the DTSI?
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/20170922/7144f8b0/attachment.sig>
^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot] [PATCH v3] sun50i: h5: Add NanoPi Neo Plus2 DT initial support
2017-09-21 15:22 [U-Boot] [PATCH] sun50i: h5: Add NanoPi Neo Plus2 DT initial support Antony Antony
2017-09-22 7:37 ` Maxime Ripard
2017-09-22 13:09 ` [U-Boot] [PATCH v2] " Antony Antony
@ 2017-09-23 17:59 ` Antony Antony
2017-09-25 11:12 ` Maxime Ripard
2017-10-10 13:35 ` [U-Boot] [PATCH v4 1/2] arm64: sun50i-h5.dtsi : add h5 & a64 compatible to mmc[0-2] Antony Antony
` (3 subsequent siblings)
6 siblings, 1 reply; 33+ messages in thread
From: Antony Antony @ 2017-09-23 17:59 UTC (permalink / raw)
To: u-boot
Add initial DT for NanoPi NEO Plus2 by FriendlyARM
- Allwinner quad core H5 Cortex A53 with an ARM Mali-450MP GPU
- 1 GB DDR3 RAM
- 8GB eMMC flash (Samsung KLM8G1WEPD-B031)
- micro SD card slot
- Gigabit Ethernet (external RTL8211E-VB-CG chip)
- 802.11 b/g/n WiFi, Bluetooth 4.0 (Ampak AP6212A module)
- 2x USB 2.0 host ports
Signed-off-by: Antony Antony <antony@phenome.org>
---
Changes v1->v2
removed memory {}, compatible ="allwinner,sun5i-a13-mmc"
remove CONFIG_SPL_SPI_FLASH_SUPPORT=y and CONFIG_SPL_SPI_SUNXI=y (no SPI)
remove CONFIG_SD_BOOT=y
Changes v2->v3
removed compatible ="allwinner,sun50i-a64-mmc"
---
arch/arm/dts/Makefile | 1 +
arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts | 107 ++++++++++++++++++++++++++++
configs/nanopi_neo_plus2_defconfig | 18 +++++
3 files changed, 126 insertions(+)
create mode 100644 arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
create mode 100644 configs/nanopi_neo_plus2_defconfig
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index fee4680..295a675 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -333,6 +333,7 @@ dtb-$(CONFIG_MACH_SUN8I_V3S) += \
sun8i-v3s-licheepi-zero.dtb
dtb-$(CONFIG_MACH_SUN50I_H5) += \
sun50i-h5-nanopi-neo2.dtb \
+ sun50i-h5-nanopi-neo-plus2.dtb \
sun50i-h5-orangepi-pc2.dtb \
sun50i-h5-orangepi-prime.dtb \
sun50i-h5-orangepi-zero-plus2.dtb
diff --git a/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
new file mode 100644
index 0000000..8ac098e
--- /dev/null
+++ b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2017 Antony Antony <antony@phenome.org>
+ * Copyright (c) 2016 ARM Ltd.
+ *
+ * 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 library 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 library 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 "sun50i-h5.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+ model = "FriendlyARM NanoPi NEO Plus 2";
+ compatible = "friendlyarm,nanopi-neo-plus2", "allwinner,sun50i-h5";
+
+ aliases {
+ serial0 = &uart0;
+ };
+
+ chosen {
+ stdout-path = "serial0:115200n8";
+ };
+
+ reg_vcc3v3: vcc3v3 {
+ compatible = "regulator-fixed";
+ regulator-name = "vcc3v3";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ };
+};
+
+&ehci1 {
+ status = "okay";
+};
+
+&mmc0 {
+ compatible = "allwinner,sun50i-h5-mmc";
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
+ vmmc-supply = <®_vcc3v3>;
+ bus-width = <4>;
+ cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;
+ cd-inverted;
+ status = "okay";
+};
+
+&mmc2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc2_8bit_pins>;
+ vmmc-supply = <®_vcc3v3>;
+ bus-width = <8>;
+ non-removable;
+ cap-mmc-hw-reset;
+ status = "okay";
+};
+
+&ohci1 {
+ status = "okay";
+};
+
+&uart0 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart0_pins_a>;
+ status = "okay";
+};
+
+&usbphy {
+ status = "okay";
+};
diff --git a/configs/nanopi_neo_plus2_defconfig b/configs/nanopi_neo_plus2_defconfig
new file mode 100644
index 0000000..83a8dff
--- /dev/null
+++ b/configs/nanopi_neo_plus2_defconfig
@@ -0,0 +1,18 @@
+CONFIG_ARM=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_MACH_SUN50I_H5=y
+CONFIG_DRAM_CLK=408
+CONFIG_DRAM_ZQ=3881977
+CONFIG_MACPWR="PD6"
+CONFIG_DEFAULT_DEVICE_TREE="sun50i-h5-nanopi-neo-plus2"
+# 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_SUN8I_EMAC=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_MMC_SUNXI_SLOT_EXTRA=2
--
2.7.4
^ permalink raw reply related [flat|nested] 33+ messages in thread* [U-Boot] [PATCH v3] sun50i: h5: Add NanoPi Neo Plus2 DT initial support
2017-09-23 17:59 ` [U-Boot] [PATCH v3] " Antony Antony
@ 2017-09-25 11:12 ` Maxime Ripard
2017-10-01 17:34 ` Antony Antony
0 siblings, 1 reply; 33+ messages in thread
From: Maxime Ripard @ 2017-09-25 11:12 UTC (permalink / raw)
To: u-boot
On Sat, Sep 23, 2017 at 05:59:15PM +0000, Antony Antony wrote:
> Add initial DT for NanoPi NEO Plus2 by FriendlyARM
> - Allwinner quad core H5 Cortex A53 with an ARM Mali-450MP GPU
> - 1 GB DDR3 RAM
> - 8GB eMMC flash (Samsung KLM8G1WEPD-B031)
> - micro SD card slot
> - Gigabit Ethernet (external RTL8211E-VB-CG chip)
> - 802.11 b/g/n WiFi, Bluetooth 4.0 (Ampak AP6212A module)
> - 2x USB 2.0 host ports
>
> Signed-off-by: Antony Antony <antony@phenome.org>
> ---
> Changes v1->v2
> removed memory {}, compatible ="allwinner,sun5i-a13-mmc"
> remove CONFIG_SPL_SPI_FLASH_SUPPORT=y and CONFIG_SPL_SPI_SUNXI=y (no SPI)
> remove CONFIG_SD_BOOT=y
> Changes v2->v3
> removed compatible ="allwinner,sun50i-a64-mmc"
> ---
> arch/arm/dts/Makefile | 1 +
> arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts | 107 ++++++++++++++++++++++++++++
> configs/nanopi_neo_plus2_defconfig | 18 +++++
> 3 files changed, 126 insertions(+)
> create mode 100644 arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
> create mode 100644 configs/nanopi_neo_plus2_defconfig
>
> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index fee4680..295a675 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -333,6 +333,7 @@ dtb-$(CONFIG_MACH_SUN8I_V3S) += \
> sun8i-v3s-licheepi-zero.dtb
> dtb-$(CONFIG_MACH_SUN50I_H5) += \
> sun50i-h5-nanopi-neo2.dtb \
> + sun50i-h5-nanopi-neo-plus2.dtb \
> sun50i-h5-orangepi-pc2.dtb \
> sun50i-h5-orangepi-prime.dtb \
> sun50i-h5-orangepi-zero-plus2.dtb
> diff --git a/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
> new file mode 100644
> index 0000000..8ac098e
> --- /dev/null
> +++ b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
> @@ -0,0 +1,107 @@
> +/*
> + * Copyright (C) 2017 Antony Antony <antony@phenome.org>
> + * Copyright (c) 2016 ARM Ltd.
> + *
> + * 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 library 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 library 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 "sun50i-h5.dtsi"
> +
> +#include <dt-bindings/gpio/gpio.h>
> +
> +/ {
> + model = "FriendlyARM NanoPi NEO Plus 2";
> + compatible = "friendlyarm,nanopi-neo-plus2", "allwinner,sun50i-h5";
> +
> + aliases {
> + serial0 = &uart0;
> + };
> +
> + chosen {
> + stdout-path = "serial0:115200n8";
> + };
> +
> + reg_vcc3v3: vcc3v3 {
> + compatible = "regulator-fixed";
> + regulator-name = "vcc3v3";
> + regulator-min-microvolt = <3300000>;
> + regulator-max-microvolt = <3300000>;
> + };
> +};
> +
> +&ehci1 {
> + status = "okay";
> +};
> +
> +&mmc0 {
> + compatible = "allwinner,sun50i-h5-mmc";
No, you need to keep the a64 one. But I'm still not sure why do you
need to set it here.
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/20170925/c2e99756/attachment.sig>
^ permalink raw reply [flat|nested] 33+ messages in thread* [U-Boot] [PATCH v3] sun50i: h5: Add NanoPi Neo Plus2 DT initial support
2017-09-25 11:12 ` Maxime Ripard
@ 2017-10-01 17:34 ` Antony Antony
2017-10-02 17:18 ` Maxime Ripard
2017-10-03 2:11 ` Chen-Yu Tsai
0 siblings, 2 replies; 33+ messages in thread
From: Antony Antony @ 2017-10-01 17:34 UTC (permalink / raw)
To: u-boot
Hi Maxime,
sorry for the delayed response.
On Mon, Sep 25, 2017 at 01:12:23PM +0200, Maxime Ripard wrote:
> On Sat, Sep 23, 2017 at 05:59:15PM +0000, Antony Antony wrote:
> > Add initial DT for NanoPi NEO Plus2 by FriendlyARM
> > - Allwinner quad core H5 Cortex A53 with an ARM Mali-450MP GPU
> > - 1 GB DDR3 RAM
> > - 8GB eMMC flash (Samsung KLM8G1WEPD-B031)
> > - micro SD card slot
> > - Gigabit Ethernet (external RTL8211E-VB-CG chip)
> > - 802.11 b/g/n WiFi, Bluetooth 4.0 (Ampak AP6212A module)
> > - 2x USB 2.0 host ports
> >
> > Signed-off-by: Antony Antony <antony@phenome.org>
> > ---
> > Changes v1->v2
> > removed memory {}, compatible ="allwinner,sun5i-a13-mmc"
> > remove CONFIG_SPL_SPI_FLASH_SUPPORT=y and CONFIG_SPL_SPI_SUNXI=y (no SPI)
> > remove CONFIG_SD_BOOT=y
> > Changes v2->v3
> > removed compatible ="allwinner,sun50i-a64-mmc"
> > ---
> > arch/arm/dts/Makefile | 1 +
> > arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts | 107 ++++++++++++++++++++++++++++
> > configs/nanopi_neo_plus2_defconfig | 18 +++++
> > 3 files changed, 126 insertions(+)
> > create mode 100644 arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
> > create mode 100644 configs/nanopi_neo_plus2_defconfig
> >
> > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> > index fee4680..295a675 100644
> > --- a/arch/arm/dts/Makefile
> > +++ b/arch/arm/dts/Makefile
> > @@ -333,6 +333,7 @@ dtb-$(CONFIG_MACH_SUN8I_V3S) += \
> > sun8i-v3s-licheepi-zero.dtb
> > dtb-$(CONFIG_MACH_SUN50I_H5) += \
> > sun50i-h5-nanopi-neo2.dtb \
> > + sun50i-h5-nanopi-neo-plus2.dtb \
> > sun50i-h5-orangepi-pc2.dtb \
> > sun50i-h5-orangepi-prime.dtb \
> > sun50i-h5-orangepi-zero-plus2.dtb
> > diff --git a/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
> > new file mode 100644
> > index 0000000..8ac098e
> > --- /dev/null
> > +++ b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
> > @@ -0,0 +1,107 @@
> > +/*
> > + * Copyright (C) 2017 Antony Antony <antony@phenome.org>
> > + * Copyright (c) 2016 ARM Ltd.
> > + *
> > + * 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 library 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 library 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 "sun50i-h5.dtsi"
> > +
> > +#include <dt-bindings/gpio/gpio.h>
> > +
> > +/ {
> > + model = "FriendlyARM NanoPi NEO Plus 2";
> > + compatible = "friendlyarm,nanopi-neo-plus2", "allwinner,sun50i-h5";
> > +
> > + aliases {
> > + serial0 = &uart0;
> > + };
> > +
> > + chosen {
> > + stdout-path = "serial0:115200n8";
> > + };
> > +
> > + reg_vcc3v3: vcc3v3 {
> > + compatible = "regulator-fixed";
> > + regulator-name = "vcc3v3";
> > + regulator-min-microvolt = <3300000>;
> > + regulator-max-microvolt = <3300000>;
> > + };
> > +};
> > +
> > +&ehci1 {
> > + status = "okay";
> > +};
> > +
> > +&mmc0 {
> > + compatible = "allwinner,sun50i-h5-mmc";
>
> No, you need to keep the a64 one. But I'm still not sure why do you
> need to set it here.
>
Antother option is remove the "allwinner,sun50i-h5-mmc"; line. That works
too.
I realzied mmc0 comes from "sun8i-h3.dtsi" which is included in
sun50i-h5.dtsi
sun8i-h3.dtsi has:
mmc0: mmc at 01c0f000 {
compatible = "allwinner,sun7i-a20-mmc",
"allwinner,sun5i-a13-mmc";
If I follow the a64, sun50i-a64.dtsi has mmc0 and it has a different entry.
mmc0: mmc at 1c0f000 {
compatible = "allwinner,sun50i-a64-mmc";
I am a bit confused. What is your opinion?
-antony
^ permalink raw reply [flat|nested] 33+ messages in thread* [U-Boot] [PATCH v3] sun50i: h5: Add NanoPi Neo Plus2 DT initial support
2017-10-01 17:34 ` Antony Antony
@ 2017-10-02 17:18 ` Maxime Ripard
2017-10-03 2:11 ` Chen-Yu Tsai
1 sibling, 0 replies; 33+ messages in thread
From: Maxime Ripard @ 2017-10-02 17:18 UTC (permalink / raw)
To: u-boot
On Sun, Oct 01, 2017 at 05:34:55PM +0000, Antony Antony wrote:
> On Mon, Sep 25, 2017 at 01:12:23PM +0200, Maxime Ripard wrote:
> > On Sat, Sep 23, 2017 at 05:59:15PM +0000, Antony Antony wrote:
> > > Add initial DT for NanoPi NEO Plus2 by FriendlyARM
> > > - Allwinner quad core H5 Cortex A53 with an ARM Mali-450MP GPU
> > > - 1 GB DDR3 RAM
> > > - 8GB eMMC flash (Samsung KLM8G1WEPD-B031)
> > > - micro SD card slot
> > > - Gigabit Ethernet (external RTL8211E-VB-CG chip)
> > > - 802.11 b/g/n WiFi, Bluetooth 4.0 (Ampak AP6212A module)
> > > - 2x USB 2.0 host ports
> > >
> > > Signed-off-by: Antony Antony <antony@phenome.org>
> > > ---
> > > Changes v1->v2
> > > removed memory {}, compatible ="allwinner,sun5i-a13-mmc"
> > > remove CONFIG_SPL_SPI_FLASH_SUPPORT=y and CONFIG_SPL_SPI_SUNXI=y (no SPI)
> > > remove CONFIG_SD_BOOT=y
> > > Changes v2->v3
> > > removed compatible ="allwinner,sun50i-a64-mmc"
> > > ---
> > > arch/arm/dts/Makefile | 1 +
> > > arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts | 107 ++++++++++++++++++++++++++++
> > > configs/nanopi_neo_plus2_defconfig | 18 +++++
> > > 3 files changed, 126 insertions(+)
> > > create mode 100644 arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
> > > create mode 100644 configs/nanopi_neo_plus2_defconfig
> > >
> > > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> > > index fee4680..295a675 100644
> > > --- a/arch/arm/dts/Makefile
> > > +++ b/arch/arm/dts/Makefile
> > > @@ -333,6 +333,7 @@ dtb-$(CONFIG_MACH_SUN8I_V3S) += \
> > > sun8i-v3s-licheepi-zero.dtb
> > > dtb-$(CONFIG_MACH_SUN50I_H5) += \
> > > sun50i-h5-nanopi-neo2.dtb \
> > > + sun50i-h5-nanopi-neo-plus2.dtb \
> > > sun50i-h5-orangepi-pc2.dtb \
> > > sun50i-h5-orangepi-prime.dtb \
> > > sun50i-h5-orangepi-zero-plus2.dtb
> > > diff --git a/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
> > > new file mode 100644
> > > index 0000000..8ac098e
> > > --- /dev/null
> > > +++ b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
> > > @@ -0,0 +1,107 @@
> > > +/*
> > > + * Copyright (C) 2017 Antony Antony <antony@phenome.org>
> > > + * Copyright (c) 2016 ARM Ltd.
> > > + *
> > > + * 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 library 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 library 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 "sun50i-h5.dtsi"
> > > +
> > > +#include <dt-bindings/gpio/gpio.h>
> > > +
> > > +/ {
> > > + model = "FriendlyARM NanoPi NEO Plus 2";
> > > + compatible = "friendlyarm,nanopi-neo-plus2", "allwinner,sun50i-h5";
> > > +
> > > + aliases {
> > > + serial0 = &uart0;
> > > + };
> > > +
> > > + chosen {
> > > + stdout-path = "serial0:115200n8";
> > > + };
> > > +
> > > + reg_vcc3v3: vcc3v3 {
> > > + compatible = "regulator-fixed";
> > > + regulator-name = "vcc3v3";
> > > + regulator-min-microvolt = <3300000>;
> > > + regulator-max-microvolt = <3300000>;
> > > + };
> > > +};
> > > +
> > > +&ehci1 {
> > > + status = "okay";
> > > +};
> > > +
> > > +&mmc0 {
> > > + compatible = "allwinner,sun50i-h5-mmc";
> >
> > No, you need to keep the a64 one. But I'm still not sure why do you
> > need to set it here.
>
> Antother option is remove the "allwinner,sun50i-h5-mmc"; line. That works
> too.
Another option for what?
> I realzied mmc0 comes from "sun8i-h3.dtsi" which is included in
> sun50i-h5.dtsi
>
> sun8i-h3.dtsi has:
> mmc0: mmc at 01c0f000 {
> compatible = "allwinner,sun7i-a20-mmc",
> "allwinner,sun5i-a13-mmc";
>
> If I follow the a64, sun50i-a64.dtsi has mmc0 and it has a different entry.
> mmc0: mmc at 1c0f000 {
> compatible = "allwinner,sun50i-a64-mmc";
>
> I am a bit confused. What is your opinion?
I'm still confused on what the issue is here.
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/20171002/53a7b069/attachment.sig>
^ permalink raw reply [flat|nested] 33+ messages in thread* [U-Boot] [PATCH v3] sun50i: h5: Add NanoPi Neo Plus2 DT initial support
2017-10-01 17:34 ` Antony Antony
2017-10-02 17:18 ` Maxime Ripard
@ 2017-10-03 2:11 ` Chen-Yu Tsai
2017-10-06 9:11 ` Antony Antony
1 sibling, 1 reply; 33+ messages in thread
From: Chen-Yu Tsai @ 2017-10-03 2:11 UTC (permalink / raw)
To: u-boot
On Mon, Oct 2, 2017 at 1:34 AM, Antony Antony <antony@phenome.org> wrote:
> Hi Maxime,
>
> sorry for the delayed response.
>
> On Mon, Sep 25, 2017 at 01:12:23PM +0200, Maxime Ripard wrote:
>> On Sat, Sep 23, 2017 at 05:59:15PM +0000, Antony Antony wrote:
>> > Add initial DT for NanoPi NEO Plus2 by FriendlyARM
>> > - Allwinner quad core H5 Cortex A53 with an ARM Mali-450MP GPU
>> > - 1 GB DDR3 RAM
>> > - 8GB eMMC flash (Samsung KLM8G1WEPD-B031)
>> > - micro SD card slot
>> > - Gigabit Ethernet (external RTL8211E-VB-CG chip)
>> > - 802.11 b/g/n WiFi, Bluetooth 4.0 (Ampak AP6212A module)
>> > - 2x USB 2.0 host ports
>> >
>> > Signed-off-by: Antony Antony <antony@phenome.org>
>> > ---
>> > Changes v1->v2
>> > removed memory {}, compatible ="allwinner,sun5i-a13-mmc"
>> > remove CONFIG_SPL_SPI_FLASH_SUPPORT=y and CONFIG_SPL_SPI_SUNXI=y (no SPI)
>> > remove CONFIG_SD_BOOT=y
>> > Changes v2->v3
>> > removed compatible ="allwinner,sun50i-a64-mmc"
>> > ---
>> > arch/arm/dts/Makefile | 1 +
>> > arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts | 107 ++++++++++++++++++++++++++++
>> > configs/nanopi_neo_plus2_defconfig | 18 +++++
>> > 3 files changed, 126 insertions(+)
>> > create mode 100644 arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
>> > create mode 100644 configs/nanopi_neo_plus2_defconfig
>> >
>> > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
>> > index fee4680..295a675 100644
>> > --- a/arch/arm/dts/Makefile
>> > +++ b/arch/arm/dts/Makefile
>> > @@ -333,6 +333,7 @@ dtb-$(CONFIG_MACH_SUN8I_V3S) += \
>> > sun8i-v3s-licheepi-zero.dtb
>> > dtb-$(CONFIG_MACH_SUN50I_H5) += \
>> > sun50i-h5-nanopi-neo2.dtb \
>> > + sun50i-h5-nanopi-neo-plus2.dtb \
>> > sun50i-h5-orangepi-pc2.dtb \
>> > sun50i-h5-orangepi-prime.dtb \
>> > sun50i-h5-orangepi-zero-plus2.dtb
>> > diff --git a/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
>> > new file mode 100644
>> > index 0000000..8ac098e
>> > --- /dev/null
>> > +++ b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
>> > @@ -0,0 +1,107 @@
>> > +/*
>> > + * Copyright (C) 2017 Antony Antony <antony@phenome.org>
>> > + * Copyright (c) 2016 ARM Ltd.
>> > + *
>> > + * 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 library 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 library 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 "sun50i-h5.dtsi"
>> > +
>> > +#include <dt-bindings/gpio/gpio.h>
>> > +
>> > +/ {
>> > + model = "FriendlyARM NanoPi NEO Plus 2";
>> > + compatible = "friendlyarm,nanopi-neo-plus2", "allwinner,sun50i-h5";
>> > +
>> > + aliases {
>> > + serial0 = &uart0;
>> > + };
>> > +
>> > + chosen {
>> > + stdout-path = "serial0:115200n8";
>> > + };
>> > +
>> > + reg_vcc3v3: vcc3v3 {
>> > + compatible = "regulator-fixed";
>> > + regulator-name = "vcc3v3";
>> > + regulator-min-microvolt = <3300000>;
>> > + regulator-max-microvolt = <3300000>;
>> > + };
>> > +};
>> > +
>> > +&ehci1 {
>> > + status = "okay";
>> > +};
>> > +
>> > +&mmc0 {
>> > + compatible = "allwinner,sun50i-h5-mmc";
>>
>> No, you need to keep the a64 one. But I'm still not sure why do you
>> need to set it here.
>>
>
> Antother option is remove the "allwinner,sun50i-h5-mmc"; line. That works
> too.
Maxime's point is that you should do compatible string overrides for
in the .dtsi file for any hardware block within the SoC itself.
>
> I realzied mmc0 comes from "sun8i-h3.dtsi" which is included in
> sun50i-h5.dtsi
>
> sun8i-h3.dtsi has:
> mmc0: mmc at 01c0f000 {
> compatible = "allwinner,sun7i-a20-mmc",
> "allwinner,sun5i-a13-mmc";
>
> If I follow the a64, sun50i-a64.dtsi has mmc0 and it has a different entry.
> mmc0: mmc at 1c0f000 {
> compatible = "allwinner,sun50i-a64-mmc";
>
> I am a bit confused. What is your opinion?
These denote the variant of the mmc controller in the SoC. The H5 has
one that is compatible with the A64's, so you should have a soc specific
compatible string, followed by a fallback one that it is compatible with.
So it should be:
compatible = "allwinner,sun50i-h5-mmc", "allwinner,sun50i-a64-mmc";
in the H5 .dtsi file.
Please try to read up on device trees in general, and understand the
meaning behind all the descriptions and choices, not just blindly
pick stuff from different files.
ChenYu
^ permalink raw reply [flat|nested] 33+ messages in thread* [U-Boot] [PATCH v3] sun50i: h5: Add NanoPi Neo Plus2 DT initial support
2017-10-03 2:11 ` Chen-Yu Tsai
@ 2017-10-06 9:11 ` Antony Antony
2017-10-09 7:22 ` Maxime Ripard
0 siblings, 1 reply; 33+ messages in thread
From: Antony Antony @ 2017-10-06 9:11 UTC (permalink / raw)
To: u-boot
Hi
Thanks Chen-Yu and Maxime.
On Tue, Oct 03, 2017 at 10:11:00AM +0800, Chen-Yu Tsai wrote:
> On Mon, Oct 2, 2017 at 1:34 AM, Antony Antony <antony@phenome.org> wrote:
> > Hi Maxime,
> >
> > sorry for the delayed response.
> >
> > On Mon, Sep 25, 2017 at 01:12:23PM +0200, Maxime Ripard wrote:
> >> On Sat, Sep 23, 2017 at 05:59:15PM +0000, Antony Antony wrote:
> >> > Add initial DT for NanoPi NEO Plus2 by FriendlyARM
> >> > - Allwinner quad core H5 Cortex A53 with an ARM Mali-450MP GPU
> >> > - 1 GB DDR3 RAM
> >> > - 8GB eMMC flash (Samsung KLM8G1WEPD-B031)
> >> > - micro SD card slot
> >> > - Gigabit Ethernet (external RTL8211E-VB-CG chip)
> >> > - 802.11 b/g/n WiFi, Bluetooth 4.0 (Ampak AP6212A module)
> >> > - 2x USB 2.0 host ports
> >> >
> >> > Signed-off-by: Antony Antony <antony@phenome.org>
> >> > ---
> >> > Changes v1->v2
> >> > removed memory {}, compatible ="allwinner,sun5i-a13-mmc"
> >> > remove CONFIG_SPL_SPI_FLASH_SUPPORT=y and CONFIG_SPL_SPI_SUNXI=y (no SPI)
> >> > remove CONFIG_SD_BOOT=y
> >> > Changes v2->v3
> >> > removed compatible ="allwinner,sun50i-a64-mmc"
> >> > ---
> >> > arch/arm/dts/Makefile | 1 +
> >> > arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts | 107 ++++++++++++++++++++++++++++
> >> > configs/nanopi_neo_plus2_defconfig | 18 +++++
> >> > 3 files changed, 126 insertions(+)
> >> > create mode 100644 arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
> >> > create mode 100644 configs/nanopi_neo_plus2_defconfig
> >> >
> >> > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> >> > index fee4680..295a675 100644
> >> > --- a/arch/arm/dts/Makefile
> >> > +++ b/arch/arm/dts/Makefile
> >> > @@ -333,6 +333,7 @@ dtb-$(CONFIG_MACH_SUN8I_V3S) += \
> >> > sun8i-v3s-licheepi-zero.dtb
> >> > dtb-$(CONFIG_MACH_SUN50I_H5) += \
> >> > sun50i-h5-nanopi-neo2.dtb \
> >> > + sun50i-h5-nanopi-neo-plus2.dtb \
> >> > sun50i-h5-orangepi-pc2.dtb \
> >> > sun50i-h5-orangepi-prime.dtb \
> >> > sun50i-h5-orangepi-zero-plus2.dtb
> >> > diff --git a/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
> >> > new file mode 100644
> >> > index 0000000..8ac098e
> >> > --- /dev/null
> >> > +++ b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
> >> > @@ -0,0 +1,107 @@
> >> > +/*
> >> > + * Copyright (C) 2017 Antony Antony <antony@phenome.org>
> >> > + * Copyright (c) 2016 ARM Ltd.
> >> > + *
> >> > + * 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 library 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 library 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 "sun50i-h5.dtsi"
> >> > +
> >> > +#include <dt-bindings/gpio/gpio.h>
> >> > +
> >> > +/ {
> >> > + model = "FriendlyARM NanoPi NEO Plus 2";
> >> > + compatible = "friendlyarm,nanopi-neo-plus2", "allwinner,sun50i-h5";
> >> > +
> >> > + aliases {
> >> > + serial0 = &uart0;
> >> > + };
> >> > +
> >> > + chosen {
> >> > + stdout-path = "serial0:115200n8";
> >> > + };
> >> > +
> >> > + reg_vcc3v3: vcc3v3 {
> >> > + compatible = "regulator-fixed";
> >> > + regulator-name = "vcc3v3";
> >> > + regulator-min-microvolt = <3300000>;
> >> > + regulator-max-microvolt = <3300000>;
> >> > + };
> >> > +};
> >> > +
> >> > +&ehci1 {
> >> > + status = "okay";
> >> > +};
> >> > +
> >> > +&mmc0 {
> >> > + compatible = "allwinner,sun50i-h5-mmc";
> >>
> >> No, you need to keep the a64 one. But I'm still not sure why do you
> >> need to set it here.
> >>
> >
> > Antother option is remove the "allwinner,sun50i-h5-mmc"; line. That works
> > too.
>
> Maxime's point is that you should do compatible string overrides for
> in the .dtsi file for any hardware block within the SoC itself.
>
> >
> > I realzied mmc0 comes from "sun8i-h3.dtsi" which is included in
> > sun50i-h5.dtsi
> >
> > sun8i-h3.dtsi has:
> > mmc0: mmc at 01c0f000 {
> > compatible = "allwinner,sun7i-a20-mmc",
> > "allwinner,sun5i-a13-mmc";
> >
> > If I follow the a64, sun50i-a64.dtsi has mmc0 and it has a different entry.
> > mmc0: mmc at 1c0f000 {
> > compatible = "allwinner,sun50i-a64-mmc";
> >
> > I am a bit confused. What is your opinion?
>
> These denote the variant of the mmc controller in the SoC. The H5 has
> one that is compatible with the A64's, so you should have a soc specific
> compatible string, followed by a fallback one that it is compatible with.
> So it should be:
>
> compatible = "allwinner,sun50i-h5-mmc", "allwinner,sun50i-a64-mmc";
>
> in the H5 .dtsi file.
I notice there two solutions.
First, a board specific dts with the following compatible line.
&mmc0 {
compatible = "allwinner,sun50i-h5-mmc", "allwinner,sun50i-a64-mmc";
This is my v2 https://patchwork.ozlabs.org/patch/817502/
Second solution, send a v4 without the compatible line and a new patch to
fix sun50i-h5.dtsi. The New patch will add a compatible.
&mmc0 {
compatible = "allwinner,sun50i-h5-mmc", "allwinner,sun50i-a64-mmc";
}
Please advise.
regards,
-antony
^ permalink raw reply [flat|nested] 33+ messages in thread* [U-Boot] [PATCH v3] sun50i: h5: Add NanoPi Neo Plus2 DT initial support
2017-10-06 9:11 ` Antony Antony
@ 2017-10-09 7:22 ` Maxime Ripard
2017-10-09 7:31 ` Antony Antony
0 siblings, 1 reply; 33+ messages in thread
From: Maxime Ripard @ 2017-10-09 7:22 UTC (permalink / raw)
To: u-boot
On Fri, Oct 06, 2017 at 09:11:22AM +0000, Antony Antony wrote:
> Hi
>
> Thanks Chen-Yu and Maxime.
>
> On Tue, Oct 03, 2017 at 10:11:00AM +0800, Chen-Yu Tsai wrote:
> > On Mon, Oct 2, 2017 at 1:34 AM, Antony Antony <antony@phenome.org> wrote:
> > > Hi Maxime,
> > >
> > > sorry for the delayed response.
> > >
> > > On Mon, Sep 25, 2017 at 01:12:23PM +0200, Maxime Ripard wrote:
> > >> On Sat, Sep 23, 2017 at 05:59:15PM +0000, Antony Antony wrote:
> > >> > Add initial DT for NanoPi NEO Plus2 by FriendlyARM
> > >> > - Allwinner quad core H5 Cortex A53 with an ARM Mali-450MP GPU
> > >> > - 1 GB DDR3 RAM
> > >> > - 8GB eMMC flash (Samsung KLM8G1WEPD-B031)
> > >> > - micro SD card slot
> > >> > - Gigabit Ethernet (external RTL8211E-VB-CG chip)
> > >> > - 802.11 b/g/n WiFi, Bluetooth 4.0 (Ampak AP6212A module)
> > >> > - 2x USB 2.0 host ports
> > >> >
> > >> > Signed-off-by: Antony Antony <antony@phenome.org>
> > >> > ---
> > >> > Changes v1->v2
> > >> > removed memory {}, compatible ="allwinner,sun5i-a13-mmc"
> > >> > remove CONFIG_SPL_SPI_FLASH_SUPPORT=y and CONFIG_SPL_SPI_SUNXI=y (no SPI)
> > >> > remove CONFIG_SD_BOOT=y
> > >> > Changes v2->v3
> > >> > removed compatible ="allwinner,sun50i-a64-mmc"
> > >> > ---
> > >> > arch/arm/dts/Makefile | 1 +
> > >> > arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts | 107 ++++++++++++++++++++++++++++
> > >> > configs/nanopi_neo_plus2_defconfig | 18 +++++
> > >> > 3 files changed, 126 insertions(+)
> > >> > create mode 100644 arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
> > >> > create mode 100644 configs/nanopi_neo_plus2_defconfig
> > >> >
> > >> > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> > >> > index fee4680..295a675 100644
> > >> > --- a/arch/arm/dts/Makefile
> > >> > +++ b/arch/arm/dts/Makefile
> > >> > @@ -333,6 +333,7 @@ dtb-$(CONFIG_MACH_SUN8I_V3S) += \
> > >> > sun8i-v3s-licheepi-zero.dtb
> > >> > dtb-$(CONFIG_MACH_SUN50I_H5) += \
> > >> > sun50i-h5-nanopi-neo2.dtb \
> > >> > + sun50i-h5-nanopi-neo-plus2.dtb \
> > >> > sun50i-h5-orangepi-pc2.dtb \
> > >> > sun50i-h5-orangepi-prime.dtb \
> > >> > sun50i-h5-orangepi-zero-plus2.dtb
> > >> > diff --git a/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
> > >> > new file mode 100644
> > >> > index 0000000..8ac098e
> > >> > --- /dev/null
> > >> > +++ b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
> > >> > @@ -0,0 +1,107 @@
> > >> > +/*
> > >> > + * Copyright (C) 2017 Antony Antony <antony@phenome.org>
> > >> > + * Copyright (c) 2016 ARM Ltd.
> > >> > + *
> > >> > + * 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 library 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 library 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 "sun50i-h5.dtsi"
> > >> > +
> > >> > +#include <dt-bindings/gpio/gpio.h>
> > >> > +
> > >> > +/ {
> > >> > + model = "FriendlyARM NanoPi NEO Plus 2";
> > >> > + compatible = "friendlyarm,nanopi-neo-plus2", "allwinner,sun50i-h5";
> > >> > +
> > >> > + aliases {
> > >> > + serial0 = &uart0;
> > >> > + };
> > >> > +
> > >> > + chosen {
> > >> > + stdout-path = "serial0:115200n8";
> > >> > + };
> > >> > +
> > >> > + reg_vcc3v3: vcc3v3 {
> > >> > + compatible = "regulator-fixed";
> > >> > + regulator-name = "vcc3v3";
> > >> > + regulator-min-microvolt = <3300000>;
> > >> > + regulator-max-microvolt = <3300000>;
> > >> > + };
> > >> > +};
> > >> > +
> > >> > +&ehci1 {
> > >> > + status = "okay";
> > >> > +};
> > >> > +
> > >> > +&mmc0 {
> > >> > + compatible = "allwinner,sun50i-h5-mmc";
> > >>
> > >> No, you need to keep the a64 one. But I'm still not sure why do you
> > >> need to set it here.
> > >>
> > >
> > > Antother option is remove the "allwinner,sun50i-h5-mmc"; line. That works
> > > too.
> >
> > Maxime's point is that you should do compatible string overrides for
> > in the .dtsi file for any hardware block within the SoC itself.
> >
> > >
> > > I realzied mmc0 comes from "sun8i-h3.dtsi" which is included in
> > > sun50i-h5.dtsi
> > >
> > > sun8i-h3.dtsi has:
> > > mmc0: mmc at 01c0f000 {
> > > compatible = "allwinner,sun7i-a20-mmc",
> > > "allwinner,sun5i-a13-mmc";
> > >
> > > If I follow the a64, sun50i-a64.dtsi has mmc0 and it has a different entry.
> > > mmc0: mmc at 1c0f000 {
> > > compatible = "allwinner,sun50i-a64-mmc";
> > >
> > > I am a bit confused. What is your opinion?
> >
> > These denote the variant of the mmc controller in the SoC. The H5 has
> > one that is compatible with the A64's, so you should have a soc specific
> > compatible string, followed by a fallback one that it is compatible with.
> > So it should be:
> >
> > compatible = "allwinner,sun50i-h5-mmc", "allwinner,sun50i-a64-mmc";
> >
> > in the H5 .dtsi file.
>
> I notice there two solutions.
>
> First, a board specific dts with the following compatible line.
> &mmc0 {
> compatible = "allwinner,sun50i-h5-mmc", "allwinner,sun50i-a64-mmc";
>
> This is my v2 https://patchwork.ozlabs.org/patch/817502/
>
> Second solution, send a v4 without the compatible line and a new patch to
> fix sun50i-h5.dtsi. The New patch will add a compatible.
>
> &mmc0 {
> compatible = "allwinner,sun50i-h5-mmc", "allwinner,sun50i-a64-mmc";
> }
Still not sure what the issue you're trying to solve, but in general
the second one is preferred.
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/20171009/0fc47a5d/attachment-0001.sig>
^ permalink raw reply [flat|nested] 33+ messages in thread* [U-Boot] [PATCH v3] sun50i: h5: Add NanoPi Neo Plus2 DT initial support
2017-10-09 7:22 ` Maxime Ripard
@ 2017-10-09 7:31 ` Antony Antony
2017-10-09 21:09 ` Maxime Ripard
0 siblings, 1 reply; 33+ messages in thread
From: Antony Antony @ 2017-10-09 7:31 UTC (permalink / raw)
To: u-boot
On Mon, Oct 09, 2017 at 09:22:03AM +0200, Maxime Ripard wrote:
> On Fri, Oct 06, 2017 at 09:11:22AM +0000, Antony Antony wrote:
> > Hi
> >
> > Thanks Chen-Yu and Maxime.
> >
> > On Tue, Oct 03, 2017 at 10:11:00AM +0800, Chen-Yu Tsai wrote:
> > > On Mon, Oct 2, 2017 at 1:34 AM, Antony Antony <antony@phenome.org> wrote:
> > > > Hi Maxime,
> > > >
> > > > sorry for the delayed response.
> > > >
> > > > On Mon, Sep 25, 2017 at 01:12:23PM +0200, Maxime Ripard wrote:
> > > >> On Sat, Sep 23, 2017 at 05:59:15PM +0000, Antony Antony wrote:
> > > >> > Add initial DT for NanoPi NEO Plus2 by FriendlyARM
> > > >> > - Allwinner quad core H5 Cortex A53 with an ARM Mali-450MP GPU
> > > >> > - 1 GB DDR3 RAM
> > > >> > - 8GB eMMC flash (Samsung KLM8G1WEPD-B031)
> > > >> > - micro SD card slot
> > > >> > - Gigabit Ethernet (external RTL8211E-VB-CG chip)
> > > >> > - 802.11 b/g/n WiFi, Bluetooth 4.0 (Ampak AP6212A module)
> > > >> > - 2x USB 2.0 host ports
> > > >> >
> > > >> > Signed-off-by: Antony Antony <antony@phenome.org>
> > > >> > ---
> > > >> > Changes v1->v2
> > > >> > removed memory {}, compatible ="allwinner,sun5i-a13-mmc"
> > > >> > remove CONFIG_SPL_SPI_FLASH_SUPPORT=y and CONFIG_SPL_SPI_SUNXI=y (no SPI)
> > > >> > remove CONFIG_SD_BOOT=y
> > > >> > Changes v2->v3
> > > >> > removed compatible ="allwinner,sun50i-a64-mmc"
> > > >> > ---
> > > >> > arch/arm/dts/Makefile | 1 +
> > > >> > arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts | 107 ++++++++++++++++++++++++++++
> > > >> > configs/nanopi_neo_plus2_defconfig | 18 +++++
> > > >> > 3 files changed, 126 insertions(+)
> > > >> > create mode 100644 arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
> > > >> > create mode 100644 configs/nanopi_neo_plus2_defconfig
> > > >> >
> > > >> > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> > > >> > index fee4680..295a675 100644
> > > >> > --- a/arch/arm/dts/Makefile
> > > >> > +++ b/arch/arm/dts/Makefile
> > > >> > @@ -333,6 +333,7 @@ dtb-$(CONFIG_MACH_SUN8I_V3S) += \
> > > >> > sun8i-v3s-licheepi-zero.dtb
> > > >> > dtb-$(CONFIG_MACH_SUN50I_H5) += \
> > > >> > sun50i-h5-nanopi-neo2.dtb \
> > > >> > + sun50i-h5-nanopi-neo-plus2.dtb \
> > > >> > sun50i-h5-orangepi-pc2.dtb \
> > > >> > sun50i-h5-orangepi-prime.dtb \
> > > >> > sun50i-h5-orangepi-zero-plus2.dtb
> > > >> > diff --git a/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
> > > >> > new file mode 100644
> > > >> > index 0000000..8ac098e
> > > >> > --- /dev/null
> > > >> > +++ b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
> > > >> > @@ -0,0 +1,107 @@
> > > >> > +/*
> > > >> > + * Copyright (C) 2017 Antony Antony <antony@phenome.org>
> > > >> > + * Copyright (c) 2016 ARM Ltd.
> > > >> > + *
> > > >> > + * 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 library 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 library 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 "sun50i-h5.dtsi"
> > > >> > +
> > > >> > +#include <dt-bindings/gpio/gpio.h>
> > > >> > +
> > > >> > +/ {
> > > >> > + model = "FriendlyARM NanoPi NEO Plus 2";
> > > >> > + compatible = "friendlyarm,nanopi-neo-plus2", "allwinner,sun50i-h5";
> > > >> > +
> > > >> > + aliases {
> > > >> > + serial0 = &uart0;
> > > >> > + };
> > > >> > +
> > > >> > + chosen {
> > > >> > + stdout-path = "serial0:115200n8";
> > > >> > + };
> > > >> > +
> > > >> > + reg_vcc3v3: vcc3v3 {
> > > >> > + compatible = "regulator-fixed";
> > > >> > + regulator-name = "vcc3v3";
> > > >> > + regulator-min-microvolt = <3300000>;
> > > >> > + regulator-max-microvolt = <3300000>;
> > > >> > + };
> > > >> > +};
> > > >> > +
> > > >> > +&ehci1 {
> > > >> > + status = "okay";
> > > >> > +};
> > > >> > +
> > > >> > +&mmc0 {
> > > >> > + compatible = "allwinner,sun50i-h5-mmc";
> > > >>
> > > >> No, you need to keep the a64 one. But I'm still not sure why do you
> > > >> need to set it here.
> > > >>
> > > >
> > > > Antother option is remove the "allwinner,sun50i-h5-mmc"; line. That works
> > > > too.
> > >
> > > Maxime's point is that you should do compatible string overrides for
> > > in the .dtsi file for any hardware block within the SoC itself.
> > >
> > > >
> > > > I realzied mmc0 comes from "sun8i-h3.dtsi" which is included in
> > > > sun50i-h5.dtsi
> > > >
> > > > sun8i-h3.dtsi has:
> > > > mmc0: mmc at 01c0f000 {
> > > > compatible = "allwinner,sun7i-a20-mmc",
> > > > "allwinner,sun5i-a13-mmc";
> > > >
> > > > If I follow the a64, sun50i-a64.dtsi has mmc0 and it has a different entry.
> > > > mmc0: mmc at 1c0f000 {
> > > > compatible = "allwinner,sun50i-a64-mmc";
> > > >
> > > > I am a bit confused. What is your opinion?
> > >
> > > These denote the variant of the mmc controller in the SoC. The H5 has
> > > one that is compatible with the A64's, so you should have a soc specific
> > > compatible string, followed by a fallback one that it is compatible with.
> > > So it should be:
> > >
> > > compatible = "allwinner,sun50i-h5-mmc", "allwinner,sun50i-a64-mmc";
> > >
> > > in the H5 .dtsi file.
> >
> > I notice there two solutions.
> >
> > First, a board specific dts with the following compatible line.
> > &mmc0 {
> > compatible = "allwinner,sun50i-h5-mmc", "allwinner,sun50i-a64-mmc";
> >
> > This is my v2 https://patchwork.ozlabs.org/patch/817502/
> >
> > Second solution, send a v4 without the compatible line and a new patch to
> > fix sun50i-h5.dtsi. The New patch will add a compatible.
> >
> > &mmc0 {
> > compatible = "allwinner,sun50i-h5-mmc", "allwinner,sun50i-a64-mmc";
> > }
>
> Still not sure what the issue you're trying to solve, but in general
> the second one is preferred.
thanks.
Would you be happy to apply the v2? If yes, there is nothing more to solve.
https://patchwork.ozlabs.org/patch/817502
I started exploring more options after you comment to v2.
-antony
^ permalink raw reply [flat|nested] 33+ messages in thread* [U-Boot] [PATCH v3] sun50i: h5: Add NanoPi Neo Plus2 DT initial support
2017-10-09 7:31 ` Antony Antony
@ 2017-10-09 21:09 ` Maxime Ripard
0 siblings, 0 replies; 33+ messages in thread
From: Maxime Ripard @ 2017-10-09 21:09 UTC (permalink / raw)
To: u-boot
On Mon, Oct 09, 2017 at 07:31:37AM +0000, Antony Antony wrote:
> On Mon, Oct 09, 2017 at 09:22:03AM +0200, Maxime Ripard wrote:
> > On Fri, Oct 06, 2017 at 09:11:22AM +0000, Antony Antony wrote:
> > > Hi
> > >
> > > Thanks Chen-Yu and Maxime.
> > >
> > > On Tue, Oct 03, 2017 at 10:11:00AM +0800, Chen-Yu Tsai wrote:
> > > > On Mon, Oct 2, 2017 at 1:34 AM, Antony Antony <antony@phenome.org> wrote:
> > > > > Hi Maxime,
> > > > >
> > > > > sorry for the delayed response.
> > > > >
> > > > > On Mon, Sep 25, 2017 at 01:12:23PM +0200, Maxime Ripard wrote:
> > > > >> On Sat, Sep 23, 2017 at 05:59:15PM +0000, Antony Antony wrote:
> > > > >> > Add initial DT for NanoPi NEO Plus2 by FriendlyARM
> > > > >> > - Allwinner quad core H5 Cortex A53 with an ARM Mali-450MP GPU
> > > > >> > - 1 GB DDR3 RAM
> > > > >> > - 8GB eMMC flash (Samsung KLM8G1WEPD-B031)
> > > > >> > - micro SD card slot
> > > > >> > - Gigabit Ethernet (external RTL8211E-VB-CG chip)
> > > > >> > - 802.11 b/g/n WiFi, Bluetooth 4.0 (Ampak AP6212A module)
> > > > >> > - 2x USB 2.0 host ports
> > > > >> >
> > > > >> > Signed-off-by: Antony Antony <antony@phenome.org>
> > > > >> > ---
> > > > >> > Changes v1->v2
> > > > >> > removed memory {}, compatible ="allwinner,sun5i-a13-mmc"
> > > > >> > remove CONFIG_SPL_SPI_FLASH_SUPPORT=y and CONFIG_SPL_SPI_SUNXI=y (no SPI)
> > > > >> > remove CONFIG_SD_BOOT=y
> > > > >> > Changes v2->v3
> > > > >> > removed compatible ="allwinner,sun50i-a64-mmc"
> > > > >> > ---
> > > > >> > arch/arm/dts/Makefile | 1 +
> > > > >> > arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts | 107 ++++++++++++++++++++++++++++
> > > > >> > configs/nanopi_neo_plus2_defconfig | 18 +++++
> > > > >> > 3 files changed, 126 insertions(+)
> > > > >> > create mode 100644 arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
> > > > >> > create mode 100644 configs/nanopi_neo_plus2_defconfig
> > > > >> >
> > > > >> > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> > > > >> > index fee4680..295a675 100644
> > > > >> > --- a/arch/arm/dts/Makefile
> > > > >> > +++ b/arch/arm/dts/Makefile
> > > > >> > @@ -333,6 +333,7 @@ dtb-$(CONFIG_MACH_SUN8I_V3S) += \
> > > > >> > sun8i-v3s-licheepi-zero.dtb
> > > > >> > dtb-$(CONFIG_MACH_SUN50I_H5) += \
> > > > >> > sun50i-h5-nanopi-neo2.dtb \
> > > > >> > + sun50i-h5-nanopi-neo-plus2.dtb \
> > > > >> > sun50i-h5-orangepi-pc2.dtb \
> > > > >> > sun50i-h5-orangepi-prime.dtb \
> > > > >> > sun50i-h5-orangepi-zero-plus2.dtb
> > > > >> > diff --git a/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
> > > > >> > new file mode 100644
> > > > >> > index 0000000..8ac098e
> > > > >> > --- /dev/null
> > > > >> > +++ b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
> > > > >> > @@ -0,0 +1,107 @@
> > > > >> > +/*
> > > > >> > + * Copyright (C) 2017 Antony Antony <antony@phenome.org>
> > > > >> > + * Copyright (c) 2016 ARM Ltd.
> > > > >> > + *
> > > > >> > + * 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 library 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 library 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 "sun50i-h5.dtsi"
> > > > >> > +
> > > > >> > +#include <dt-bindings/gpio/gpio.h>
> > > > >> > +
> > > > >> > +/ {
> > > > >> > + model = "FriendlyARM NanoPi NEO Plus 2";
> > > > >> > + compatible = "friendlyarm,nanopi-neo-plus2", "allwinner,sun50i-h5";
> > > > >> > +
> > > > >> > + aliases {
> > > > >> > + serial0 = &uart0;
> > > > >> > + };
> > > > >> > +
> > > > >> > + chosen {
> > > > >> > + stdout-path = "serial0:115200n8";
> > > > >> > + };
> > > > >> > +
> > > > >> > + reg_vcc3v3: vcc3v3 {
> > > > >> > + compatible = "regulator-fixed";
> > > > >> > + regulator-name = "vcc3v3";
> > > > >> > + regulator-min-microvolt = <3300000>;
> > > > >> > + regulator-max-microvolt = <3300000>;
> > > > >> > + };
> > > > >> > +};
> > > > >> > +
> > > > >> > +&ehci1 {
> > > > >> > + status = "okay";
> > > > >> > +};
> > > > >> > +
> > > > >> > +&mmc0 {
> > > > >> > + compatible = "allwinner,sun50i-h5-mmc";
> > > > >>
> > > > >> No, you need to keep the a64 one. But I'm still not sure why do you
> > > > >> need to set it here.
> > > > >>
> > > > >
> > > > > Antother option is remove the "allwinner,sun50i-h5-mmc"; line. That works
> > > > > too.
> > > >
> > > > Maxime's point is that you should do compatible string overrides for
> > > > in the .dtsi file for any hardware block within the SoC itself.
> > > >
> > > > >
> > > > > I realzied mmc0 comes from "sun8i-h3.dtsi" which is included in
> > > > > sun50i-h5.dtsi
> > > > >
> > > > > sun8i-h3.dtsi has:
> > > > > mmc0: mmc at 01c0f000 {
> > > > > compatible = "allwinner,sun7i-a20-mmc",
> > > > > "allwinner,sun5i-a13-mmc";
> > > > >
> > > > > If I follow the a64, sun50i-a64.dtsi has mmc0 and it has a different entry.
> > > > > mmc0: mmc at 1c0f000 {
> > > > > compatible = "allwinner,sun50i-a64-mmc";
> > > > >
> > > > > I am a bit confused. What is your opinion?
> > > >
> > > > These denote the variant of the mmc controller in the SoC. The H5 has
> > > > one that is compatible with the A64's, so you should have a soc specific
> > > > compatible string, followed by a fallback one that it is compatible with.
> > > > So it should be:
> > > >
> > > > compatible = "allwinner,sun50i-h5-mmc", "allwinner,sun50i-a64-mmc";
> > > >
> > > > in the H5 .dtsi file.
> > >
> > > I notice there two solutions.
> > >
> > > First, a board specific dts with the following compatible line.
> > > &mmc0 {
> > > compatible = "allwinner,sun50i-h5-mmc", "allwinner,sun50i-a64-mmc";
> > >
> > > This is my v2 https://patchwork.ozlabs.org/patch/817502/
> > >
> > > Second solution, send a v4 without the compatible line and a new patch to
> > > fix sun50i-h5.dtsi. The New patch will add a compatible.
> > >
> > > &mmc0 {
> > > compatible = "allwinner,sun50i-h5-mmc", "allwinner,sun50i-a64-mmc";
> > > }
> >
> > Still not sure what the issue you're trying to solve, but in general
> > the second one is preferred.
>
> thanks.
>
> Would you be happy to apply the v2? If yes, there is nothing more to solve.
>
> https://patchwork.ozlabs.org/patch/817502
>
> I started exploring more options after you comment to v2.
V2 isn't acceptable, you shouldn't have any compatible in the DT in
the first place, but in the DTSI, like you suggested.
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/20171009/5ff886b5/attachment.sig>
^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot] [PATCH v4 1/2] arm64: sun50i-h5.dtsi : add h5 & a64 compatible to mmc[0-2]
2017-09-21 15:22 [U-Boot] [PATCH] sun50i: h5: Add NanoPi Neo Plus2 DT initial support Antony Antony
` (2 preceding siblings ...)
2017-09-23 17:59 ` [U-Boot] [PATCH v3] " Antony Antony
@ 2017-10-10 13:35 ` Antony Antony
2017-10-10 13:48 ` Peter Robinson
2017-10-10 13:45 ` [U-Boot] [PATCH v4 2/2] sun50i: h5: Add NanoPi Neo Plus2 DT initial support Antony Antony
` (2 subsequent siblings)
6 siblings, 1 reply; 33+ messages in thread
From: Antony Antony @ 2017-10-10 13:35 UTC (permalink / raw)
To: u-boot
add more specific, Allwinner H5 SoC, compaitable to mmc0,1,2
current one comes from sun8i-h3.dtsi
compatible = "allwinner,sun7i-a20-mmc", "allwinner,sun5i-a13-mmc";
Signed-off-by: Antony Antony <antony@phenome.org>
---
arch/arm/dts/sun50i-h5.dtsi | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/arch/arm/dts/sun50i-h5.dtsi b/arch/arm/dts/sun50i-h5.dtsi
index 4904c18..1f4c1d1 100644
--- a/arch/arm/dts/sun50i-h5.dtsi
+++ b/arch/arm/dts/sun50i-h5.dtsi
@@ -75,3 +75,15 @@
&gic {
compatible = "arm,gic-400";
};
+
+&mmc0 {
+ compatible = "allwinner,sun50i-h5-mmc", "allwinner,sun50i-a64-mmc";
+};
+
+&mmc1 {
+ compatible = "allwinner,sun50i-h5-mmc", "allwinner,sun50i-a64-mmc";
+};
+
+&mmc2 {
+ compatible = "allwinner,sun50i-h5-mmc", "allwinner,sun50i-a64-mmc";
+};
--
2.7.4
^ permalink raw reply related [flat|nested] 33+ messages in thread* [U-Boot] [PATCH v4 1/2] arm64: sun50i-h5.dtsi : add h5 & a64 compatible to mmc[0-2]
2017-10-10 13:35 ` [U-Boot] [PATCH v4 1/2] arm64: sun50i-h5.dtsi : add h5 & a64 compatible to mmc[0-2] Antony Antony
@ 2017-10-10 13:48 ` Peter Robinson
2017-10-10 13:51 ` Jagan Teki
0 siblings, 1 reply; 33+ messages in thread
From: Peter Robinson @ 2017-10-10 13:48 UTC (permalink / raw)
To: u-boot
Shouldn't we just be syncing changes to the DT from the kernel?
On Tue, Oct 10, 2017 at 2:35 PM, Antony Antony <antony@phenome.org> wrote:
> add more specific, Allwinner H5 SoC, compaitable to mmc0,1,2
> current one comes from sun8i-h3.dtsi
> compatible = "allwinner,sun7i-a20-mmc", "allwinner,sun5i-a13-mmc";
>
> Signed-off-by: Antony Antony <antony@phenome.org>
> ---
> arch/arm/dts/sun50i-h5.dtsi | 12 ++++++++++++
> 1 file changed, 12 insertions(+)
>
> diff --git a/arch/arm/dts/sun50i-h5.dtsi b/arch/arm/dts/sun50i-h5.dtsi
> index 4904c18..1f4c1d1 100644
> --- a/arch/arm/dts/sun50i-h5.dtsi
> +++ b/arch/arm/dts/sun50i-h5.dtsi
> @@ -75,3 +75,15 @@
> &gic {
> compatible = "arm,gic-400";
> };
> +
> +&mmc0 {
> + compatible = "allwinner,sun50i-h5-mmc", "allwinner,sun50i-a64-mmc";
> +};
> +
> +&mmc1 {
> + compatible = "allwinner,sun50i-h5-mmc", "allwinner,sun50i-a64-mmc";
> +};
> +
> +&mmc2 {
> + compatible = "allwinner,sun50i-h5-mmc", "allwinner,sun50i-a64-mmc";
> +};
> --
> 2.7.4
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> https://lists.denx.de/listinfo/u-boot
^ permalink raw reply [flat|nested] 33+ messages in thread* [U-Boot] [PATCH v4 1/2] arm64: sun50i-h5.dtsi : add h5 & a64 compatible to mmc[0-2]
2017-10-10 13:48 ` Peter Robinson
@ 2017-10-10 13:51 ` Jagan Teki
2017-10-10 17:18 ` Antony Antony
0 siblings, 1 reply; 33+ messages in thread
From: Jagan Teki @ 2017-10-10 13:51 UTC (permalink / raw)
To: u-boot
On Tue, Oct 10, 2017 at 7:18 PM, Peter Robinson <pbrobinson@gmail.com> wrote:
> Shouldn't we just be syncing changes to the DT from the kernel?
And add last merge commit details on commit message.
thanks!
--
Jagan Teki
Free Software Engineer | www.openedev.com
U-Boot, Linux | Upstream Maintainer
Hyderabad, India.
^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot] [PATCH v4 1/2] arm64: sun50i-h5.dtsi : add h5 & a64 compatible to mmc[0-2]
2017-10-10 13:51 ` Jagan Teki
@ 2017-10-10 17:18 ` Antony Antony
2017-10-16 21:29 ` Jagan Teki
0 siblings, 1 reply; 33+ messages in thread
From: Antony Antony @ 2017-10-10 17:18 UTC (permalink / raw)
To: u-boot
On Tue, Oct 10, 2017 at 07:21:57PM +0530, Jagan Teki wrote:
> On Tue, Oct 10, 2017 at 7:18 PM, Peter Robinson <pbrobinson@gmail.com> wrote:
> > Shouldn't we just be syncing changes to the DT from the kernel?
>
I guess syncing could possibly solve the problem! Kernel DTSI got the
compiltables I need from the begining.
The diff looks big to me. I am not sure yet, I understand all changes.
Anyone who would like to sync the two files? Or willing to help me?
diff ~/u-boot/arch/arm/dts/sun50i-h5.dtsi
~/linux/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
> And add last merge commit details on commit message.
A good point. I am wondering what is the practice for this u-boot commit
message. I do not see commit IDs mentioned. A few commits seems to mention
kernel version in the commit message.
-antony
^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot] [PATCH v4 1/2] arm64: sun50i-h5.dtsi : add h5 & a64 compatible to mmc[0-2]
2017-10-10 17:18 ` Antony Antony
@ 2017-10-16 21:29 ` Jagan Teki
0 siblings, 0 replies; 33+ messages in thread
From: Jagan Teki @ 2017-10-16 21:29 UTC (permalink / raw)
To: u-boot
On Tue, Oct 10, 2017 at 10:48 PM, Antony Antony <antony@phenome.org> wrote:
> On Tue, Oct 10, 2017 at 07:21:57PM +0530, Jagan Teki wrote:
>> On Tue, Oct 10, 2017 at 7:18 PM, Peter Robinson <pbrobinson@gmail.com> wrote:
>> > Shouldn't we just be syncing changes to the DT from the kernel?
>>
>
> I guess syncing could possibly solve the problem! Kernel DTSI got the
> compiltables I need from the begining.
>
> The diff looks big to me. I am not sure yet, I understand all changes.
> Anyone who would like to sync the two files? Or willing to help me?
>
> diff ~/u-boot/arch/arm/dts/sun50i-h5.dtsi
> ~/linux/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
>
>> And add last merge commit details on commit message.
>
> A good point. I am wondering what is the practice for this u-boot commit
> message. I do not see commit IDs mentioned. A few commits seems to mention
> kernel version in the commit message.
Getting merge ID details can help to check what details got synced,
not a big deal.
thanks!
--
Jagan Teki
Free Software Engineer | www.openedev.com
U-Boot, Linux | Upstream Maintainer
Hyderabad, India.
^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot] [PATCH v4 2/2] sun50i: h5: Add NanoPi Neo Plus2 DT initial support
2017-09-21 15:22 [U-Boot] [PATCH] sun50i: h5: Add NanoPi Neo Plus2 DT initial support Antony Antony
` (3 preceding siblings ...)
2017-10-10 13:35 ` [U-Boot] [PATCH v4 1/2] arm64: sun50i-h5.dtsi : add h5 & a64 compatible to mmc[0-2] Antony Antony
@ 2017-10-10 13:45 ` Antony Antony
2017-10-10 13:58 ` Jagan Teki
2017-11-17 9:39 ` [U-Boot] [PATCH v5 1/2] " Antony Antony
2017-11-21 9:11 ` [U-Boot] [PATCH v6 1/2] arm64: sun50i-h5.dtsi : update to kernel 4.14 Antony Antony
6 siblings, 1 reply; 33+ messages in thread
From: Antony Antony @ 2017-10-10 13:45 UTC (permalink / raw)
To: u-boot
Add initial DT for NanoPi NEO Plus2 by FriendlyARM
- Allwinner quad core H5 Cortex A53 with an ARM Mali-450MP GPU
- 1 GB DDR3 RAM
- 8GB eMMC flash (Samsung KLM8G1WEPD-B031)
- micro SD card slot
- Gigabit Ethernet (external RTL8211E-VB-CG chip)
- 802.11 b/g/n WiFi, Bluetooth 4.0 (Ampak AP6212A module)
- 2x USB 2.0 host ports
Signed-off-by: Antony Antony <antony@phenome.org>
---
arch/arm/dts/Makefile | 1 +
arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts | 106 ++++++++++++++++++++++++++++
configs/nanopi_neo_plus2_defconfig | 18 +++++
3 files changed, 125 insertions(+)
create mode 100644 arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
create mode 100644 configs/nanopi_neo_plus2_defconfig
---
Changes v1->v2
removed memory {}, compatible ="allwinner,sun5i-a13-mmc"
remove CONFIG_SPL_SPI_FLASH_SUPPORT=y and CONFIG_SPL_SPI_SUNXI=y (no SPI)
remove CONFIG_SD_BOOT=y
Changes v2->v3
removed compatible ="allwinner,sun50i-a64-mmc"
Changes v3->v4
removed compatible from mmc0
add h5 & a64 compaitable to sun50i-h5.dtsi
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 5b90280..879ff24 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -335,6 +335,7 @@ dtb-$(CONFIG_MACH_SUN8I_V3S) += \
sun8i-v3s-licheepi-zero.dtb
dtb-$(CONFIG_MACH_SUN50I_H5) += \
sun50i-h5-nanopi-neo2.dtb \
+ sun50i-h5-nanopi-neo-plus2.dtb \
sun50i-h5-orangepi-pc2.dtb \
sun50i-h5-orangepi-prime.dtb \
sun50i-h5-orangepi-zero-plus2.dtb
diff --git a/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
new file mode 100644
index 0000000..f1406c2
--- /dev/null
+++ b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2017 Antony Antony <antony@phenome.org>
+ * Copyright (c) 2016 ARM Ltd.
+ *
+ * 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 library 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 library 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 "sun50i-h5.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+ model = "FriendlyARM NanoPi NEO Plus 2";
+ compatible = "friendlyarm,nanopi-neo-plus2", "allwinner,sun50i-h5";
+
+ aliases {
+ serial0 = &uart0;
+ };
+
+ chosen {
+ stdout-path = "serial0:115200n8";
+ };
+
+ reg_vcc3v3: vcc3v3 {
+ compatible = "regulator-fixed";
+ regulator-name = "vcc3v3";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ };
+};
+
+&ehci1 {
+ status = "okay";
+};
+
+&mmc0 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
+ vmmc-supply = <®_vcc3v3>;
+ bus-width = <4>;
+ cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;
+ cd-inverted;
+ status = "okay";
+};
+
+&mmc2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc2_8bit_pins>;
+ vmmc-supply = <®_vcc3v3>;
+ bus-width = <8>;
+ non-removable;
+ cap-mmc-hw-reset;
+ status = "okay";
+};
+
+&ohci1 {
+ status = "okay";
+};
+
+&uart0 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart0_pins_a>;
+ status = "okay";
+};
+
+&usbphy {
+ status = "okay";
+};
diff --git a/configs/nanopi_neo_plus2_defconfig b/configs/nanopi_neo_plus2_defconfig
new file mode 100644
index 0000000..83a8dff
--- /dev/null
+++ b/configs/nanopi_neo_plus2_defconfig
@@ -0,0 +1,18 @@
+CONFIG_ARM=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_MACH_SUN50I_H5=y
+CONFIG_DRAM_CLK=408
+CONFIG_DRAM_ZQ=3881977
+CONFIG_MACPWR="PD6"
+CONFIG_DEFAULT_DEVICE_TREE="sun50i-h5-nanopi-neo-plus2"
+# 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_SUN8I_EMAC=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_MMC_SUNXI_SLOT_EXTRA=2
--
2.7.4
^ permalink raw reply related [flat|nested] 33+ messages in thread* [U-Boot] [PATCH v4 2/2] sun50i: h5: Add NanoPi Neo Plus2 DT initial support
2017-10-10 13:45 ` [U-Boot] [PATCH v4 2/2] sun50i: h5: Add NanoPi Neo Plus2 DT initial support Antony Antony
@ 2017-10-10 13:58 ` Jagan Teki
2017-10-10 16:56 ` Antony Antony
0 siblings, 1 reply; 33+ messages in thread
From: Jagan Teki @ 2017-10-10 13:58 UTC (permalink / raw)
To: u-boot
On Tue, Oct 10, 2017 at 7:15 PM, Antony Antony <antony@phenome.org> wrote:
> Add initial DT for NanoPi NEO Plus2 by FriendlyARM
> - Allwinner quad core H5 Cortex A53 with an ARM Mali-450MP GPU
> - 1 GB DDR3 RAM
> - 8GB eMMC flash (Samsung KLM8G1WEPD-B031)
> - micro SD card slot
> - Gigabit Ethernet (external RTL8211E-VB-CG chip)
> - 802.11 b/g/n WiFi, Bluetooth 4.0 (Ampak AP6212A module)
> - 2x USB 2.0 host ports
>
> Signed-off-by: Antony Antony <antony@phenome.org>
> ---
> arch/arm/dts/Makefile | 1 +
> arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts | 106 ++++++++++++++++++++++++++++
> configs/nanopi_neo_plus2_defconfig | 18 +++++
> 3 files changed, 125 insertions(+)
> create mode 100644 arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
> create mode 100644 configs/nanopi_neo_plus2_defconfig
> ---
> Changes v1->v2
> removed memory {}, compatible ="allwinner,sun5i-a13-mmc"
> remove CONFIG_SPL_SPI_FLASH_SUPPORT=y and CONFIG_SPL_SPI_SUNXI=y (no SPI)
> remove CONFIG_SD_BOOT=y
> Changes v2->v3
> removed compatible ="allwinner,sun50i-a64-mmc"
> Changes v3->v4
> removed compatible from mmc0
> add h5 & a64 compaitable to sun50i-h5.dtsi
>
> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index 5b90280..879ff24 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -335,6 +335,7 @@ dtb-$(CONFIG_MACH_SUN8I_V3S) += \
> sun8i-v3s-licheepi-zero.dtb
> dtb-$(CONFIG_MACH_SUN50I_H5) += \
> sun50i-h5-nanopi-neo2.dtb \
> + sun50i-h5-nanopi-neo-plus2.dtb \
> sun50i-h5-orangepi-pc2.dtb \
> sun50i-h5-orangepi-prime.dtb \
> sun50i-h5-orangepi-zero-plus2.dtb
> diff --git a/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
> new file mode 100644
> index 0000000..f1406c2
> --- /dev/null
> +++ b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
> @@ -0,0 +1,106 @@
> +/*
> + * Copyright (C) 2017 Antony Antony <antony@phenome.org>
> + * Copyright (c) 2016 ARM Ltd.
> + *
> + * 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 library 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 library 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 "sun50i-h5.dtsi"
> +
> +#include <dt-bindings/gpio/gpio.h>
> +
> +/ {
> + model = "FriendlyARM NanoPi NEO Plus 2";
> + compatible = "friendlyarm,nanopi-neo-plus2", "allwinner,sun50i-h5";
> +
> + aliases {
> + serial0 = &uart0;
> + };
> +
> + chosen {
> + stdout-path = "serial0:115200n8";
> + };
> +
> + reg_vcc3v3: vcc3v3 {
> + compatible = "regulator-fixed";
> + regulator-name = "vcc3v3";
> + regulator-min-microvolt = <3300000>;
> + regulator-max-microvolt = <3300000>;
> + };
> +};
> +
> +&ehci1 {
> + status = "okay";
> +};
Does this tested? need to have in Linux first.
> +
> +&mmc0 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
> + vmmc-supply = <®_vcc3v3>;
> + bus-width = <4>;
> + cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;
> + cd-inverted;
> + status = "okay";
> +};
> +
> +&mmc2 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&mmc2_8bit_pins>;
> + vmmc-supply = <®_vcc3v3>;
> + bus-width = <8>;
> + non-removable;
> + cap-mmc-hw-reset;
> + status = "okay";
> +};
> +
> +&ohci1 {
> + status = "okay";
> +};
Same comment like ehci1
thanks!
--
Jagan Teki
Free Software Engineer | www.openedev.com
U-Boot, Linux | Upstream Maintainer
Hyderabad, India.
^ permalink raw reply [flat|nested] 33+ messages in thread* [U-Boot] [PATCH v4 2/2] sun50i: h5: Add NanoPi Neo Plus2 DT initial support
2017-10-10 13:58 ` Jagan Teki
@ 2017-10-10 16:56 ` Antony Antony
2017-10-10 17:00 ` Jagan Teki
0 siblings, 1 reply; 33+ messages in thread
From: Antony Antony @ 2017-10-10 16:56 UTC (permalink / raw)
To: u-boot
On Tue, Oct 10, 2017 at 07:28:23PM +0530, Jagan Teki wrote:
> On Tue, Oct 10, 2017 at 7:15 PM, Antony Antony <antony@phenome.org> wrote:
> > Add initial DT for NanoPi NEO Plus2 by FriendlyARM
> > - Allwinner quad core H5 Cortex A53 with an ARM Mali-450MP GPU
> > - 1 GB DDR3 RAM
> > - 8GB eMMC flash (Samsung KLM8G1WEPD-B031)
> > - micro SD card slot
> > - Gigabit Ethernet (external RTL8211E-VB-CG chip)
> > - 802.11 b/g/n WiFi, Bluetooth 4.0 (Ampak AP6212A module)
> > - 2x USB 2.0 host ports
> >
> > Signed-off-by: Antony Antony <antony@phenome.org>
> > ---
> > arch/arm/dts/Makefile | 1 +
> > arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts | 106 ++++++++++++++++++++++++++++
> > configs/nanopi_neo_plus2_defconfig | 18 +++++
> > 3 files changed, 125 insertions(+)
> > create mode 100644 arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
> > create mode 100644 configs/nanopi_neo_plus2_defconfig
> > ---
> > Changes v1->v2
> > removed memory {}, compatible ="allwinner,sun5i-a13-mmc"
> > remove CONFIG_SPL_SPI_FLASH_SUPPORT=y and CONFIG_SPL_SPI_SUNXI=y (no SPI)
> > remove CONFIG_SD_BOOT=y
> > Changes v2->v3
> > removed compatible ="allwinner,sun50i-a64-mmc"
> > Changes v3->v4
> > removed compatible from mmc0
> > add h5 & a64 compaitable to sun50i-h5.dtsi
> >
> > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> > index 5b90280..879ff24 100644
> > --- a/arch/arm/dts/Makefile
> > +++ b/arch/arm/dts/Makefile
> > @@ -335,6 +335,7 @@ dtb-$(CONFIG_MACH_SUN8I_V3S) += \
> > sun8i-v3s-licheepi-zero.dtb
> > dtb-$(CONFIG_MACH_SUN50I_H5) += \
> > sun50i-h5-nanopi-neo2.dtb \
> > + sun50i-h5-nanopi-neo-plus2.dtb \
> > sun50i-h5-orangepi-pc2.dtb \
> > sun50i-h5-orangepi-prime.dtb \
> > sun50i-h5-orangepi-zero-plus2.dtb
> > diff --git a/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
> > new file mode 100644
> > index 0000000..f1406c2
> > --- /dev/null
> > +++ b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
> > @@ -0,0 +1,106 @@
> > +/*
> > + * Copyright (C) 2017 Antony Antony <antony@phenome.org>
> > + * Copyright (c) 2016 ARM Ltd.
> > + *
> > + * 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 library 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 library 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 "sun50i-h5.dtsi"
> > +
> > +#include <dt-bindings/gpio/gpio.h>
> > +
> > +/ {
> > + model = "FriendlyARM NanoPi NEO Plus 2";
> > + compatible = "friendlyarm,nanopi-neo-plus2", "allwinner,sun50i-h5";
> > +
> > + aliases {
> > + serial0 = &uart0;
> > + };
> > +
> > + chosen {
> > + stdout-path = "serial0:115200n8";
> > + };
> > +
> > + reg_vcc3v3: vcc3v3 {
> > + compatible = "regulator-fixed";
> > + regulator-name = "vcc3v3";
> > + regulator-min-microvolt = <3300000>;
> > + regulator-max-microvolt = <3300000>;
> > + };
> > +};
> > +
> > +&ehci1 {
> > + status = "okay";
> > +};
>
> Does this tested? need to have in Linux first.
I use rootfs from /dev/sda1 , spl and u-boot are on MicroSD card.
in armbianEnv.txt set rootdev=/dev/sda1
Begin: Will now check root file system ... fsck from util-linux 2.27.1
[/sbin/fsck.ext4 (1) -- /dev/sda1] fsck.ext4 -a -C0 /dev/sda1
Are you suggesting ehci1 & ohci1 are not necessary in the u-boot DT file,
The kernel will initialize it after u-boot?
> > +
> > +&mmc0 {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
> > + vmmc-supply = <®_vcc3v3>;
> > + bus-width = <4>;
> > + cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;
> > + cd-inverted;
> > + status = "okay";
> > +};
> > +
> > +&mmc2 {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&mmc2_8bit_pins>;
> > + vmmc-supply = <®_vcc3v3>;
> > + bus-width = <8>;
> > + non-removable;
> > + cap-mmc-hw-reset;
> > + status = "okay";
> > +};
> > +
> > +&ohci1 {
> > + status = "okay";
> > +};
>
> Same comment like ehci1
>
> thanks!
> --
> Jagan Teki
> Free Software Engineer | www.openedev.com
> U-Boot, Linux | Upstream Maintainer
> Hyderabad, India.
^ permalink raw reply [flat|nested] 33+ messages in thread* [U-Boot] [PATCH v4 2/2] sun50i: h5: Add NanoPi Neo Plus2 DT initial support
2017-10-10 16:56 ` Antony Antony
@ 2017-10-10 17:00 ` Jagan Teki
2017-10-10 17:30 ` Antony Antony
0 siblings, 1 reply; 33+ messages in thread
From: Jagan Teki @ 2017-10-10 17:00 UTC (permalink / raw)
To: u-boot
On Tue, Oct 10, 2017 at 10:26 PM, Antony Antony <antony@phenome.org> wrote:
> On Tue, Oct 10, 2017 at 07:28:23PM +0530, Jagan Teki wrote:
>> On Tue, Oct 10, 2017 at 7:15 PM, Antony Antony <antony@phenome.org> wrote:
>> > Add initial DT for NanoPi NEO Plus2 by FriendlyARM
>> > - Allwinner quad core H5 Cortex A53 with an ARM Mali-450MP GPU
>> > - 1 GB DDR3 RAM
>> > - 8GB eMMC flash (Samsung KLM8G1WEPD-B031)
>> > - micro SD card slot
>> > - Gigabit Ethernet (external RTL8211E-VB-CG chip)
>> > - 802.11 b/g/n WiFi, Bluetooth 4.0 (Ampak AP6212A module)
>> > - 2x USB 2.0 host ports
>> >
>> > Signed-off-by: Antony Antony <antony@phenome.org>
>> > ---
>> > arch/arm/dts/Makefile | 1 +
>> > arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts | 106 ++++++++++++++++++++++++++++
>> > configs/nanopi_neo_plus2_defconfig | 18 +++++
>> > 3 files changed, 125 insertions(+)
>> > create mode 100644 arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
>> > create mode 100644 configs/nanopi_neo_plus2_defconfig
>> > ---
>> > Changes v1->v2
>> > removed memory {}, compatible ="allwinner,sun5i-a13-mmc"
>> > remove CONFIG_SPL_SPI_FLASH_SUPPORT=y and CONFIG_SPL_SPI_SUNXI=y (no SPI)
>> > remove CONFIG_SD_BOOT=y
>> > Changes v2->v3
>> > removed compatible ="allwinner,sun50i-a64-mmc"
>> > Changes v3->v4
>> > removed compatible from mmc0
>> > add h5 & a64 compaitable to sun50i-h5.dtsi
>> >
>> > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
>> > index 5b90280..879ff24 100644
>> > --- a/arch/arm/dts/Makefile
>> > +++ b/arch/arm/dts/Makefile
>> > @@ -335,6 +335,7 @@ dtb-$(CONFIG_MACH_SUN8I_V3S) += \
>> > sun8i-v3s-licheepi-zero.dtb
>> > dtb-$(CONFIG_MACH_SUN50I_H5) += \
>> > sun50i-h5-nanopi-neo2.dtb \
>> > + sun50i-h5-nanopi-neo-plus2.dtb \
>> > sun50i-h5-orangepi-pc2.dtb \
>> > sun50i-h5-orangepi-prime.dtb \
>> > sun50i-h5-orangepi-zero-plus2.dtb
>> > diff --git a/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
>> > new file mode 100644
>> > index 0000000..f1406c2
>> > --- /dev/null
>> > +++ b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
>> > @@ -0,0 +1,106 @@
>> > +/*
>> > + * Copyright (C) 2017 Antony Antony <antony@phenome.org>
>> > + * Copyright (c) 2016 ARM Ltd.
>> > + *
>> > + * 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 library 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 library 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 "sun50i-h5.dtsi"
>> > +
>> > +#include <dt-bindings/gpio/gpio.h>
>> > +
>> > +/ {
>> > + model = "FriendlyARM NanoPi NEO Plus 2";
>> > + compatible = "friendlyarm,nanopi-neo-plus2", "allwinner,sun50i-h5";
>> > +
>> > + aliases {
>> > + serial0 = &uart0;
>> > + };
>> > +
>> > + chosen {
>> > + stdout-path = "serial0:115200n8";
>> > + };
>> > +
>> > + reg_vcc3v3: vcc3v3 {
>> > + compatible = "regulator-fixed";
>> > + regulator-name = "vcc3v3";
>> > + regulator-min-microvolt = <3300000>;
>> > + regulator-max-microvolt = <3300000>;
>> > + };
>> > +};
>> > +
>> > +&ehci1 {
>> > + status = "okay";
>> > +};
>>
>> Does this tested? need to have in Linux first.
>
> I use rootfs from /dev/sda1 , spl and u-boot are on MicroSD card.
> in armbianEnv.txt set rootdev=/dev/sda1
>
> Begin: Will now check root file system ... fsck from util-linux 2.27.1
> [/sbin/fsck.ext4 (1) -- /dev/sda1] fsck.ext4 -a -C0 /dev/sda1
>
> Are you suggesting ehci1 & ohci1 are not necessary in the u-boot DT file,
> The kernel will initialize it after u-boot?
No, the dts need to sync with Linux (atleast for sunxi), usually new
dts additions should go Linux first.
thanks!
--
Jagan Teki
Free Software Engineer | www.openedev.com
U-Boot, Linux | Upstream Maintainer
Hyderabad, India.
^ permalink raw reply [flat|nested] 33+ messages in thread* [U-Boot] [PATCH v4 2/2] sun50i: h5: Add NanoPi Neo Plus2 DT initial support
2017-10-10 17:00 ` Jagan Teki
@ 2017-10-10 17:30 ` Antony Antony
0 siblings, 0 replies; 33+ messages in thread
From: Antony Antony @ 2017-10-10 17:30 UTC (permalink / raw)
To: u-boot
On Tue, Oct 10, 2017 at 10:30:42PM +0530, Jagan Teki wrote:
> On Tue, Oct 10, 2017 at 10:26 PM, Antony Antony <antony@phenome.org> wrote:
> > On Tue, Oct 10, 2017 at 07:28:23PM +0530, Jagan Teki wrote:
> >> On Tue, Oct 10, 2017 at 7:15 PM, Antony Antony <antony@phenome.org> wrote:
> >> > Add initial DT for NanoPi NEO Plus2 by FriendlyARM
> >> > - Allwinner quad core H5 Cortex A53 with an ARM Mali-450MP GPU
> >> > - 1 GB DDR3 RAM
> >> > - 8GB eMMC flash (Samsung KLM8G1WEPD-B031)
> >> > - micro SD card slot
> >> > - Gigabit Ethernet (external RTL8211E-VB-CG chip)
> >> > - 802.11 b/g/n WiFi, Bluetooth 4.0 (Ampak AP6212A module)
> >> > - 2x USB 2.0 host ports
> >> >
> >> > Signed-off-by: Antony Antony <antony@phenome.org>
> >> > ---
> >> > arch/arm/dts/Makefile | 1 +
> >> > arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts | 106 ++++++++++++++++++++++++++++
> >> > configs/nanopi_neo_plus2_defconfig | 18 +++++
> >> > 3 files changed, 125 insertions(+)
> >> > create mode 100644 arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
> >> > create mode 100644 configs/nanopi_neo_plus2_defconfig
> >> > ---
> >> > Changes v1->v2
> >> > removed memory {}, compatible ="allwinner,sun5i-a13-mmc"
> >> > remove CONFIG_SPL_SPI_FLASH_SUPPORT=y and CONFIG_SPL_SPI_SUNXI=y (no SPI)
> >> > remove CONFIG_SD_BOOT=y
> >> > Changes v2->v3
> >> > removed compatible ="allwinner,sun50i-a64-mmc"
> >> > Changes v3->v4
> >> > removed compatible from mmc0
> >> > add h5 & a64 compaitable to sun50i-h5.dtsi
> >> >
> >> > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> >> > index 5b90280..879ff24 100644
> >> > --- a/arch/arm/dts/Makefile
> >> > +++ b/arch/arm/dts/Makefile
> >> > @@ -335,6 +335,7 @@ dtb-$(CONFIG_MACH_SUN8I_V3S) += \
> >> > sun8i-v3s-licheepi-zero.dtb
> >> > dtb-$(CONFIG_MACH_SUN50I_H5) += \
> >> > sun50i-h5-nanopi-neo2.dtb \
> >> > + sun50i-h5-nanopi-neo-plus2.dtb \
> >> > sun50i-h5-orangepi-pc2.dtb \
> >> > sun50i-h5-orangepi-prime.dtb \
> >> > sun50i-h5-orangepi-zero-plus2.dtb
> >> > diff --git a/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
> >> > new file mode 100644
> >> > index 0000000..f1406c2
> >> > --- /dev/null
> >> > +++ b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
> >> > @@ -0,0 +1,106 @@
> >> > +/*
> >> > + * Copyright (C) 2017 Antony Antony <antony@phenome.org>
> >> > + * Copyright (c) 2016 ARM Ltd.
> >> > + *
> >> > + * 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 library 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 library 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 "sun50i-h5.dtsi"
> >> > +
> >> > +#include <dt-bindings/gpio/gpio.h>
> >> > +
> >> > +/ {
> >> > + model = "FriendlyARM NanoPi NEO Plus 2";
> >> > + compatible = "friendlyarm,nanopi-neo-plus2", "allwinner,sun50i-h5";
> >> > +
> >> > + aliases {
> >> > + serial0 = &uart0;
> >> > + };
> >> > +
> >> > + chosen {
> >> > + stdout-path = "serial0:115200n8";
> >> > + };
> >> > +
> >> > + reg_vcc3v3: vcc3v3 {
> >> > + compatible = "regulator-fixed";
> >> > + regulator-name = "vcc3v3";
> >> > + regulator-min-microvolt = <3300000>;
> >> > + regulator-max-microvolt = <3300000>;
> >> > + };
> >> > +};
> >> > +
> >> > +&ehci1 {
> >> > + status = "okay";
> >> > +};
> >>
> >> Does this tested? need to have in Linux first.
> >
> > I use rootfs from /dev/sda1 , spl and u-boot are on MicroSD card.
> > in armbianEnv.txt set rootdev=/dev/sda1
> >
> > Begin: Will now check root file system ... fsck from util-linux 2.27.1
> > [/sbin/fsck.ext4 (1) -- /dev/sda1] fsck.ext4 -a -C0 /dev/sda1
> >
> > Are you suggesting ehci1 & ohci1 are not necessary in the u-boot DT file,
> > The kernel will initialize it after u-boot?
>
> No, the dts need to sync with Linux (atleast for sunxi), usually new
> dts additions should go Linux first.
It is sunxi/for-next queed up for 4.15
-antony
^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot] [PATCH v5 1/2] sun50i: h5: Add NanoPi Neo Plus2 DT initial support
2017-09-21 15:22 [U-Boot] [PATCH] sun50i: h5: Add NanoPi Neo Plus2 DT initial support Antony Antony
` (4 preceding siblings ...)
2017-10-10 13:45 ` [U-Boot] [PATCH v4 2/2] sun50i: h5: Add NanoPi Neo Plus2 DT initial support Antony Antony
@ 2017-11-17 9:39 ` Antony Antony
2017-11-17 9:39 ` [U-Boot] [PATCH v5 2/2] arm64: sun50i-h5.dtsi : update to kernel 4.14 Antony Antony
` (2 more replies)
2017-11-21 9:11 ` [U-Boot] [PATCH v6 1/2] arm64: sun50i-h5.dtsi : update to kernel 4.14 Antony Antony
6 siblings, 3 replies; 33+ messages in thread
From: Antony Antony @ 2017-11-17 9:39 UTC (permalink / raw)
To: u-boot
Add initial DT for NanoPi NEO Plus2 by FriendlyARM
- Allwinner quad core H5 Cortex A53 with an ARM Mali-450MP GPU
- 1 GB DDR3 RAM
- 8GB eMMC flash (Samsung KLM8G1WEPD-B031)
- micro SD card slot
- Gigabit Ethernet (external RTL8211E-VB-CG chip)
- 802.11 b/g/n WiFi, Bluetooth 4.0 (Ampak AP6212A module)
- 2x USB 2.0 host ports
Signed-off-by: Antony Antony <antony@phenome.org>
---
Changes v1->v2
removed memory {}, compatible ="allwinner,sun5i-a13-mmc"
remove CONFIG_SPL_SPI_FLASH_SUPPORT=y and CONFIG_SPL_SPI_SUNXI=y (no SPI)
remove CONFIG_SD_BOOT=y
Changes v2->v3
removed compatible ="allwinner,sun50i-a64-mmc"
Changes v3->v4
removed compatible from mmc0
add h5 & a64 compaitable to sun50i-h5.dtsi
Changes v4->v5
update sun50i-h5.dtsi to krenel tree 4.14
---
arch/arm/dts/Makefile | 1 +
arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts | 106 ++++++++++++++++++++++++++++
configs/nanopi_neo_plus2_defconfig | 18 +++++
3 files changed, 125 insertions(+)
create mode 100644 arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
create mode 100644 configs/nanopi_neo_plus2_defconfig
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 6db64f91..e44ceaf 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -336,6 +336,7 @@ dtb-$(CONFIG_MACH_SUN8I_V3S) += \
sun8i-v3s-licheepi-zero.dtb
dtb-$(CONFIG_MACH_SUN50I_H5) += \
sun50i-h5-nanopi-neo2.dtb \
+ sun50i-h5-nanopi-neo-plus2.dtb \
sun50i-h5-orangepi-pc2.dtb \
sun50i-h5-orangepi-prime.dtb \
sun50i-h5-orangepi-zero-plus2.dtb
diff --git a/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
new file mode 100644
index 0000000..f1406c2
--- /dev/null
+++ b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2017 Antony Antony <antony@phenome.org>
+ * Copyright (c) 2016 ARM Ltd.
+ *
+ * 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 library 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 library 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 "sun50i-h5.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+ model = "FriendlyARM NanoPi NEO Plus 2";
+ compatible = "friendlyarm,nanopi-neo-plus2", "allwinner,sun50i-h5";
+
+ aliases {
+ serial0 = &uart0;
+ };
+
+ chosen {
+ stdout-path = "serial0:115200n8";
+ };
+
+ reg_vcc3v3: vcc3v3 {
+ compatible = "regulator-fixed";
+ regulator-name = "vcc3v3";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ };
+};
+
+&ehci1 {
+ status = "okay";
+};
+
+&mmc0 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
+ vmmc-supply = <®_vcc3v3>;
+ bus-width = <4>;
+ cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;
+ cd-inverted;
+ status = "okay";
+};
+
+&mmc2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc2_8bit_pins>;
+ vmmc-supply = <®_vcc3v3>;
+ bus-width = <8>;
+ non-removable;
+ cap-mmc-hw-reset;
+ status = "okay";
+};
+
+&ohci1 {
+ status = "okay";
+};
+
+&uart0 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart0_pins_a>;
+ status = "okay";
+};
+
+&usbphy {
+ status = "okay";
+};
diff --git a/configs/nanopi_neo_plus2_defconfig b/configs/nanopi_neo_plus2_defconfig
new file mode 100644
index 0000000..83a8dff
--- /dev/null
+++ b/configs/nanopi_neo_plus2_defconfig
@@ -0,0 +1,18 @@
+CONFIG_ARM=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_MACH_SUN50I_H5=y
+CONFIG_DRAM_CLK=408
+CONFIG_DRAM_ZQ=3881977
+CONFIG_MACPWR="PD6"
+CONFIG_DEFAULT_DEVICE_TREE="sun50i-h5-nanopi-neo-plus2"
+# 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_SUN8I_EMAC=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_MMC_SUNXI_SLOT_EXTRA=2
--
2.7.4
^ permalink raw reply related [flat|nested] 33+ messages in thread* [U-Boot] [PATCH v5 2/2] arm64: sun50i-h5.dtsi : update to kernel 4.14
2017-11-17 9:39 ` [U-Boot] [PATCH v5 1/2] " Antony Antony
@ 2017-11-17 9:39 ` Antony Antony
2017-11-17 13:06 ` Maxime Ripard
2017-11-17 13:05 ` [U-Boot] [PATCH v5 1/2] sun50i: h5: Add NanoPi Neo Plus2 DT initial support Maxime Ripard
2017-11-21 6:29 ` Jagan Teki
2 siblings, 1 reply; 33+ messages in thread
From: Antony Antony @ 2017-11-17 9:39 UTC (permalink / raw)
To: u-boot
last Kernel commit of sun50i-h5.dtsi d86e63e1f0b7
Signed-off-by: Antony Antony <antony@phenome.org>
---
Changes v3->v4
removed compatible from mmc0
add h5 & a64 compaitable to sun50i-h5.dtsi
Changes v4->v5
update sun50i-h5.dtsi to kernel 4.14
---
arch/arm/dts/sun50i-h5.dtsi | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/arch/arm/dts/sun50i-h5.dtsi b/arch/arm/dts/sun50i-h5.dtsi
index 4904c18..c052f31 100644
--- a/arch/arm/dts/sun50i-h5.dtsi
+++ b/arch/arm/dts/sun50i-h5.dtsi
@@ -72,6 +72,38 @@
};
};
+&ccu {
+ compatible = "allwinner,sun50i-h5-ccu";
+};
+
&gic {
compatible = "arm,gic-400";
};
+
+&mmc0 {
+ compatible = "allwinner,sun50i-h5-mmc",
+ "allwinner,sun50i-a64-mmc";
+ clocks = <&ccu CLK_BUS_MMC0>, <&ccu CLK_MMC0>;
+ clock-names = "ahb", "mmc";
+};
+
+&mmc1 {
+ compatible = "allwinner,sun50i-h5-mmc",
+ "allwinner,sun50i-a64-mmc";
+ clocks = <&ccu CLK_BUS_MMC1>, <&ccu CLK_MMC1>;
+ clock-names = "ahb", "mmc";
+};
+
+&mmc2 {
+ compatible = "allwinner,sun50i-h5-emmc",
+ "allwinner,sun50i-a64-emmc";
+ clocks = <&ccu CLK_BUS_MMC2>, <&ccu CLK_MMC2>;
+ clock-names = "ahb", "mmc";
+};
+
+&pio {
+ interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
+ compatible = "allwinner,sun50i-h5-pinctrl";
+};
--
2.7.4
^ permalink raw reply related [flat|nested] 33+ messages in thread* [U-Boot] [PATCH v5 1/2] sun50i: h5: Add NanoPi Neo Plus2 DT initial support
2017-11-17 9:39 ` [U-Boot] [PATCH v5 1/2] " Antony Antony
2017-11-17 9:39 ` [U-Boot] [PATCH v5 2/2] arm64: sun50i-h5.dtsi : update to kernel 4.14 Antony Antony
@ 2017-11-17 13:05 ` Maxime Ripard
2017-11-21 6:29 ` Jagan Teki
2 siblings, 0 replies; 33+ messages in thread
From: Maxime Ripard @ 2017-11-17 13:05 UTC (permalink / raw)
To: u-boot
On Fri, Nov 17, 2017 at 10:39:53AM +0100, Antony Antony wrote:
> Add initial DT for NanoPi NEO Plus2 by FriendlyARM
> - Allwinner quad core H5 Cortex A53 with an ARM Mali-450MP GPU
> - 1 GB DDR3 RAM
> - 8GB eMMC flash (Samsung KLM8G1WEPD-B031)
> - micro SD card slot
> - Gigabit Ethernet (external RTL8211E-VB-CG chip)
> - 802.11 b/g/n WiFi, Bluetooth 4.0 (Ampak AP6212A module)
> - 2x USB 2.0 host ports
>
> Signed-off-by: Antony Antony <antony@phenome.org>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
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/20171117/d7769730/attachment.sig>
^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot] [PATCH v5 1/2] sun50i: h5: Add NanoPi Neo Plus2 DT initial support
2017-11-17 9:39 ` [U-Boot] [PATCH v5 1/2] " Antony Antony
2017-11-17 9:39 ` [U-Boot] [PATCH v5 2/2] arm64: sun50i-h5.dtsi : update to kernel 4.14 Antony Antony
2017-11-17 13:05 ` [U-Boot] [PATCH v5 1/2] sun50i: h5: Add NanoPi Neo Plus2 DT initial support Maxime Ripard
@ 2017-11-21 6:29 ` Jagan Teki
2017-11-21 8:59 ` Antony Antony
2 siblings, 1 reply; 33+ messages in thread
From: Jagan Teki @ 2017-11-21 6:29 UTC (permalink / raw)
To: u-boot
On Fri, Nov 17, 2017 at 3:09 PM, Antony Antony <antony@phenome.org> wrote:
> Add initial DT for NanoPi NEO Plus2 by FriendlyARM
> - Allwinner quad core H5 Cortex A53 with an ARM Mali-450MP GPU
> - 1 GB DDR3 RAM
> - 8GB eMMC flash (Samsung KLM8G1WEPD-B031)
> - micro SD card slot
> - Gigabit Ethernet (external RTL8211E-VB-CG chip)
> - 802.11 b/g/n WiFi, Bluetooth 4.0 (Ampak AP6212A module)
> - 2x USB 2.0 host ports
>
> Signed-off-by: Antony Antony <antony@phenome.org>
> ---
> Changes v1->v2
> removed memory {}, compatible ="allwinner,sun5i-a13-mmc"
> remove CONFIG_SPL_SPI_FLASH_SUPPORT=y and CONFIG_SPL_SPI_SUNXI=y (no SPI)
> remove CONFIG_SD_BOOT=y
> Changes v2->v3
> removed compatible ="allwinner,sun50i-a64-mmc"
> Changes v3->v4
> removed compatible from mmc0
> add h5 & a64 compaitable to sun50i-h5.dtsi
> Changes v4->v5
> update sun50i-h5.dtsi to krenel tree 4.14
> ---
> arch/arm/dts/Makefile | 1 +
> arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts | 106 ++++++++++++++++++++++++++++
> configs/nanopi_neo_plus2_defconfig | 18 +++++
Update board MAINTAINERS file as well.
> 3 files changed, 125 insertions(+)
> create mode 100644 arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
> create mode 100644 configs/nanopi_neo_plus2_defconfig
>
> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index 6db64f91..e44ceaf 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -336,6 +336,7 @@ dtb-$(CONFIG_MACH_SUN8I_V3S) += \
> sun8i-v3s-licheepi-zero.dtb
> dtb-$(CONFIG_MACH_SUN50I_H5) += \
> sun50i-h5-nanopi-neo2.dtb \
> + sun50i-h5-nanopi-neo-plus2.dtb \
> sun50i-h5-orangepi-pc2.dtb \
> sun50i-h5-orangepi-prime.dtb \
> sun50i-h5-orangepi-zero-plus2.dtb
> diff --git a/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
> new file mode 100644
> index 0000000..f1406c2
> --- /dev/null
> +++ b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
> @@ -0,0 +1,106 @@
> +/*
> + * Copyright (C) 2017 Antony Antony <antony@phenome.org>
> + * Copyright (c) 2016 ARM Ltd.
> + *
> + * 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 library 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 library 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 "sun50i-h5.dtsi"
> +
> +#include <dt-bindings/gpio/gpio.h>
> +
> +/ {
> + model = "FriendlyARM NanoPi NEO Plus 2";
> + compatible = "friendlyarm,nanopi-neo-plus2", "allwinner,sun50i-h5";
> +
> + aliases {
> + serial0 = &uart0;
> + };
> +
> + chosen {
> + stdout-path = "serial0:115200n8";
> + };
> +
> + reg_vcc3v3: vcc3v3 {
> + compatible = "regulator-fixed";
> + regulator-name = "vcc3v3";
> + regulator-min-microvolt = <3300000>;
> + regulator-max-microvolt = <3300000>;
> + };
> +};
> +
> +&ehci1 {
> + status = "okay";
> +};
> +
> +&mmc0 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
> + vmmc-supply = <®_vcc3v3>;
> + bus-width = <4>;
> + cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;
> + cd-inverted;
> + status = "okay";
> +};
> +
> +&mmc2 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&mmc2_8bit_pins>;
> + vmmc-supply = <®_vcc3v3>;
> + bus-width = <8>;
> + non-removable;
> + cap-mmc-hw-reset;
> + status = "okay";
> +};
> +
> +&ohci1 {
> + status = "okay";
> +};
> +
> +&uart0 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&uart0_pins_a>;
> + status = "okay";
> +};
> +
> +&usbphy {
> + status = "okay";
> +};
> diff --git a/configs/nanopi_neo_plus2_defconfig b/configs/nanopi_neo_plus2_defconfig
> new file mode 100644
> index 0000000..83a8dff
> --- /dev/null
> +++ b/configs/nanopi_neo_plus2_defconfig
> @@ -0,0 +1,18 @@
> +CONFIG_ARM=y
> +CONFIG_ARCH_SUNXI=y
> +CONFIG_MACH_SUN50I_H5=y
> +CONFIG_DRAM_CLK=408
> +CONFIG_DRAM_ZQ=3881977
> +CONFIG_MACPWR="PD6"
> +CONFIG_DEFAULT_DEVICE_TREE="sun50i-h5-nanopi-neo-plus2"
> +# 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_SUN8I_EMAC=y
> +CONFIG_USB_EHCI_HCD=y
> +CONFIG_MMC_SUNXI_SLOT_EXTRA=2
Did you test eMMC boot?
thanks!
--
Jagan Teki
Senior Linux Kernel Engineer | Amarula Solutions
U-Boot, Linux | Upstream Maintainer
Hyderabad, India.
^ permalink raw reply [flat|nested] 33+ messages in thread* [U-Boot] [PATCH v5 1/2] sun50i: h5: Add NanoPi Neo Plus2 DT initial support
2017-11-21 6:29 ` Jagan Teki
@ 2017-11-21 8:59 ` Antony Antony
0 siblings, 0 replies; 33+ messages in thread
From: Antony Antony @ 2017-11-21 8:59 UTC (permalink / raw)
To: u-boot
On Tue, Nov 21, 2017 at 11:59:42AM +0530, Jagan Teki wrote:
> On Fri, Nov 17, 2017 at 3:09 PM, Antony Antony <antony@phenome.org> wrote:
> > Add initial DT for NanoPi NEO Plus2 by FriendlyARM
> > - Allwinner quad core H5 Cortex A53 with an ARM Mali-450MP GPU
> > - 1 GB DDR3 RAM
> > - 8GB eMMC flash (Samsung KLM8G1WEPD-B031)
> > - micro SD card slot
> > - Gigabit Ethernet (external RTL8211E-VB-CG chip)
> > - 802.11 b/g/n WiFi, Bluetooth 4.0 (Ampak AP6212A module)
> > - 2x USB 2.0 host ports
> >
> > Signed-off-by: Antony Antony <antony@phenome.org>
> > ---
> > Changes v1->v2
> > removed memory {}, compatible ="allwinner,sun5i-a13-mmc"
> > remove CONFIG_SPL_SPI_FLASH_SUPPORT=y and CONFIG_SPL_SPI_SUNXI=y (no SPI)
> > remove CONFIG_SD_BOOT=y
> > Changes v2->v3
> > removed compatible ="allwinner,sun50i-a64-mmc"
> > Changes v3->v4
> > removed compatible from mmc0
> > add h5 & a64 compaitable to sun50i-h5.dtsi
> > Changes v4->v5
> > update sun50i-h5.dtsi to krenel tree 4.14
> > ---
> > arch/arm/dts/Makefile | 1 +
> > arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts | 106 ++++++++++++++++++++++++++++
> > configs/nanopi_neo_plus2_defconfig | 18 +++++
>
> Update board MAINTAINERS file as well.
yes. I will send new version soon.
> > +CONFIG_MMC_SUNXI_SLOT_EXTRA=2
> Did you test eMMC boot?
yes. I use Armbian and boot from eMMC.
thanks,
-antony
^ permalink raw reply [flat|nested] 33+ messages in thread
* [U-Boot] [PATCH v6 1/2] arm64: sun50i-h5.dtsi : update to kernel 4.14
2017-09-21 15:22 [U-Boot] [PATCH] sun50i: h5: Add NanoPi Neo Plus2 DT initial support Antony Antony
` (5 preceding siblings ...)
2017-11-17 9:39 ` [U-Boot] [PATCH v5 1/2] " Antony Antony
@ 2017-11-21 9:11 ` Antony Antony
2017-11-21 9:11 ` [U-Boot] [PATCH v6 2/2] sun50i: h5: Add NanoPi Neo Plus2 DT initial support Antony Antony
2017-11-21 13:47 ` [U-Boot] [PATCH v6 1/2] arm64: sun50i-h5.dtsi : update to kernel 4.14 Jagan Teki
6 siblings, 2 replies; 33+ messages in thread
From: Antony Antony @ 2017-11-21 9:11 UTC (permalink / raw)
To: u-boot
last Kernel commit of sun50i-h5.dtsi d86e63e1f0b7
Signed-off-by: Antony Antony <antony@phenome.org>
---
Changes v1->v2
removed memory {}, compatible ="allwinner,sun5i-a13-mmc"
remove CONFIG_SPL_SPI_FLASH_SUPPORT=y and CONFIG_SPL_SPI_SUNXI=y (no SPI)
remove CONFIG_SD_BOOT=y
Changes v2->v3
removed compatible ="allwinner,sun50i-a64-mmc"
Changes v3->v4
removed compatible from mmc0
add h5 & a64 compaitable to sun50i-h5.dtsi
Changes v4->v5
update sun50i-h5.dtsi to krenel tree 4.14
Changes v5->v6
update board/sunxi/MAINTAINERS
---
arch/arm/dts/sun50i-h5.dtsi | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/arch/arm/dts/sun50i-h5.dtsi b/arch/arm/dts/sun50i-h5.dtsi
index 4904c18..c052f31 100644
--- a/arch/arm/dts/sun50i-h5.dtsi
+++ b/arch/arm/dts/sun50i-h5.dtsi
@@ -72,6 +72,38 @@
};
};
+&ccu {
+ compatible = "allwinner,sun50i-h5-ccu";
+};
+
&gic {
compatible = "arm,gic-400";
};
+
+&mmc0 {
+ compatible = "allwinner,sun50i-h5-mmc",
+ "allwinner,sun50i-a64-mmc";
+ clocks = <&ccu CLK_BUS_MMC0>, <&ccu CLK_MMC0>;
+ clock-names = "ahb", "mmc";
+};
+
+&mmc1 {
+ compatible = "allwinner,sun50i-h5-mmc",
+ "allwinner,sun50i-a64-mmc";
+ clocks = <&ccu CLK_BUS_MMC1>, <&ccu CLK_MMC1>;
+ clock-names = "ahb", "mmc";
+};
+
+&mmc2 {
+ compatible = "allwinner,sun50i-h5-emmc",
+ "allwinner,sun50i-a64-emmc";
+ clocks = <&ccu CLK_BUS_MMC2>, <&ccu CLK_MMC2>;
+ clock-names = "ahb", "mmc";
+};
+
+&pio {
+ interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
+ compatible = "allwinner,sun50i-h5-pinctrl";
+};
--
2.7.4
^ permalink raw reply related [flat|nested] 33+ messages in thread* [U-Boot] [PATCH v6 2/2] sun50i: h5: Add NanoPi Neo Plus2 DT initial support
2017-11-21 9:11 ` [U-Boot] [PATCH v6 1/2] arm64: sun50i-h5.dtsi : update to kernel 4.14 Antony Antony
@ 2017-11-21 9:11 ` Antony Antony
2017-11-21 13:47 ` Jagan Teki
2017-11-21 13:47 ` [U-Boot] [PATCH v6 1/2] arm64: sun50i-h5.dtsi : update to kernel 4.14 Jagan Teki
1 sibling, 1 reply; 33+ messages in thread
From: Antony Antony @ 2017-11-21 9:11 UTC (permalink / raw)
To: u-boot
Add initial DT for NanoPi NEO Plus2 by FriendlyARM
- Allwinner quad core H5 Cortex A53 with an ARM Mali-450MP GPU
- 1 GB DDR3 RAM
- 8GB eMMC flash (Samsung KLM8G1WEPD-B031)
- micro SD card slot
- Gigabit Ethernet (external RTL8211E-VB-CG chip)
- 802.11 b/g/n WiFi, Bluetooth 4.0 (Ampak AP6212A module)
- 2x USB 2.0 host ports
Signed-off-by: Antony Antony <antony@phenome.org>
---
Changes v3->v4
removed compatible from mmc0
add h5 & a64 compaitable to sun50i-h5.dtsi
Changes v4->v5
update sun50i-h5.dtsi to kernel 4.14
Changes v5->v6
update board/sunxi/MAINTAINERS
---
arch/arm/dts/Makefile | 1 +
arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts | 106 ++++++++++++++++++++++++++++
board/sunxi/MAINTAINERS | 5 ++
configs/nanopi_neo_plus2_defconfig | 18 +++++
4 files changed, 130 insertions(+)
create mode 100644 arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
create mode 100644 configs/nanopi_neo_plus2_defconfig
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index cd540e9..f54adb2 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -337,6 +337,7 @@ dtb-$(CONFIG_MACH_SUN8I_V3S) += \
sun8i-v3s-licheepi-zero.dtb
dtb-$(CONFIG_MACH_SUN50I_H5) += \
sun50i-h5-nanopi-neo2.dtb \
+ sun50i-h5-nanopi-neo-plus2.dtb \
sun50i-h5-orangepi-pc2.dtb \
sun50i-h5-orangepi-prime.dtb \
sun50i-h5-orangepi-zero-plus2.dtb
diff --git a/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
new file mode 100644
index 0000000..f1406c2
--- /dev/null
+++ b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2017 Antony Antony <antony@phenome.org>
+ * Copyright (c) 2016 ARM Ltd.
+ *
+ * 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 library 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 library 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 "sun50i-h5.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+ model = "FriendlyARM NanoPi NEO Plus 2";
+ compatible = "friendlyarm,nanopi-neo-plus2", "allwinner,sun50i-h5";
+
+ aliases {
+ serial0 = &uart0;
+ };
+
+ chosen {
+ stdout-path = "serial0:115200n8";
+ };
+
+ reg_vcc3v3: vcc3v3 {
+ compatible = "regulator-fixed";
+ regulator-name = "vcc3v3";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ };
+};
+
+&ehci1 {
+ status = "okay";
+};
+
+&mmc0 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
+ vmmc-supply = <®_vcc3v3>;
+ bus-width = <4>;
+ cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;
+ cd-inverted;
+ status = "okay";
+};
+
+&mmc2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc2_8bit_pins>;
+ vmmc-supply = <®_vcc3v3>;
+ bus-width = <8>;
+ non-removable;
+ cap-mmc-hw-reset;
+ status = "okay";
+};
+
+&ohci1 {
+ status = "okay";
+};
+
+&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 99809c6..ee24d70 100644
--- a/board/sunxi/MAINTAINERS
+++ b/board/sunxi/MAINTAINERS
@@ -286,6 +286,11 @@ M: Jagan Teki <jagan@amarulasolutions.com>
S: Maintained
F: configs/nanopi_neo2_defconfig
+NANOPI-NEO-PLUS2 BOARD
+M: Antony Antony <antony@phenome.org>
+S: Maintained
+F: configs/nanopi_neo_plus2_defconfig
+
NANOPI-NEO-AIR BOARD
M: Jelle van der Waa <jelle@vdwaa.nl>
S: Maintained
diff --git a/configs/nanopi_neo_plus2_defconfig b/configs/nanopi_neo_plus2_defconfig
new file mode 100644
index 0000000..83a8dff
--- /dev/null
+++ b/configs/nanopi_neo_plus2_defconfig
@@ -0,0 +1,18 @@
+CONFIG_ARM=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_MACH_SUN50I_H5=y
+CONFIG_DRAM_CLK=408
+CONFIG_DRAM_ZQ=3881977
+CONFIG_MACPWR="PD6"
+CONFIG_DEFAULT_DEVICE_TREE="sun50i-h5-nanopi-neo-plus2"
+# 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_SUN8I_EMAC=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_MMC_SUNXI_SLOT_EXTRA=2
--
2.7.4
^ permalink raw reply related [flat|nested] 33+ messages in thread* [U-Boot] [PATCH v6 1/2] arm64: sun50i-h5.dtsi : update to kernel 4.14
2017-11-21 9:11 ` [U-Boot] [PATCH v6 1/2] arm64: sun50i-h5.dtsi : update to kernel 4.14 Antony Antony
2017-11-21 9:11 ` [U-Boot] [PATCH v6 2/2] sun50i: h5: Add NanoPi Neo Plus2 DT initial support Antony Antony
@ 2017-11-21 13:47 ` Jagan Teki
1 sibling, 0 replies; 33+ messages in thread
From: Jagan Teki @ 2017-11-21 13:47 UTC (permalink / raw)
To: u-boot
On Tue, Nov 21, 2017 at 2:41 PM, Antony Antony <antony@phenome.org> wrote:
> last Kernel commit of sun50i-h5.dtsi d86e63e1f0b7
>
> Signed-off-by: Antony Antony <antony@phenome.org>
Applied to u-boot-sunxi/master
^ permalink raw reply [flat|nested] 33+ messages in thread