sunxi: update Xunlong Orange Pi Zero Plus dts file

This updates the DTS file to the version send upstream

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/target/linux/sunxi/patches-4.14/220-ARM-dts-orange-pi-zero-plus.patch b/target/linux/sunxi/patches-4.14/220-ARM-dts-orange-pi-zero-plus.patch
index d4f987eb65d866bff00690b638005bb4717efa02..2eedb915ddbd7196847c858c0c769698c44c35dc 100644 (file)
--- a/target/linux/sunxi/patches-4.14/220-ARM-dts-orange-pi-zero-plus.patch
+++ b/target/linux/sunxi/patches-4.14/220-ARM-dts-orange-pi-zero-plus.patch
@@ -1,56 +1,46 @@
+From 0e2da1a792a21e3933e17727920ed3c35a3ba57a Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Sun, 11 Mar 2018 15:13:30 +0100
+Subject: [PATCH] arm64: allwinner: H5: Add Xunlong Orange Pi Zero Plus
+
+The Xunlong Orange Pi Zero Plus is single board computer.
+- H5 Quad-core 64-bit Cortex-A53
+- 512MB DDR3
+- microSD slot
+- Debug TTL UART
+- 1000M/100M/10M Ethernet RJ45
+- Realtek RTL8189FTV
+- Spi flash (2MB)
+- One USB 2.0 HOST, One USB 2.0 OTG
+
+This is based on a patch from armbian:
+https://github.com/armbian/build/blob/master/patch/kernel/sunxi-next/sunxi-add-orangepi-zero-plus.patch
+
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+---
+ arch/arm64/boot/dts/allwinner/Makefile             |   1 +
+ .../dts/allwinner/sun50i-h5-orangepi-zero-plus.dts | 147 +++++++++++++++++++++
+ 2 files changed, 148 insertions(+)
+ create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus.dts
+
 --- a/arch/arm64/boot/dts/allwinner/Makefile
 +++ b/arch/arm64/boot/dts/allwinner/Makefile
-@@ -8,6 +8,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-s
+@@ -7,6 +7,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-p
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-sopine-baseboard.dtb
  dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-pc2.dtb
  dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-prime.dtb
- dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus2.dtb
 +dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus.dtb
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus2.dtb
  dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-neo2.dtb
  dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-neo-plus2.dtb
- 
 --- /dev/null
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus.dts
-@@ -0,0 +1,180 @@
+@@ -0,0 +1,147 @@
 +/*
 + * Copyright (C) 2016 ARM Ltd.
++ * Copyright (C) 2018 Hauke Mehrtens <hauke@hauke-m.de>
 + *
-+ * 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.
++ * SPDX-License-Identifier: (GPL-2.0+ OR X11)
 + */
 +
 +/dts-v1/;
@@ -62,7 +52,7 @@
 +
 +/ {
 +      model = "Xunlong Orange Pi Zero Plus";
-+      compatible = "xunlong,orangepi-pc2", "allwinner,sun50i-h5";
++      compatible = "xunlong,orangepi-zero-plus", "allwinner,sun50i-h5";
 +
 +      reg_vcc3v3: vcc3v3 {
 +              compatible = "regulator-fixed";
@@ -86,13 +76,13 @@
 +
 +              pwr {
 +                      label = "orangepi:green:pwr";
-+                      gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>;
++                      gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PA10 */
 +                      default-state = "on";
 +              };
 +
 +              status {
 +                      label = "orangepi:red:status";
-+                      gpios = <&pio 0 17 GPIO_ACTIVE_HIGH>;
++                      gpios = <&pio 0 17 GPIO_ACTIVE_HIGH>; /* PA17 */
 +              };
 +      };
 +
@@ -103,17 +93,7 @@
 +              regulator-max-microvolt = <3300000>;
 +              startup-delay-us = <100000>;
 +              enable-active-high;
-+              gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>;
-+      };
-+
-+      reg_usb0_vbus: usb0-vbus {
-+              compatible = "regulator-fixed";
-+              regulator-name = "usb0-vbus";
-+              regulator-min-microvolt = <5000000>;
-+              regulator-max-microvolt = <5000000>;
-+              enable-active-high;
-+              gpio = <&r_pio 0 2 GPIO_ACTIVE_HIGH>; /* PL2 */
-+              status = "okay";
++              gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; /* PD6 */
 +      };
 +};
 +
@@ -143,7 +123,7 @@
 +
 +&mmc0 {
 +      pinctrl-names = "default";
-+      pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
++      pinctrl-0 = <&mmc0_pins_a>;
 +      vmmc-supply = <&reg_vcc3v3>;
 +      bus-width = <4>;
 +      cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
@@ -167,6 +147,18 @@
 +      };
 +};
 +
++&spi0  {
++      status = "okay";
++
++      flash@0 {
++              #address-cells = <1>;
++              #size-cells = <1>;
++              compatible = "mxicy,mx25l1606e", "winbond,w25q128";
++              reg = <0>;
++              spi-max-frequency = <40000000>;
++      };
++};
++
 +&ohci0 {
 +      status = "okay";
 +};