Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[linux-2.6-omap-h63xx.git] / arch / arm / mach-pxa / zylonite_pxa320.c

diff --git a/arch/arm/mach-pxa/zylonite_pxa320.c b/arch/arm/mach-pxa/zylonite_pxa320.c
index 9879d7da2df52cbf47ccfbed67bf54702fbdaa77..0f244744daaeb3c7e776a0abb27c325f664e2ef9 100644 (file)
--- 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 = {
        GPIO39_AC97_BITCLK,
        GPIO40_AC97_nACRESET,
 
+       /* SSP3 */
+       GPIO89_SSP3_SCLK,
+       GPIO90_SSP3_FRM,
+       GPIO91_SSP3_TXD,
+       GPIO92_SSP3_RXD,
+
        /* WM9713 IRQ */
        GPIO15_GPIO,
 
@@ -117,6 +123,10 @@ static mfp_cfg_t mfp_cfg[] __initdata = {
        GPIO28_MMC2_CLK,
        GPIO29_MMC2_CMD,
 
+       /* USB Host */
+       GPIO2_2_USBH_PEN,
+       GPIO3_2_USBH_PWR,
+
        /* Debug LEDs */
        GPIO1_2_GPIO | MFP_LPM_DRIVE_HIGH,
        GPIO4_2_GPIO | MFP_LPM_DRIVE_HIGH,