diff options
| author | Misael Lopez Cruz <x0052729@ti.com> | 2009-10-01 18:23:30 -0500 |
|---|---|---|
| committer | Margarita Olaya Cabrera <x0080101@ti.com> | 2009-11-06 10:47:11 -0600 |
| commit | 261f1a07fa4cbc196e993897d1a755cba6302148 (patch) | |
| tree | 75cb1e73aeafe470db0001a7890ff4211a8491ad /arch/arm/mach-omap2 | |
| parent | afca6c2f225cc72107aaf723220fb25dd36997dd (diff) | |
ARM: OMAP4: Add pin mux configuration for audio
Add pin mux configuration for OMAP4 McPDM and TWL6030
power-on gpio.
Signed-off-by: Misael Lopez Cruz <x0052729@ti.com>
Signed-off-by: Margarita Olaya <x0080101@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/board-4430sdp.c | 14 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/mux.c | 14 |
2 files changed, 28 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c index dc5ca3574d17..9fa62b1b2486 100644 --- a/arch/arm/mach-omap2/board-4430sdp.c +++ b/arch/arm/mach-omap2/board-4430sdp.c @@ -558,8 +558,21 @@ static void omap_mcbsp_init(void) omap_cfg_reg(Y4_4430_McBSP1_FSX); } +static void omap_abe_init(void) +{ + /* mcpdm */ + omap_cfg_reg(AG25_4430_ABE_PDM_UL_DATA); + omap_cfg_reg(AF25_4430_ABE_PDM_DL_DATA); + omap_cfg_reg(AE25_4430_ABE_PDM_FRAME); + omap_cfg_reg(AF26_4430_ABE_PDM_LB_CLK); + omap_cfg_reg(AH26_4430_ABE_PDM_CLKS); +} + static void omap_phoenix_init(void) { + /* twl6030 audio power-on */ + omap_cfg_reg(AA27_4430_GPIO_127); + omap_cfg_reg(PAD1_4430_SYS_NIRQ1); omap_cfg_reg(PAD0_4430_SYS_NIRQ2); } @@ -595,6 +608,7 @@ static void __init omap_4430sdp_init(void) usb_host_and_tll_init(sdp_usbhost_port_data, ARRAY_SIZE(sdp_usbhost_port_data)); usb_ehci_init(EHCI_HCD_OMAP_MODE_PHY, true, true, 57, 61); + omap_abe_init(); } diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c index 4049693704df..47901b4466c5 100644 --- a/arch/arm/mach-omap2/mux.c +++ b/arch/arm/mach-omap2/mux.c @@ -712,6 +712,20 @@ MUX_CFG_34XX("AF_4430_USB1HS_PHY_D6", 0x0D6, OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT_PULLDOWN) MUX_CFG_34XX("AG_4430_USB1HS_PHY_D7", 0x0D8, OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT_PULLDOWN) +/* Audio */ +MUX_CFG_34XX("AG25_4430_ABE_PDM_UL_DATA", 0x0106, + OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT) +MUX_CFG_34XX("AF25_4430_ABE_PDM_DL_DATA", 0x0108, + OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_OUTPUT) +MUX_CFG_34XX("AE25_4430_ABE_PDM_FRAME", 0x010a, + OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT) +MUX_CFG_34XX("AF26_4430_ABE_PDM_LB_CLK", 0x010c, + OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_OUTPUT) +MUX_CFG_34XX("AH26_4430_ABE_PDM_CLKS", 0x010e, + OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT) + +MUX_CFG_34XX("AA27_4430_GPIO_127", 0x0120, + OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_OUTPUT) }; #define OMAP44XX_PINS_SZ ARRAY_SIZE(omap44xx_pins) |