aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/h5000.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-03-28 16:29:51 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-03-28 16:29:51 -0400
commited40d0c472b136682b2fcba05f89762859c7374f (patch)
tree076b83a26bcd63d6158463735dd34c10bbc591dc /arch/arm/mach-pxa/h5000.c
parent9e495834e59ca9b29f1a1f63b9f5533bb022ac49 (diff)
parent5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a (diff)
Merge branch 'origin' into devel
Conflicts: sound/soc/pxa/pxa2xx-i2s.c
Diffstat (limited to 'arch/arm/mach-pxa/h5000.c')
-rw-r--r--arch/arm/mach-pxa/h5000.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/h5000.c b/arch/arm/mach-pxa/h5000.c
index 6a197fb5c095..f3d220c32e07 100644
--- a/arch/arm/mach-pxa/h5000.c
+++ b/arch/arm/mach-pxa/h5000.c
@@ -154,6 +154,13 @@ static unsigned long h5000_pin_config[] __initdata = {
154 GPIO23_SSP1_SCLK, 154 GPIO23_SSP1_SCLK,
155 GPIO25_SSP1_TXD, 155 GPIO25_SSP1_TXD,
156 GPIO26_SSP1_RXD, 156 GPIO26_SSP1_RXD,
157
158 /* I2S */
159 GPIO28_I2S_BITCLK_OUT,
160 GPIO29_I2S_SDATA_IN,
161 GPIO30_I2S_SDATA_OUT,
162 GPIO31_I2S_SYNC,
163 GPIO32_I2S_SYSCLK,
157}; 164};
158 165
159/* 166/*