From e2e4ef27606f96a06aadba94668e261b844be2d9 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor.pecovnik@gmail.com>
Date: Tue, 16 May 2017 09:47:54 +0200
Subject: [PATCH] Adjusting patch and update kernel conf for Rockchip NEXT

---
 config/kernel/linux-rockchip-next.config          |  2 +-
 .../rockchip-next/9002_dts_rk3288_updates.patch   | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/config/kernel/linux-rockchip-next.config b/config/kernel/linux-rockchip-next.config
index 772b5ab74a..be0a851a6a 100644
--- a/config/kernel/linux-rockchip-next.config
+++ b/config/kernel/linux-rockchip-next.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.11.0 Kernel Configuration
+# Linux/arm 4.11.1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
diff --git a/patch/kernel/rockchip-next/9002_dts_rk3288_updates.patch b/patch/kernel/rockchip-next/9002_dts_rk3288_updates.patch
index 65da708a6b..9984f01964 100644
--- a/patch/kernel/rockchip-next/9002_dts_rk3288_updates.patch
+++ b/patch/kernel/rockchip-next/9002_dts_rk3288_updates.patch
@@ -13,7 +13,7 @@ index f796568..6bc4b39 100644
  				regulator-state-mem {
 @@ -333,7 +333,6 @@
  			};
- 
+
  			vcc33_sd: SWITCH_REG1 {
 -				regulator-always-on;
  				regulator-boot-on;
@@ -22,7 +22,7 @@ index f796568..6bc4b39 100644
 @@ -353,14 +352,45 @@
  	};
  };
- 
+
 +&i2c1 {
 +    status = "okay";
 +};
@@ -30,11 +30,11 @@ index f796568..6bc4b39 100644
  &i2c2 {
  	status = "okay";
  };
- 
+
 +&i2c3 {
 +    status = "okay";
 +};
-+ 
++
 +&i2c4 {
 +    status = "okay";
 +};
@@ -42,7 +42,7 @@ index f796568..6bc4b39 100644
  &i2c5 {
  	status = "okay";
  };
- 
+
 + &spi2 {
 +        status = "okay";
 +        max-freq = <50000000>;
@@ -89,7 +89,7 @@ index 7b3c737..d54bb79 100644
 +		};
 +
  	};
- 
+
  	reserved-memory {
 @@ -437,9 +450,9 @@
  		dma-names = "tx", "rx";
@@ -116,11 +116,10 @@ diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
 index 9e2e099..3a0f0a7 100644
 --- a/drivers/spi/spidev.c
 +++ b/drivers/spi/spidev.c
-@@ -697,7 +697,8 @@ static const struct of_device_id spidev_dt_ids[] = {
+@@ -697,6 +697,7 @@ static const struct of_device_id spidev_dt_ids[] = {
  	{ .compatible = "rohm,dh2228fv" },
  	{ .compatible = "lineartechnology,ltc2488" },
  	{ .compatible = "ge,achc" },
- 	{ .compatible = "semtech,sx1301" },
 +	{ .compatible = "rockchip,spi_tinker" },
  	{},
  };