Commit 0ae86689 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'omap4-ehci-for-greg' of... 

Merge branch 'omap4-ehci-for-greg' of git://dev.omapzoom.org/pub/scm/anand/linux-omap-usb into usb-next

* 'omap4-ehci-for-greg' of git://dev.omapzoom.org/pub/scm/anand/linux-omap-usb:
  omap4: 4430sdp: enable the ehci port on 4430SDP
  arm: omap4: select USB_ARCH_HAS_EHCI
  arm: omap4: usb: add platform init code for EHCI
  arm: omap4: add USBHOST and related base addresses
  usb: ehci-omap: Add OMAP4 support
  omap: usb: ehci: introduce HSIC mode
  usb: ehci-omap: add helpers for checking port mode
  usb: ehci-omap: use clkdev aliases for functional clocks
  omap: clock: add clkdev aliases for EHCI clocks
  usb: ehci: introduce CONFIG_USB_EHCI_HCD_OMAP
  usb: ehci-omap: don't hard-code TLL channel count
  usb: ehci-omap: update clock names to be more generic
parents e7cddda4 6aa85a5a

arch/arm/mach-omap2/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ config ARCH_OMAP4 
	select ARM_GIC

	select PL310_ERRATA_588369

	select ARM_ERRATA_720789

	select USB_ARCH_HAS_EHCI



comment "OMAP Core Type"

	depends on ARCH_OMAP2

arch/arm/mach-omap2/board-4430sdp.c

+20 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#define ETH_KS8851_IRQ			34

#define ETH_KS8851_POWER_ON		48

#define ETH_KS8851_QUART		138

#define OMAP4SDP_MDM_PWR_EN_GPIO	157

#define OMAP4_SFH7741_SENSOR_OUTPUT_GPIO	184

#define OMAP4_SFH7741_ENABLE_GPIO		188
@@ -225,6 +226,16 @@ static void __init omap_4430sdp_init_irq(void) 
	omap_gpio_init();

}



static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {

	.port_mode[0]	= EHCI_HCD_OMAP_MODE_PHY,

	.port_mode[1]	= EHCI_HCD_OMAP_MODE_UNKNOWN,

	.port_mode[2]	= EHCI_HCD_OMAP_MODE_UNKNOWN,

	.phy_reset	= false,

	.reset_gpio_port[0]  = -EINVAL,

	.reset_gpio_port[1]  = -EINVAL,

	.reset_gpio_port[2]  = -EINVAL,

};



static struct omap_musb_board_data musb_board_data = {

	.interface_type		= MUSB_INTERFACE_UTMI,

	.mode			= MUSB_PERIPHERAL,
@@ -514,6 +525,15 @@ static void __init omap_4430sdp_init(void) 
	platform_add_devices(sdp4430_devices, ARRAY_SIZE(sdp4430_devices));

	omap_serial_init();

	omap4_twl6030_hsmmc_init(mmc);



	/* Power on the ULPI PHY */

	if (gpio_is_valid(OMAP4SDP_MDM_PWR_EN_GPIO)) {

		/* FIXME: Assumes pad is already muxed for GPIO mode */

		gpio_request(OMAP4SDP_MDM_PWR_EN_GPIO, "USBB1 PHY VMDM_3V3");

		gpio_direction_output(OMAP4SDP_MDM_PWR_EN_GPIO, 1);

	}

	usb_ehci_init(&ehci_pdata);



	/* OMAP4 SDP uses internal transceiver so register nop transceiver */

	usb_nop_xceiv_register();

