diff options
| -rw-r--r-- | arch/arm/mach-omap2/usb-host.c | 8 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/usb-musb.c | 38 |
2 files changed, 4 insertions, 42 deletions
diff --git a/arch/arm/mach-omap2/usb-host.c b/arch/arm/mach-omap2/usb-host.c index a4d4d54..d6768bb 100644 --- a/arch/arm/mach-omap2/usb-host.c +++ b/arch/arm/mach-omap2/usb-host.c @@ -620,8 +620,8 @@ static void setup_ehci_io_mux(const enum usbhs_omap_port_mode *port_mode) static struct omap_hwmod_mux_info * setup_4430ehci_io_mux(const enum usbhs_omap_port_mode *port_mode) { - struct omap_device_pad *pads; - int pads_cnt; + struct omap_device_pad *pads = NULL; + int pads_cnt = 0; u32 val = 0; switch (port_mode[0]) { @@ -802,8 +802,8 @@ static void setup_ohci_io_mux(const enum usbhs_omap_port_mode *port_mode) static struct omap_hwmod_mux_info * setup_4430ohci_io_mux(const enum usbhs_omap_port_mode *port_mode) { - struct omap_device_pad *pads; - int pads_cnt; + struct omap_device_pad *pads = NULL; + int pads_cnt = 0; switch (port_mode[0]) { case OMAP_OHCI_PORT_MODE_PHY_6PIN_DATSE0: diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c index bd3b513..d8927c6 100644 --- a/arch/arm/mach-omap2/usb-musb.c +++ b/arch/arm/mach-omap2/usb-musb.c @@ -70,44 +70,6 @@ static struct omap_device_pm_latency omap_musb_latency[] = { }, }; -static void usb_musb_mux_init(struct omap_musb_board_data *board_data) -{ - switch (board_data->interface_type) { - case MUSB_INTERFACE_UTMI: - omap_mux_init_signal("usba0_otg_dp", OMAP_PIN_INPUT); - omap_mux_init_signal("usba0_otg_dm", OMAP_PIN_INPUT); - break; - case MUSB_INTERFACE_ULPI: - omap_mux_init_signal("usba0_ulpiphy_clk", - OMAP_PIN_INPUT_PULLDOWN); - omap_mux_init_signal("usba0_ulpiphy_stp", - OMAP_PIN_INPUT_PULLDOWN); - omap_mux_init_signal("usba0_ulpiphy_dir", - OMAP_PIN_INPUT_PULLDOWN); - omap_mux_init_signal("usba0_ulpiphy_nxt", - OMAP_PIN_INPUT_PULLDOWN); - omap_mux_init_signal("usba0_ulpiphy_dat0", - OMAP_PIN_INPUT_PULLDOWN); - omap_mux_init_signal("usba0_ulpiphy_dat1", - OMAP_PIN_INPUT_PULLDOWN); - omap_mux_init_signal("usba0_ulpiphy_dat2", - OMAP_PIN_INPUT_PULLDOWN); - omap_mux_init_signal("usba0_ulpiphy_dat3", - OMAP_PIN_INPUT_PULLDOWN); - omap_mux_init_signal("usba0_ulpiphy_dat4", - OMAP_PIN_INPUT_PULLDOWN); - omap_mux_init_signal("usba0_ulpiphy_dat5", - OMAP_PIN_INPUT_PULLDOWN); - omap_mux_init_signal("usba0_ulpiphy_dat6", - OMAP_PIN_INPUT_PULLDOWN); - omap_mux_init_signal("usba0_ulpiphy_dat7", - OMAP_PIN_INPUT_PULLDOWN); - break; - default: - break; - } -} - static struct omap_musb_board_data musb_default_board_data = { .interface_type = MUSB_INTERFACE_ULPI, .mode = MUSB_OTG, |