From c010b05e66d4bb0a33fbe3d24a2373358dc3532a Mon Sep 17 00:00:00 2001
From: Piotr Szczepanik <piter75@gmail.com>
Date: Tue, 6 Oct 2020 22:57:58 +0200
Subject: [PATCH] Enabled SPI flash by default for ROCK Pi 4A/B/C

---
 ...kpi4-0006-arm64-dts-enable-spi-flash.patch | 21 +++++++++++++++
 ...kpi4-0006-arm64-dts-enable-spi-flash.patch | 21 +++++++++++++++
 .../rockpi4b-enabled-spi-flash.patch          | 27 +++++++++++++++++++
 3 files changed, 69 insertions(+)
 create mode 100644 patch/kernel/rockchip64-current/rockpi4-0006-arm64-dts-enable-spi-flash.patch
 create mode 100644 patch/kernel/rockchip64-dev/rockpi4-0006-arm64-dts-enable-spi-flash.patch
 create mode 100644 patch/kernel/rockchip64-legacy/rockpi4b-enabled-spi-flash.patch

diff --git a/patch/kernel/rockchip64-current/rockpi4-0006-arm64-dts-enable-spi-flash.patch b/patch/kernel/rockchip64-current/rockpi4-0006-arm64-dts-enable-spi-flash.patch
new file mode 100644
index 000000000..00b663d97
--- /dev/null
+++ b/patch/kernel/rockchip64-current/rockpi4-0006-arm64-dts-enable-spi-flash.patch
@@ -0,0 +1,21 @@
+diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
+index ffe40eca8..ac0ac5932 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
++++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
+@@ -719,6 +719,16 @@ &sdhci {
+ 	status = "okay";
+ };
+ 
++&spi1 {
++	status = "okay";
++
++	flash@0 {
++		compatible = "jedec,spi-nor";
++		reg = <0>;
++		spi-max-frequency = <10000000>;
++	};
++};
++
+ &tcphy0 {
+ 	status = "okay";
+ };
diff --git a/patch/kernel/rockchip64-dev/rockpi4-0006-arm64-dts-enable-spi-flash.patch b/patch/kernel/rockchip64-dev/rockpi4-0006-arm64-dts-enable-spi-flash.patch
new file mode 100644
index 000000000..00b663d97
--- /dev/null
+++ b/patch/kernel/rockchip64-dev/rockpi4-0006-arm64-dts-enable-spi-flash.patch
@@ -0,0 +1,21 @@
+diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
+index ffe40eca8..ac0ac5932 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
++++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
+@@ -719,6 +719,16 @@ &sdhci {
+ 	status = "okay";
+ };
+ 
++&spi1 {
++	status = "okay";
++
++	flash@0 {
++		compatible = "jedec,spi-nor";
++		reg = <0>;
++		spi-max-frequency = <10000000>;
++	};
++};
++
+ &tcphy0 {
+ 	status = "okay";
+ };
diff --git a/patch/kernel/rockchip64-legacy/rockpi4b-enabled-spi-flash.patch b/patch/kernel/rockchip64-legacy/rockpi4b-enabled-spi-flash.patch
new file mode 100644
index 000000000..f9154c5e7
--- /dev/null
+++ b/patch/kernel/rockchip64-legacy/rockpi4b-enabled-spi-flash.patch
@@ -0,0 +1,27 @@
+diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpi4b.dts b/arch/arm64/boot/dts/rockchip/rk3399-rockpi4b.dts
+index 9d88c06c5..9f3693003 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3399-rockpi4b.dts
++++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpi4b.dts
+@@ -353,6 +353,22 @@
+ 	status = "okay";
+ };
+ 
++&spi1 {
++	status = "okay";
++	max-freq = <10000000>;
++	#address-cells = <1>;
++	#size-cells = <0>;
++
++	spiflash: spi-flash@0 {
++		#address-cells = <0x1>;
++		#size-cells = <1>; 
++		compatible = "jedec,spi-nor";
++		reg = <0x0>;
++		spi-max-frequency = <10000000>;
++		status = "okay";
++	};
++};
++
+ &i2s0 {
+ 	status = "okay";
+ 	rockchip,i2s-broken-burst-len;