mirror of
https://github.com/torvalds/linux
synced 2024-10-22 03:09:41 +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
...
92 lines
2.5 KiB
C
92 lines
2.5 KiB
C
/*
|
|
* OMAP2 ARM Performance Monitoring Unit (PMU) Support
|
|
*
|
|
* Copyright (C) 2012 Texas Instruments, Inc.
|
|
*
|
|
* Contacts:
|
|
* Jon Hunter <jon-hunter@ti.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*/
|
|
#include <asm/pmu.h>
|
|
|
|
#include "soc.h"
|
|
#include "omap_hwmod.h"
|
|
#include "omap_device.h"
|
|
|
|
static char *omap2_pmu_oh_names[] = {"mpu"};
|
|
static char *omap3_pmu_oh_names[] = {"mpu", "debugss"};
|
|
static char *omap4430_pmu_oh_names[] = {"l3_main_3", "l3_instr", "debugss"};
|
|
static struct platform_device *omap_pmu_dev;
|
|
|
|
/**
|
|
* omap2_init_pmu - creates and registers PMU platform device
|
|
* @oh_num: Number of OMAP HWMODs required to create PMU device
|
|
* @oh_names: Array of OMAP HWMODS names required to create PMU device
|
|
*
|
|
* Uses OMAP HWMOD framework to create and register an ARM PMU device
|
|
* from a list of HWMOD names passed. Currently supports OMAP2, OMAP3
|
|
* and OMAP4 devices.
|
|
*/
|
|
static int __init omap2_init_pmu(unsigned oh_num, char *oh_names[])
|
|
{
|
|
int i;
|
|
struct omap_hwmod *oh[3];
|
|
char *dev_name = "arm-pmu";
|
|
|
|
if ((!oh_num) || (oh_num > 3))
|
|
return -EINVAL;
|
|
|
|
for (i = 0; i < oh_num; i++) {
|
|
oh[i] = omap_hwmod_lookup(oh_names[i]);
|
|
if (!oh[i]) {
|
|
pr_err("Could not look up %s hwmod\n", oh_names[i]);
|
|
return -ENODEV;
|
|
}
|
|
}
|
|
|
|
omap_pmu_dev = omap_device_build_ss(dev_name, -1, oh, oh_num, NULL, 0);
|
|
WARN(IS_ERR(omap_pmu_dev), "Can't build omap_device for %s.\n",
|
|
dev_name);
|
|
|
|
if (IS_ERR(omap_pmu_dev))
|
|
return PTR_ERR(omap_pmu_dev);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int __init omap_init_pmu(void)
|
|
{
|
|
unsigned oh_num;
|
|
char **oh_names;
|
|
|
|
/*
|
|
* To create an ARM-PMU device the following HWMODs
|
|
* are required for the various OMAP2+ devices.
|
|
*
|
|
* OMAP24xx: mpu
|
|
* OMAP3xxx: mpu, debugss
|
|
* OMAP4430: l3_main_3, l3_instr, debugss
|
|
* OMAP4460/70: mpu, debugss
|
|
*/
|
|
if (cpu_is_omap443x()) {
|
|
oh_num = ARRAY_SIZE(omap4430_pmu_oh_names);
|
|
oh_names = omap4430_pmu_oh_names;
|
|
/* XXX Remove the next two lines when CTI driver available */
|
|
pr_info("ARM PMU: not yet supported on OMAP4430 due to missing CTI driver\n");
|
|
return 0;
|
|
} else if (cpu_is_omap34xx() || cpu_is_omap44xx()) {
|
|
oh_num = ARRAY_SIZE(omap3_pmu_oh_names);
|
|
oh_names = omap3_pmu_oh_names;
|
|
} else {
|
|
oh_num = ARRAY_SIZE(omap2_pmu_oh_names);
|
|
oh_names = omap2_pmu_oh_names;
|
|
}
|
|
|
|
return omap2_init_pmu(oh_num, oh_names);
|
|
}
|
|
omap_subsys_initcall(omap_init_pmu);
|