diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:35:53 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:35:53 +0100 |
commit | b5c784894c90042f4fc6348aedc7524e899df281 (patch) | |
tree | 0db86a93d73e4aabca04e361d7e6807aa4c1d307 /arch/arm/mach-pxa/h5000.c | |
parent | ff4fc3656e489ed6ee575959b0510286aefe1e20 (diff) | |
parent | 1f2186951e02f2a5bcda9459f63136918932385a (diff) | |
download | op-kernel-dev-b5c784894c90042f4fc6348aedc7524e899df281.zip op-kernel-dev-b5c784894c90042f4fc6348aedc7524e899df281.tar.gz |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'arch/arm/mach-pxa/h5000.c')
-rw-r--r-- | arch/arm/mach-pxa/h5000.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/h5000.c b/arch/arm/mach-pxa/h5000.c index da6e442..295ec41 100644 --- a/arch/arm/mach-pxa/h5000.c +++ b/arch/arm/mach-pxa/h5000.c @@ -153,6 +153,13 @@ static unsigned long h5000_pin_config[] __initdata = { GPIO23_SSP1_SCLK, GPIO25_SSP1_TXD, GPIO26_SSP1_RXD, + + /* I2S */ + GPIO28_I2S_BITCLK_OUT, + GPIO29_I2S_SDATA_IN, + GPIO30_I2S_SDATA_OUT, + GPIO31_I2S_SYNC, + GPIO32_I2S_SYSCLK, }; /* |