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

Commit 3a0d30bc authored by Ajay Kumar Gupta's avatar Ajay Kumar Gupta Committed by Greg Kroah-Hartman
Browse files

USB: AM35x: Add musb support 



AM35x has musb interface (version 1.8) and uses CPPI41 DMA engine.
It has USB phy built inside the IP itself.

Signed-off-by: default avatarAjay Kumar Gupta <ajay.gupta@ti.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-omap@vger.kernel.org
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 436a3890

arch/arm/mach-omap2/board-am3517evm.c

+30 −0
Original line number Diff line number Diff line
@@ -375,6 +375,31 @@ static void __init am3517_evm_init_irq(void) 
	omap_gpio_init();

}



static struct omap_musb_board_data musb_board_data = {

	.interface_type         = MUSB_INTERFACE_ULPI,

	.mode                   = MUSB_OTG,

	.power                  = 500,

};



static __init void am3517_evm_musb_init(void)

{

	u32 devconf2;



	/*

	 * Set up USB clock/mode in the DEVCONF2 register.

	 */

	devconf2 = omap_ctrl_readl(AM35XX_CONTROL_DEVCONF2);



	/* USB2.0 PHY reference clock is 13 MHz */

	devconf2 &= ~(CONF2_REFFREQ | CONF2_OTGMODE | CONF2_PHY_GPIOMODE);

	devconf2 |=  CONF2_REFFREQ_13MHZ | CONF2_SESENDEN | CONF2_VBDTCTEN

			| CONF2_DATPOL;



	omap_ctrl_writel(devconf2, AM35XX_CONTROL_DEVCONF2);



	usb_musb_init(&musb_board_data);

}



static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {

	.port_mode[0] = EHCI_HCD_OMAP_MODE_PHY,

#if defined(CONFIG_PANEL_SHARP_LQ043T1DG01) || \
@@ -393,6 +418,8 @@ static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = { 


#ifdef CONFIG_OMAP_MUX

static struct omap_board_mux board_mux[] __initdata = {

	/* USB OTG DRVVBUS offset = 0x212 */

	OMAP3_MUX(SAD2D_MCAD23, OMAP_MUX_MODE0 | OMAP_PIN_INPUT_PULLDOWN),

	{ .reg_offset = OMAP_MUX_TERMINATOR },

};

#else
@@ -459,6 +486,9 @@ static void __init am3517_evm_init(void) 
				ARRAY_SIZE(am3517evm_i2c1_boardinfo));

	/*Ethernet*/

	am3517_evm_ethernet_init(&am3517_evm_emac_pdata);



	/* MUSB */

	am3517_evm_musb_init();

}



MACHINE_START(OMAP3517EVM, "OMAP3517/AM3517 EVM")

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

+4 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 


#include <mach/hardware.h>

#include <mach/irqs.h>

#include <mach/am35xx.h>

#include <plat/usb.h>



#ifdef CONFIG_USB_MUSB_SOC
@@ -89,6 +90,9 @@ void __init usb_musb_init(struct omap_musb_board_data *board_data) 
{

	if (cpu_is_omap243x()) {

		musb_resources[0].start = OMAP243X_HS_BASE;

	} else if (cpu_is_omap3517() || cpu_is_omap3505()) {

		musb_resources[0].start = AM35XX_IPSS_USBOTGSS_BASE;

		musb_resources[1].start = INT_35XX_USBOTG_IRQ;

	} else if (cpu_is_omap34xx()) {

		musb_resources[0].start = OMAP34XX_HSUSB_OTG_BASE;

	} else if (cpu_is_omap44xx()) {

arch/arm/plat-omap/include/plat/usb.h

+21 −0
Original line number Diff line number Diff line
@@ -218,6 +218,27 @@ static inline omap2_usbfs_init(struct omap_usb_config *pdata) 
#	define	USBT2TLL5PI		(1 << 17)

#	define	USB0PUENACTLOI		(1 << 16)

#	define	USBSTANDBYCTRL		(1 << 15)

/* AM35x */

/* USB 2.0 PHY Control */

#define CONF2_PHY_GPIOMODE	(1 << 23)

#define CONF2_OTGMODE		(3 << 14)

#define CONF2_NO_OVERRIDE	(0 << 14)

#define CONF2_FORCE_HOST	(1 << 14)

#define CONF2_FORCE_DEVICE	(2 << 14)

#define CONF2_FORCE_HOST_VBUS_LOW (3 << 14)

#define CONF2_SESENDEN		(1 << 13)

#define CONF2_VBDTCTEN		(1 << 12)

#define CONF2_REFFREQ_24MHZ	(2 << 8)

#define CONF2_REFFREQ_26MHZ	(7 << 8)

#define CONF2_REFFREQ_13MHZ	(6 << 8)

#define CONF2_REFFREQ		(0xf << 8)

#define CONF2_PHYCLKGD		(1 << 7)

#define CONF2_VBUSSENSE		(1 << 6)

#define CONF2_PHY_PLLON		(1 << 5)

#define CONF2_RESET		(1 << 4)

#define CONF2_PHYPWRDN		(1 << 3)

#define CONF2_OTGPWRDN		(1 << 2)

#define CONF2_DATPOL		(1 << 1)



#if defined(CONFIG_ARCH_OMAP1) && defined(CONFIG_USB)

u32 omap1_usb0_init(unsigned nwires, unsigned is_device);