Commit 52d084fc authored by Eric Bénard's avatar Eric Bénard Committed by Sascha Hauer
Browse files

cpuimx25 & cpuimx35: fix OTG port registration in host mode 



the PHY is UTMI so don't create an ULPI viewpoint.

Signed-off-by: default avatarEric Bénard <eric@eukrea.com>
parent 4a66b5d9

arch/arm/mach-mx25/mach-cpuimx25.c

+4 −10
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ 
#include <mach/mxc_nand.h>

#include <mach/imxfb.h>

#include <mach/mxc_ehci.h>

#include <mach/ulpi.h>

#include <mach/iomux-mx25.h>



#include "devices-imx25.h"
@@ -134,18 +133,13 @@ static void __init eukrea_cpuimx25_init(void) 
				ARRAY_SIZE(eukrea_cpuimx25_i2c_devices));

	imx25_add_imx_i2c0(&eukrea_cpuimx25_i2c0_data);



#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);



	if (otg_mode_host)

		mxc_register_device(&mxc_otg, &otg_pdata);

	}

	mxc_register_device(&mxc_usbh2, &usbh2_pdata);

#endif

	if (!otg_mode_host)

	else

		mxc_register_device(&otg_udc_device, &otg_device_pdata);



	mxc_register_device(&mxc_usbh2, &usbh2_pdata);



#ifdef CONFIG_MACH_EUKREA_MBIMXSD25_BASEBOARD

	eukrea_mbimxsd25_baseboard_init();

#endif

arch/arm/mach-mx3/mach-cpuimx35.c

+4 −10
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ 
#include <mach/iomux-mx35.h>

#include <mach/mxc_nand.h>

#include <mach/mxc_ehci.h>

#include <mach/ulpi.h>



#include "devices-imx35.h"

#include "devices.h"
@@ -167,18 +166,13 @@ static void __init mxc_board_init(void) 
			ARRAY_SIZE(eukrea_cpuimx35_i2c_devices));

	imx35_add_imx_i2c0(&eukrea_cpuimx35_i2c0_data);



#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);



	if (otg_mode_host)

		mxc_register_device(&mxc_otg_host, &otg_pdata);

	}

	mxc_register_device(&mxc_usbh1, &usbh1_pdata);

#endif

	if (!otg_mode_host)

	else

		mxc_register_device(&mxc_otg_udc_device, &otg_device_pdata);



	mxc_register_device(&mxc_usbh1, &usbh1_pdata);



#ifdef CONFIG_MACH_EUKREA_MBIMXSD35_BASEBOARD

	eukrea_mbimxsd35_baseboard_init();

#endif