Del rk29-audio.c

diff --git a/arch/arm/mach-rk29/Makefile b/arch/arm/mach-rk29/Makefile
index 18e5948018f4e1cfad410afd9ad7a860ce6f9bf1..df59ba3d11af562f73bfca27cd8867d5af813ca9 100644 (file)
--- a/arch/arm/mach-rk29/Makefile
+++ b/arch/arm/mach-rk29/Makefile
@@ -1,4 +1,3 @@
 obj-y += timer.o io.o devices.o iomux.o clock.o rk29-pl330.o dma.o gpio.o
-obj-$(CONFIG_SND_RK29_SOC_I2S) += rk29-audio.o
 obj-$(CONFIG_RK29_VPU) += vpu.o
 obj-$(CONFIG_MACH_RK29SDK) += board-rk29sdk.o board-rk29sdk-key.o

diff --git a/arch/arm/mach-rk29/devices.c b/arch/arm/mach-rk29/devices.c
index 333735f662295a7b38e6abd72b61dc64b3129a52..98490783bac92c90055df7a29500cc1f8b6dcd78 100755 (executable)
--- a/arch/arm/mach-rk29/devices.c
+++ b/arch/arm/mach-rk29/devices.c
@@ -422,3 +422,64 @@ struct platform_device rk29_device_nand = {
 };
 #endif
 
+#if defined(CONFIG_SND_RK29_SOC_I2S)
+static struct resource rk29_iis_2ch_resource[] = {
+        [0] = {
+                .start = RK29_I2S_2CH_PHYS,
+                .end   = RK29_I2S_2CH_PHYS + RK29_I2S_2CH_SIZE,
+                .flags = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start = DMACH_I2S_2CH_TX,
+                .end   = DMACH_I2S_2CH_TX,
+                .flags = IORESOURCE_DMA,
+        },
+        [2] = {
+                .start = DMACH_I2S_2CH_RX,
+                .end   = DMACH_I2S_2CH_RX,
+                .flags = IORESOURCE_DMA,
+        },
+        [3] = {
+                .start = IRQ_I2S_2CH,
+                .end   = IRQ_I2S_2CH,
+                .flags = IORESOURCE_IRQ,        
+        },
+};
+
+struct platform_device rk29_device_iis_2ch = {
+        .name           = "rk29-i2s",
+        .id             = 0,
+        .num_resources  = ARRAY_SIZE(rk29_iis_2ch_resource),
+        .resource       = rk29_iis_2ch_resource,
+};
+
+static struct resource rk29_iis_8ch_resource[] = {
+        [0] = {
+                .start = RK29_I2S_8CH_PHYS,
+                .end   = RK29_I2S_8CH_PHYS + RK29_I2S_8CH_SIZE,
+                .flags = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start = DMACH_I2S_8CH_TX,
+                .end   = DMACH_I2S_8CH_TX,
+                .flags = IORESOURCE_DMA,
+        },
+        [2] = {
+                .start = DMACH_I2S_8CH_RX,
+                .end   = DMACH_I2S_8CH_RX,
+                .flags = IORESOURCE_DMA,
+        },
+        [3] = {
+                .start = IRQ_I2S_8CH,
+                .end   = IRQ_I2S_8CH,
+                .flags = IORESOURCE_IRQ,        
+        },
+};
+
+struct platform_device rk29_device_iis_8ch = {
+        .name           = "rk29-i2s",
+        .id             = 1,
+        .num_resources  = ARRAY_SIZE(rk29_iis_8ch_resource),
+        .resource       = rk29_iis_8ch_resource,
+};
+#endif

diff --git a/arch/arm/mach-rk29/rk29-audio.c b/arch/arm/mach-rk29/rk29-audio.c
deleted file mode 100644 (file)
index 7238538..0000000
--- a/arch/arm/mach-rk29/rk29-audio.c
+++ /dev/null
@@ -1,68 +0,0 @@
-
-#include <linux/platform_device.h>
-#include <linux/dma-mapping.h>
-#include <linux/gpio.h>
-
-#include <mach/rk29-dma-pl330.h>
-#include <mach/rk29_iomap.h>
-#include <mach/irqs.h>
-
-static struct resource rk29_iis_2ch_resource[] = {
-        [0] = {
-                .start = RK29_I2S_2CH_PHYS,
-                .end   = RK29_I2S_2CH_PHYS + RK29_I2S_2CH_SIZE,
-                .flags = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start = DMACH_I2S_2CH_TX,
-                .end   = DMACH_I2S_2CH_TX,
-                .flags = IORESOURCE_DMA,
-        },
-        [2] = {
-                .start = DMACH_I2S_2CH_RX,
-                .end   = DMACH_I2S_2CH_RX,
-                .flags = IORESOURCE_DMA,
-        },
-        [3] = {
-                .start = IRQ_I2S_2CH,
-                .end   = IRQ_I2S_2CH,
-                .flags = IORESOURCE_IRQ,        
-        },
-};
-
-struct platform_device rk29_device_iis_2ch = {
-        .name           = "rk29-i2s",
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(rk29_iis_2ch_resource),
-        .resource       = rk29_iis_2ch_resource,
-};
-
-static struct resource rk29_iis_8ch_resource[] = {
-        [0] = {
-                .start = RK29_I2S_8CH_PHYS,
-                .end   = RK29_I2S_8CH_PHYS + RK29_I2S_8CH_SIZE,
-                .flags = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start = DMACH_I2S_8CH_TX,
-                .end   = DMACH_I2S_8CH_TX,
-                .flags = IORESOURCE_DMA,
-        },
-        [2] = {
-                .start = DMACH_I2S_8CH_RX,
-                .end   = DMACH_I2S_8CH_RX,
-                .flags = IORESOURCE_DMA,
-        },
-        [3] = {
-                .start = IRQ_I2S_8CH,
-                .end   = IRQ_I2S_8CH,
-                .flags = IORESOURCE_IRQ,        
-        },
-};
-
-struct platform_device rk29_device_iis_8ch = {
-        .name           = "rk29-i2s",
-        .id             = 1,
-        .num_resources  = ARRAY_SIZE(rk29_iis_8ch_resource),
-        .resource       = rk29_iis_8ch_resource,
-};