mirror of
https://github.com/torvalds/linux.git
synced 2024-11-20 02:51:44 +00:00
bab588fcfb
This is a larger set of new functionality for the existing SoC families, including: * vt8500 gains support for new CPU cores, notably the Cortex-A9 based wm8850 * prima2 gains support for the "marco" SoC family, its SMP based cousin * tegra gains support for the new Tegra4 (Tegra114) family * socfpga now supports a newer version of the hardware including SMP * i.mx31 and bcm2835 are now using DT probing for their clocks * lots of updates for sh-mobile * OMAP updates for clocks, power management and USB * i.mx6q and tegra now support cpuidle * kirkwood now supports PCIe hot plugging * tegra clock support is updated * tegra USB PHY probing gets implemented diffently -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIVAwUAUSUyPGCrR//JCVInAQI4YA/+Nb0FaA7qMmTPuJhm7aZNfnwBcGxZ7IZp s2xByEl3r5zbLKlKGNGE0x7Q7ETHV4y9tohzi9ZduH2b60dMRYgII06CEmDPu6/h 4vBap2oLzfWfs9hwpCIh7N9wNzxSj/R42vlXHhNmspHlw7cFk1yw5EeJ+ocxmZPq H9lyjAxsGErkZyM/xstNQ1Uvhc8XHAFSUzWrg8hvf6AVVR8hwpIqVzfIizv6Vpk6 ryBoUBHfdTztAOrafK54CdRc7l6kVMomRodKGzMyasnBK3ZfFca3IR7elnxLyEFJ uPDu5DKOdYrjXC8X2dPM6kYiE41YFuqOV2ahBt9HqRe6liNBLHQ6NAH7f7+jBWSI eeWe84c2vFaqhAGlci/xm4GaP0ud5ZLudtiVPlDY5tYIADqLygNcx1HIt/5sT7QI h34LMjc4+/TGVWTVf5yRmIzTrCXZv5YoAak3UWFoM4nVBo/eYVyNLEt5g9YsfjrC P/GWrXJJvOCB3gAi31pgGYJzZg8K7kTTAh/dgxjqzU4f6nGRm5PBydiJe18/lWkH qtfNE0RbhxCi3JEBnxW48AIEndVSRbd7jf8upC/s9rPURtFSVXp4APTHVyNUKCip gojBxcRYtesyG/53nrwdTyiyHx6GocmWnMNZJoDo0UQEkog2dOef+StdC3zhc2Vm 9EttcFqWJ+E= =PRrg -----END PGP SIGNATURE----- Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC-specific updates from Arnd Bergmann: "This is a larger set of new functionality for the existing SoC families, including: - vt8500 gains support for new CPU cores, notably the Cortex-A9 based wm8850 - prima2 gains support for the "marco" SoC family, its SMP based cousin - tegra gains support for the new Tegra4 (Tegra114) family - socfpga now supports a newer version of the hardware including SMP - i.mx31 and bcm2835 are now using DT probing for their clocks - lots of updates for sh-mobile - OMAP updates for clocks, power management and USB - i.mx6q and tegra now support cpuidle - kirkwood now supports PCIe hot plugging - tegra clock support is updated - tegra USB PHY probing gets implemented diffently" * tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (148 commits) ARM: prima2: remove duplicate v7_invalidate_l1 ARM: shmobile: r8a7779: Correct TMU clock support again ARM: prima2: fix __init section for cpu hotplug ARM: OMAP: Consolidate OMAP USB-HS platform data (part 3/3) ARM: OMAP: Consolidate OMAP USB-HS platform data (part 1/3) arm: socfpga: Add SMP support for actual socfpga harware arm: Add v7_invalidate_l1 to cache-v7.S arm: socfpga: Add entries to enable make dtbs socfpga arm: socfpga: Add new device tree source for actual socfpga HW ARM: tegra: sort Kconfig selects for Tegra114 ARM: tegra: enable ARCH_REQUIRE_GPIOLIB for Tegra114 ARM: tegra: Fix build error w/ ARCH_TEGRA_114_SOC w/o ARCH_TEGRA_3x_SOC ARM: tegra: Fix build error for gic update ARM: tegra: remove empty tegra_smp_init_cpus() ARM: shmobile: Register ARM architected timer ARM: MARCO: fix the build issue due to gic-vic-to-irqchip move ARM: shmobile: r8a7779: Correct TMU clock support ARM: mxs_defconfig: Select CONFIG_DEVTMPFS_MOUNT ARM: mxs: decrease mxs_clockevent_device.min_delta_ns to 2 clock cycles ARM: mxs: use apbx bus clock to drive the timers on timrotv2 ...
121 lines
2.9 KiB
C
121 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 "omap_device.h"
|
|
#include "soc.h"
|
|
#include "mux.h"
|
|
#include "usb.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 (cpu_is_omap44xx())
|
|
musb_plat.has_mailbox = true;
|
|
|
|
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));
|
|
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);
|
|
}
|