mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-25 05:34:00 +08:00
61464c8357
This is a large branch that contains a handful of different cleanups:
- Fixing up the I/O space remapping on PCI on ARM. This is a series
from Rob Herring that restructures how all pci devices allocate I/O
space, and it's part of the work to allow multiplatform kernels.
- A number of cleanup series for OMAP, moving and removing some
headers, sparse irq rework and in general preparation for
multiplatform.
- Final removal of all non-DT boards for Tegra, it is now
device-tree-only!
- Removal of a stale platform, nxp4008. It's an old mobile chipset
that is no longer in use, and was very likely never really used with
a mainline kernel. We have not been able to find anyone interested
in keeping it around in the kernel.
- Removal of the legacy dmaengine driver on tegra
+ A handful of other things that I haven't described above.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAABAgAGBQJQaO1fAAoJEIwa5zzehBx3IPgP/jxoO1flVGNVf0reqqyDro/w
prZmp8cNVH9uv8xG9n9vawObrMQ8M6jCJ449fEWuAZ58EXrpIPd0kkm/MOmxp8K1
LNs+q2aXxWpD488+b3RK55g3fksqZutTbn3y6HNuCoLG9l8yT/95KX4IIzfEP2Ch
1TCNHdkTbf37nTBOmKN0x1kahGpWDrOkf9ysHQq+DXAGF4uwNwtR194dqz3HbDND
hZqRq7qCLn9OwGRGNicPFoB6UcxwZ/+/+u5sX7nqPGoiPofg977mhWk1DFO15EM3
S+A6g0dZ+XLsL+fFtOl4snSmrG5Et6qTOP0/ItQJgTG+5YdCS09ohCWJwRCBHbgj
M5arOkyGFdVAlvX7cUux374sMe0AcqUsEmt79mYuBpIE+pBJaRUoCgDcs9FDZeUB
U6WcE4AkxMtW7DtmVW+mF4ls9/K6cRXgWMuHCUmt1o3m3Ly9ITT7j+ntXnD9nuYk
ndoVLR6Vxk2BzlkD0JEtg7FRAS9Wgo2DBix05qM1Qkut2iIZRhFQlqJQpNbeNdii
/3Lg/hqpAVTZKGCd+paegHez61meyFz2PB2IiE0JKANhKHRCWTWRGgKIXkGyCiXk
wJ2iRCOlMEpmpJgCBzfI32ER/hnW4s64iDjgksEwz6pEt7xCbhwgmwrpf0H0KsSF
rLroHOMqyISd/Ha52Vin
=ck1u
-----END PGP SIGNATURE-----
Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM soc general cleanups from Olof Johansson:
"This is a large branch that contains a handful of different cleanups:
- Fixing up the I/O space remapping on PCI on ARM. This is a series
from Rob Herring that restructures how all pci devices allocate I/O
space, and it's part of the work to allow multiplatform kernels.
- A number of cleanup series for OMAP, moving and removing some
headers, sparse irq rework and in general preparation for
multiplatform.
- Final removal of all non-DT boards for Tegra, it is now
device-tree-only!
- Removal of a stale platform, nxp4008. It's an old mobile chipset
that is no longer in use, and was very likely never really used
with a mainline kernel. We have not been able to find anyone
interested in keeping it around in the kernel.
- Removal of the legacy dmaengine driver on tegra
+ A handful of other things that I haven't described above."
Fix up some conflicts with the staging tree (and because nxp4008 was
removed)
* tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (184 commits)
ARM: OMAP2+: serial: Change MAX_HSUART_PORTS to 6
ARM: OMAP4: twl-common: Support for additional devices on i2c1 bus
ARM: mmp: using for_each_set_bit to simplify the code
ARM: tegra: harmony: fix ldo7 regulator-name
ARM: OMAP2+: Make omap4-keypad.h local
ARM: OMAP2+: Make l4_3xxx.h local
ARM: OMAP2+: Make l4_2xxx.h local
ARM: OMAP2+: Make l3_3xxx.h local
ARM: OMAP2+: Make l3_2xxx.h local
ARM: OMAP1: Move irda.h from plat to mach
ARM: OMAP2+: Make hdq1w.h local
ARM: OMAP2+: Make gpmc-smsc911x.h local
ARM: OMAP2+: Make gpmc-smc91x.h local
ARM: OMAP1: Move flash.h from plat to mach
ARM: OMAP2+: Make debug-devices.h local
ARM: OMAP1: Move board-voiceblue.h from plat to mach
ARM: OMAP1: Move board-sx1.h from plat to mach
ARM: OMAP2+: Make omap-wakeupgen.h local
ARM: OMAP2+: Make omap-secure.h local
ARM: OMAP2+: Make ctrl_module_wkup_44xx.h local
...
120 lines
2.9 KiB
C
120 lines
2.9 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 <plat/usb.h>
|
|
#include <plat/omap_device.h>
|
|
|
|
#include "am35xx.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);
|
|
}
|