Re: [U-Boot] [PATCH] sunxi: add support for Orange Pi R1 board

2017-11-16 Thread Maxime Ripard 
On Mon, Nov 13, 2017 at 08:42:34PM +0800, Icenowy Zheng wrote:
> 在 2017-11-13 20:38，Maxime Ripard 写道：
> > Hi,
> > 
> > On Mon, Nov 13, 2017 at 07:34:46PM +0800, Icenowy Zheng wrote:
> > > +++ b/configs/orangepi_r1_defconfig
> > > @@ -0,0 +1,19 @@
> > > +CONFIG_ARM=y
> > > +CONFIG_ARCH_SUNXI=y
> > > +CONFIG_MACH_SUN8I_H3=y
> > > +CONFIG_DRAM_CLK=624
> > > +CONFIG_DRAM_ZQ=3881979
> > > +CONFIG_DRAM_ODT_EN=y
> > > +# CONFIG_VIDEO_DE2 is not set
> > > +CONFIG_DEFAULT_DEVICE_TREE="sun8i-h2-plus-orangepi-r1"
> > > +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> > > +CONFIG_CONSOLE_MUX=y
> > 
> > Why?
> 
> This option is also present on the original Orange Pi Zero
> defconfig. If you like I will delete it.

If there's no justifications, then yes, please do.

Thanks!
Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com


signature.asc
Description: PGP signature
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Re: [U-Boot] [PATCH] sunxi: add support for Orange Pi R1 board

2017-11-13 Thread Icenowy Zheng 

在 2017-11-13 20:38，Maxime Ripard 写道：

Hi,

On Mon, Nov 13, 2017 at 07:34:46PM +0800, Icenowy Zheng wrote:

+++ b/configs/orangepi_r1_defconfig
@@ -0,0 +1,19 @@
+CONFIG_ARM=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_MACH_SUN8I_H3=y
+CONFIG_DRAM_CLK=624
+CONFIG_DRAM_ZQ=3881979
+CONFIG_DRAM_ODT_EN=y
+# CONFIG_VIDEO_DE2 is not set
+CONFIG_DEFAULT_DEVICE_TREE="sun8i-h2-plus-orangepi-r1"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_CONSOLE_MUX=y


Why?


This option is also present on the original Orange Pi Zero
defconfig. If you like I will delete it.




+CONFIG_SPL=y
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+CONFIG_SPL_SPI_SUNXI=y
+CONFIG_SUN8I_EMAC=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
+CONFIG_USB_HOST_ETHER=y
+CONFIG_USB_ETHER_RTL8152=y


Shouldn't this one depend on USB_HOST_ETHER?


I think so, but `make savedefconfig` generates this; if the
CONFIG_USB_HOST_ETHER line is deleted, `make orangepi_r1_defconfig`
won't be able to enable CONFIG_USB_ETHER_RTL8152 properly.



Thanks!
Maxime

___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Re: [U-Boot] [PATCH] sunxi: add support for Orange Pi R1 board

2017-11-13 Thread Maxime Ripard 
Hi,

On Mon, Nov 13, 2017 at 07:34:46PM +0800, Icenowy Zheng wrote:
> +++ b/configs/orangepi_r1_defconfig
> @@ -0,0 +1,19 @@
> +CONFIG_ARM=y
> +CONFIG_ARCH_SUNXI=y
> +CONFIG_MACH_SUN8I_H3=y
> +CONFIG_DRAM_CLK=624
> +CONFIG_DRAM_ZQ=3881979
> +CONFIG_DRAM_ODT_EN=y
> +# CONFIG_VIDEO_DE2 is not set
> +CONFIG_DEFAULT_DEVICE_TREE="sun8i-h2-plus-orangepi-r1"
> +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_CONSOLE_MUX=y

Why?

> +CONFIG_SPL=y
> +# CONFIG_CMD_FLASH is not set
> +# CONFIG_CMD_FPGA is not set
> +CONFIG_SPL_SPI_SUNXI=y
> +CONFIG_SUN8I_EMAC=y
> +CONFIG_USB_EHCI_HCD=y
> +CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
> +CONFIG_USB_HOST_ETHER=y
> +CONFIG_USB_ETHER_RTL8152=y