	/* FIXME: allow multi-omap to boot until musb is updated for omap4 */

arch/arm/mach-omap2/clock3xxx_data.c

+5 −0
Original line number Diff line number Diff line
@@ -3278,6 +3278,7 @@ static struct omap_clk omap3xxx_clks[] = { 
	CLK(NULL,	"cpefuse_fck",	&cpefuse_fck,	CK_3430ES2 | CK_AM35XX),

	CLK(NULL,	"ts_fck",	&ts_fck,	CK_3430ES2 | CK_AM35XX),

	CLK(NULL,	"usbtll_fck",	&usbtll_fck,	CK_3430ES2 | CK_AM35XX),

	CLK("ehci-omap.0",	"usbtll_fck",	&usbtll_fck,	CK_3430ES2 | CK_AM35XX),

	CLK("omap-mcbsp.1",	"prcm_fck",	&core_96m_fck,	CK_3XXX),

	CLK("omap-mcbsp.5",	"prcm_fck",	&core_96m_fck,	CK_3XXX),

	CLK(NULL,	"core_96m_fck",	&core_96m_fck,	CK_3XXX),
@@ -3313,6 +3314,7 @@ static struct omap_clk omap3xxx_clks[] = { 
	CLK(NULL,	"pka_ick",	&pka_ick,	CK_343X),

	CLK(NULL,	"core_l4_ick",	&core_l4_ick,	CK_3XXX),

	CLK(NULL,	"usbtll_ick",	&usbtll_ick,	CK_3430ES2 | CK_AM35XX),

	CLK("ehci-omap.0",	"usbtll_ick",	&usbtll_ick,	CK_3430ES2 | CK_AM35XX),

	CLK("mmci-omap-hs.2",	"ick",	&mmchs3_ick,	CK_3430ES2 | CK_AM35XX),

	CLK(NULL,	"icr_ick",	&icr_ick,	CK_343X),

	CLK("omap-aes",	"ick",	&aes2_ick,	CK_343X),
@@ -3358,8 +3360,11 @@ static struct omap_clk omap3xxx_clks[] = { 
	CLK(NULL,	"cam_ick",	&cam_ick,	CK_343X),

	CLK(NULL,	"csi2_96m_fck",	&csi2_96m_fck,	CK_343X),

	CLK(NULL,	"usbhost_120m_fck", &usbhost_120m_fck, CK_3430ES2 | CK_AM35XX),

	CLK("ehci-omap.0",	"hs_fck", &usbhost_120m_fck, CK_3430ES2 | CK_AM35XX),

	CLK(NULL,	"usbhost_48m_fck", &usbhost_48m_fck, CK_3430ES2 | CK_AM35XX),

	CLK("ehci-omap.0",	"fs_fck", &usbhost_48m_fck, CK_3430ES2 | CK_AM35XX),

	CLK(NULL,	"usbhost_ick",	&usbhost_ick,	CK_3430ES2 | CK_AM35XX),

	CLK("ehci-omap.0",	"usbhost_ick",	&usbhost_ick,	CK_3430ES2 | CK_AM35XX),

	CLK(NULL,	"usim_fck",	&usim_fck,	CK_3430ES2),

	CLK(NULL,	"gpt1_fck",	&gpt1_fck,	CK_3XXX),

	CLK(NULL,	"wkup_32k_fck",	&wkup_32k_fck,	CK_3XXX),

arch/arm/mach-omap2/clock44xx_data.c

+5 −0
Original line number Diff line number Diff line
@@ -2937,6 +2937,7 @@ static struct omap_clk omap44xx_clks[] = { 
	CLK(NULL,	"uart3_fck",			&uart3_fck,	CK_443X),

	CLK(NULL,	"uart4_fck",			&uart4_fck,	CK_443X),

	CLK(NULL,	"usb_host_fs_fck",		&usb_host_fs_fck,	CK_443X),

	CLK("ehci-omap.0",	"fs_fck",		&usb_host_fs_fck,	CK_443X),

	CLK(NULL,	"usb_host_hs_utmi_p3_clk",	&usb_host_hs_utmi_p3_clk,	CK_443X),

	CLK(NULL,	"usb_host_hs_hsic60m_p1_clk",	&usb_host_hs_hsic60m_p1_clk,	CK_443X),

	CLK(NULL,	"usb_host_hs_hsic60m_p2_clk",	&usb_host_hs_hsic60m_p2_clk,	CK_443X),
@@ -2948,6 +2949,8 @@ static struct omap_clk omap44xx_clks[] = { 
	CLK(NULL,	"usb_host_hs_hsic480m_p2_clk",	&usb_host_hs_hsic480m_p2_clk,	CK_443X),

	CLK(NULL,	"usb_host_hs_func48mclk",	&usb_host_hs_func48mclk,	CK_443X),

	CLK(NULL,	"usb_host_hs_fck",		&usb_host_hs_fck,	CK_443X),

	CLK("ehci-omap.0",	"hs_fck",		&usb_host_hs_fck,	CK_443X),

	CLK("ehci-omap.0",	"usbhost_ick",		&dummy_ck,		CK_443X),

	CLK(NULL,	"otg_60m_gfclk",		&otg_60m_gfclk,	CK_443X),

	CLK(NULL,	"usb_otg_hs_xclk",		&usb_otg_hs_xclk,	CK_443X),

	CLK("musb_hdrc",	"ick",				&usb_otg_hs_ick,	CK_443X),
@@ -2956,6 +2959,8 @@ static struct omap_clk omap44xx_clks[] = { 
	CLK(NULL,	"usb_tll_hs_usb_ch0_clk",	&usb_tll_hs_usb_ch0_clk,	CK_443X),

	CLK(NULL,	"usb_tll_hs_usb_ch1_clk",	&usb_tll_hs_usb_ch1_clk,	CK_443X),

	CLK(NULL,	"usb_tll_hs_ick",		&usb_tll_hs_ick,	CK_443X),

	CLK("ehci-omap.0",	"usbtll_ick",		&usb_tll_hs_ick,	CK_443X),

	CLK("ehci-omap.0",	"usbtll_fck",		&dummy_ck,	CK_443X),

	CLK(NULL,	"usim_ck",			&usim_ck,	CK_443X),

	CLK(NULL,	"usim_fclk",			&usim_fclk,	CK_443X),

	CLK(NULL,	"usim_fck",			&usim_fck,	CK_443X),

arch/arm/mach-omap2/usb-ehci.c

+136 −8
Original line number Diff line number Diff line
@@ -34,22 +34,15 @@ 


static struct resource ehci_resources[] = {

	{

		.start	= OMAP34XX_EHCI_BASE,

		.end	= OMAP34XX_EHCI_BASE + SZ_1K - 1,

		.flags	= IORESOURCE_MEM,

	},

	{

		.start	= OMAP34XX_UHH_CONFIG_BASE,

		.end	= OMAP34XX_UHH_CONFIG_BASE + SZ_1K - 1,

		.flags	= IORESOURCE_MEM,

	},

	{

		.start	= OMAP34XX_USBTLL_BASE,

		.end	= OMAP34XX_USBTLL_BASE + SZ_4K - 1,

		.flags	= IORESOURCE_MEM,

	},

	{         /* general IRQ */

		.start   = INT_34XX_EHCI_IRQ,

		.flags   = IORESOURCE_IRQ,

	}

};
@@ -214,13 +207,148 @@ static void setup_ehci_io_mux(const enum ehci_hcd_omap_mode *port_mode) 
	return;

}



static void setup_4430ehci_io_mux(const enum ehci_hcd_omap_mode *port_mode)

{

	switch (port_mode[0]) {

	case EHCI_HCD_OMAP_MODE_PHY:

		omap_mux_init_signal("usbb1_ulpiphy_stp",

			OMAP_PIN_OUTPUT);

		omap_mux_init_signal("usbb1_ulpiphy_clk",

			OMAP_PIN_INPUT_PULLDOWN);

		omap_mux_init_signal("usbb1_ulpiphy_dir",

			OMAP_PIN_INPUT_PULLDOWN);

		omap_mux_init_signal("usbb1_ulpiphy_nxt",

			OMAP_PIN_INPUT_PULLDOWN);

		omap_mux_init_signal("usbb1_ulpiphy_dat0",

			OMAP_PIN_INPUT_PULLDOWN);

		omap_mux_init_signal("usbb1_ulpiphy_dat1",

			OMAP_PIN_INPUT_PULLDOWN);

		omap_mux_init_signal("usbb1_ulpiphy_dat2",

			OMAP_PIN_INPUT_PULLDOWN);

		omap_mux_init_signal("usbb1_ulpiphy_dat3",

			OMAP_PIN_INPUT_PULLDOWN);

		omap_mux_init_signal("usbb1_ulpiphy_dat4",

			OMAP_PIN_INPUT_PULLDOWN);

		omap_mux_init_signal("usbb1_ulpiphy_dat5",

			OMAP_PIN_INPUT_PULLDOWN);

		omap_mux_init_signal("usbb1_ulpiphy_dat6",

			OMAP_PIN_INPUT_PULLDOWN);

		omap_mux_init_signal("usbb1_ulpiphy_dat7",

			OMAP_PIN_INPUT_PULLDOWN);

			break;

	case EHCI_HCD_OMAP_MODE_TLL:

		omap_mux_init_signal("usbb1_ulpitll_stp",

			OMAP_PIN_INPUT_PULLUP);

		omap_mux_init_signal("usbb1_ulpitll_clk",

			OMAP_PIN_INPUT_PULLDOWN);

		omap_mux_init_signal("usbb1_ulpitll_dir",

			OMAP_PIN_INPUT_PULLDOWN);

		omap_mux_init_signal("usbb1_ulpitll_nxt",

			OMAP_PIN_INPUT_PULLDOWN);

		omap_mux_init_signal("usbb1_ulpitll_dat0",

			OMAP_PIN_INPUT_PULLDOWN);

		omap_mux_init_signal("usbb1_ulpitll_dat1",

			OMAP_PIN_INPUT_PULLDOWN);

		omap_mux_init_signal("usbb1_ulpitll_dat2",

			OMAP_PIN_INPUT_PULLDOWN);

		omap_mux_init_signal("usbb1_ulpitll_dat3",

			OMAP_PIN_INPUT_PULLDOWN);

		omap_mux_init_signal("usbb1_ulpitll_dat4",

			OMAP_PIN_INPUT_PULLDOWN);

		omap_mux_init_signal("usbb1_ulpitll_dat5",

			OMAP_PIN_INPUT_PULLDOWN);

		omap_mux_init_signal("usbb1_ulpitll_dat6",

			OMAP_PIN_INPUT_PULLDOWN);

		omap_mux_init_signal("usbb1_ulpitll_dat7",

			OMAP_PIN_INPUT_PULLDOWN);

			break;

	case EHCI_HCD_OMAP_MODE_UNKNOWN:

	default:

			break;

	}

	switch (port_mode[1]) {

	case EHCI_HCD_OMAP_MODE_PHY:

		omap_mux_init_signal("usbb2_ulpiphy_stp",

			OMAP_PIN_OUTPUT);

		omap_mux_init_signal("usbb2_ulpiphy_clk",

			OMAP_PIN_INPUT_PULLDOWN);

		omap_mux_init_signal("usbb2_ulpiphy_dir",

			OMAP_PIN_INPUT_PULLDOWN);

		omap_mux_init_signal("usbb2_ulpiphy_nxt",

			OMAP_PIN_INPUT_PULLDOWN);

		omap_mux_init_signal("usbb2_ulpiphy_dat0",

			OMAP_PIN_INPUT_PULLDOWN);

		omap_mux_init_signal("usbb2_ulpiphy_dat1",

			OMAP_PIN_INPUT_PULLDOWN);

		omap_mux_init_signal("usbb2_ulpiphy_dat2",

			OMAP_PIN_INPUT_PULLDOWN);

		omap_mux_init_signal("usbb2_ulpiphy_dat3",

			OMAP_PIN_INPUT_PULLDOWN);

		omap_mux_init_signal("usbb2_ulpiphy_dat4",

			OMAP_PIN_INPUT_PULLDOWN);

		omap_mux_init_signal("usbb2_ulpiphy_dat5",

			OMAP_PIN_INPUT_PULLDOWN);

		omap_mux_init_signal("usbb2_ulpiphy_dat6",

			OMAP_PIN_INPUT_PULLDOWN);

		omap_mux_init_signal("usbb2_ulpiphy_dat7",

			OMAP_PIN_INPUT_PULLDOWN);

			break;

	case EHCI_HCD_OMAP_MODE_TLL:

		omap_mux_init_signal("usbb2_ulpitll_stp",

			OMAP_PIN_INPUT_PULLUP);

		omap_mux_init_signal("usbb2_ulpitll_clk",

			OMAP_PIN_INPUT_PULLDOWN);

		omap_mux_init_signal("usbb2_ulpitll_dir",

			OMAP_PIN_INPUT_PULLDOWN);

		omap_mux_init_signal("usbb2_ulpitll_nxt",

			OMAP_PIN_INPUT_PULLDOWN);

		omap_mux_init_signal("usbb2_ulpitll_dat0",

			OMAP_PIN_INPUT_PULLDOWN);

		omap_mux_init_signal("usbb2_ulpitll_dat1",

			OMAP_PIN_INPUT_PULLDOWN);

		omap_mux_init_signal("usbb2_ulpitll_dat2",

			OMAP_PIN_INPUT_PULLDOWN);

		omap_mux_init_signal("usbb2_ulpitll_dat3",

			OMAP_PIN_INPUT_PULLDOWN);

		omap_mux_init_signal("usbb2_ulpitll_dat4",

			OMAP_PIN_INPUT_PULLDOWN);

		omap_mux_init_signal("usbb2_ulpitll_dat5",

			OMAP_PIN_INPUT_PULLDOWN);

		omap_mux_init_signal("usbb2_ulpitll_dat6",

			OMAP_PIN_INPUT_PULLDOWN);

		omap_mux_init_signal("usbb2_ulpitll_dat7",

			OMAP_PIN_INPUT_PULLDOWN);

			break;

	case EHCI_HCD_OMAP_MODE_UNKNOWN:

	default:

			break;

	}

}



void __init usb_ehci_init(const struct ehci_hcd_omap_platform_data *pdata)

{

	platform_device_add_data(&ehci_device, pdata, sizeof(*pdata));



	/* Setup Pin IO MUX for EHCI */

	if (cpu_is_omap34xx())

	if (cpu_is_omap34xx()) {

		ehci_resources[0].start	= OMAP34XX_EHCI_BASE;

		ehci_resources[0].end	= OMAP34XX_EHCI_BASE + SZ_1K - 1;

		ehci_resources[1].start	= OMAP34XX_UHH_CONFIG_BASE;

		ehci_resources[1].end	= OMAP34XX_UHH_CONFIG_BASE + SZ_1K - 1;

		ehci_resources[2].start	= OMAP34XX_USBTLL_BASE;

		ehci_resources[2].end	= OMAP34XX_USBTLL_BASE + SZ_4K - 1;

		ehci_resources[3].start = INT_34XX_EHCI_IRQ;

		setup_ehci_io_mux(pdata->port_mode);

	} else if (cpu_is_omap44xx()) {

		ehci_resources[0].start	= OMAP44XX_HSUSB_EHCI_BASE;

		ehci_resources[0].end	= OMAP44XX_HSUSB_EHCI_BASE + SZ_1K - 1;

		ehci_resources[1].start	= OMAP44XX_UHH_CONFIG_BASE;

		ehci_resources[1].end	= OMAP44XX_UHH_CONFIG_BASE + SZ_2K - 1;

		ehci_resources[2].start	= OMAP44XX_USBTLL_BASE;

		ehci_resources[2].end	= OMAP44XX_USBTLL_BASE + SZ_4K - 1;

		ehci_resources[3].start = OMAP44XX_IRQ_EHCI;

		setup_4430ehci_io_mux(pdata->port_mode);

	}



	if (platform_device_register(&ehci_device) < 0) {

		printk(KERN_ERR "Unable to register HS-USB (EHCI) device\n");

CRA Git | Maintained and supported by SUSTech CRA and CCSE