diff options
author | Mark Brown <broonie@sirena.org.uk> | 2008-07-10 12:52:10 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-26 12:02:00 -0400 |
commit | 58d27fcfe64a21c7094e0b60784258e1cccf26a4 (patch) | |
tree | be709468acf583ded9b10ec3bef66cde5d4e9780 /arch | |
parent | ad826e22c1343ceca76d814539a6fc94dd474def (diff) |
[ARM] 5111/2: zylonite: Configure SSP
SSP3 is connected to the voice PCM of the WM9713 audio codec on the
Zylonite so configure the MFPs appropriately and select SSP support.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-pxa/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-pxa/zylonite_pxa300.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-pxa/zylonite_pxa320.c | 6 |
3 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index e8ee7ec9ff6d..4ef9ad17f224 100644 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig | |||
@@ -189,6 +189,7 @@ config MACH_COLIBRI | |||
189 | config MACH_ZYLONITE | 189 | config MACH_ZYLONITE |
190 | bool "PXA3xx Development Platform (aka Zylonite)" | 190 | bool "PXA3xx Development Platform (aka Zylonite)" |
191 | select PXA3xx | 191 | select PXA3xx |
192 | select PXA_SSP | ||
192 | select HAVE_PWM | 193 | select HAVE_PWM |
193 | 194 | ||
194 | config MACH_LITTLETON | 195 | config MACH_LITTLETON |
diff --git a/arch/arm/mach-pxa/zylonite_pxa300.c b/arch/arm/mach-pxa/zylonite_pxa300.c index 095f5c648236..915bedc73133 100644 --- a/arch/arm/mach-pxa/zylonite_pxa300.c +++ b/arch/arm/mach-pxa/zylonite_pxa300.c | |||
@@ -73,6 +73,12 @@ static mfp_cfg_t common_mfp_cfg[] __initdata = { | |||
73 | GPIO27_AC97_SDATA_OUT, | 73 | GPIO27_AC97_SDATA_OUT, |
74 | GPIO28_AC97_SYNC, | 74 | GPIO28_AC97_SYNC, |
75 | 75 | ||
76 | /* SSP3 */ | ||
77 | GPIO91_SSP3_SCLK, | ||
78 | GPIO92_SSP3_FRM, | ||
79 | GPIO93_SSP3_TXD, | ||
80 | GPIO94_SSP3_RXD, | ||
81 | |||
76 | /* WM9713 IRQ */ | 82 | /* WM9713 IRQ */ |
77 | GPIO26_GPIO, | 83 | GPIO26_GPIO, |
78 | 84 | ||
diff --git a/arch/arm/mach-pxa/zylonite_pxa320.c b/arch/arm/mach-pxa/zylonite_pxa320.c index 9879d7da2df5..755e87fa8ab9 100644 --- a/arch/arm/mach-pxa/zylonite_pxa320.c +++ b/arch/arm/mach-pxa/zylonite_pxa320.c | |||
@@ -69,6 +69,12 @@ static mfp_cfg_t mfp_cfg[] __initdata = { | |||
69 | GPIO39_AC97_BITCLK, | 69 | GPIO39_AC97_BITCLK, |
70 | GPIO40_AC97_nACRESET, | 70 | GPIO40_AC97_nACRESET, |
71 | 71 | ||
72 | /* SSP3 */ | ||
73 | GPIO89_SSP3_SCLK, | ||
74 | GPIO90_SSP3_FRM, | ||
75 | GPIO91_SSP3_TXD, | ||
76 | GPIO92_SSP3_RXD, | ||
77 | |||
72 | /* WM9713 IRQ */ | 78 | /* WM9713 IRQ */ |
73 | GPIO15_GPIO, | 79 | GPIO15_GPIO, |
74 | 80 | ||