mirror of
https://github.com/torvalds/linux.git
synced 2024-12-27 13:22:23 +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 ...
123 lines
3.0 KiB
C
123 lines
3.0 KiB
C
/*
|
|
* linux/arch/arm/mach-omap2/mcbsp.c
|
|
*
|
|
* Copyright (C) 2008 Instituto Nokia de Tecnologia
|
|
* Contact: Eduardo Valentin <eduardo.valentin@indt.org.br>
|
|
*
|
|
* 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.
|
|
*
|
|
* Multichannel mode not supported.
|
|
*/
|
|
#include <linux/module.h>
|
|
#include <linux/init.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/err.h>
|
|
#include <linux/io.h>
|
|
#include <linux/of.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/platform_data/asoc-ti-mcbsp.h>
|
|
#include <linux/pm_runtime.h>
|
|
|
|
#include <linux/omap-dma.h>
|
|
|
|
#include "soc.h"
|
|
#include "omap_device.h"
|
|
|
|
/*
|
|
* FIXME: Find a mechanism to enable/disable runtime the McBSP ICLK autoidle.
|
|
* Sidetone needs non-gated ICLK and sidetone autoidle is broken.
|
|
*/
|
|
#include "cm3xxx.h"
|
|
#include "cm-regbits-34xx.h"
|
|
|
|
static int omap3_enable_st_clock(unsigned int id, bool enable)
|
|
{
|
|
unsigned int w;
|
|
|
|
/*
|
|
* Sidetone uses McBSP ICLK - which must not idle when sidetones
|
|
* are enabled or sidetones start sounding ugly.
|
|
*/
|
|
w = omap2_cm_read_mod_reg(OMAP3430_PER_MOD, CM_AUTOIDLE);
|
|
if (enable)
|
|
w &= ~(1 << (id - 2));
|
|
else
|
|
w |= 1 << (id - 2);
|
|
omap2_cm_write_mod_reg(w, OMAP3430_PER_MOD, CM_AUTOIDLE);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int __init omap_init_mcbsp(struct omap_hwmod *oh, void *unused)
|
|
{
|
|
int id, count = 1;
|
|
char *name = "omap-mcbsp";
|
|
struct omap_hwmod *oh_device[2];
|
|
struct omap_mcbsp_platform_data *pdata = NULL;
|
|
struct platform_device *pdev;
|
|
|
|
sscanf(oh->name, "mcbsp%d", &id);
|
|
|
|
pdata = kzalloc(sizeof(struct omap_mcbsp_platform_data), GFP_KERNEL);
|
|
if (!pdata) {
|
|
pr_err("%s: No memory for mcbsp\n", __func__);
|
|
return -ENOMEM;
|
|
}
|
|
|
|
pdata->reg_step = 4;
|
|
if (oh->class->rev < MCBSP_CONFIG_TYPE2) {
|
|
pdata->reg_size = 2;
|
|
} else {
|
|
pdata->reg_size = 4;
|
|
pdata->has_ccr = true;
|
|
}
|
|
|
|
if (oh->class->rev == MCBSP_CONFIG_TYPE2) {
|
|
/* The FIFO has 128 locations */
|
|
pdata->buffer_size = 0x80;
|
|
} else if (oh->class->rev == MCBSP_CONFIG_TYPE3) {
|
|
if (id == 2)
|
|
/* The FIFO has 1024 + 256 locations */
|
|
pdata->buffer_size = 0x500;
|
|
else
|
|
/* The FIFO has 128 locations */
|
|
pdata->buffer_size = 0x80;
|
|
} else if (oh->class->rev == MCBSP_CONFIG_TYPE4) {
|
|
/* The FIFO has 128 locations for all instances */
|
|
pdata->buffer_size = 0x80;
|
|
}
|
|
|
|
if (oh->class->rev >= MCBSP_CONFIG_TYPE3)
|
|
pdata->has_wakeup = true;
|
|
|
|
oh_device[0] = oh;
|
|
|
|
if (oh->dev_attr) {
|
|
oh_device[1] = omap_hwmod_lookup((
|
|
(struct omap_mcbsp_dev_attr *)(oh->dev_attr))->sidetone);
|
|
pdata->enable_st_clock = omap3_enable_st_clock;
|
|
count++;
|
|
}
|
|
pdev = omap_device_build_ss(name, id, oh_device, count, pdata,
|
|
sizeof(*pdata));
|
|
kfree(pdata);
|
|
if (IS_ERR(pdev)) {
|
|
pr_err("%s: Can't build omap_device for %s:%s.\n", __func__,
|
|
name, oh->name);
|
|
return PTR_ERR(pdev);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int __init omap2_mcbsp_init(void)
|
|
{
|
|
if (!of_have_populated_dt())
|
|
omap_hwmod_for_each_by_class("mcbsp", omap_init_mcbsp, NULL);
|
|
|
|
return 0;
|
|
}
|
|
omap_arch_initcall(omap2_mcbsp_init);
|