From 11aa129d33635fb33304b6e9b945e502f5ba707a Mon Sep 17 00:00:00 2001

From: Peter Robinson <pbrobinson@gmail.com>

Date: Thu, 17 Mar 2016 15:19:04 +0000

Subject: [PATCH] geekbox v4 patchset

---

 Documentation/devicetree/bindings/arm/rockchip.txt |  9 ++++

 arch/arm64/boot/dts/rockchip/Makefile              |  1 +

 arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi       |  2 +-

 .../dts/rockchip/rk3368-geekbox-landingship.dts    | 57 ++++++++++++++++++++++

 arch/arm64/boot/dts/rockchip/rk3368-r88.dts        |  2 +-

 5 files changed, 69 insertions(+), 2 deletions(-)

 create mode 100644 arch/arm64/boot/dts/rockchip/rk3368-geekbox-landingship.dts

diff --git a/Documentation/devicetree/bindings/arm/rockchip.txt b/Documentation/devicetree/bindings/arm/rockchip.txt

index 55f388f..989a039 100644

--- a/Documentation/devicetree/bindings/arm/rockchip.txt

+++ b/Documentation/devicetree/bindings/arm/rockchip.txt

@@ -99,6 +99,15 @@ Rockchip platforms device tree bindings

     Required root node properties:

       - compatible = "mqmaker,miqi", "rockchip,rk3288";

+- GeekBuying GeekBox:

+    Required root node properties:

+      - compatible = "geekbuying,geekbox", "rockchip,rk3368";

+

+- GeekBuying Landingship with GeekBox module:

+    Required root node properties:

+      - compatible = "geekbuying,geekbox-landingship",

+		     "geekbuying,geekbox", "rockchip,rk3368";

+

 - Rockchip RK3368 evb:

     Required root node properties:

       - compatible = "rockchip,rk3368-evb-act8846", "rockchip,rk3368";

diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile

index 87669f6..9aec54e 100644

--- a/arch/arm64/boot/dts/rockchip/Makefile

+++ b/arch/arm64/boot/dts/rockchip/Makefile

@@ -1,6 +1,7 @@

 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-evb-act8846.dtb

 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-geekbox.dtb

 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-orion-r68-meta.dtb

+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-geekbox-landingship.dtb

 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-r88.dtb

 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb.dtb

diff --git a/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi

index fff8b19..bd4f2cf 100644

--- a/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi

+++ b/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi

@@ -49,7 +49,7 @@

 		stdout-path = "serial2:115200n8";

 	};

-	memory {

+	memory@0 {

 		device_type = "memory";

 		reg = <0x0 0x0 0x0 0x40000000>;

 	};

diff --git a/arch/arm64/boot/dts/rockchip/rk3368-geekbox-landingship.dts b/arch/arm64/boot/dts/rockchip/rk3368-geekbox-landingship.dts

new file mode 100644

index 0000000..a28ace9

--- /dev/null

+++ b/arch/arm64/boot/dts/rockchip/rk3368-geekbox-landingship.dts

@@ -0,0 +1,57 @@

+/*

+ * Copyright (c) 2016 Andreas Färber

+ *

+ * This file is dual-licensed: you can use it either under the terms

+ * of the GPL or the X11 license, at your option. Note that this dual

+ * licensing only applies to this file, and not this project as a

+ * whole.

+ *

+ *  a) This file is free software; you can redistribute it and/or

+ *     modify it under the terms of the GNU General Public License as

+ *     published by the Free Software Foundation; either version 2 of the

+ *     License, or (at your option) any later version.

+ *

+ *     This file is distributed in the hope that it will be useful,

+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of

+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ *     GNU General Public License for more details.

+ *

+ * Or, alternatively,

+ *

+ *  b) Permission is hereby granted, free of charge, to any person

+ *     obtaining a copy of this software and associated documentation

+ *     files (the "Software"), to deal in the Software without

+ *     restriction, including without limitation the rights to use,

+ *     copy, modify, merge, publish, distribute, sublicense, and/or

+ *     sell copies of the Software, and to permit persons to whom the

+ *     Software is furnished to do so, subject to the following

+ *     conditions:

+ *

+ *     The above copyright notice and this permission notice shall be

+ *     included in all copies or substantial portions of the Software.

+ *

+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES

+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+ *     OTHER DEALINGS IN THE SOFTWARE.

+ */

+

+#include "rk3368-geekbox.dts"

+

+/ {

+	model = "GeekBox on Landingship";

+	compatible = "geekbuying,geekbox-landingship",

+		     "geekbuying,geekbox", "rockchip,rk3368";

+};

+

+&i2c1 {

+	status = "disabled";

+};

+

+&i2c2 {

+	status = "okay";

+};

diff --git a/arch/arm64/boot/dts/rockchip/rk3368-r88.dts b/arch/arm64/boot/dts/rockchip/rk3368-r88.dts

index eed1ef6..18e2b77 100644

--- a/arch/arm64/boot/dts/rockchip/rk3368-r88.dts

+++ b/arch/arm64/boot/dts/rockchip/rk3368-r88.dts

@@ -52,7 +52,7 @@

 		stdout-path = "serial2:115200n8";

 	};

-	memory {

+	memory@0 {

 		device_type = "memory";

 		reg = <0x0 0x0 0x0 0x40000000>;

 	};

-- 

2.7.4