From e4375cd328594090758f6cdb8c60fbb5f23040f9 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=E9=BB=84=E6=B6=9B?= <huangtao@rock-chips.com>
Date: Mon, 10 Feb 2014 14:19:24 +0800
Subject: [PATCH] ARM: rockchip: fix dma commit
 1dcced23a5ed21220d42540a1e897db61cda66ba

---
 arch/arm/boot/dts/rk3188.dtsi       | 32 ++++++++++++++---------------
 arch/arm/configs/rockchip_defconfig |  4 ----
 arch/arm/mach-rockchip/Kconfig      |  7 ++-----
 3 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi
index 1fcd4300a4c8..3f48110748ec 100644
--- a/arch/arm/boot/dts/rk3188.dtsi
+++ b/arch/arm/boot/dts/rk3188.dtsi
@@ -200,33 +200,33 @@
 		rockchip,clocksource = <1>;
 	};
 
-    amba {
+	amba {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "arm,amba-bus";
 		interrupt-parent = <&gic>;
 		ranges;
 
-        pdma0: pdma@20018000 {
-            compatible = "arm,pl330", "arm,primecell";
-            reg = <0x20018000 0x4000>;
-            interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>,
-                         <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
-            #dma-cells = <1>;
+		pdma0: pdma@20018000 {
+			compatible = "arm,pl330", "arm,primecell";
+			reg = <0x20018000 0x4000>;
+			interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
+			#dma-cells = <1>;
 			#dma-channels = <9>;
 			#dma-requests = <10>;
-        };
+		};
 
-        pdma1: pdma@20078000 {
-            compatible = "arm,pl330", "arm,primecell";
-            reg = <0x20078000 0x4000>;
-            interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>,
-                         <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
-            #dma-cells = <1>;
+		pdma1: pdma@20078000 {
+			compatible = "arm,pl330", "arm,primecell";
+			reg = <0x20078000 0x4000>;
+			interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
+			#dma-cells = <1>;
 			#dma-channels = <7>;
 			#dma-requests = <14>;
-        };
-    };
+		};
+	};
 
 	uart0: serial@10124000 {
 		compatible = "rockchip,serial";
diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig
index 413d06ad502f..b7d5a6da9d19 100644
--- a/arch/arm/configs/rockchip_defconfig
+++ b/arch/arm/configs/rockchip_defconfig
@@ -32,7 +32,6 @@ CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_ARCH_ROCKCHIP=y
-CONFIG_RK_PL330_DMA_TEST=y
 # CONFIG_SWP_EMULATE is not set
 CONFIG_ARM_ERRATA_720789=y
 CONFIG_PL310_ERRATA_753970=y
@@ -56,7 +55,6 @@ CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_ARM_APPENDED_DTB=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND=y
-CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE=y
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
@@ -410,8 +408,6 @@ CONFIG_SWITCH=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_PCF8563=y
 CONFIG_RK808_RTC=y
-CONFIG_DMADEVICES=y
-CONFIG_PL330_DMA=y
 CONFIG_STAGING=y
 CONFIG_ANDROID=y
 CONFIG_ANDROID_BINDER_IPC=y
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index ed5afe409beb..76a6c9f0238b 100644
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -17,10 +17,8 @@ config ARCH_ROCKCHIP
 	select ARCH_HAS_CPUFREQ
 	select ARCH_HAS_OPP
 	select ARM_AMBA
-    select ROCKCHIP_DEV_DMA
-	help
-	  Support for Rockchip's Cortex-A9 Single-to-Quad-Core-SoCs
-	  containing the RK2928, RK30xx and RK31xx series.
+	select DMADEVICES
+	select PL330_DMA
 
 if ARCH_ROCKCHIP
 
@@ -41,5 +39,4 @@ config DVFS
 
 config RK_PL330_DMA_TEST
 	bool "pl330 DMA memcpy test"
-	depends on PL330_DMA
 endif
-- 
2.34.1