From 8b735688821482d78a373981b56d4c9fa6305275 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <tpearson@raptorengineeringinc.com>
Date: Mon, 18 Apr 2016 16:48:55 +0000
Subject: [PATCH 10/15] arch/arm/dts: Update RK3288 DTS files

Signed-off-by: Timothy Pearson <tpearson@raptorengineeringinc.com>
---
 arch/arm/dts/rk3288-jerry.dts   |  8 +-------
 arch/arm/dts/rk3288-veyron.dtsi | 12 ------------
 arch/arm/dts/rk3288.dtsi        |  4 ++++
 3 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/arch/arm/dts/rk3288-jerry.dts b/arch/arm/dts/rk3288-jerry.dts
index 2aa3b9f..275223b 100644
--- a/arch/arm/dts/rk3288-jerry.dts
+++ b/arch/arm/dts/rk3288-jerry.dts
@@ -8,6 +8,7 @@
 
 /dts-v1/;
 #include "rk3288-veyron-chromebook.dtsi"
+#include "rk3288-veyron-ddr3.dtsi"
 #include "cros-ec-sbs.dtsi"
 
 / {
@@ -137,13 +138,6 @@
 		};
 	};
 
-	emmc {
-		/* Make sure eMMC is not in reset */
-		emmc_deassert_reset: emmc-deassert-reset {
-			rockchip,pins = <2 9 RK_FUNC_GPIO &pcfg_pull_none>;
-		};
-	};
-
 	hdmi {
 		vcc50_hdmi_en: vcc50-hdmi-en {
 			rockchip,pins = <5 19 RK_FUNC_GPIO &pcfg_pull_none>;
diff --git a/arch/arm/dts/rk3288-veyron.dtsi b/arch/arm/dts/rk3288-veyron.dtsi
index 421d212..7a74dac 100644
--- a/arch/arm/dts/rk3288-veyron.dtsi
+++ b/arch/arm/dts/rk3288-veyron.dtsi
@@ -232,19 +232,11 @@
 	rockchip,odt-disable-freq = <333000000>;
 	rockchip,dll-disable-freq = <333000000>;
 	rockchip,sr-enable-freq = <333000000>;
-	rockchip,pd-enable-freq = <666000000>;
 	rockchip,auto-self-refresh-cnt = <0>;
 	rockchip,auto-power-down-cnt = <64>;
 	rockchip,ddr-speed-bin = <21>;
 	rockchip,trcd = <10>;
 	rockchip,trp = <10>;
-	operating-points = <
-		/* KHz    uV */
-		200000 1050000
-		333000 1100000
-		533000 1150000
-		666000 1200000
-	>;
 	rockchip,num-channels = <2>;
 	rockchip,pctl-timing = <0x29a 0xc8 0x1f4 0x42 0x4e 0x4 0xea 0xa
 		0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
@@ -843,10 +835,6 @@
 	assigned-clock-parents = <&cru SCLK_OTGPHY0>;
 };
 
-&sdmmc {
-	u-boot,dm-pre-reloc;
-};
-
 &gpio3 {
 	u-boot,dm-pre-reloc;
 };
diff --git a/arch/arm/dts/rk3288.dtsi b/arch/arm/dts/rk3288.dtsi
index e51c75c..038195a 100644
--- a/arch/arm/dts/rk3288.dtsi
+++ b/arch/arm/dts/rk3288.dtsi
@@ -1110,6 +1110,8 @@
 		};
 
 		sdmmc {
+			interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
+
 			sdmmc_clk: sdmmc-clk {
 				rockchip,pins = <6 20 RK_FUNC_1 &pcfg_pull_none>;
 			};
@@ -1217,6 +1219,8 @@
 		};
 
 		emmc {
+			interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
+
 			emmc_clk: emmc-clk {
 				rockchip,pins = <3 18 RK_FUNC_2 &pcfg_pull_none>;
 			};
-- 
1.9.1