From f3ba298c2e2cb330313f73f5dc9d3dbe47298884 Mon Sep 17 00:00:00 2001
From: Thomas McKahan <tonymckahan@gmail.com>
Date: Mon, 17 Dec 2018 01:25:27 -0500
Subject: [PATCH] [ rockchip-dev ] spidev to default overlay

	Makes spidev2 an overlay for rk3288, tinker board defines it as default overlay

	overlay patch a bit messy, will clean shortly.
---
 config/boards/tinkerboard.conf                |  2 +-
 .../rockchip-dev/general-add-overlays.patch   | 97 +++++++++++++++++++
 2 files changed, 98 insertions(+), 1 deletion(-)

diff --git a/config/boards/tinkerboard.conf b/config/boards/tinkerboard.conf
index 4bea92618f..c7cc0e9296 100644
--- a/config/boards/tinkerboard.conf
+++ b/config/boards/tinkerboard.conf
@@ -5,7 +5,7 @@ BOOTCONFIG="tinker-rk3288_defconfig"
 #
 MODULES="hci_uart rfcomm hidp 8723bs"
 MODULES_NEXT=""
-#
+DEFAULT_OVERLAYS="spidev2"
 KERNEL_TARGET="default,next,dev"
 CLI_TARGET="stretch,bionic:default,next"
 DESKTOP_TARGET="stretch,bionic:default,next"
diff --git a/patch/kernel/rockchip-dev/general-add-overlays.patch b/patch/kernel/rockchip-dev/general-add-overlays.patch
index ac9efad611..0c08c10feb 100644
--- a/patch/kernel/rockchip-dev/general-add-overlays.patch
+++ b/patch/kernel/rockchip-dev/general-add-overlays.patch
@@ -198,3 +198,100 @@ index 000000000..02bb81a1e
 +        };
 +    };
 +};
+diff --git a/arch/arm/boot/dts/overlay/Makefile b/arch/arm/boot/dts/overlay/Makefile
+index f1c792059..acf1bc549 100644
+--- a/arch/arm/boot/dts/overlay/Makefile
++++ b/arch/arm/boot/dts/overlay/Makefile
+@@ -1,6 +1,7 @@
+ # SPDX-License-Identifier: GPL-2.0
+ dtbo-$(CONFIG_ARCH_ROCKCHIP) += \
+ 	rockchip-ds1307.dtbo	\
++	rockchip-spidev2.dtbo	\
+ 	rockchip-w1-gpio.dtbo
+ 
+ scr-$(CONFIG_ARCH_ROCKCHIP) += \
+diff --git a/arch/arm/boot/dts/overlay/README.rockchip-overlays b/arch/arm/boot/dts/overlay/README.rockchip-overlays
+index 14b22cc0c..45abdbbc2 100644
+--- a/arch/arm/boot/dts/overlay/README.rockchip-overlays
++++ b/arch/arm/boot/dts/overlay/README.rockchip-overlays
+@@ -9,6 +9,7 @@ rockchip (Rockchip)
+ ### Provided overlays:
+ 
+ - ds1307
++- spidev2
+ - w1-gpio
+ 
+ ### Overlay details:
+@@ -17,6 +18,10 @@ rockchip (Rockchip)
+ 
+ Activates ds1307 rtc on i2c1
+ 
++### spidev2
++
++Activate spidev on spi2
++
+ ### w1-gpio
+ 
+ Activates 1-wire gpio master on GPIO0 17
+diff --git a/arch/arm/boot/dts/overlay/rockchip-spidev2.dts b/arch/arm/boot/dts/overlay/rockchip-spidev2.dts
+new file mode 100644
+index 000000000..bdaf0bd77
+--- /dev/null
++++ b/arch/arm/boot/dts/overlay/rockchip-spidev2.dts
+@@ -0,0 +1,33 @@
++/* Definition for SPI2 Spidev
++ * spi port for Tinker Board
++ */
++
++/dts-v1/;
++/plugin/;
++
++/{
++	compatible = "rockchip,rk3288-miniarm", "rockchip,rk3288";
++
++	fragment@0 {
++		
++		target = <&spi2>;
++		__overlay__ {
++
++			spidev@0 {
++				compatible = "rockchip,spi_tinker";
++				reg = <0>;
++				spi-max-frequency = <50000000>;
++				spi-cpha = <1>;
++				status = "okay";
++			};
++	
++			spidev@1 {
++				compatible = "rockchip,spi_tinker";
++				reg = <1>;
++				spi-max-frequency = <50000000>;
++				spi-cpha = <1>;
++				status = "okay";
++			};
++		};
++	};
++};
+diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
+index 08ec7aa4b..f9efc85eb 100644
+--- a/arch/arm/boot/dts/rk3288-tinker.dts
++++ b/arch/arm/boot/dts/rk3288-tinker.dts
+@@ -433,18 +433,7 @@
+ &spi2 {
+ 	status = "okay";
+ 	max-freq = <50000000>;
+-	spidev@0 {
+-		compatible = "rockchip,spi_tinker";
+-		reg = <0>;
+-		spi-max-frequency = <50000000>;
+-		spi-cpha = <1>;
+-	};
+-	spidev@1 {
+-		compatible = "rockchip,spi_tinker";
+-		reg = <1>;
+-		spi-max-frequency = <50000000>;
+-		spi-cpha = <1>;
+-	};
++
+ };
+