Shouldn't this one depend on USB_HOST_ETHER?

Thanks!
Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com


signature.asc
Description: PGP signature
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

[U-Boot] [PATCH] sunxi: add support for Orange Pi R1 board

2017-11-13 Thread Icenowy Zheng 
Orange Pi R1 is a board designed based on Orange Pi Zero, with Wi-Fi
chip replaced and USB Type-A jack replaced with an on-board RTL8152B
USB-Ethernet adapter.

Add support for it.

Signed-off-by: Icenowy Zheng 
---
 arch/arm/dts/Makefile  |  1 +
 arch/arm/dts/sun8i-h2-plus-orangepi-r1.dts | 73 ++
 board/sunxi/MAINTAINERS|  5 ++
 configs/orangepi_r1_defconfig  | 19 
 4 files changed, 98 insertions(+)
 create mode 100644 arch/arm/dts/sun8i-h2-plus-orangepi-r1.dts
 create mode 100644 configs/orangepi_r1_defconfig

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 6db64f9101..a34634d219 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -317,6 +317,7 @@ dtb-$(CONFIG_MACH_SUN8I_A83T) += \
sun8i-a83t-bananapi-m3.dtb \
sun8i-a83t-cubietruck-plus.dtb
 dtb-$(CONFIG_MACH_SUN8I_H3) += \
+   sun8i-h2-plus-orangepi-r1.dtb \
sun8i-h2-plus-orangepi-zero.dtb \
sun8i-h3-bananapi-m2-plus.dtb \
sun8i-h3-orangepi-2.dtb \
diff --git a/arch/arm/dts/sun8i-h2-plus-orangepi-r1.dts 
b/arch/arm/dts/sun8i-h2-plus-orangepi-r1.dts
new file mode 100644
index 00..32a6d31242
--- /dev/null
+++ b/arch/arm/dts/sun8i-h2-plus-orangepi-r1.dts
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2017 Icenowy Zheng 
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/* Orange Pi R1 is based on Orange Pi Zero design */
+#include "sun8i-h2-plus-orangepi-zero.dts"
+
+/ {
+   model = "Xunlong Orange Pi R1";
+   compatible = "xunlong,orangepi-r1", "allwinner,sun8i-h2-plus";
+
+   /delete-node/ reg_vcc_wifi;
+
+   aliases {
+   ethernet1 = 
+   };
+};
+
+ {
+   /*
+* RTL8152B USB-Ethernet adapter is connected to USB1,
+* and it's a USB 2.0 device. So the OHCI1 controller
+* can be left disabled.
+*/
+   status = "disabled";
+};
+
+ {
+   vmmc-supply = <_vcc3v3>;
+   vqmmc-supply = <_vcc3v3>;
+
+   rtl8189etv: sdio_wifi@1 {
+   reg = <1>;
+   };
+};
diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS
index 99809c6a1c..0db64e6080 100644
--- a/board/sunxi/MAINTAINERS
+++ b/board/sunxi/MAINTAINERS
@@ -326,6 +326,11 @@ M: Jagan Teki 
 S: Maintained
 F: configs/orangepi_prime_defconfig
 
+ORANGEPI R1 BOARD
+M: Icenowy Zheng 
+S: Maintained
+F: configs/orangepi_r1_defconfig
+
 PINE64 BOARDS
 M: Andre Przywara 
 S: Maintained
diff --git a/configs/orangepi_r1_defconfig b/configs/orangepi_r1_defconfig
new file mode 100644
index 00..87037a7b79
--- /dev/null
+++ b/configs/orangepi_r1_defconfig
@@ -0,0 +1,19 @@
+CONFIG_ARM=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_MACH_SUN8I_H3=y
+CONFIG_DRAM_CLK=624
+CONFIG_DRAM_ZQ=3881979
+CONFIG_DRAM_ODT_EN=y
+# CONFIG_VIDEO_DE2 is not set
+CONFIG_DEFAULT_DEVICE_TREE="sun8i-h2-plus-orangepi-r1"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set