mirror of
https://github.com/torvalds/linux.git
synced 2024-12-19 17:41:29 +00:00
11801e9de2
Most notable here is probably the addition of basic support for the BCM2835, an SoC used in some of the Roku 2 players as well as the much-hyped Raspberry Pi, cleaned up and contributed by Stephen Warren. It's still early days on mainline support, with just the basics working. But it has to start somewhere! Beyond that there's some conversions of clock infrastructure on tegra to common clock, misc updates for several other platforms, and OMAP now has its own bus (under drivers/bus) to manage its devices through. This branch adds two new directories outside of arch/arm: drivers/irqchip for new irq controllers, and drivers/bus for the above OMAP bus. It's expected that some of the other platforms will migrate parts of their platforms to those directories over time as well. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJQaO2SAAoJEIwa5zzehBx3TBIQAJYc+vpAqiv8MLQ1XV3cLiIP X57fxM9u1A+uXpXsiCTGR+ga8W4a5tlfGMXDBnl/K2bnFs2x11b9NkFLDJ7mdkih J4c/iOWT/mT5suLnnybyg6ZGaxGkAKou2AumiSmkazmq5hGG67hkpAOqFEfDK0J2 Au7/6VN6GZXgiwt8nYaAB/qR5NVcww4m/6GQ2looaWgRLT/wgC3W2ZKvw6zEdl2J OxOpwf2ujG/75zLQaxTeZ5rKnGtAXH4v0KhY9CWQacQPi4L2MVCrvUrDB4j0as4H Wmsu7g6fZA9Vlf1aW/mlDY1ftozfbDaKORoYVS+CsWhm1oiQI5t+sAWRTkbbS85t pobgKfFdvNsl9kS1zRdEddK2tyotwtXh2jz+P/s1l95hfqZ8IdVBJNMlcrHRINOI 2iQXFfGRhCCqMcfFiGXJ43tYja/aCsaIc4M5TrEma57czZT5jK8HSLh0ZUmFYDoe /TfUegVhFASmkNTk7dVZgZ2UoQVkv4lWs+xuf8YgX3UalWgl/YIRRFl4NnylGlEc jjrX3MjXATqXzLPEZaf8dRZHIpB6FYmZq1QqaoefcUQ46gBOueThElZP3sNWR8a2 MOtknauLfLwQbrcH5CmqKpIpXTB4LKgbf/omH2jQlxBhQ5t7PXHVD1NFsbZbwM8J RVCZb4PwqEwOt/wibTrk =BCp4 -----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 Olof Johansson: "Most notable here is probably the addition of basic support for the BCM2835, an SoC used in some of the Roku 2 players as well as the much-hyped Raspberry Pi, cleaned up and contributed by Stephen Warren. It's still early days on mainline support, with just the basics working. But it has to start somewhere! Beyond that there's some conversions of clock infrastructure on tegra to common clock, misc updates for several other platforms, and OMAP now has its own bus (under drivers/bus) to manage its devices through. This branch adds two new directories outside of arch/arm: drivers/irqchip for new irq controllers, and drivers/bus for the above OMAP bus. It's expected that some of the other platforms will migrate parts of their platforms to those directories over time as well." Fix up trivial conflicts with the clk infrastructure changes. * tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (62 commits) ARM: shmobile: add new __iomem annotation for new code ARM: LPC32xx: Support GPI 28 ARM: LPC32xx: Platform update for devicetree completion of spi-pl022 ARM: LPC32xx: Board cleanup irqchip: fill in empty Kconfig ARM: SAMSUNG: Add check for NULL in clock interface ARM: EXYNOS: Put PCM, Slimbus, Spdif clocks to off state ARM: EXYNOS: Add bus clock for FIMD ARM: SAMSUNG: Fix HDMI related warnings ARM: S3C24XX: Add .get_rate callback for "camif-upll" clock ARM: EXYNOS: Fix incorrect help text ARM: EXYNOS: Turn off clocks for NAND, OneNAND and TSI controllers ARM: OMAP: AM33xx hwmod: fixup SPI after platform_data move MAINTAINERS: add an entry for the BCM2835 ARM sub-architecture ARM: bcm2835: instantiate console UART ARM: bcm2835: add stub clock driver ARM: bcm2835: add system timer ARM: bcm2835: add interrupt controller driver ARM: add infra-structure for BCM2835 and Raspberry Pi ARM: tegra20: add CPU hotplug support ...
155 lines
3.8 KiB
C
155 lines
3.8 KiB
C
/*
|
|
* Copyright (C) ST-Ericsson SA 2010
|
|
*
|
|
* Author: Rabin Vincent <rabin.vincent@stericsson.com> for ST-Ericsson
|
|
* Author: Lee Jones <lee.jones@linaro.org> for ST-Ericsson
|
|
* License terms: GNU General Public License (GPL) version 2
|
|
*/
|
|
|
|
#include <linux/platform_device.h>
|
|
#include <linux/io.h>
|
|
#include <linux/mfd/db8500-prcmu.h>
|
|
#include <linux/clksrc-dbx500-prcmu.h>
|
|
#include <linux/sys_soc.h>
|
|
#include <linux/err.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/stat.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_irq.h>
|
|
#include <linux/platform_data/clk-ux500.h>
|
|
|
|
#include <asm/hardware/gic.h>
|
|
#include <asm/mach/map.h>
|
|
|
|
#include <mach/hardware.h>
|
|
#include <mach/setup.h>
|
|
#include <mach/devices.h>
|
|
|
|
void __iomem *_PRCMU_BASE;
|
|
|
|
/*
|
|
* FIXME: Should we set up the GPIO domain here?
|
|
*
|
|
* The problem is that we cannot put the interrupt resources into the platform
|
|
* device until the irqdomain has been added. Right now, we set the GIC interrupt
|
|
* domain from init_irq(), then load the gpio driver from
|
|
* core_initcall(nmk_gpio_init) and add the platform devices from
|
|
* arch_initcall(customize_machine).
|
|
*
|
|
* This feels fragile because it depends on the gpio device getting probed
|
|
* _before_ any device uses the gpio interrupts.
|
|
*/
|
|
static const struct of_device_id ux500_dt_irq_match[] = {
|
|
{ .compatible = "arm,cortex-a9-gic", .data = gic_of_init, },
|
|
{},
|
|
};
|
|
|
|
void __init ux500_init_irq(void)
|
|
{
|
|
void __iomem *dist_base;
|
|
void __iomem *cpu_base;
|
|
|
|
gic_arch_extn.flags = IRQCHIP_SKIP_SET_WAKE | IRQCHIP_MASK_ON_SUSPEND;
|
|
|
|
if (cpu_is_u8500_family() || cpu_is_ux540_family()) {
|
|
dist_base = __io_address(U8500_GIC_DIST_BASE);
|
|
cpu_base = __io_address(U8500_GIC_CPU_BASE);
|
|
} else
|
|
ux500_unknown_soc();
|
|
|
|
#ifdef CONFIG_OF
|
|
if (of_have_populated_dt())
|
|
of_irq_init(ux500_dt_irq_match);
|
|
else
|
|
#endif
|
|
gic_init(0, 29, dist_base, cpu_base);
|
|
|
|
/*
|
|
* Init clocks here so that they are available for system timer
|
|
* initialization.
|
|
*/
|
|
if (cpu_is_u8500_family())
|
|
db8500_prcmu_early_init();
|
|
|
|
if (cpu_is_u8500_family())
|
|
u8500_clk_init();
|
|
else if (cpu_is_u9540())
|
|
u9540_clk_init();
|
|
else if (cpu_is_u8540())
|
|
u8540_clk_init();
|
|
}
|
|
|
|
void __init ux500_init_late(void)
|
|
{
|
|
}
|
|
|
|
static const char * __init ux500_get_machine(void)
|
|
{
|
|
return kasprintf(GFP_KERNEL, "DB%4x", dbx500_partnumber());
|
|
}
|
|
|
|
static const char * __init ux500_get_family(void)
|
|
{
|
|
return kasprintf(GFP_KERNEL, "ux500");
|
|
}
|
|
|
|
static const char * __init ux500_get_revision(void)
|
|
{
|
|
unsigned int rev = dbx500_revision();
|
|
|
|
if (rev == 0x01)
|
|
return kasprintf(GFP_KERNEL, "%s", "ED");
|
|
else if (rev >= 0xA0)
|
|
return kasprintf(GFP_KERNEL, "%d.%d",
|
|
(rev >> 4) - 0xA + 1, rev & 0xf);
|
|
|
|
return kasprintf(GFP_KERNEL, "%s", "Unknown");
|
|
}
|
|
|
|
static ssize_t ux500_get_process(struct device *dev,
|
|
struct device_attribute *attr,
|
|
char *buf)
|
|
{
|
|
if (dbx500_id.process == 0x00)
|
|
return sprintf(buf, "Standard\n");
|
|
|
|
return sprintf(buf, "%02xnm\n", dbx500_id.process);
|
|
}
|
|
|
|
static void __init soc_info_populate(struct soc_device_attribute *soc_dev_attr,
|
|
const char *soc_id)
|
|
{
|
|
soc_dev_attr->soc_id = soc_id;
|
|
soc_dev_attr->machine = ux500_get_machine();
|
|
soc_dev_attr->family = ux500_get_family();
|
|
soc_dev_attr->revision = ux500_get_revision();
|
|
}
|
|
|
|
struct device_attribute ux500_soc_attr =
|
|
__ATTR(process, S_IRUGO, ux500_get_process, NULL);
|
|
|
|
struct device * __init ux500_soc_device_init(const char *soc_id)
|
|
{
|
|
struct device *parent;
|
|
struct soc_device *soc_dev;
|
|
struct soc_device_attribute *soc_dev_attr;
|
|
|
|
soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL);
|
|
if (!soc_dev_attr)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
soc_info_populate(soc_dev_attr, soc_id);
|
|
|
|
soc_dev = soc_device_register(soc_dev_attr);
|
|
if (IS_ERR_OR_NULL(soc_dev)) {
|
|
kfree(soc_dev_attr);
|
|
return NULL;
|
|
}
|
|
|
|
parent = soc_device_to_device(soc_dev);
|
|
if (!IS_ERR_OR_NULL(parent))
|
|
device_create_file(parent, &ux500_soc_attr);
|
|
|
|
return parent;
|
|
}
|