---

yaml --- r: 48924 b: refs/heads/master c: 4c784ef h: refs/heads/master v: v3
git-mirror · Feb 11, 2007 · 4ed8799 · 4ed8799
1 parent 63fe0d3
commit 4ed8799
Show file tree

Hide file tree

Showing 11 changed files with 126 additions and 269 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 108d093fdd75643dfc8c327f38125f4da76771e7
+refs/heads/master: 4c784ef76ac4443ab13648859f1b2a2737546cc1
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -280,7 +280,6 @@ config ARCH_PXA
 	bool "PXA2xx-based"
 	depends on MMU
 	select ARCH_MTD_XIP
-	select GENERIC_TIME
 	help
 	  Support for Intel's PXA2XX processor line.
 

diff --git a/trunk/arch/arm/mach-pxa/generic.c b/trunk/arch/arm/mach-pxa/generic.c
@@ -338,27 +338,6 @@ static struct platform_device i2c_device = {
 	.num_resources	= ARRAY_SIZE(i2c_resources),
 };
 
-#ifdef CONFIG_PXA27x
-static struct resource i2c_power_resources[] = {
-	{
-		.start	= 0x40f00180,
-		.end	= 0x40f001a3,
-		.flags	= IORESOURCE_MEM,
-	}, {
-		.start	= IRQ_PWRI2C,
-		.end	= IRQ_PWRI2C,
-		.flags	= IORESOURCE_IRQ,
-	},
-};
-
-static struct platform_device i2c_power_device = {
-	.name		= "pxa2xx-i2c",
-	.id		= 1,
-	.resource	= i2c_power_resources,
-	.num_resources	= ARRAY_SIZE(i2c_resources),
-};
-#endif
-
 void __init pxa_set_i2c_info(struct i2c_pxa_platform_data *info)
 {
 	i2c_device.dev.platform_data = info;
@@ -413,9 +392,6 @@ static struct platform_device *devices[] __initdata = {
 	&stuart_device,
 	&pxaficp_device,
 	&i2c_device,
-#ifdef CONFIG_PXA27x
-	&i2c_power_device,
-#endif
 	&i2s_device,
 	&pxartc_device,
 };

diff --git a/trunk/arch/arm/mach-s3c2410/Kconfig b/trunk/arch/arm/mach-s3c2410/Kconfig
@@ -192,10 +192,17 @@ config S3C2412_PM
 	help
 	  Internal config node to apply S3C2412 power management
 
+config S3C2412_DMA
+	bool
+	depends on CPU_S3C2412
+	help
+	  Internal config node for S3C2412 DMA support
+
 config CPU_S3C2412
 	bool
 	depends on ARCH_S3C2410
 	select S3C2412_PM if PM
+	select S3C2412_DMA if S3C2410_DMA
 	help
 	  Support for the S3C2412 and S3C2413 SoCs from the S3C24XX line
 
@@ -205,11 +212,18 @@ config CPU_S3C244X
 	help
 	  Support for S3C2440 and S3C2442 Samsung Mobile CPU based systems.
 
+config S3C2440_DMA
+	bool
+	depends on ARCH_S3C2410 && CPU_S3C24405B
+	help
+	  Support for S3C2440 specific DMA code5A
+
 config CPU_S3C2440
 	bool
 	depends on ARCH_S3C2410
 	select S3C2410_CLOCK
 	select S3C2410_PM if PM
+	select S3C2440_DMA if S3C2410_DMA
 	select CPU_S3C244X
 	help
 	  Support for S3C2440 Samsung Mobile CPU based systems.
@@ -272,7 +286,6 @@ config S3C2410_DMA_DEBUG
 	  amount of time, as well as using an significant percentage of
 	  the CPU time doing so.
 
-
 config S3C2410_PM_DEBUG
 	bool "S3C2410 PM Suspend debug"
 	depends on ARCH_S3C2410 && PM

diff --git a/trunk/arch/arm/mach-s3c2410/Makefile b/trunk/arch/arm/mach-s3c2410/Makefile
@@ -9,8 +9,6 @@ obj-y			:= cpu.o irq.o time.o gpio.o clock.o devs.o
 obj-m			:=
 obj-n			:=
 obj-			:=
-obj-dma-y		:=
-obj-dma-n		:=
 
 # DMA
 obj-$(CONFIG_S3C2410_DMA)	+= dma.o
@@ -37,9 +35,9 @@ obj-$(CONFIG_PM_H1940)		+= pm-h1940.o
 obj-$(CONFIG_CPU_S3C2412)	+= s3c2412.o
 obj-$(CONFIG_CPU_S3C2412)	+= s3c2412-irq.o
 obj-$(CONFIG_CPU_S3C2412)	+= s3c2412-clock.o
-obj-dma-$(CONFIG_CPU_S3C2412)	+= s3c2412-dma.o
 
 obj-$(CONFIG_S3C2412_PM)	+= s3c2412-pm.o
+obj-$(CONFIG_S3C2412_DMA)	+= s3c2412-dma.o
 
 #
 # S3C244X support
@@ -57,7 +55,7 @@ obj-$(CONFIG_CPU_S3C2440)	+= s3c2440.o s3c2440-dsc.o
 obj-$(CONFIG_CPU_S3C2440)	+= s3c2440-irq.o
 obj-$(CONFIG_CPU_S3C2440)	+= s3c2440-clock.o
 obj-$(CONFIG_CPU_S3C2440)	+= s3c2410-gpio.o
-obj-dma-$(CONFIG_CPU_S3C2440)	+= s3c2440-dma.o
+obj-$(CONFIG_S3C2440_DMA)	+= s3c2440-dma.o
 
 # S3C2442 support
 
@@ -68,10 +66,6 @@ obj-$(CONFIG_CPU_S3C2442)	+= s3c2442-clock.o
 
 obj-$(CONFIG_BAST_PC104_IRQ)	+= bast-irq.o
 
-# merge in dma objects
-
-obj-y				+= $(obj-dma-y)
-
 # machine specific support
 
 obj-$(CONFIG_MACH_AML_M5900)	+= mach-amlm5900.o