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

Commit 51482be9 authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I Committed by Greg Kroah-Hartman
Browse files

ARM: OMAP: USB: Add phy binding information 



This 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.

Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fa1dfe4a

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

+2 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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,