diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-10-24 09:19:36 +0100 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-10-24 09:19:36 +0100 |
| commit | 47c564e10f219f867bdb49225972749a43485a47 (patch) | |
| tree | 5e119e0f2e011f422d880d88d1adb2142e508bfc /arch/arm/mach-pxa | |
| parent | c9c2009a4e915db17f32701d1f0535b400e61b58 (diff) | |
| parent | ba9e358fd04190a59e605c2963a15e014139a707 (diff) | |
| download | talos-op-linux-47c564e10f219f867bdb49225972749a43485a47.tar.gz talos-op-linux-47c564e10f219f867bdb49225972749a43485a47.zip | |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'arch/arm/mach-pxa')
| -rw-r--r-- | arch/arm/mach-pxa/generic.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c index d327c127eddb..1d7677669a76 100644 --- a/arch/arm/mach-pxa/generic.c +++ b/arch/arm/mach-pxa/generic.c @@ -250,6 +250,25 @@ void __init pxa_set_i2c_info(struct i2c_pxa_platform_data *info) i2c_device.dev.platform_data = info; } +static struct resource i2s_resources[] = { + { + .start = 0x40400000, + .end = 0x40400083, + .flags = IORESOURCE_MEM, + }, { + .start = IRQ_I2S, + .end = IRQ_I2S, + .flags = IORESOURCE_IRQ, + }, +}; + +static struct platform_device i2s_device = { + .name = "pxa2xx-i2s", + .id = -1, + .resource = i2c_resources, + .num_resources = ARRAY_SIZE(i2s_resources), +}; + static struct platform_device *devices[] __initdata = { &pxamci_device, &udc_device, @@ -258,6 +277,7 @@ static struct platform_device *devices[] __initdata = { &btuart_device, &stuart_device, &i2c_device, + &i2s_device, }; static int __init pxa_init(void) |
