Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4bd597b6 authored by Sascha Hauer's avatar Sascha Hauer
Browse files

ARM i.MX ehci: do ehci init in board specific functions 



The mxc-ehci driver calls SoC specific phy initialization right after
calling board specific initialization. To offer greater flexibility for
boards to setup the phy and to get rid of some unnecessary flags in
platform data this patch lets the boards call the SoC specific phy
initialization and remove it from the driver.

Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent cb07625d

arch/arm/mach-imx/mach-cpuimx27.c

+12 −2
Original line number Diff line number Diff line
@@ -210,14 +210,24 @@ static struct platform_device serial_device = { 
#endif



#if defined(CONFIG_USB_ULPI)

static int eukrea_cpuimx27_otg_init(struct platform_device *pdev)

{

	return mx27_initialize_usb_hw(pdev->id, MXC_EHCI_INTERFACE_DIFF_UNI);

}



static struct mxc_usbh_platform_data otg_pdata __initdata = {

	.init	= eukrea_cpuimx27_otg_init,

	.portsc	= MXC_EHCI_MODE_ULPI,

	.flags	= MXC_EHCI_INTERFACE_DIFF_UNI,

};



static int eukrea_cpuimx27_usbh2_init(struct platform_device *pdev)

{

	return mx27_initialize_usb_hw(pdev->id, MXC_EHCI_INTERFACE_DIFF_UNI);

}



static struct mxc_usbh_platform_data usbh2_pdata __initdata = {

	.init	= eukrea_cpuimx27_usbh2_init,

	.portsc	= MXC_EHCI_MODE_ULPI,

	.flags	= MXC_EHCI_INTERFACE_DIFF_UNI,

};

#endif

arch/arm/mach-imx/mach-eukrea_cpuimx25.c

+13 −3
Original line number Diff line number Diff line
@@ -84,15 +84,25 @@ static struct i2c_board_info eukrea_cpuimx25_i2c_devices[] = { 
	},

};



static int eukrea_cpuimx25_otg_init(struct platform_device *pdev)

{

	return mx25_initialize_usb_hw(pdev->id, MXC_EHCI_INTERFACE_DIFF_UNI);

}



static const struct mxc_usbh_platform_data otg_pdata __initconst = {

	.init	= eukrea_cpuimx25_otg_init,

	.portsc	= MXC_EHCI_MODE_UTMI,

	.flags	= MXC_EHCI_INTERFACE_DIFF_UNI,

};



static int eukrea_cpuimx25_usbh2_init(struct platform_device *pdev)

{

	return mx25_initialize_usb_hw(pdev->id, MXC_EHCI_INTERFACE_SINGLE_UNI |

			MXC_EHCI_INTERNAL_PHY | MXC_EHCI_IPPUE_DOWN);

}



static const struct mxc_usbh_platform_data usbh2_pdata __initconst = {

	.init	= eukrea_cpuimx25_usbh2_init,

	.portsc	= MXC_EHCI_MODE_SERIAL,

	.flags	= MXC_EHCI_INTERFACE_SINGLE_UNI | MXC_EHCI_INTERNAL_PHY |

		  MXC_EHCI_IPPUE_DOWN,

};



static const struct fsl_usb2_platform_data otg_device_pdata __initconst = {

arch/arm/mach-imx/mach-imx27_visstrim_m10.c

+5 −2
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/gpio_keys.h>

#include <linux/input.h>

#include <linux/gpio.h>

#include <linux/delay.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/time.h>
@@ -210,14 +211,16 @@ static struct i2c_board_info visstrim_m10_i2c_devices[] = { 
static int otg_phy_init(struct platform_device *pdev)

{

	gpio_set_value(OTG_PHY_CS_GPIO, 0);

	return 0;



	mdelay(10);



	return mx27_initialize_usb_hw(pdev->id, MXC_EHCI_POWER_PINS_ENABLED);

}



static const struct mxc_usbh_platform_data

visstrim_m10_usbotg_pdata __initconst = {

	.init = otg_phy_init,

	.portsc	= MXC_EHCI_MODE_ULPI | MXC_EHCI_UTMI_8BIT,

	.flags	= MXC_EHCI_POWER_PINS_ENABLED,

};



static void __init visstrim_m10_board_init(void)

arch/arm/mach-imx/mach-mx25_3ds.c

+6 −1
Original line number Diff line number Diff line
@@ -185,9 +185,14 @@ static const struct matrix_keymap_data mx25pdk_keymap_data __initconst = { 
	.keymap_size	= ARRAY_SIZE(mx25pdk_keymap),

};



static int mx25pdk_usbh2_init(struct platform_device *pdev)

{

	return mx25_initialize_usb_hw(pdev->id, MXC_EHCI_INTERNAL_PHY);

}



static const struct mxc_usbh_platform_data usbh2_pdata __initconst = {

	.init	= mx25pdk_usbh2_init,

	.portsc	= MXC_EHCI_MODE_SERIAL,

	.flags	= MXC_EHCI_INTERNAL_PHY,

};



static const struct fsl_usb2_platform_data otg_device_pdata __initconst = {

arch/arm/mach-imx/mach-mx27_3ds.c

+5 −1
Original line number Diff line number Diff line
@@ -160,10 +160,14 @@ static int otg_phy_init(void) 
}



#if defined(CONFIG_USB_ULPI)

static int mx27_3ds_otg_init(struct platform_device *pdev)

{

	return mx27_initialize_usb_hw(pdev->id, MXC_EHCI_INTERFACE_DIFF_UNI);

}



static struct mxc_usbh_platform_data otg_pdata __initdata = {

	.init	= mx27_3ds_otg_init,

	.portsc	= MXC_EHCI_MODE_ULPI,

	.flags	= MXC_EHCI_INTERFACE_DIFF_UNI,

};

#endif