mirror of
https://github.com/torvalds/linux
synced 2024-09-30 16:29:47 +00:00
310018d52e
Commit 62285963 (usb: musb: drop a gigantic amount of ifdeferry)
got rid of a bunch of ifdefs in the MUSB code. Looks like the
platform init code is still using these dropped defines though,
which in many cases results the board defaulting always to host
mode.
Currently the situation is that USB_MUSB_HDRC is the main
Kconfig option with additional USB_GADGET_MUSB_HDRC so only
these two should be used to select between host and OTG mode.
Fix the situation for omaps. The following users should fix the
platform init code in a similar way:
Dropped Kconfig option Current users
USB_MUSB_OTG blackfin, davinci, not in Kconfigs
USB_MUSB_PERIPHERAL davinci, not in Kconfigs
USB_MUSB_HOST davinci, not in Kconfigs
USB_MUSB_HDRC_HCD blackfin, not in Kconfigs
USB_MUSB_OTG blackfin, not in Kconfigs
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Sekhar Nori <nsekhar@ti.com>
Cc: linux-usb@vger.kernel.org
Cc: Felipe Balbi <balbi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
124 lines
3 KiB
C
124 lines
3 KiB
C
/*
|
|
* linux/arch/arm/mach-omap2/usb-musb.c
|
|
*
|
|
* This file will contain the board specific details for the
|
|
* MENTOR USB OTG controller on OMAP3430
|
|
*
|
|
* Copyright (C) 2007-2008 Texas Instruments
|
|
* Copyright (C) 2008 Nokia Corporation
|
|
* Author: Vikram Pandita
|
|
*
|
|
* Generalization by:
|
|
* Felipe Balbi <felipe.balbi@nokia.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/dma-mapping.h>
|
|
#include <linux/io.h>
|
|
|
|
#include <linux/usb/musb.h>
|
|
|
|
#include <mach/hardware.h>
|
|
#include <mach/irqs.h>
|
|
#include <mach/am35xx.h>
|
|
#include <plat/usb.h>
|
|
#include <plat/omap_device.h>
|
|
#include "mux.h"
|
|
|
|
static struct musb_hdrc_config musb_config = {
|
|
.multipoint = 1,
|
|
.dyn_fifo = 1,
|
|
.num_eps = 16,
|
|
.ram_bits = 12,
|
|
};
|
|
|
|
static struct musb_hdrc_platform_data musb_plat = {
|
|
#ifdef CONFIG_USB_GADGET_MUSB_HDRC
|
|
.mode = MUSB_OTG,
|
|
#else
|
|
.mode = MUSB_HOST,
|
|
#endif
|
|
/* .clock is set dynamically */
|
|
.config = &musb_config,
|
|
|
|
/* REVISIT charge pump on TWL4030 can supply up to
|
|
* 100 mA ... but this value is board-specific, like
|
|
* "mode", and should be passed to usb_musb_init().
|
|
*/
|
|
.power = 50, /* up to 100 mA */
|
|
};
|
|
|
|
static u64 musb_dmamask = DMA_BIT_MASK(32);
|
|
|
|
static struct omap_musb_board_data musb_default_board_data = {
|
|
.interface_type = MUSB_INTERFACE_ULPI,
|
|
.mode = MUSB_OTG,
|
|
.power = 100,
|
|
};
|
|
|
|
void __init usb_musb_init(struct omap_musb_board_data *musb_board_data)
|
|
{
|
|
struct omap_hwmod *oh;
|
|
struct platform_device *pdev;
|
|
struct device *dev;
|
|
int bus_id = -1;
|
|
const char *oh_name, *name;
|
|
struct omap_musb_board_data *board_data;
|
|
|
|
if (musb_board_data)
|
|
board_data = musb_board_data;
|
|
else
|
|
board_data = &musb_default_board_data;
|
|
|
|
/*
|
|
* REVISIT: This line can be removed once all the platforms using
|
|
* musb_core.c have been converted to use use clkdev.
|
|
*/
|
|
musb_plat.clock = "ick";
|
|
musb_plat.board_data = board_data;
|
|
musb_plat.power = board_data->power >> 1;
|
|
musb_plat.mode = board_data->mode;
|
|
musb_plat.extvbus = board_data->extvbus;
|
|
|
|
if (soc_is_am35xx()) {
|
|
oh_name = "am35x_otg_hs";
|
|
name = "musb-am35x";
|
|
} else if (cpu_is_ti81xx()) {
|
|
oh_name = "usb_otg_hs";
|
|
name = "musb-ti81xx";
|
|
} else {
|
|
oh_name = "usb_otg_hs";
|
|
name = "musb-omap2430";
|
|
}
|
|
|
|
oh = omap_hwmod_lookup(oh_name);
|
|
if (WARN(!oh, "%s: could not find omap_hwmod for %s\n",
|
|
__func__, oh_name))
|
|
return;
|
|
|
|
pdev = omap_device_build(name, bus_id, oh, &musb_plat,
|
|
sizeof(musb_plat), NULL, 0, false);
|
|
if (IS_ERR(pdev)) {
|
|
pr_err("Could not build omap_device for %s %s\n",
|
|
name, oh_name);
|
|
return;
|
|
}
|
|
|
|
dev = &pdev->dev;
|
|
get_device(dev);
|
|
dev->dma_mask = &musb_dmamask;
|
|
dev->coherent_dma_mask = musb_dmamask;
|
|
put_device(dev);
|
|
|
|
if (cpu_is_omap44xx())
|
|
omap4430_phy_init(dev);
|
|
}
|