diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 11:32:05 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 11:32:05 -0400 |
commit | 33081adf8b89d5a716d7e1c60171768d39795b39 (patch) | |
tree | 275de58bbbb5f7ddffcdc087844cfc7fbe4315be /arch/arm | |
parent | c55960499f810357a29659b32d6ea594abee9237 (diff) | |
parent | 506ecbca71d07fa327dd986be1682e90885678ee (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (365 commits)
ALSA: hda - Disable sticky PCM stream assignment for AD codecs
ALSA: usb - Creative USB X-Fi volume knob support
ALSA: ca0106: Use card specific dac id for mute controls.
ALSA: ca0106: Allow different sound cards to use different SPI channel mappings.
ALSA: ca0106: Create a nice spot for mapping channels to dacs.
ALSA: ca0106: Move enabling of front dac out of hardcoded setup sequence.
ALSA: ca0106: Pull out dac powering routine into separate function.
ALSA: ca0106 - add Sound Blaster 5.1vx info.
ASoC: tlv320dac33: Use usleep_range for delays
ALSA: usb-audio: add Novation Launchpad support
ALSA: hda - Add workarounds for CT-IBG controllers
ALSA: hda - Fix wrong TLV mute bit for STAC/IDT codecs
ASoC: tpa6130a2: Error handling for broken chip
ASoC: max98088: Staticise m98088_eq_band
ASoC: soc-core: Fix codec->name memory leak
ALSA: hda - Apply ideapad quirk to Acer laptops with Cxt5066
ALSA: hda - Add some workarounds for Creative IBG
ALSA: hda - Fix wrong SPDIF NID assignment for CA0110
ALSA: hda - Fix codec rename rules for ALC662-compatible codecs
ALSA: hda - Add alc_init_jacks() call to other codecs
...
Diffstat (limited to 'arch/arm')
22 files changed, 263 insertions, 46 deletions
diff --git a/arch/arm/mach-davinci/devices.c b/arch/arm/mach-davinci/devices.c index 8b7201e4c79c..de40e9c787e1 100644 --- a/arch/arm/mach-davinci/devices.c +++ b/arch/arm/mach-davinci/devices.c | |||
@@ -295,6 +295,18 @@ static void davinci_init_wdt(void) | |||
295 | 295 | ||
296 | /*-------------------------------------------------------------------------*/ | 296 | /*-------------------------------------------------------------------------*/ |
297 | 297 | ||
298 | struct platform_device davinci_pcm_device = { | ||
299 | .name = "davinci-pcm-audio", | ||
300 | .id = -1, | ||
301 | }; | ||
302 | |||
303 | static void davinci_init_pcm(void) | ||
304 | { | ||
305 | platform_device_register(&davinci_pcm_device); | ||
306 | } | ||
307 | |||
308 | /*-------------------------------------------------------------------------*/ | ||
309 | |||
298 | struct davinci_timer_instance davinci_timer_instance[2] = { | 310 | struct davinci_timer_instance davinci_timer_instance[2] = { |
299 | { | 311 | { |
300 | .base = DAVINCI_TIMER0_BASE, | 312 | .base = DAVINCI_TIMER0_BASE, |
@@ -315,6 +327,7 @@ static int __init davinci_init_devices(void) | |||
315 | /* please keep these calls, and their implementations above, | 327 | /* please keep these calls, and their implementations above, |
316 | * in alphabetical order so they're easier to sort through. | 328 | * in alphabetical order so they're easier to sort through. |
317 | */ | 329 | */ |
330 | davinci_init_pcm(); | ||
318 | davinci_init_wdt(); | 331 | davinci_init_wdt(); |
319 | 332 | ||
320 | return 0; | 333 | return 0; |
diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c index 4cb55d3902ff..ffdf87be2958 100644 --- a/arch/arm/mach-ep93xx/core.c +++ b/arch/arm/mach-ep93xx/core.c | |||
@@ -776,9 +776,15 @@ static struct platform_device ep93xx_i2s_device = { | |||
776 | .resource = ep93xx_i2s_resource, | 776 | .resource = ep93xx_i2s_resource, |
777 | }; | 777 | }; |
778 | 778 | ||
779 | static struct platform_device ep93xx_pcm_device = { | ||
780 | .name = "ep93xx-pcm-audio", | ||
781 | .id = -1, | ||
782 | }; | ||
783 | |||
779 | void __init ep93xx_register_i2s(void) | 784 | void __init ep93xx_register_i2s(void) |
780 | { | 785 | { |
781 | platform_device_register(&ep93xx_i2s_device); | 786 | platform_device_register(&ep93xx_i2s_device); |
787 | platform_device_register(&ep93xx_pcm_device); | ||
782 | } | 788 | } |
783 | 789 | ||
784 | #define EP93XX_SYSCON_DEVCFG_I2S_MASK (EP93XX_SYSCON_DEVCFG_I2SONSSP | \ | 790 | #define EP93XX_SYSCON_DEVCFG_I2S_MASK (EP93XX_SYSCON_DEVCFG_I2SONSSP | \ |
@@ -826,6 +832,40 @@ void ep93xx_i2s_release(void) | |||
826 | } | 832 | } |
827 | EXPORT_SYMBOL(ep93xx_i2s_release); | 833 | EXPORT_SYMBOL(ep93xx_i2s_release); |
828 | 834 | ||
835 | /************************************************************************* | ||
836 | * EP93xx AC97 audio peripheral handling | ||
837 | *************************************************************************/ | ||
838 | static struct resource ep93xx_ac97_resources[] = { | ||
839 | { | ||
840 | .start = EP93XX_AAC_PHYS_BASE, | ||
841 | .end = EP93XX_AAC_PHYS_BASE + 0xb0 - 1, | ||
842 | .flags = IORESOURCE_MEM, | ||
843 | }, | ||
844 | { | ||
845 | .start = IRQ_EP93XX_AACINTR, | ||
846 | .end = IRQ_EP93XX_AACINTR, | ||
847 | .flags = IORESOURCE_IRQ, | ||
848 | }, | ||
849 | }; | ||
850 | |||
851 | static struct platform_device ep93xx_ac97_device = { | ||
852 | .name = "ep93xx-ac97", | ||
853 | .id = -1, | ||
854 | .num_resources = ARRAY_SIZE(ep93xx_ac97_resources), | ||
855 | .resource = ep93xx_ac97_resources, | ||
856 | }; | ||
857 | |||
858 | void __init ep93xx_register_ac97(void) | ||
859 | { | ||
860 | /* | ||
861 | * Make sure that the AC97 pins are not used by I2S. | ||
862 | */ | ||
863 | ep93xx_devcfg_clear_bits(EP93XX_SYSCON_DEVCFG_I2SONAC97); | ||
864 | |||
865 | platform_device_register(&ep93xx_ac97_device); | ||
866 | platform_device_register(&ep93xx_pcm_device); | ||
867 | } | ||
868 | |||
829 | extern void ep93xx_gpio_init(void); | 869 | extern void ep93xx_gpio_init(void); |
830 | 870 | ||
831 | void __init ep93xx_init_devices(void) | 871 | void __init ep93xx_init_devices(void) |
diff --git a/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h index c54b3e56ba63..9ac4d1055097 100644 --- a/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h +++ b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | |||
@@ -105,6 +105,7 @@ | |||
105 | #define EP93XX_GPIO_B_INT_STATUS EP93XX_GPIO_REG(0xbc) | 105 | #define EP93XX_GPIO_B_INT_STATUS EP93XX_GPIO_REG(0xbc) |
106 | #define EP93XX_GPIO_EEDRIVE EP93XX_GPIO_REG(0xc8) | 106 | #define EP93XX_GPIO_EEDRIVE EP93XX_GPIO_REG(0xc8) |
107 | 107 | ||
108 | #define EP93XX_AAC_PHYS_BASE EP93XX_APB_PHYS(0x00080000) | ||
108 | #define EP93XX_AAC_BASE EP93XX_APB_IOMEM(0x00080000) | 109 | #define EP93XX_AAC_BASE EP93XX_APB_IOMEM(0x00080000) |
109 | 110 | ||
110 | #define EP93XX_SPI_PHYS_BASE EP93XX_APB_PHYS(0x000a0000) | 111 | #define EP93XX_SPI_PHYS_BASE EP93XX_APB_PHYS(0x000a0000) |
diff --git a/arch/arm/mach-ep93xx/include/mach/platform.h b/arch/arm/mach-ep93xx/include/mach/platform.h index 3330b36d79e6..50660455b1d8 100644 --- a/arch/arm/mach-ep93xx/include/mach/platform.h +++ b/arch/arm/mach-ep93xx/include/mach/platform.h | |||
@@ -61,6 +61,7 @@ void ep93xx_keypad_release_gpio(struct platform_device *pdev); | |||
61 | void ep93xx_register_i2s(void); | 61 | void ep93xx_register_i2s(void); |
62 | int ep93xx_i2s_acquire(unsigned i2s_pins, unsigned i2s_config); | 62 | int ep93xx_i2s_acquire(unsigned i2s_pins, unsigned i2s_config); |
63 | void ep93xx_i2s_release(void); | 63 | void ep93xx_i2s_release(void); |
64 | void ep93xx_register_ac97(void); | ||
64 | 65 | ||
65 | void ep93xx_init_devices(void); | 66 | void ep93xx_init_devices(void); |
66 | extern struct sys_timer ep93xx_timer; | 67 | extern struct sys_timer ep93xx_timer; |
diff --git a/arch/arm/mach-ep93xx/simone.c b/arch/arm/mach-ep93xx/simone.c index f22ce8db7947..d96dc1c5da20 100644 --- a/arch/arm/mach-ep93xx/simone.c +++ b/arch/arm/mach-ep93xx/simone.c | |||
@@ -61,6 +61,7 @@ static void __init simone_init_machine(void) | |||
61 | ep93xx_register_fb(&simone_fb_info); | 61 | ep93xx_register_fb(&simone_fb_info); |
62 | ep93xx_register_i2c(&simone_i2c_gpio_data, simone_i2c_board_info, | 62 | ep93xx_register_i2c(&simone_i2c_gpio_data, simone_i2c_board_info, |
63 | ARRAY_SIZE(simone_i2c_board_info)); | 63 | ARRAY_SIZE(simone_i2c_board_info)); |
64 | ep93xx_register_ac97(); | ||
64 | } | 65 | } |
65 | 66 | ||
66 | MACHINE_START(SIM_ONE, "Simplemachines Sim.One Board") | 67 | MACHINE_START(SIM_ONE, "Simplemachines Sim.One Board") |
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c index 1c82d4290dad..51ff23b72d3a 100644 --- a/arch/arm/mach-kirkwood/common.c +++ b/arch/arm/mach-kirkwood/common.c | |||
@@ -903,10 +903,16 @@ static struct platform_device kirkwood_i2s_device = { | |||
903 | }, | 903 | }, |
904 | }; | 904 | }; |
905 | 905 | ||
906 | static struct platform_device kirkwood_pcm_device = { | ||
907 | .name = "kirkwood-pcm-audio", | ||
908 | .id = -1, | ||
909 | }; | ||
910 | |||
906 | void __init kirkwood_audio_init(void) | 911 | void __init kirkwood_audio_init(void) |
907 | { | 912 | { |
908 | kirkwood_clk_ctrl |= CGC_AUDIO; | 913 | kirkwood_clk_ctrl |= CGC_AUDIO; |
909 | platform_device_register(&kirkwood_i2s_device); | 914 | platform_device_register(&kirkwood_i2s_device); |
915 | platform_device_register(&kirkwood_pcm_device); | ||
910 | } | 916 | } |
911 | 917 | ||
912 | /***************************************************************************** | 918 | /***************************************************************************** |
diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c index aa0725608fb1..b583121b04b9 100644 --- a/arch/arm/mach-omap1/devices.c +++ b/arch/arm/mach-omap1/devices.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <mach/gpio.h> | 25 | #include <mach/gpio.h> |
26 | #include <plat/mmc.h> | 26 | #include <plat/mmc.h> |
27 | #include <plat/omap7xx.h> | 27 | #include <plat/omap7xx.h> |
28 | #include <plat/mcbsp.h> | ||
28 | 29 | ||
29 | /*-------------------------------------------------------------------------*/ | 30 | /*-------------------------------------------------------------------------*/ |
30 | 31 | ||
@@ -195,6 +196,30 @@ static inline void omap_init_spi100k(void) | |||
195 | 196 | ||
196 | static inline void omap_init_sti(void) {} | 197 | static inline void omap_init_sti(void) {} |
197 | 198 | ||
199 | #if defined(CONFIG_SND_SOC) || defined(CONFIG_SND_SOC_MODULE) | ||
200 | |||
201 | static struct platform_device omap_pcm = { | ||
202 | .name = "omap-pcm-audio", | ||
203 | .id = -1, | ||
204 | }; | ||
205 | |||
206 | OMAP_MCBSP_PLATFORM_DEVICE(1); | ||
207 | OMAP_MCBSP_PLATFORM_DEVICE(2); | ||
208 | OMAP_MCBSP_PLATFORM_DEVICE(3); | ||
209 | |||
210 | static void omap_init_audio(void) | ||
211 | { | ||
212 | platform_device_register(&omap_mcbsp1); | ||
213 | platform_device_register(&omap_mcbsp2); | ||
214 | if (!cpu_is_omap7xx()) | ||
215 | platform_device_register(&omap_mcbsp3); | ||
216 | platform_device_register(&omap_pcm); | ||
217 | } | ||
218 | |||
219 | #else | ||
220 | static inline void omap_init_audio(void) {} | ||
221 | #endif | ||
222 | |||
198 | /*-------------------------------------------------------------------------*/ | 223 | /*-------------------------------------------------------------------------*/ |
199 | 224 | ||
200 | /* | 225 | /* |
@@ -227,6 +252,7 @@ static int __init omap1_init_devices(void) | |||
227 | omap_init_rtc(); | 252 | omap_init_rtc(); |
228 | omap_init_spi100k(); | 253 | omap_init_spi100k(); |
229 | omap_init_sti(); | 254 | omap_init_sti(); |
255 | omap_init_audio(); | ||
230 | 256 | ||
231 | return 0; | 257 | return 0; |
232 | } | 258 | } |
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index ce28a851dcd3..63d786bccb67 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <linux/gpio.h> | 23 | #include <linux/gpio.h> |
24 | #include <linux/gpio_keys.h> | 24 | #include <linux/gpio_keys.h> |
25 | #include <linux/mmc/host.h> | 25 | #include <linux/mmc/host.h> |
26 | #include <sound/tlv320aic3x.h> | ||
26 | 27 | ||
27 | #include <plat/mcspi.h> | 28 | #include <plat/mcspi.h> |
28 | #include <plat/board.h> | 29 | #include <plat/board.h> |
@@ -689,7 +690,6 @@ static struct twl4030_power_data rx51_t2scripts_data __initdata = { | |||
689 | }; | 690 | }; |
690 | 691 | ||
691 | 692 | ||
692 | |||
693 | static struct twl4030_platform_data rx51_twldata __initdata = { | 693 | static struct twl4030_platform_data rx51_twldata __initdata = { |
694 | .irq_base = TWL4030_IRQ_BASE, | 694 | .irq_base = TWL4030_IRQ_BASE, |
695 | .irq_end = TWL4030_IRQ_END, | 695 | .irq_end = TWL4030_IRQ_END, |
@@ -710,10 +710,6 @@ static struct twl4030_platform_data rx51_twldata __initdata = { | |||
710 | .vio = &rx51_vio, | 710 | .vio = &rx51_vio, |
711 | }; | 711 | }; |
712 | 712 | ||
713 | static struct aic3x_pdata rx51_aic3x_data __initdata = { | ||
714 | .gpio_reset = 60, | ||
715 | }; | ||
716 | |||
717 | static struct tpa6130a2_platform_data rx51_tpa6130a2_data __initdata = { | 713 | static struct tpa6130a2_platform_data rx51_tpa6130a2_data __initdata = { |
718 | .id = TPA6130A2, | 714 | .id = TPA6130A2, |
719 | .power_gpio = 98, | 715 | .power_gpio = 98, |
@@ -728,6 +724,17 @@ static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_1[] = { | |||
728 | }, | 724 | }, |
729 | }; | 725 | }; |
730 | 726 | ||
727 | /* Audio setup data */ | ||
728 | static struct aic3x_setup_data rx51_aic34_setup = { | ||
729 | .gpio_func[0] = AIC3X_GPIO1_FUNC_DISABLED, | ||
730 | .gpio_func[1] = AIC3X_GPIO2_FUNC_DIGITAL_MIC_INPUT, | ||
731 | }; | ||
732 | |||
733 | static struct aic3x_pdata rx51_aic3x_data = { | ||
734 | .setup = &rx51_aic34_setup, | ||
735 | .gpio_reset = 60, | ||
736 | }; | ||
737 | |||
731 | static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_2[] = { | 738 | static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_2[] = { |
732 | { | 739 | { |
733 | I2C_BOARD_INFO("tlv320aic3x", 0x18), | 740 | I2C_BOARD_INFO("tlv320aic3x", 0x18), |
diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c index 189a6d1600b2..bc8232845d7a 100644 --- a/arch/arm/mach-omap2/board-zoom-peripherals.c +++ b/arch/arm/mach-omap2/board-zoom-peripherals.c | |||
@@ -26,6 +26,8 @@ | |||
26 | #include <plat/common.h> | 26 | #include <plat/common.h> |
27 | #include <plat/usb.h> | 27 | #include <plat/usb.h> |
28 | 28 | ||
29 | #include <mach/board-zoom.h> | ||
30 | |||
29 | #include "mux.h" | 31 | #include "mux.h" |
30 | #include "hsmmc.h" | 32 | #include "hsmmc.h" |
31 | 33 | ||
@@ -238,6 +240,11 @@ static int zoom_twl_gpio_setup(struct device *dev, | |||
238 | return 0; | 240 | return 0; |
239 | } | 241 | } |
240 | 242 | ||
243 | /* EXTMUTE callback function */ | ||
244 | void zoom2_set_hs_extmute(int mute) | ||
245 | { | ||
246 | gpio_set_value(ZOOM2_HEADSET_EXTMUTE_GPIO, mute); | ||
247 | } | ||
241 | 248 | ||
242 | static int zoom_batt_table[] = { | 249 | static int zoom_batt_table[] = { |
243 | /* 0 C*/ | 250 | /* 0 C*/ |
@@ -307,6 +314,11 @@ static struct i2c_board_info __initdata zoom_i2c_boardinfo[] = { | |||
307 | 314 | ||
308 | static int __init omap_i2c_init(void) | 315 | static int __init omap_i2c_init(void) |
309 | { | 316 | { |
317 | if (machine_is_omap_zoom2()) { | ||
318 | zoom_audio_data.ramp_delay_value = 3; /* 161 ms */ | ||
319 | zoom_audio_data.hs_extmute = 1; | ||
320 | zoom_audio_data.set_hs_extmute = zoom2_set_hs_extmute; | ||
321 | } | ||
310 | omap_register_i2c_bus(1, 2400, zoom_i2c_boardinfo, | 322 | omap_register_i2c_bus(1, 2400, zoom_i2c_boardinfo, |
311 | ARRAY_SIZE(zoom_i2c_boardinfo)); | 323 | ARRAY_SIZE(zoom_i2c_boardinfo)); |
312 | omap_register_i2c_bus(2, 400, NULL, 0); | 324 | omap_register_i2c_bus(2, 400, NULL, 0); |
diff --git a/arch/arm/mach-omap2/board-zoom2.c b/arch/arm/mach-omap2/board-zoom2.c index 24bbd0def64f..4ccbc32386a0 100644 --- a/arch/arm/mach-omap2/board-zoom2.c +++ b/arch/arm/mach-omap2/board-zoom2.c | |||
@@ -14,6 +14,7 @@ | |||
14 | #include <linux/platform_device.h> | 14 | #include <linux/platform_device.h> |
15 | #include <linux/input.h> | 15 | #include <linux/input.h> |
16 | #include <linux/gpio.h> | 16 | #include <linux/gpio.h> |
17 | #include <linux/i2c/twl.h> | ||
17 | 18 | ||
18 | #include <asm/mach-types.h> | 19 | #include <asm/mach-types.h> |
19 | #include <asm/mach/arch.h> | 20 | #include <asm/mach/arch.h> |
@@ -34,41 +35,6 @@ static void __init omap_zoom2_init_irq(void) | |||
34 | omap_gpio_init(); | 35 | omap_gpio_init(); |
35 | } | 36 | } |
36 | 37 | ||
37 | /* REVISIT: These audio entries can be removed once MFD code is merged */ | ||
38 | #if 0 | ||
39 | |||
40 | static struct twl4030_madc_platform_data zoom2_madc_data = { | ||
41 | .irq_line = 1, | ||
42 | }; | ||
43 | |||
44 | static struct twl4030_codec_audio_data zoom2_audio_data = { | ||
45 | .audio_mclk = 26000000, | ||
46 | }; | ||
47 | |||
48 | static struct twl4030_codec_data zoom2_codec_data = { | ||
49 | .audio_mclk = 26000000, | ||
50 | .audio = &zoom2_audio_data, | ||
51 | }; | ||
52 | |||
53 | static struct twl4030_platform_data zoom2_twldata = { | ||
54 | .irq_base = TWL4030_IRQ_BASE, | ||
55 | .irq_end = TWL4030_IRQ_END, | ||
56 | |||
57 | /* platform_data for children goes here */ | ||
58 | .bci = &zoom2_bci_data, | ||
59 | .madc = &zoom2_madc_data, | ||
60 | .usb = &zoom2_usb_data, | ||
61 | .gpio = &zoom2_gpio_data, | ||
62 | .keypad = &zoom2_kp_twl4030_data, | ||
63 | .codec = &zoom2_codec_data, | ||
64 | .vmmc1 = &zoom2_vmmc1, | ||
65 | .vmmc2 = &zoom2_vmmc2, | ||
66 | .vsim = &zoom2_vsim, | ||
67 | |||
68 | }; | ||
69 | |||
70 | #endif | ||
71 | |||
72 | #ifdef CONFIG_OMAP_MUX | 38 | #ifdef CONFIG_OMAP_MUX |
73 | static struct omap_board_mux board_mux[] __initdata = { | 39 | static struct omap_board_mux board_mux[] __initdata = { |
74 | /* WLAN IRQ - GPIO 162 */ | 40 | /* WLAN IRQ - GPIO 162 */ |
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index b27e7cbb3f29..c5cf1ba08a6f 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <plat/control.h> | 25 | #include <plat/control.h> |
26 | #include <plat/tc.h> | 26 | #include <plat/tc.h> |
27 | #include <plat/board.h> | 27 | #include <plat/board.h> |
28 | #include <plat/mcbsp.h> | ||
28 | #include <mach/gpio.h> | 29 | #include <mach/gpio.h> |
29 | #include <plat/mmc.h> | 30 | #include <plat/mmc.h> |
30 | #include <plat/dma.h> | 31 | #include <plat/dma.h> |
@@ -235,6 +236,43 @@ static inline void omap_init_mbox(void) { } | |||
235 | 236 | ||
236 | static inline void omap_init_sti(void) {} | 237 | static inline void omap_init_sti(void) {} |
237 | 238 | ||
239 | #if defined(CONFIG_SND_SOC) || defined(CONFIG_SND_SOC_MODULE) | ||
240 | |||
241 | static struct platform_device omap_pcm = { | ||
242 | .name = "omap-pcm-audio", | ||
243 | .id = -1, | ||
244 | }; | ||
245 | |||
246 | /* | ||
247 | * OMAP2420 has 2 McBSP ports | ||
248 | * OMAP2430 has 5 McBSP ports | ||
249 | * OMAP3 has 5 McBSP ports | ||
250 | * OMAP4 has 4 McBSP ports | ||
251 | */ | ||
252 | OMAP_MCBSP_PLATFORM_DEVICE(1); | ||
253 | OMAP_MCBSP_PLATFORM_DEVICE(2); | ||
254 | OMAP_MCBSP_PLATFORM_DEVICE(3); | ||
255 | OMAP_MCBSP_PLATFORM_DEVICE(4); | ||
256 | OMAP_MCBSP_PLATFORM_DEVICE(5); | ||
257 | |||
258 | static void omap_init_audio(void) | ||
259 | { | ||
260 | platform_device_register(&omap_mcbsp1); | ||
261 | platform_device_register(&omap_mcbsp2); | ||
262 | if (cpu_is_omap243x() || cpu_is_omap34xx() || cpu_is_omap44xx()) { | ||
263 | platform_device_register(&omap_mcbsp3); | ||
264 | platform_device_register(&omap_mcbsp4); | ||
265 | } | ||
266 | if (cpu_is_omap243x() || cpu_is_omap34xx()) | ||
267 | platform_device_register(&omap_mcbsp5); | ||
268 | |||
269 | platform_device_register(&omap_pcm); | ||
270 | } | ||
271 | |||
272 | #else | ||
273 | static inline void omap_init_audio(void) {} | ||
274 | #endif | ||
275 | |||
238 | #if defined(CONFIG_SPI_OMAP24XX) || defined(CONFIG_SPI_OMAP24XX_MODULE) | 276 | #if defined(CONFIG_SPI_OMAP24XX) || defined(CONFIG_SPI_OMAP24XX_MODULE) |
239 | 277 | ||
240 | #include <plat/mcspi.h> | 278 | #include <plat/mcspi.h> |
@@ -917,6 +955,7 @@ static int __init omap2_init_devices(void) | |||
917 | * in alphabetical order so they're easier to sort through. | 955 | * in alphabetical order so they're easier to sort through. |
918 | */ | 956 | */ |
919 | omap_hsmmc_reset(); | 957 | omap_hsmmc_reset(); |
958 | omap_init_audio(); | ||
920 | omap_init_camera(); | 959 | omap_init_camera(); |
921 | omap_init_mbox(); | 960 | omap_init_mbox(); |
922 | omap_init_mcspi(); | 961 | omap_init_mcspi(); |
diff --git a/arch/arm/mach-omap2/include/mach/board-zoom.h b/arch/arm/mach-omap2/include/mach/board-zoom.h index 3af69d2c3dcd..80591fda8f8f 100644 --- a/arch/arm/mach-omap2/include/mach/board-zoom.h +++ b/arch/arm/mach-omap2/include/mach/board-zoom.h | |||
@@ -9,3 +9,5 @@ | |||
9 | extern void __init board_nand_init(struct mtd_partition *, u8 nr_parts, u8 cs); | 9 | extern void __init board_nand_init(struct mtd_partition *, u8 nr_parts, u8 cs); |
10 | extern int __init zoom_debugboard_init(void); | 10 | extern int __init zoom_debugboard_init(void); |
11 | extern void __init zoom_peripherals_init(void); | 11 | extern void __init zoom_peripherals_init(void); |
12 | |||
13 | #define ZOOM2_HEADSET_EXTMUTE_GPIO 153 | ||
diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c index 08b410343870..aaa1166df964 100644 --- a/arch/arm/mach-pxa/devices.c +++ b/arch/arm/mach-pxa/devices.c | |||
@@ -382,6 +382,31 @@ struct platform_device pxa_device_i2s = { | |||
382 | .num_resources = ARRAY_SIZE(pxai2s_resources), | 382 | .num_resources = ARRAY_SIZE(pxai2s_resources), |
383 | }; | 383 | }; |
384 | 384 | ||
385 | struct platform_device pxa_device_asoc_ssp1 = { | ||
386 | .name = "pxa-ssp-dai", | ||
387 | .id = 0, | ||
388 | }; | ||
389 | |||
390 | struct platform_device pxa_device_asoc_ssp2= { | ||
391 | .name = "pxa-ssp-dai", | ||
392 | .id = 1, | ||
393 | }; | ||
394 | |||
395 | struct platform_device pxa_device_asoc_ssp3 = { | ||
396 | .name = "pxa-ssp-dai", | ||
397 | .id = 2, | ||
398 | }; | ||
399 | |||
400 | struct platform_device pxa_device_asoc_ssp4 = { | ||
401 | .name = "pxa-ssp-dai", | ||
402 | .id = 3, | ||
403 | }; | ||
404 | |||
405 | struct platform_device pxa_device_asoc_platform = { | ||
406 | .name = "pxa-pcm-audio", | ||
407 | .id = -1, | ||
408 | }; | ||
409 | |||
385 | static u64 pxaficp_dmamask = ~(u32)0; | 410 | static u64 pxaficp_dmamask = ~(u32)0; |
386 | 411 | ||
387 | struct platform_device pxa_device_ficp = { | 412 | struct platform_device pxa_device_ficp = { |
diff --git a/arch/arm/mach-pxa/devices.h b/arch/arm/mach-pxa/devices.h index 715e8bd02e24..2fd5a8b35757 100644 --- a/arch/arm/mach-pxa/devices.h +++ b/arch/arm/mach-pxa/devices.h | |||
@@ -39,4 +39,10 @@ extern struct platform_device pxa3xx_device_i2c_power; | |||
39 | 39 | ||
40 | extern struct platform_device pxa3xx_device_gcu; | 40 | extern struct platform_device pxa3xx_device_gcu; |
41 | 41 | ||
42 | extern struct platform_device pxa_device_asoc_platform; | ||
43 | extern struct platform_device pxa_device_asoc_ssp1; | ||
44 | extern struct platform_device pxa_device_asoc_ssp2; | ||
45 | extern struct platform_device pxa_device_asoc_ssp3; | ||
46 | extern struct platform_device pxa_device_asoc_ssp4; | ||
47 | |||
42 | void __init pxa_register_device(struct platform_device *dev, void *data); | 48 | void __init pxa_register_device(struct platform_device *dev, void *data); |
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c index 12e5b9f01e6f..d1fbf29d561c 100644 --- a/arch/arm/mach-pxa/pxa27x.c +++ b/arch/arm/mach-pxa/pxa27x.c | |||
@@ -385,6 +385,10 @@ static struct platform_device *devices[] __initdata = { | |||
385 | &pxa27x_device_udc, | 385 | &pxa27x_device_udc, |
386 | &pxa_device_pmu, | 386 | &pxa_device_pmu, |
387 | &pxa_device_i2s, | 387 | &pxa_device_i2s, |
388 | &pxa_device_asoc_ssp1, | ||
389 | &pxa_device_asoc_ssp2, | ||
390 | &pxa_device_asoc_ssp3, | ||
391 | &pxa_device_asoc_platform, | ||
388 | &sa1100_device_rtc, | 392 | &sa1100_device_rtc, |
389 | &pxa_device_rtc, | 393 | &pxa_device_rtc, |
390 | &pxa27x_device_ssp1, | 394 | &pxa27x_device_ssp1, |
diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c index c85c3a7abd31..d1c747cdacf8 100644 --- a/arch/arm/mach-pxa/pxa3xx.c +++ b/arch/arm/mach-pxa/pxa3xx.c | |||
@@ -593,6 +593,11 @@ static struct platform_device *devices[] __initdata = { | |||
593 | &pxa27x_device_udc, | 593 | &pxa27x_device_udc, |
594 | &pxa_device_pmu, | 594 | &pxa_device_pmu, |
595 | &pxa_device_i2s, | 595 | &pxa_device_i2s, |
596 | &pxa_device_asoc_ssp1, | ||
597 | &pxa_device_asoc_ssp2, | ||
598 | &pxa_device_asoc_ssp3, | ||
599 | &pxa_device_asoc_ssp4, | ||
600 | &pxa_device_asoc_platform, | ||
596 | &sa1100_device_rtc, | 601 | &sa1100_device_rtc, |
597 | &pxa_device_rtc, | 602 | &pxa_device_rtc, |
598 | &pxa27x_device_ssp1, | 603 | &pxa27x_device_ssp1, |
diff --git a/arch/arm/mach-pxa/zylonite.c b/arch/arm/mach-pxa/zylonite.c index f25fb6245bd7..702f7a68e87d 100644 --- a/arch/arm/mach-pxa/zylonite.c +++ b/arch/arm/mach-pxa/zylonite.c | |||
@@ -45,6 +45,16 @@ int wm9713_irq; | |||
45 | int lcd_id; | 45 | int lcd_id; |
46 | int lcd_orientation; | 46 | int lcd_orientation; |
47 | 47 | ||
48 | struct platform_device pxa_device_wm9713_audio = { | ||
49 | .name = "wm9713-codec", | ||
50 | .id = -1, | ||
51 | }; | ||
52 | |||
53 | static void __init zylonite_init_wm9713_audio(void) | ||
54 | { | ||
55 | platform_device_register(&pxa_device_wm9713_audio); | ||
56 | } | ||
57 | |||
48 | static struct resource smc91x_resources[] = { | 58 | static struct resource smc91x_resources[] = { |
49 | [0] = { | 59 | [0] = { |
50 | .start = ZYLONITE_ETH_PHYS + 0x300, | 60 | .start = ZYLONITE_ETH_PHYS + 0x300, |
@@ -408,6 +418,7 @@ static void __init zylonite_init(void) | |||
408 | zylonite_init_nand(); | 418 | zylonite_init_nand(); |
409 | zylonite_init_leds(); | 419 | zylonite_init_leds(); |
410 | zylonite_init_ohci(); | 420 | zylonite_init_ohci(); |
421 | zylonite_init_wm9713_audio(); | ||
411 | } | 422 | } |
412 | 423 | ||
413 | MACHINE_START(ZYLONITE, "PXA3xx Platform Development Kit (aka Zylonite)") | 424 | MACHINE_START(ZYLONITE, "PXA3xx Platform Development Kit (aka Zylonite)") |
diff --git a/arch/arm/mach-s3c64xx/dev-audio.c b/arch/arm/mach-s3c64xx/dev-audio.c index 9648fbc36eec..3838335f125b 100644 --- a/arch/arm/mach-s3c64xx/dev-audio.c +++ b/arch/arm/mach-s3c64xx/dev-audio.c | |||
@@ -43,8 +43,10 @@ static int s3c64xx_i2sv3_cfg_gpio(struct platform_device *pdev) | |||
43 | s3c_gpio_cfgpin(S3C64XX_GPE(2), S3C64XX_GPE2_I2S1_LRCLK); | 43 | s3c_gpio_cfgpin(S3C64XX_GPE(2), S3C64XX_GPE2_I2S1_LRCLK); |
44 | s3c_gpio_cfgpin(S3C64XX_GPE(3), S3C64XX_GPE3_I2S1_DI); | 44 | s3c_gpio_cfgpin(S3C64XX_GPE(3), S3C64XX_GPE3_I2S1_DI); |
45 | s3c_gpio_cfgpin(S3C64XX_GPE(4), S3C64XX_GPE4_I2S1_D0); | 45 | s3c_gpio_cfgpin(S3C64XX_GPE(4), S3C64XX_GPE4_I2S1_D0); |
46 | break; | ||
46 | default: | 47 | default: |
47 | printk(KERN_DEBUG "Invalid I2S Controller number!"); | 48 | printk(KERN_DEBUG "Invalid I2S Controller number: %d\n", |
49 | pdev->id); | ||
48 | return -EINVAL; | 50 | return -EINVAL; |
49 | } | 51 | } |
50 | 52 | ||
@@ -184,7 +186,8 @@ static int s3c64xx_pcm_cfg_gpio(struct platform_device *pdev) | |||
184 | s3c_gpio_cfgpin(S3C64XX_GPE(4), S3C64XX_GPE4_PCM1_SOUT); | 186 | s3c_gpio_cfgpin(S3C64XX_GPE(4), S3C64XX_GPE4_PCM1_SOUT); |
185 | break; | 187 | break; |
186 | default: | 188 | default: |
187 | printk(KERN_DEBUG "Invalid PCM Controller number!"); | 189 | printk(KERN_DEBUG "Invalid PCM Controller number: %d\n", |
190 | pdev->id); | ||
188 | return -EINVAL; | 191 | return -EINVAL; |
189 | } | 192 | } |
190 | 193 | ||
@@ -333,3 +336,16 @@ void __init s3c64xx_ac97_setup_gpio(int num) | |||
333 | else | 336 | else |
334 | s3c_ac97_pdata.cfg_gpio = s3c64xx_ac97_cfg_gpe; | 337 | s3c_ac97_pdata.cfg_gpio = s3c64xx_ac97_cfg_gpe; |
335 | } | 338 | } |
339 | |||
340 | static u64 s3c_device_audio_dmamask = 0xffffffffUL; | ||
341 | |||
342 | struct platform_device s3c_device_pcm = { | ||
343 | .name = "s3c24xx-pcm-audio", | ||
344 | .id = -1, | ||
345 | .dev = { | ||
346 | .dma_mask = &s3c_device_audio_dmamask, | ||
347 | .coherent_dma_mask = 0xffffffffUL | ||
348 | } | ||
349 | }; | ||
350 | EXPORT_SYMBOL(s3c_device_pcm); | ||
351 | |||
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c index ec8865c03a19..77488facfe4c 100644 --- a/arch/arm/mach-s3c64xx/mach-smdk6410.c +++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c | |||
@@ -283,6 +283,7 @@ static struct platform_device *smdk6410_devices[] __initdata = { | |||
283 | &s3c_device_fb, | 283 | &s3c_device_fb, |
284 | &s3c_device_ohci, | 284 | &s3c_device_ohci, |
285 | &s3c_device_usb_hsotg, | 285 | &s3c_device_usb_hsotg, |
286 | &s3c_device_pcm, | ||
286 | &s3c64xx_device_iisv4, | 287 | &s3c64xx_device_iisv4, |
287 | &samsung_device_keypad, | 288 | &samsung_device_keypad, |
288 | 289 | ||
diff --git a/arch/arm/plat-omap/include/plat/mcbsp.h b/arch/arm/plat-omap/include/plat/mcbsp.h index b4ff6a11a8f2..5b20103e68eb 100644 --- a/arch/arm/plat-omap/include/plat/mcbsp.h +++ b/arch/arm/plat-omap/include/plat/mcbsp.h | |||
@@ -30,6 +30,13 @@ | |||
30 | #include <mach/hardware.h> | 30 | #include <mach/hardware.h> |
31 | #include <plat/clock.h> | 31 | #include <plat/clock.h> |
32 | 32 | ||
33 | /* macro for building platform_device for McBSP ports */ | ||
34 | #define OMAP_MCBSP_PLATFORM_DEVICE(port_nr) \ | ||
35 | static struct platform_device omap_mcbsp##port_nr = { \ | ||
36 | .name = "omap-mcbsp-dai", \ | ||
37 | .id = OMAP_MCBSP##port_nr, \ | ||
38 | } | ||
39 | |||
33 | #define OMAP7XX_MCBSP1_BASE 0xfffb1000 | 40 | #define OMAP7XX_MCBSP1_BASE 0xfffb1000 |
34 | #define OMAP7XX_MCBSP2_BASE 0xfffb1800 | 41 | #define OMAP7XX_MCBSP2_BASE 0xfffb1800 |
35 | 42 | ||
diff --git a/arch/arm/plat-s3c24xx/devs.c b/arch/arm/plat-s3c24xx/devs.c index 452e18438b41..2f91057a0c02 100644 --- a/arch/arm/plat-s3c24xx/devs.c +++ b/arch/arm/plat-s3c24xx/devs.c | |||
@@ -247,7 +247,7 @@ static struct resource s3c_iis_resource[] = { | |||
247 | static u64 s3c_device_iis_dmamask = 0xffffffffUL; | 247 | static u64 s3c_device_iis_dmamask = 0xffffffffUL; |
248 | 248 | ||
249 | struct platform_device s3c_device_iis = { | 249 | struct platform_device s3c_device_iis = { |
250 | .name = "s3c2410-iis", | 250 | .name = "s3c24xx-iis", |
251 | .id = -1, | 251 | .id = -1, |
252 | .num_resources = ARRAY_SIZE(s3c_iis_resource), | 252 | .num_resources = ARRAY_SIZE(s3c_iis_resource), |
253 | .resource = s3c_iis_resource, | 253 | .resource = s3c_iis_resource, |
@@ -259,6 +259,21 @@ struct platform_device s3c_device_iis = { | |||
259 | 259 | ||
260 | EXPORT_SYMBOL(s3c_device_iis); | 260 | EXPORT_SYMBOL(s3c_device_iis); |
261 | 261 | ||
262 | /* ASoC PCM DMA */ | ||
263 | |||
264 | static u64 s3c_device_audio_dmamask = 0xffffffffUL; | ||
265 | |||
266 | struct platform_device s3c_device_pcm = { | ||
267 | .name = "s3c24xx-pcm-audio", | ||
268 | .id = -1, | ||
269 | .dev = { | ||
270 | .dma_mask = &s3c_device_audio_dmamask, | ||
271 | .coherent_dma_mask = 0xffffffffUL | ||
272 | } | ||
273 | }; | ||
274 | |||
275 | EXPORT_SYMBOL(s3c_device_pcm); | ||
276 | |||
262 | /* RTC */ | 277 | /* RTC */ |
263 | 278 | ||
264 | static struct resource s3c_rtc_resource[] = { | 279 | static struct resource s3c_rtc_resource[] = { |
@@ -481,19 +496,30 @@ static struct resource s3c_ac97_resource[] = { | |||
481 | }, | 496 | }, |
482 | }; | 497 | }; |
483 | 498 | ||
484 | static u64 s3c_device_ac97_dmamask = 0xffffffffUL; | ||
485 | |||
486 | struct platform_device s3c_device_ac97 = { | 499 | struct platform_device s3c_device_ac97 = { |
487 | .name = "s3c-ac97", | 500 | .name = "s3c-ac97", |
488 | .id = -1, | 501 | .id = -1, |
489 | .num_resources = ARRAY_SIZE(s3c_ac97_resource), | 502 | .num_resources = ARRAY_SIZE(s3c_ac97_resource), |
490 | .resource = s3c_ac97_resource, | 503 | .resource = s3c_ac97_resource, |
491 | .dev = { | 504 | .dev = { |
492 | .dma_mask = &s3c_device_ac97_dmamask, | 505 | .dma_mask = &s3c_device_audio_dmamask, |
493 | .coherent_dma_mask = 0xffffffffUL | 506 | .coherent_dma_mask = 0xffffffffUL |
494 | } | 507 | } |
495 | }; | 508 | }; |
496 | 509 | ||
497 | EXPORT_SYMBOL(s3c_device_ac97); | 510 | EXPORT_SYMBOL(s3c_device_ac97); |
498 | 511 | ||
512 | /* ASoC I2S */ | ||
513 | |||
514 | struct platform_device s3c2412_device_iis = { | ||
515 | .name = "s3c2412-iis", | ||
516 | .id = -1, | ||
517 | .dev = { | ||
518 | .dma_mask = &s3c_device_audio_dmamask, | ||
519 | .coherent_dma_mask = 0xffffffffUL | ||
520 | } | ||
521 | }; | ||
522 | |||
523 | EXPORT_SYMBOL(s3c2412_device_iis); | ||
524 | |||
499 | #endif // CONFIG_CPU_S32440 | 525 | #endif // CONFIG_CPU_S32440 |
diff --git a/arch/arm/plat-samsung/include/plat/devs.h b/arch/arm/plat-samsung/include/plat/devs.h index 7d448e138792..c8b94279bad1 100644 --- a/arch/arm/plat-samsung/include/plat/devs.h +++ b/arch/arm/plat-samsung/include/plat/devs.h | |||
@@ -32,6 +32,8 @@ extern struct platform_device s3c64xx_device_iisv4; | |||
32 | extern struct platform_device s3c64xx_device_spi0; | 32 | extern struct platform_device s3c64xx_device_spi0; |
33 | extern struct platform_device s3c64xx_device_spi1; | 33 | extern struct platform_device s3c64xx_device_spi1; |
34 | 34 | ||
35 | extern struct platform_device s3c_device_pcm; | ||
36 | |||
35 | extern struct platform_device s3c64xx_device_pcm0; | 37 | extern struct platform_device s3c64xx_device_pcm0; |
36 | extern struct platform_device s3c64xx_device_pcm1; | 38 | extern struct platform_device s3c64xx_device_pcm1; |
37 | 39 | ||