shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 04:10:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

Del rk29-audio.c

Browse Source
This commit is contained in:
fang
2010-11-22 20:20:02 +08:00
parent 57a60e6afb
commit 217d6eb38f
3 changed files with 61 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-rk29/Makefile
View File

@@ -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

61
arch/arm/mach-rk29/devices.c
View File

@@ -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

68
arch/arm/mach-rk29/rk29-audio.c
View File

@@ -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,
};