mirror of
https://github.com/torvalds/linux.git
synced 2024-12-26 21:02:19 +00:00
6b783f7c5d
irq_domain_add_simple() was a stop-gap measure until complete irq_domain support was complete. This patch removes the irq_domain_add_simple() interface. This patch also drops the explicit irq_domain initialization performed by the mach-versatile code because the versatile interrupt controller already has irq_domain support built into it. This was a bug that was hanging around quietly for a while, but with the full irq_domain which actually verifies that irq_domain ranges are available it would cause the registration to fail and the system wouldn't boot. v4: Fixed number of irqs in mx5 gpio code v2: Updated to pass in host_data pointer on irq_domain allocation. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Cc: Rob Herring <rob.herring@calxeda.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Milton Miller <miltonm@bga.com> Cc: Russell King <linux@arm.linux.org.uk> Tested-by: Olof Johansson <olof@lixom.net>
120 lines
4.0 KiB
C
120 lines
4.0 KiB
C
/*
|
|
* Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved.
|
|
* Copyright 2011 Linaro Ltd.
|
|
*
|
|
* The code contained herein is licensed under the GNU General Public
|
|
* License. You may obtain a copy of the GNU General Public License
|
|
* Version 2 or later at the following locations:
|
|
*
|
|
* http://www.opensource.org/licenses/gpl-license.html
|
|
* http://www.gnu.org/copyleft/gpl.html
|
|
*/
|
|
|
|
#include <linux/irq.h>
|
|
#include <linux/irqdomain.h>
|
|
#include <linux/of_irq.h>
|
|
#include <linux/of_platform.h>
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/time.h>
|
|
#include <mach/common.h>
|
|
#include <mach/mx51.h>
|
|
|
|
/*
|
|
* Lookup table for attaching a specific name and platform_data pointer to
|
|
* devices as they get created by of_platform_populate(). Ideally this table
|
|
* would not exist, but the current clock implementation depends on some devices
|
|
* having a specific name.
|
|
*/
|
|
static const struct of_dev_auxdata imx51_auxdata_lookup[] __initconst = {
|
|
OF_DEV_AUXDATA("fsl,imx51-uart", MX51_UART1_BASE_ADDR, "imx21-uart.0", NULL),
|
|
OF_DEV_AUXDATA("fsl,imx51-uart", MX51_UART2_BASE_ADDR, "imx21-uart.1", NULL),
|
|
OF_DEV_AUXDATA("fsl,imx51-uart", MX51_UART3_BASE_ADDR, "imx21-uart.2", NULL),
|
|
OF_DEV_AUXDATA("fsl,imx51-fec", MX51_FEC_BASE_ADDR, "imx27-fec.0", NULL),
|
|
OF_DEV_AUXDATA("fsl,imx51-esdhc", MX51_ESDHC1_BASE_ADDR, "sdhci-esdhc-imx51.0", NULL),
|
|
OF_DEV_AUXDATA("fsl,imx51-esdhc", MX51_ESDHC2_BASE_ADDR, "sdhci-esdhc-imx51.1", NULL),
|
|
OF_DEV_AUXDATA("fsl,imx51-esdhc", MX51_ESDHC3_BASE_ADDR, "sdhci-esdhc-imx51.2", NULL),
|
|
OF_DEV_AUXDATA("fsl,imx51-esdhc", MX51_ESDHC4_BASE_ADDR, "sdhci-esdhc-imx51.3", NULL),
|
|
OF_DEV_AUXDATA("fsl,imx51-ecspi", MX51_ECSPI1_BASE_ADDR, "imx51-ecspi.0", NULL),
|
|
OF_DEV_AUXDATA("fsl,imx51-ecspi", MX51_ECSPI2_BASE_ADDR, "imx51-ecspi.1", NULL),
|
|
OF_DEV_AUXDATA("fsl,imx51-cspi", MX51_CSPI_BASE_ADDR, "imx35-cspi.0", NULL),
|
|
OF_DEV_AUXDATA("fsl,imx51-i2c", MX51_I2C1_BASE_ADDR, "imx-i2c.0", NULL),
|
|
OF_DEV_AUXDATA("fsl,imx51-i2c", MX51_I2C2_BASE_ADDR, "imx-i2c.1", NULL),
|
|
OF_DEV_AUXDATA("fsl,imx51-sdma", MX51_SDMA_BASE_ADDR, "imx35-sdma", NULL),
|
|
OF_DEV_AUXDATA("fsl,imx51-wdt", MX51_WDOG1_BASE_ADDR, "imx2-wdt.0", NULL),
|
|
{ /* sentinel */ }
|
|
};
|
|
|
|
static int __init imx51_tzic_add_irq_domain(struct device_node *np,
|
|
struct device_node *interrupt_parent)
|
|
{
|
|
irq_domain_add_legacy(np, 128, 0, 0, &irq_domain_simple_ops, NULL);
|
|
return 0;
|
|
}
|
|
|
|
static int __init imx51_gpio_add_irq_domain(struct device_node *np,
|
|
struct device_node *interrupt_parent)
|
|
{
|
|
static int gpio_irq_base = MXC_GPIO_IRQ_START + ARCH_NR_GPIOS;
|
|
|
|
gpio_irq_base -= 32;
|
|
irq_domain_add_legacy(np, 32, gpio_irq_base, 0, &irq_domain_simple_ops, NULL);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct of_device_id imx51_irq_match[] __initconst = {
|
|
{ .compatible = "fsl,imx51-tzic", .data = imx51_tzic_add_irq_domain, },
|
|
{ .compatible = "fsl,imx51-gpio", .data = imx51_gpio_add_irq_domain, },
|
|
{ /* sentinel */ }
|
|
};
|
|
|
|
static const struct of_device_id imx51_iomuxc_of_match[] __initconst = {
|
|
{ .compatible = "fsl,imx51-iomuxc-babbage", .data = imx51_babbage_common_init, },
|
|
{ /* sentinel */ }
|
|
};
|
|
|
|
static void __init imx51_dt_init(void)
|
|
{
|
|
struct device_node *node;
|
|
const struct of_device_id *of_id;
|
|
void (*func)(void);
|
|
|
|
of_irq_init(imx51_irq_match);
|
|
|
|
node = of_find_matching_node(NULL, imx51_iomuxc_of_match);
|
|
if (node) {
|
|
of_id = of_match_node(imx51_iomuxc_of_match, node);
|
|
func = of_id->data;
|
|
func();
|
|
of_node_put(node);
|
|
}
|
|
|
|
of_platform_populate(NULL, of_default_bus_match_table,
|
|
imx51_auxdata_lookup, NULL);
|
|
}
|
|
|
|
static void __init imx51_timer_init(void)
|
|
{
|
|
mx51_clocks_init_dt();
|
|
}
|
|
|
|
static struct sys_timer imx51_timer = {
|
|
.init = imx51_timer_init,
|
|
};
|
|
|
|
static const char *imx51_dt_board_compat[] __initdata = {
|
|
"fsl,imx51-babbage",
|
|
NULL
|
|
};
|
|
|
|
DT_MACHINE_START(IMX51_DT, "Freescale i.MX51 (Device Tree Support)")
|
|
.map_io = mx51_map_io,
|
|
.init_early = imx51_init_early,
|
|
.init_irq = mx51_init_irq,
|
|
.handle_irq = imx51_handle_irq,
|
|
.timer = &imx51_timer,
|
|
.init_machine = imx51_dt_init,
|
|
.dt_compat = imx51_dt_board_compat,
|
|
.restart = mxc_restart,
|
|
MACHINE_END
|