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

Commit 04aa67de authored Feb 22, 2011 by Tony Lindgren

Merge branch 'for-tony' of git://gitorious.org/usb/usb into omap-for-linus

Conflicts:
	arch/arm/mach-omap2/omap_hwmod_2430_data.c
	arch/arm/mach-omap2/omap_hwmod_3xxx_data.c

parents 3b03b58d 18a26892

arch/arm/mach-omap2/Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -218,7 +218,8 @@ obj-$(CONFIG_MACH_OMAP4_PANDA) += board-omap4panda.o \
		hsmmc.o \
		omap_phy_internal.o

		obj-$(CONFIG_MACH_OMAP3517EVM) += board-am3517evm.o
		obj-$(CONFIG_MACH_OMAP3517EVM) += board-am3517evm.o \
		omap_phy_internal.o \

		obj-$(CONFIG_MACH_CRANEBOARD) += board-am3517crane.o

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

+0 −19

Original line number	Diff line number	Diff line
		@@ -44,7 +44,6 @@
		#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

		@@ -250,16 +249,6 @@ static void __init omap_4430sdp_init_early(void)
		#endif
		}

		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_OTG,
		@@ -575,14 +564,6 @@ static void __init omap_4430sdp_init(void)
		omap_serial_init();
		omap4_twl6030_hsmmc_init(mmc);

		/* Power on the ULPI PHY */
		status = gpio_request(OMAP4SDP_MDM_PWR_EN_GPIO, "USBB1 PHY VMDM_3V3");
		if (status)
		pr_err("%s: Could not get USBB1 PHY GPIO\n", __func__);
		else
		gpio_direction_output(OMAP4SDP_MDM_PWR_EN_GPIO, 1);

		usb_ehci_init(&ehci_pdata);
		usb_musb_init(&musb_board_data);

		status = omap_ethernet_init();

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -408,6 +408,10 @@ static struct omap_musb_board_data musb_board_data = {
		.interface_type = MUSB_INTERFACE_ULPI,
		.mode = MUSB_OTG,
		.power = 500,
		.set_phy_power = am35x_musb_phy_power,
		.clear_irq = am35x_musb_clear_irq,
		.set_mode = am35x_musb_set_mode,
		.reset = am35x_musb_reset,
		};

		static __init void am3517_evm_musb_init(void)

arch/arm/mach-omap2/omap_hwmod_2430_data.c

+101 −0

