ARM: OMAP: arm part of usb patches
Subsystems (6)
v2 cover ARM: OMAP: arm part of usb patches
Hi Greg,
Here is the patch series that includes the arch/arm part to get MUSB working in OMAP platforms. As discussed in the other mail thread with Tony, this patch series should go into usb-next.
This patch series also contains a patch by Felipe to fix compilation warning in usb-next when CONFIG_OMAP_CONTROL_USB is not set.
Changes from v1:
Fixed alignment in omap4_control_usb as suggested by Sergei.
Boot tested panda board.
Felipe Balbi (1):
usb: omap_control_usb: fix compile warning
Kishon Vijay Abraham I (4):
ARM: OMAP4: remove control module address space from PHY and OTG
ARM: OMAP: devices: create device for usb part of control module
ARM: OMAP2: MUSB: Specify omap4 has mailbox
ARM: OMAP: USB: Add phy binding information
arch/arm/mach-omap2/board-2430sdp.c | 2 ++ arch/arm/mach-omap2/board-3430sdp.c | 2 ++ arch/arm/mach-omap2/board-4430sdp.c | 2 ++ arch/arm/mach-omap2/board-cm-t35.c | 2 ++ arch/arm/mach-omap2/board-devkit8000.c | 2 ++ arch/arm/mach-omap2/board-igep0020.c | 2 ++ arch/arm/mach-omap2/board-ldp.c | 2 ++ arch/arm/mach-omap2/board-omap3beagle.c | 2 ++ arch/arm/mach-omap2/board-omap3evm.c | 2 ++ arch/arm/mach-omap2/board-omap3logic.c | 2 ++ arch/arm/mach-omap2/board-omap3pandora.c | 2 ++ arch/arm/mach-omap2/board-omap3stalker.c | 2 ++ arch/arm/mach-omap2/board-omap3touchbook.c | 2 ++ arch/arm/mach-omap2/board-omap4panda.c | 2 ++ arch/arm/mach-omap2/board-overo.c | 2 ++ arch/arm/mach-omap2/board-rm680.c | 2 ++ arch/arm/mach-omap2/board-zoom-peripherals.c | 2 ++ arch/arm/mach-omap2/devices.c | 45 ++++++++++++++++++++++++++ arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 13 -------- arch/arm/mach-omap2/usb-musb.c | 3 ++ include/linux/usb/musb.h | 2 ++ include/linux/usb/omap_control_usb.h | 2 +- 22 files changed, 85 insertions(+), 14 deletions(-)
Signature · 1 line
1.7.10.4
PATCH v2 1/5 ARM: OMAP4: remove control module address space from PHY and OTG
Now that we have a separate driver for the control module, stop populating the control module device data in other modules (PHY and OTG) device info.
--- arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 13 ------------- 1 file changed, 13 deletions(-)
arch/arm/mach-omap2/omap_hwmod_44xx_data.c +0 -13
@@ -2702,13 +2702,6 @@ static struct resource omap44xx_usb_phy_and_pll_addrs[] = { .end = 0x4a0ae000, .flags = IORESOURCE_MEM, }, - { -/* XXX: Remove this once control module driver is in place */ - .name = "ctrl_dev", - .start = 0x4a002300, - .end = 0x4a002303, - .flags = IORESOURCE_MEM, - }, { } };
@@ -6156,12 +6149,6 @@ static struct omap_hwmod_addr_space omap44xx_usb_otg_hs_addrs[] = { .pa_end = 0x4a0ab7ff, .flags = ADDR_TYPE_RT }, - { -/* XXX: Remove this once control module driver is in place */ - .pa_start = 0x4a00233c, - .pa_end = 0x4a00233f, - .flags = ADDR_TYPE_RT - }, { } };
Signature · 1 line
1.7.10.4
PATCH v2 2/5 ARM: OMAP: devices: create device for usb part of control module
In reply to Kishon Vijay Abraham IA seperate driver has been added to handle the usb part of control module. A device for the above driver is created here, using the register address information to be used by the driver for powering on the PHY and for writing to the mailbox.
--- arch/arm/mach-omap2/devices.c | 45 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+)
arch/arm/mach-omap2/devices.c +45 -0
@@ -20,6 +20,7 @@#include <linux/pinctrl/machine.h> #include <linux/platform_data/omap4-keypad.h> #include <linux/platform_data/omap_ocp2scp.h> +#include <linux/usb/omap_control_usb.h> #include <asm/mach-types.h> #include <asm/mach/map.h>
@@ -254,6 +255,49 @@ static inline void omap_init_camera(void)#endif } +#if IS_ENABLED (CONFIG_OMAP_CONTROL_USB ) +static struct omap_control_usb_platform_data omap4_control_usb_pdata = { + .type =1 , +}; + +struct resource omap4_control_usb_res[] = { + { + .name ="control_dev_conf" , + .start =0x4a002300 , + .end =0x4a002303 , + .flags =IORESOURCE_MEM , + }, + { + .name ="otghs_control" , + .start =0x4a00233c , + .end =0x4a00233f , + .flags =IORESOURCE_MEM , + }, +}; + +static struct platform_device omap4_control_usb = { + .name ="omap-control-usb" , + .id =-1 , + .dev = { + .platform_data = &omap4_control_usb_pdata, + }, + .num_resources =2 , + .resource = omap4_control_usb_res, +}; + +static inline void __init omap_init_control_usb (void ) +{ +if (!cpu_is_omap44xx ()) +return ; + +if (platform_device_register (&omap4_control_usb)) +pr_err ("Error registering omap_control_usb device\n" ); +} + +#else +static inline void omap_init_control_usb (void ) { } +#endif /* CONFIG_OMAP_CONTROL_USB */ +int __init omap4_keyboard_init (struct omap4_keypad_platform_data *sdp4430_keypad_data,struct omap_board_data *bdata) {
@@ -721,6 +765,7 @@ static int __init omap2_init_devices(void)omap_init_mbox ();/* If dtb is there, the devices will be created dynamically */ if (!of_have_populated_dt ()) { +omap_init_control_usb ();omap_init_dmic ();omap_init_mcpdm ();omap_init_mcspi ();
Signature · 1 line
1.7.10.4
PATCH v2 3/5 ARM: OMAP2: MUSB: Specify omap4 has mailbox
In reply to Kishon Vijay Abraham IAdded has_mailbox to the musb platform data to specify that omap uses an external mailbox (in control module) to communicate with the musb core during device connect and disconnect.
--- arch/arm/mach-omap2/usb-musb.c | 3 +++ include/linux/usb/musb.h | 2 ++ 2 files changed, 5 insertions(+)
arch/arm/mach-omap2/usb-musb.c +3 -0
@@ -85,6 +85,9 @@ void __init usb_musb_init(struct omap_musb_board_data *musb_board_data) musb_plat.mode = board_data->mode; musb_plat.extvbus = board_data->extvbus; +if (cpu_is_omap44xx ()) + musb_plat.has_mailbox = true; +if (soc_is_am35xx ()) { oh_name ="am35x_otg_hs" ; name ="musb-am35x" ;
include/linux/usb/musb.h +2 -0
@@ -99,6 +99,8 @@ struct musb_hdrc_platform_data {/* MUSB_HOST, MUSB_PERIPHERAL, or MUSB_OTG */ u8 mode; + u8 has_mailbox:1; +/* for clk_get() */ const char *clock;
Signature · 1 line
1.7.10.4
PATCH v2 4/5 ARM: OMAP: USB: Add phy binding information
In reply to Kishon Vijay Abraham IThis is w.r.t the changes in PHY library to support adding and getting multiple PHYs of the same type. In the new design, the binding information between the PHY and the USB controller should be specified in the platform specific initialization code. So it's been done here for OMAP platforms.
--- arch/arm/mach-omap2/board-2430sdp.c | 2 ++ arch/arm/mach-omap2/board-3430sdp.c | 2 ++ arch/arm/mach-omap2/board-4430sdp.c | 2 ++ arch/arm/mach-omap2/board-cm-t35.c | 2 ++ arch/arm/mach-omap2/board-devkit8000.c | 2 ++ arch/arm/mach-omap2/board-igep0020.c | 2 ++ arch/arm/mach-omap2/board-ldp.c | 2 ++ arch/arm/mach-omap2/board-omap3beagle.c | 2 ++ arch/arm/mach-omap2/board-omap3evm.c | 2 ++ arch/arm/mach-omap2/board-omap3logic.c | 2 ++ arch/arm/mach-omap2/board-omap3pandora.c | 2 ++ arch/arm/mach-omap2/board-omap3stalker.c | 2 ++ arch/arm/mach-omap2/board-omap3touchbook.c | 2 ++ arch/arm/mach-omap2/board-omap4panda.c | 2 ++ arch/arm/mach-omap2/board-overo.c | 2 ++ arch/arm/mach-omap2/board-rm680.c | 2 ++ arch/arm/mach-omap2/board-zoom-peripherals.c | 2 ++ 17 files changed, 34 insertions(+)
arch/arm/mach-omap2/board-2430sdp.c +2 -0
@@ -27,6 +27,7 @@#include <linux/clk.h> #include <linux/io.h> #include <linux/gpio.h> +#include <linux/usb/phy.h> #include <asm/mach-types.h> #include <asm/mach/arch.h>
@@ -263,6 +264,7 @@ static void __init omap_2430sdp_init(void)omap_hsmmc_init (mmc);omap_mux_init_signal ("usb0hs_stp" ,OMAP_PULL_ENA |OMAP_PULL_UP ); +usb_bind_phy ("musb-hdrc.0.auto" ,0 ,"twl4030_usb" );usb_musb_init (NULL );board_smc91x_init ();
arch/arm/mach-omap2/board-3430sdp.c +2 -0
@@ -25,6 +25,7 @@#include <linux/gpio.h> #include <linux/mmc/host.h> #include <linux/platform_data/spi-omap2-mcspi.h> +#include <linux/usb/phy.h> #include <asm/mach-types.h> #include <asm/mach/arch.h>
@@ -579,6 +580,7 @@ static void __init omap_3430sdp_init(void)omap_ads7846_init (1 , gpio_pendown,310 ,NULL );omap_serial_init ();omap_sdrc_init (hyb18m512160af6_sdrc_params,NULL ); +usb_bind_phy ("musb-hdrc.0.auto" ,0 ,"twl4030_usb" );usb_musb_init (NULL );board_smc91x_init ();board_flash_init (sdp_flash_partitions, chip_sel_3430,0 );
arch/arm/mach-omap2/board-4430sdp.c +2 -0
@@ -28,6 +28,7 @@#include <linux/leds_pwm.h> #include <linux/platform_data/omap4-keypad.h> #include <linux/usb/musb.h> +#include <linux/usb/phy.h> #include <asm/hardware/gic.h> #include <asm/mach-types.h>
@@ -696,6 +697,7 @@ static void __init omap_4430sdp_init(void)omap4_sdp4430_wifi_init ();omap4_twl6030_hsmmc_init (mmc); +usb_bind_phy ("musb-hdrc.0.auto" ,0 ,"omap-usb2.1.auto" );usb_musb_init (&musb_board_data); status =omap_ethernet_init ();
arch/arm/mach-omap2/board-cm-t35.c +2 -0
@@ -30,6 +30,7 @@#include <linux/regulator/fixed.h> #include <linux/regulator/machine.h> #include <linux/mmc/host.h> +#include <linux/usb/phy.h> #include <linux/spi/spi.h> #include <linux/spi/tdo24m.h>
@@ -724,6 +725,7 @@ static void __init cm_t3x_common_init(void)cm_t35_init_display ();omap_twl4030_audio_init ("cm-t3x" ); +usb_bind_phy ("musb-hdrc.0.auto" ,0 ,"twl4030_usb" );usb_musb_init (NULL );cm_t35_init_usbh ();cm_t35_init_camera ();
arch/arm/mach-omap2/board-devkit8000.c +2 -0
@@ -29,6 +29,7 @@#include <linux/mtd/partitions.h> #include <linux/mtd/nand.h> #include <linux/mmc/host.h> +#include <linux/usb/phy.h> #include <linux/regulator/machine.h> #include <linux/i2c/twl.h>
@@ -622,6 +623,7 @@ static void __init devkit8000_init(void)omap_ads7846_init (2 ,OMAP3_DEVKIT_TS_GPIO ,0 ,NULL ); +usb_bind_phy ("musb-hdrc.0.auto" ,0 ,"twl4030_usb" );usb_musb_init (NULL );usbhs_init (&usbhs_bdata); board_nand_init(devkit8000_nand_partitions,
arch/arm/mach-omap2/board-igep0020.c +2 -0
@@ -18,6 +18,7 @@#include <linux/gpio.h> #include <linux/interrupt.h> #include <linux/input.h> +#include <linux/usb/phy.h> #include <linux/regulator/machine.h> #include <linux/regulator/fixed.h>
@@ -625,6 +626,7 @@ static void __init igep_init(void)omap_serial_init ();omap_sdrc_init (m65kxxxxam_sdrc_params, m65kxxxxam_sdrc_params); +usb_bind_phy ("musb-hdrc.0.auto" ,0 ,"twl4030_usb" );usb_musb_init (NULL );igep_flash_init ();
arch/arm/mach-omap2/board-ldp.c +2 -0
@@ -28,6 +28,7 @@#include <linux/io.h> #include <linux/smsc911x.h> #include <linux/mmc/host.h> +#include <linux/usb/phy.h> #include <linux/platform_data/spi-omap2-mcspi.h> #include <asm/mach-types.h>
@@ -418,6 +419,7 @@ static void __init omap_ldp_init(void)omap_ads7846_init (1 ,54 ,310 ,NULL );omap_serial_init ();omap_sdrc_init (NULL ,NULL ); +usb_bind_phy ("musb-hdrc.0.auto" ,0 ,"twl4030_usb" );usb_musb_init (NULL );board_nand_init (ldp_nand_partitions,ARRAY_SIZE (ldp_nand_partitions),ZOOM_NAND_CS ,0 , nand_default_timings);
arch/arm/mach-omap2/board-omap3beagle.c +2 -0
@@ -30,6 +30,7 @@#include <linux/mtd/partitions.h> #include <linux/mtd/nand.h> #include <linux/mmc/host.h> +#include <linux/usb/phy.h> #include <linux/regulator/machine.h> #include <linux/i2c/twl.h>
@@ -519,6 +520,7 @@ static void __init omap3_beagle_init(void)omap_sdrc_init (mt46h32m32lf6_sdrc_params, mt46h32m32lf6_sdrc_params); +usb_bind_phy ("musb-hdrc.0.auto" ,0 ,"twl4030_usb" );usb_musb_init (NULL );usbhs_init (&usbhs_bdata); board_nand_init(omap3beagle_nand_partitions,
arch/arm/mach-omap2/board-omap3evm.c +2 -0
@@ -41,6 +41,7 @@#include <linux/regulator/machine.h> #include <linux/mmc/host.h> #include <linux/export.h> +#include <linux/usb/phy.h> #include <asm/mach-types.h> #include <asm/mach/arch.h>
@@ -734,6 +735,7 @@ static void __init omap3_evm_init(void)omap_mux_init_gpio (135 ,OMAP_PIN_OUTPUT ); usbhs_bdata.reset_gpio_port[1 ] =135 ; } +usb_bind_phy ("musb-hdrc.0.auto" ,0 ,"twl4030_usb" );usb_musb_init (&musb_board_data);usbhs_init (&usbhs_bdata); board_nand_init(omap3evm_nand_partitions,
arch/arm/mach-omap2/board-omap3logic.c +2 -0
@@ -29,6 +29,7 @@#include <linux/i2c/twl.h> #include <linux/mmc/host.h> +#include <linux/usb/phy.h> #include <asm/mach-types.h> #include <asm/mach/arch.h>
@@ -215,6 +216,7 @@ static void __init omap3logic_init(void)board_mmc_init ();board_smsc911x_init (); +usb_bind_phy ("musb-hdrc.0.auto" ,0 ,"twl4030_usb" );usb_musb_init (NULL );/* Ensure SDRC pins are mux'd for self-refresh */
arch/arm/mach-omap2/board-omap3pandora.c +2 -0
@@ -35,6 +35,7 @@#include <linux/mmc/host.h> #include <linux/mmc/card.h> #include <linux/regulator/fixed.h> +#include <linux/usb/phy.h> #include <linux/platform_data/spi-omap2-mcspi.h> #include <asm/mach-types.h>
@@ -601,6 +602,7 @@ static void __init omap3pandora_init(void) ARRAY_SIZE(omap3pandora_spi_board_info));omap_ads7846_init (1 ,OMAP3_PANDORA_TS_GPIO ,0 ,NULL );usbhs_init (&usbhs_bdata); +usb_bind_phy ("musb-hdrc.0.auto" ,0 ,"twl4030_usb" );usb_musb_init (NULL );gpmc_nand_init (&pandora_nand_data,NULL );
arch/arm/mach-omap2/board-omap3stalker.c +2 -0
@@ -33,6 +33,7 @@#include <linux/interrupt.h> #include <linux/smsc911x.h> #include <linux/i2c/at24.h> +#include <linux/usb/phy.h> #include <asm/mach-types.h> #include <asm/mach/arch.h>
@@ -404,6 +405,7 @@ static void __init omap3_stalker_init(void)omap_serial_init ();omap_sdrc_init (mt46h32m32lf6_sdrc_params,NULL ); +usb_bind_phy ("musb-hdrc.0.auto" ,0 ,"twl4030_usb" );usb_musb_init (NULL );usbhs_init (&usbhs_bdata);omap_ads7846_init (1 ,OMAP3_STALKER_TS_GPIO ,310 ,NULL );
arch/arm/mach-omap2/board-omap3touchbook.c +2 -0
@@ -28,6 +28,7 @@#include <linux/mtd/partitions.h> #include <linux/mtd/nand.h> #include <linux/mmc/host.h> +#include <linux/usb/phy.h> #include <linux/platform_data/spi-omap2-mcspi.h> #include <linux/spi/spi.h>
@@ -365,6 +366,7 @@ static void __init omap3_touchbook_init(void)/* Touchscreen and accelerometer */ omap_ads7846_init (4 ,OMAP3_TS_GPIO ,310 , &ads7846_pdata); +usb_bind_phy ("musb-hdrc.0.auto" ,0 ,"twl4030_usb" );usb_musb_init (NULL );usbhs_init (&usbhs_bdata); board_nand_init(omap3touchbook_nand_partitions,
arch/arm/mach-omap2/board-omap4panda.c +2 -0
@@ -30,6 +30,7 @@#include <linux/regulator/fixed.h> #include <linux/ti_wilink_st.h> #include <linux/usb/musb.h> +#include <linux/usb/phy.h> #include <linux/wl12xx.h> #include <linux/platform_data/omap-abe-twl6040.h>
@@ -447,6 +448,7 @@ static void __init omap4_panda_init(void)omap_sdrc_init (NULL ,NULL );omap4_twl6030_hsmmc_init (mmc);omap4_ehci_init (); +usb_bind_phy ("musb-hdrc.0.auto" ,0 ,"omap-usb2.1.auto" );usb_musb_init (&musb_board_data);omap4_panda_display_init (); }
arch/arm/mach-omap2/board-overo.c +2 -0
@@ -36,6 +36,7 @@#include <linux/mtd/nand.h> #include <linux/mtd/partitions.h> #include <linux/mmc/host.h> +#include <linux/usb/phy.h> #include <linux/platform_data/mtd-nand-omap2.h> #include <linux/platform_data/spi-omap2-mcspi.h>
@@ -499,6 +500,7 @@ static void __init overo_init(void) mt46h32m32lf6_sdrc_params);board_nand_init (overo_nand_partitions,ARRAY_SIZE (overo_nand_partitions),NAND_CS ,0 ,NULL ); +usb_bind_phy ("musb-hdrc.0.auto" ,0 ,"twl4030_usb" );usb_musb_init (NULL );usbhs_init (&usbhs_bdata);overo_spi_init ();
arch/arm/mach-omap2/board-rm680.c +2 -0
@@ -18,6 +18,7 @@#include <linux/regulator/machine.h> #include <linux/regulator/consumer.h> #include <linux/platform_data/mtd-onenand-omap2.h> +#include <linux/usb/phy.h> #include <asm/mach/arch.h> #include <asm/mach-types.h>
@@ -134,6 +135,7 @@ static void __init rm680_init(void) sdrc_params =nokia_get_sdram_timings ();omap_sdrc_init (sdrc_params, sdrc_params); +usb_bind_phy ("musb-hdrc.0.auto" ,0 ,"twl4030_usb" );usb_musb_init (NULL );rm680_peripherals_init (); }
arch/arm/mach-omap2/board-zoom-peripherals.c +2 -0
@@ -20,6 +20,7 @@#include <linux/wl12xx.h> #include <linux/mmc/host.h> #include <linux/platform_data/gpio-omap.h> +#include <linux/usb/phy.h> #include <asm/mach-types.h> #include <asm/mach/arch.h>
@@ -298,6 +299,7 @@ void __init zoom_peripherals_init(void)omap_hsmmc_init (mmc);omap_i2c_init ();platform_device_register (&omap_vwlan_device); +usb_bind_phy ("musb-hdrc.0.auto" ,0 ,"twl4030_usb" );usb_musb_init (NULL );enable_board_wakeup_source ();omap_serial_init ();
Signature · 1 line
1.7.10.4
PATCH v2 5/5 usb: omap_control_usb: fix compile warning
In reply to Kishon Vijay Abraham IFrom: Felipe Balbi <[email protected]>
When CONFIG_OMAP_CONTROL_USB isn't enabled, there's a compile warning stating that a particular function isn't a prototype.
Fix it.
--- include/linux/usb/omap_control_usb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/usb/omap_control_usb.h +1 -1
@@ -70,7 +70,7 @@ extern void omap_control_usb3_phy_power(struct device *dev, bool on);extern void omap_control_usb_set_mode (struct device *dev,enum omap_control_usb_mode mode);#else -static inline struct device *omap_get_control_dev () +static inline struct device *omap_get_control_dev (void ) {return ERR_PTR (-ENODEV ); }
Signature · 1 line
1.7.10.4