Merge branch 'origin' into devel

Conflicts: sound/soc/pxa/pxa2xx-i2s.c
2009-03-28 20:29:51 +00:00
parent 9e495834e5 5d80f8e5a9
commit ed40d0c472
3099 changed files with 224252 additions and 127768 deletions
--- a/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
@@ -103,6 +103,12 @@ static unsigned long spitz_pin_config[] __initdata = {
 	GPIO57_nIOIS16,
 	GPIO104_PSKTSEL,

+	/* I2S */
+	GPIO28_I2S_BITCLK_OUT,
+	GPIO29_I2S_SDATA_IN,
+	GPIO30_I2S_SDATA_OUT,
+	GPIO31_I2S_SYNC,
+
 	/* MMC */
 	GPIO32_MMC_CLK,
 	GPIO112_MMC_CMD,