diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:53 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:53 -0400 |
commit | b5c784894c90042f4fc6348aedc7524e899df281 (patch) | |
tree | 0db86a93d73e4aabca04e361d7e6807aa4c1d307 /arch/arm/mach-pxa/spitz.c | |
parent | ff4fc3656e489ed6ee575959b0510286aefe1e20 (diff) | |
parent | 1f2186951e02f2a5bcda9459f63136918932385a (diff) |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'arch/arm/mach-pxa/spitz.c')
-rw-r--r-- | arch/arm/mach-pxa/spitz.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index 6d447c9ce8ab..0d62d311d41a 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c | |||
@@ -105,6 +105,12 @@ static unsigned long spitz_pin_config[] __initdata = { | |||
105 | GPIO57_nIOIS16, | 105 | GPIO57_nIOIS16, |
106 | GPIO104_PSKTSEL, | 106 | GPIO104_PSKTSEL, |
107 | 107 | ||
108 | /* I2S */ | ||
109 | GPIO28_I2S_BITCLK_OUT, | ||
110 | GPIO29_I2S_SDATA_IN, | ||
111 | GPIO30_I2S_SDATA_OUT, | ||
112 | GPIO31_I2S_SYNC, | ||
113 | |||
108 | /* MMC */ | 114 | /* MMC */ |
109 | GPIO32_MMC_CLK, | 115 | GPIO32_MMC_CLK, |
110 | GPIO112_MMC_CMD, | 116 | GPIO112_MMC_CMD, |