Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / arch / arm / mach-mx3 / mach-pcm043.c

diff --git a/arch/arm/mach-mx3/mach-pcm043.c b/arch/arm/mach-mx3/mach-pcm043.c
index 4fa0714..b3ecfb2 100644 (file)
--- a/arch/arm/mach-mx3/mach-pcm043.c
+++ b/arch/arm/mach-mx3/mach-pcm043.c
@@ -219,9 +219,9 @@ static iomux_v3_cfg_t pcm043_pads[] = {
        MX35_PAD_SD1_DATA3__ESDHC1_DAT3,
 };
 
-#define AC97_GPIO_TXFS (1 * 32 + 31)
-#define AC97_GPIO_TXD  (1 * 32 + 28)
-#define AC97_GPIO_RESET        (1 * 32 + 0)
+#define AC97_GPIO_TXFS IMX_GPIO_NR(2, 31)
+#define AC97_GPIO_TXD  IMX_GPIO_NR(2, 28)
+#define AC97_GPIO_RESET        IMX_GPIO_NR(2, 0)
 
 static void pcm043_ac97_warm_reset(struct snd_ac97 *ac97)
 {
@@ -305,7 +305,6 @@ pcm037_nand_board_info __initconst = {
        .hw_ecc = 1,
 };
 
-#if defined(CONFIG_USB_ULPI)
 static int pcm043_otg_init(struct platform_device *pdev)
 {
        return mx35_initialize_usb_hw(pdev->id, MXC_EHCI_INTERFACE_DIFF_UNI);
@@ -315,7 +314,6 @@ static struct mxc_usbh_platform_data otg_pdata __initdata = {
        .init   = pcm043_otg_init,
        .portsc = MXC_EHCI_MODE_UTMI,
 };
-#endif
 
 static int pcm043_usbh1_init(struct platform_device *pdev)
 {
@@ -351,7 +349,7 @@ __setup("otg_mode=", pcm043_otg_mode);
 /*
  * Board specific initialization.
  */
-static void __init mxc_board_init(void)
+static void __init pcm043_init(void)
 {
        mxc_iomux_v3_setup_multiple_pads(pcm043_pads, ARRAY_SIZE(pcm043_pads));
 
@@ -385,14 +383,12 @@ static void __init mxc_board_init(void)
        mxc_register_device(&mx3_ipu, &mx3_ipu_data);
        mxc_register_device(&mx3_fb, &mx3fb_pdata);
 
-#if defined(CONFIG_USB_ULPI)
        if (otg_mode_host) {
-               otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
-                               ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);
-
-               imx35_add_mxc_ehci_otg(&otg_pdata);
+               otg_pdata.otg = imx_otg_ulpi_create(ULPI_OTG_DRVVBUS |
+                               ULPI_OTG_DRVVBUS_EXT);
+               if (otg_pdata.otg)
+                       imx35_add_mxc_ehci_otg(&otg_pdata);
        }
-#endif
        imx35_add_mxc_ehci_hs(&usbh1_pdata);
 
        if (!otg_mode_host)
@@ -418,5 +414,5 @@ MACHINE_START(PCM043, "Phytec Phycore pcm043")
        .init_early = imx35_init_early,
        .init_irq = mx35_init_irq,
        .timer = &pcm043_timer,
-       .init_machine = mxc_board_init,
+       .init_machine = pcm043_init,
 MACHINE_END