Original line number	Diff line number	Diff line
		@@ -93,6 +93,16 @@ static struct omap_hwmod omap2430_uart3_hwmod;
		static struct omap_hwmod omap2430_i2c1_hwmod;
		static struct omap_hwmod omap2430_i2c2_hwmod;

		static struct omap_hwmod omap2430_usbhsotg_hwmod;

		/* l3_core -> usbhsotg interface */
		static struct omap_hwmod_ocp_if omap2430_usbhsotg__l3 = {
		.master = &omap2430_usbhsotg_hwmod,
		.slave = &omap2430_l3_main_hwmod,
		.clk = "core_l3_ck",
		.user = OCP_USER_MPU,
		};

		/* I2C IP block address space length (in bytes) */
		#define OMAP2_I2C_AS_LEN 128

		@@ -193,6 +203,35 @@ static struct omap_hwmod_ocp_if omap2_l4_core__uart3 = {
		.user = OCP_USER_MPU \| OCP_USER_SDMA,
		};

		/*
		* usbhsotg interface data
		*/
		static struct omap_hwmod_addr_space omap2430_usbhsotg_addrs[] = {
		{
		.pa_start = OMAP243X_HS_BASE,
		.pa_end = OMAP243X_HS_BASE + SZ_4K - 1,
		.flags = ADDR_TYPE_RT
		},
		};

		/* l4_core ->usbhsotg interface */
		static struct omap_hwmod_ocp_if omap2430_l4_core__usbhsotg = {
		.master = &omap2430_l4_core_hwmod,
		.slave = &omap2430_usbhsotg_hwmod,
		.clk = "usb_l4_ick",
		.addr = omap2430_usbhsotg_addrs,
		.addr_cnt = ARRAY_SIZE(omap2430_usbhsotg_addrs),
		.user = OCP_USER_MPU,
		};

		static struct omap_hwmod_ocp_if *omap2430_usbhsotg_masters[] = {
		&omap2430_usbhsotg__l3,
		};

		static struct omap_hwmod_ocp_if *omap2430_usbhsotg_slaves[] = {
		&omap2430_l4_core__usbhsotg,
		};

		/* Slave interfaces on the L4_CORE interconnect */
		static struct omap_hwmod_ocp_if *omap2430_l4_core_slaves[] = {
		&omap2430_l3_main__l4_core,
		@@ -1133,6 +1172,64 @@ static struct omap_hwmod omap2430_mcspi3_hwmod = {
		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2430),
		};

		/*
		* usbhsotg
		*/
		static struct omap_hwmod_class_sysconfig omap2430_usbhsotg_sysc = {
		.rev_offs = 0x0400,
		.sysc_offs = 0x0404,
		.syss_offs = 0x0408,
		.sysc_flags = (SYSC_HAS_SIDLEMODE \| SYSC_HAS_MIDLEMODE\|
		SYSC_HAS_ENAWAKEUP \| SYSC_HAS_SOFTRESET \|
		SYSC_HAS_AUTOIDLE),
		.idlemodes = (SIDLE_FORCE \| SIDLE_NO \| SIDLE_SMART \|
		MSTANDBY_FORCE \| MSTANDBY_NO \| MSTANDBY_SMART),
		.sysc_fields = &omap_hwmod_sysc_type1,
		};

		static struct omap_hwmod_class usbotg_class = {
		.name = "usbotg",
		.sysc = &omap2430_usbhsotg_sysc,
		};

		/* usb_otg_hs */
		static struct omap_hwmod_irq_info omap2430_usbhsotg_mpu_irqs[] = {

		{ .name = "mc", .irq = 92 },
		{ .name = "dma", .irq = 93 },
		};

		static struct omap_hwmod omap2430_usbhsotg_hwmod = {
		.name = "usb_otg_hs",
		.mpu_irqs = omap2430_usbhsotg_mpu_irqs,
		.mpu_irqs_cnt = ARRAY_SIZE(omap2430_usbhsotg_mpu_irqs),
		.main_clk = "usbhs_ick",
		.prcm = {
		.omap2 = {
		.prcm_reg_id = 1,
		.module_bit = OMAP2430_EN_USBHS_MASK,
		.module_offs = CORE_MOD,
		.idlest_reg_id = 1,
		.idlest_idle_bit = OMAP2430_ST_USBHS_SHIFT,
		},
		},
		.masters = omap2430_usbhsotg_masters,
		.masters_cnt = ARRAY_SIZE(omap2430_usbhsotg_masters),
		.slaves = omap2430_usbhsotg_slaves,
		.slaves_cnt = ARRAY_SIZE(omap2430_usbhsotg_slaves),
		.class = &usbotg_class,
		/*
		* Erratum ID: i479 idle_req / idle_ack mechanism potentially
		* broken when autoidle is enabled
		* workaround is to disable the autoidle bit at module level.
		*/
		.flags = HWMOD_NO_OCP_AUTOIDLE \| HWMOD_SWSUP_SIDLE
		\| HWMOD_SWSUP_MSTANDBY,
		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2430)
		};



		static __initdata struct omap_hwmod *omap2430_hwmods[] = {
		&omap2430_l3_main_hwmod,
		&omap2430_l4_core_hwmod,
		@@ -1160,6 +1257,10 @@ static __initdata struct omap_hwmod *omap2430_hwmods[] = {
		&omap2430_mcspi1_hwmod,
		&omap2430_mcspi2_hwmod,
		&omap2430_mcspi3_hwmod,

		/* usbotg class*/
		&omap2430_usbhsotg_hwmod,

		NULL,
		};

arch/arm/mach-omap2/omap_hwmod_3xxx_data.c

+165 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@
		#include "prm-regbits-34xx.h"
		#include "cm-regbits-34xx.h"
		#include "wd_timer.h"
		#include <mach/am35xx.h>

		/*
		* OMAP3xxx hardware module integration data
		@@ -60,6 +61,7 @@ static struct omap_hwmod omap34xx_mcspi1;
		static struct omap_hwmod omap34xx_mcspi2;
		static struct omap_hwmod omap34xx_mcspi3;
		static struct omap_hwmod omap34xx_mcspi4;
		static struct omap_hwmod am35xx_usbhsotg_hwmod;

		static struct omap_hwmod omap3xxx_dma_system_hwmod;

		@@ -112,7 +114,23 @@ static struct omap_hwmod omap3xxx_uart1_hwmod;
		static struct omap_hwmod omap3xxx_uart2_hwmod;
		static struct omap_hwmod omap3xxx_uart3_hwmod;
		static struct omap_hwmod omap3xxx_uart4_hwmod;
		static struct omap_hwmod omap3xxx_usbhsotg_hwmod;

		/* l3_core -> usbhsotg interface */
		static struct omap_hwmod_ocp_if omap3xxx_usbhsotg__l3 = {
		.master = &omap3xxx_usbhsotg_hwmod,
		.slave = &omap3xxx_l3_main_hwmod,
		.clk = "core_l3_ick",
		.user = OCP_USER_MPU,
		};

		/* l3_core -> am35xx_usbhsotg interface */
		static struct omap_hwmod_ocp_if am35xx_usbhsotg__l3 = {
		.master = &am35xx_usbhsotg_hwmod,
		.slave = &omap3xxx_l3_main_hwmod,
		.clk = "core_l3_ick",
		.user = OCP_USER_MPU,
		};
		/* L4_CORE -> L4_WKUP interface */
		static struct omap_hwmod_ocp_if omap3xxx_l4_core__l4_wkup = {
		.master = &omap3xxx_l4_core_hwmod,
		@@ -306,6 +324,61 @@ static struct omap_hwmod_ocp_if omap3_l4_core__sr2 = {
		.user = OCP_USER_MPU,
		};

		/*
		* usbhsotg interface data
		*/

		static struct omap_hwmod_addr_space omap3xxx_usbhsotg_addrs[] = {
		{
		.pa_start = OMAP34XX_HSUSB_OTG_BASE,
		.pa_end = OMAP34XX_HSUSB_OTG_BASE + SZ_4K - 1,
		.flags = ADDR_TYPE_RT
		},
		};

		/* l4_core -> usbhsotg */
		static struct omap_hwmod_ocp_if omap3xxx_l4_core__usbhsotg = {
		.master = &omap3xxx_l4_core_hwmod,
		.slave = &omap3xxx_usbhsotg_hwmod,
		.clk = "l4_ick",
		.addr = omap3xxx_usbhsotg_addrs,
		.addr_cnt = ARRAY_SIZE(omap3xxx_usbhsotg_addrs),
		.user = OCP_USER_MPU,
		};

		static struct omap_hwmod_ocp_if *omap3xxx_usbhsotg_masters[] = {
		&omap3xxx_usbhsotg__l3,
		};

		static struct omap_hwmod_ocp_if *omap3xxx_usbhsotg_slaves[] = {
		&omap3xxx_l4_core__usbhsotg,
		};

		static struct omap_hwmod_addr_space am35xx_usbhsotg_addrs[] = {
		{
		.pa_start = AM35XX_IPSS_USBOTGSS_BASE,
		.pa_end = AM35XX_IPSS_USBOTGSS_BASE + SZ_4K - 1,
		.flags = ADDR_TYPE_RT
		},
		};

		/* l4_core -> usbhsotg */
		static struct omap_hwmod_ocp_if am35xx_l4_core__usbhsotg = {
		.master = &omap3xxx_l4_core_hwmod,
		.slave = &am35xx_usbhsotg_hwmod,
		.clk = "l4_ick",
		.addr = am35xx_usbhsotg_addrs,
		.addr_cnt = ARRAY_SIZE(am35xx_usbhsotg_addrs),
		.user = OCP_USER_MPU,
		};

		static struct omap_hwmod_ocp_if *am35xx_usbhsotg_masters[] = {
		&am35xx_usbhsotg__l3,
		};

		static struct omap_hwmod_ocp_if *am35xx_usbhsotg_slaves[] = {
		&am35xx_l4_core__usbhsotg,
		};
		/* Slave interfaces on the L4_CORE interconnect */
		static struct omap_hwmod_ocp_if *omap3xxx_l4_core_slaves[] = {
		&omap3xxx_l3_main__l4_core,
		@@ -1630,6 +1703,91 @@ static struct omap_hwmod omap34xx_mcspi4 = {
		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
		};

		/*
		* usbhsotg
		*/
		static struct omap_hwmod_class_sysconfig omap3xxx_usbhsotg_sysc = {
		.rev_offs = 0x0400,
		.sysc_offs = 0x0404,
		.syss_offs = 0x0408,
		.sysc_flags = (SYSC_HAS_SIDLEMODE \| SYSC_HAS_MIDLEMODE\|
		SYSC_HAS_ENAWAKEUP \| SYSC_HAS_SOFTRESET \|
		SYSC_HAS_AUTOIDLE),
		.idlemodes = (SIDLE_FORCE \| SIDLE_NO \| SIDLE_SMART \|
		MSTANDBY_FORCE \| MSTANDBY_NO \| MSTANDBY_SMART),
		.sysc_fields = &omap_hwmod_sysc_type1,
		};

		static struct omap_hwmod_class usbotg_class = {
		.name = "usbotg",
		.sysc = &omap3xxx_usbhsotg_sysc,
		};
		/* usb_otg_hs */
		static struct omap_hwmod_irq_info omap3xxx_usbhsotg_mpu_irqs[] = {

		{ .name = "mc", .irq = 92 },
		{ .name = "dma", .irq = 93 },
		};

		static struct omap_hwmod omap3xxx_usbhsotg_hwmod = {
		.name = "usb_otg_hs",
		.mpu_irqs = omap3xxx_usbhsotg_mpu_irqs,
		.mpu_irqs_cnt = ARRAY_SIZE(omap3xxx_usbhsotg_mpu_irqs),
		.main_clk = "hsotgusb_ick",
		.prcm = {
		.omap2 = {
		.prcm_reg_id = 1,
		.module_bit = OMAP3430_EN_HSOTGUSB_SHIFT,
		.module_offs = CORE_MOD,
		.idlest_reg_id = 1,
		.idlest_idle_bit = OMAP3430ES2_ST_HSOTGUSB_IDLE_SHIFT,
		.idlest_stdby_bit = OMAP3430ES2_ST_HSOTGUSB_STDBY_SHIFT
		},
		},
		.masters = omap3xxx_usbhsotg_masters,
		.masters_cnt = ARRAY_SIZE(omap3xxx_usbhsotg_masters),
		.slaves = omap3xxx_usbhsotg_slaves,
		.slaves_cnt = ARRAY_SIZE(omap3xxx_usbhsotg_slaves),
		.class = &usbotg_class,

		/*
		* Erratum ID: i479 idle_req / idle_ack mechanism potentially
		* broken when autoidle is enabled
		* workaround is to disable the autoidle bit at module level.
		*/
		.flags = HWMOD_NO_OCP_AUTOIDLE \| HWMOD_SWSUP_SIDLE
		\| HWMOD_SWSUP_MSTANDBY,
		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
		};

		/* usb_otg_hs */
		static struct omap_hwmod_irq_info am35xx_usbhsotg_mpu_irqs[] = {

		{ .name = "mc", .irq = 71 },
		};

		static struct omap_hwmod_class am35xx_usbotg_class = {
		.name = "am35xx_usbotg",
		.sysc = NULL,
		};

		static struct omap_hwmod am35xx_usbhsotg_hwmod = {
		.name = "am35x_otg_hs",
		.mpu_irqs = am35xx_usbhsotg_mpu_irqs,
		.mpu_irqs_cnt = ARRAY_SIZE(am35xx_usbhsotg_mpu_irqs),
		.main_clk = NULL,
		.prcm = {
		.omap2 = {
		},
		},
		.masters = am35xx_usbhsotg_masters,
		.masters_cnt = ARRAY_SIZE(am35xx_usbhsotg_masters),
		.slaves = am35xx_usbhsotg_slaves,
		.slaves_cnt = ARRAY_SIZE(am35xx_usbhsotg_slaves),
		.class = &am35xx_usbotg_class,
		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430ES3_1)
		};

		static __initdata struct omap_hwmod *omap3xxx_hwmods[] = {
		&omap3xxx_l3_main_hwmod,
		&omap3xxx_l4_core_hwmod,
		@@ -1667,6 +1825,13 @@ static __initdata struct omap_hwmod *omap3xxx_hwmods[] = {
		&omap34xx_mcspi2,
		&omap34xx_mcspi3,
		&omap34xx_mcspi4,

		/* usbotg class */
		&omap3xxx_usbhsotg_hwmod,

		/* usbotg for am35x */
		&am35xx_usbhsotg_hwmod,

		NULL,
		};