mirror of https://gitee.com/openkylin/linux.git
irqchip core changes for v4.0
- STi
- New driver, irq-st
- Renesas
- Use u32 type for 32bit regs
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAABAgAGBQJU+3XOAAoJEP45WPkGe8ZnvDkP+wf5ix1gF9NymdaYxFz74Aui
y2836blOdJEpT2K7v95FXoIYdPnpWIW+GyAjVHEjhgxVx+Kfjc6SNUAJrM/KRHzU
SuQp/oVQhj7gSCU4rL18uOstCj3/L4MxdacZy66zWHQnzxUD7Jzq4SSHcbay7tHB
UlnHGzPjksjVR6G/c2QSxqCvCeETZiKaxiMZCiqqBacnC8JEi4JDTtW4g1CuqTlk
TWEAIs/ua27K7zfVUUFKvBrQCaSNVHZRqeIVgYocKuqBN8CaROwD6+cQ+NokaJE0
1GI/txyyJ1dm5VfPYEx6P06R/Ac+59cHQjV7T6wWihmw7dI5Ve6qzefFL9Iogr7+
WHNyuRuYtA+dL9cXdVTjkRxwOjCalMnpKZraKDk3wHEUEwWhPyDu9WZNRCRfNIXZ
ostp9hXxEYOQ+PhzfqyK6gjS/SE1twvgk2g1JylNF9oMnymRJFTkddzRNq/eP6EJ
yOV3SdRHi4gG4cP+a7uJnWmxb4BHVRZs7cwQkNnOJC4Dnbl9J4BC0dW/o7G+sUwj
7u+fZpuvreJc36LpRsXy5KJYRS71+v/E+0orvMMVC8OStwX8sMA/5WCtabSBnIaH
+4RbI5EizL2q5X9UXO1vYkVvT/Km4v51VZ5DnAA7VeqCoZ2hfZKM8QXyiTBATccb
KPSDPNy2x6pH9meXPb95
=WGOO
-----END PGP SIGNATURE-----
Merge tag 'irqchip-core-4.0' of git://git.infradead.org/users/jcooper/linux into irq/core
irqchip core changes for v4.0 from Jason Cooper
- ST
- New driver, irq-st
- Renesas
- Use u32 type for 32bit regs
This commit is contained in:
Thomas Gleixner
commit
fdb7144ba3
|
|
@ -0,0 +1,35 @@
|
|||
STMicroelectronics STi System Configuration Controlled IRQs
|
||||
-----------------------------------------------------------
|
||||
|
||||
On STi based systems; External, CTI (Core Sight), PMU (Performance Management),
|
||||
and PL310 L2 Cache IRQs are controlled using System Configuration registers.
|
||||
This driver is used to unmask them prior to use.
|
||||
|
||||
Required properties:
|
||||
- compatible : Should be set to one of:
|
||||
"st,stih415-irq-syscfg"
|
||||
"st,stih416-irq-syscfg"
|
||||
"st,stih407-irq-syscfg"
|
||||
"st,stid127-irq-syscfg"
|
||||
- st,syscfg : Phandle to Cortex-A9 IRQ system config registers
|
||||
- st,irq-device : Array of IRQs to enable - should be 2 in length
|
||||
- st,fiq-device : Array of FIQs to enable - should be 2 in length
|
||||
|
||||
Optional properties:
|
||||
- st,invert-ext : External IRQs can be inverted at will. This property inverts
|
||||
these IRQs using bitwise logic. A number of defines have been
|
||||
provided for convenience:
|
||||
ST_IRQ_SYSCFG_EXT_1_INV
|
||||
ST_IRQ_SYSCFG_EXT_2_INV
|
||||
ST_IRQ_SYSCFG_EXT_3_INV
|
||||
Example:
|
||||
|
||||
irq-syscfg {
|
||||
compatible = "st,stih416-irq-syscfg";
|
||||
st,syscfg = <&syscfg_cpu>;
|
||||
st,irq-device = <ST_IRQ_SYSCFG_PMU_0>,
|
||||
<ST_IRQ_SYSCFG_PMU_1>;
|
||||
st,fiq-device = <ST_IRQ_SYSCFG_DISABLED>,
|
||||
<ST_IRQ_SYSCFG_DISABLED>;
|
||||
st,invert-ext = <(ST_IRQ_SYSCFG_EXT_1_INV | ST_IRQ_SYSCFG_EXT_3_INV)>;
|
||||
};
|
||||
|
|
@ -110,6 +110,13 @@ config RENESAS_IRQC
|
|||
bool
|
||||
select IRQ_DOMAIN
|
||||
|
||||
config ST_IRQCHIP
|
||||
bool
|
||||
select REGMAP
|
||||
select MFD_SYSCON
|
||||
help
|
||||
Enables SysCfg Controlled IRQs on STi based platforms.
|
||||
|
||||
config TB10X_IRQC
|
||||
bool
|
||||
select IRQ_DOMAIN
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@ obj-$(CONFIG_RENESAS_IRQC) += irq-renesas-irqc.o
|
|||
obj-$(CONFIG_VERSATILE_FPGA_IRQ) += irq-versatile-fpga.o
|
||||
obj-$(CONFIG_ARCH_NSPIRE) += irq-zevio.o
|
||||
obj-$(CONFIG_ARCH_VT8500) += irq-vt8500.o
|
||||
obj-$(CONFIG_ST_IRQCHIP) += irq-st.o
|
||||
obj-$(CONFIG_TB10X_IRQC) += irq-tb10x.o
|
||||
obj-$(CONFIG_XTENSA) += irq-xtensa-pic.o
|
||||
obj-$(CONFIG_XTENSA_MX) += irq-xtensa-mx.o
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@ static int irqc_irq_set_type(struct irq_data *d, unsigned int type)
|
|||
struct irqc_priv *p = irq_data_get_irq_chip_data(d);
|
||||
int hw_irq = irqd_to_hwirq(d);
|
||||
unsigned char value = irqc_sense[type & IRQ_TYPE_SENSE_MASK];
|
||||
unsigned long tmp;
|
||||
u32 tmp;
|
||||
|
||||
irqc_dbg(&p->irq[hw_irq], "sense");
|
||||
|
||||
|
|
@ -112,7 +112,7 @@ static irqreturn_t irqc_irq_handler(int irq, void *dev_id)
|
|||
{
|
||||
struct irqc_irq *i = dev_id;
|
||||
struct irqc_priv *p = i->p;
|
||||
unsigned long bit = BIT(i->hw_irq);
|
||||
u32 bit = BIT(i->hw_irq);
|
||||
|
||||
irqc_dbg(i, "demux1");
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,206 @@
|
|||
/*
|
||||
* Copyright (C) 2014 STMicroelectronics – All Rights Reserved
|
||||
*
|
||||
* Author: Lee Jones <lee.jones@linaro.org>
|
||||
*
|
||||
* This is a re-write of Christophe Kerello's PMU driver.
|
||||
*
|
||||
* 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 <dt-bindings/interrupt-controller/irq-st.h>
|
||||
#include <linux/err.h>
|
||||
#include <linux/mfd/syscon.h>
|
||||
#include <linux/of_device.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/regmap.h>
|
||||
#include <linux/slab.h>
|
||||
|
||||
#define STIH415_SYSCFG_642 0x0a8
|
||||
#define STIH416_SYSCFG_7543 0x87c
|
||||
#define STIH407_SYSCFG_5102 0x198
|
||||
#define STID127_SYSCFG_734 0x088
|
||||
|
||||
#define ST_A9_IRQ_MASK 0x001FFFFF
|
||||
#define ST_A9_IRQ_MAX_CHANS 2
|
||||
|
||||
#define ST_A9_IRQ_EN_CTI_0 BIT(0)
|
||||
#define ST_A9_IRQ_EN_CTI_1 BIT(1)
|
||||
#define ST_A9_IRQ_EN_PMU_0 BIT(2)
|
||||
#define ST_A9_IRQ_EN_PMU_1 BIT(3)
|
||||
#define ST_A9_IRQ_EN_PL310_L2 BIT(4)
|
||||
#define ST_A9_IRQ_EN_EXT_0 BIT(5)
|
||||
#define ST_A9_IRQ_EN_EXT_1 BIT(6)
|
||||
#define ST_A9_IRQ_EN_EXT_2 BIT(7)
|
||||
|
||||
#define ST_A9_FIQ_N_SEL(dev, chan) (dev << (8 + (chan * 3)))
|
||||
#define ST_A9_IRQ_N_SEL(dev, chan) (dev << (14 + (chan * 3)))
|
||||
#define ST_A9_EXTIRQ_INV_SEL(dev) (dev << 20)
|
||||
|
||||
struct st_irq_syscfg {
|
||||
struct regmap *regmap;
|
||||
unsigned int syscfg;
|
||||
unsigned int config;
|
||||
bool ext_inverted;
|
||||
};
|
||||
|
||||
static const struct of_device_id st_irq_syscfg_match[] = {
|
||||
{
|
||||
.compatible = "st,stih415-irq-syscfg",
|
||||
.data = (void *)STIH415_SYSCFG_642,
|
||||
},
|
||||
{
|
||||
.compatible = "st,stih416-irq-syscfg",
|
||||
.data = (void *)STIH416_SYSCFG_7543,
|
||||
},
|
||||
{
|
||||
.compatible = "st,stih407-irq-syscfg",
|
||||
.data = (void *)STIH407_SYSCFG_5102,
|
||||
},
|
||||
{
|
||||
.compatible = "st,stid127-irq-syscfg",
|
||||
.data = (void *)STID127_SYSCFG_734,
|
||||
},
|
||||
{}
|
||||
};
|
||||
|
||||
static int st_irq_xlate(struct platform_device *pdev,
|
||||
int device, int channel, bool irq)
|
||||
{
|
||||
struct st_irq_syscfg *ddata = dev_get_drvdata(&pdev->dev);
|
||||
|
||||
/* Set the device enable bit. */
|
||||
switch (device) {
|
||||
case ST_IRQ_SYSCFG_EXT_0:
|
||||
ddata->config |= ST_A9_IRQ_EN_EXT_0;
|
||||
break;
|
||||
case ST_IRQ_SYSCFG_EXT_1:
|
||||
ddata->config |= ST_A9_IRQ_EN_EXT_1;
|
||||
break;
|
||||
case ST_IRQ_SYSCFG_EXT_2:
|
||||
ddata->config |= ST_A9_IRQ_EN_EXT_2;
|
||||
break;
|
||||
case ST_IRQ_SYSCFG_CTI_0:
|
||||
ddata->config |= ST_A9_IRQ_EN_CTI_0;
|
||||
break;
|
||||
case ST_IRQ_SYSCFG_CTI_1:
|
||||
ddata->config |= ST_A9_IRQ_EN_CTI_1;
|
||||
break;
|
||||
case ST_IRQ_SYSCFG_PMU_0:
|
||||
ddata->config |= ST_A9_IRQ_EN_PMU_0;
|
||||
break;
|
||||
case ST_IRQ_SYSCFG_PMU_1:
|
||||
ddata->config |= ST_A9_IRQ_EN_PMU_1;
|
||||
break;
|
||||
case ST_IRQ_SYSCFG_pl310_L2:
|
||||
ddata->config |= ST_A9_IRQ_EN_PL310_L2;
|
||||
break;
|
||||
case ST_IRQ_SYSCFG_DISABLED:
|
||||
return 0;
|
||||
default:
|
||||
dev_err(&pdev->dev, "Unrecognised device %d\n", device);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* Select IRQ/FIQ channel for device. */
|
||||
ddata->config |= irq ?
|
||||
ST_A9_IRQ_N_SEL(device, channel) :
|
||||
ST_A9_FIQ_N_SEL(device, channel);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int st_irq_syscfg_enable(struct platform_device *pdev)
|
||||
{
|
||||
struct device_node *np = pdev->dev.of_node;
|
||||
struct st_irq_syscfg *ddata = dev_get_drvdata(&pdev->dev);
|
||||
int channels, ret, i;
|
||||
u32 device, invert;
|
||||
|
||||
channels = of_property_count_u32_elems(np, "st,irq-device");
|
||||
if (channels != ST_A9_IRQ_MAX_CHANS) {
|
||||
dev_err(&pdev->dev, "st,enable-irq-device must have 2 elems\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
channels = of_property_count_u32_elems(np, "st,fiq-device");
|
||||
if (channels != ST_A9_IRQ_MAX_CHANS) {
|
||||
dev_err(&pdev->dev, "st,enable-fiq-device must have 2 elems\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
for (i = 0; i < ST_A9_IRQ_MAX_CHANS; i++) {
|
||||
of_property_read_u32_index(np, "st,irq-device", i, &device);
|
||||
|
||||
ret = st_irq_xlate(pdev, device, i, true);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
of_property_read_u32_index(np, "st,fiq-device", i, &device);
|
||||
|
||||
ret = st_irq_xlate(pdev, device, i, false);
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* External IRQs may be inverted. */
|
||||
of_property_read_u32(np, "st,invert-ext", &invert);
|
||||
ddata->config |= ST_A9_EXTIRQ_INV_SEL(invert);
|
||||
|
||||
return regmap_update_bits(ddata->regmap, ddata->syscfg,
|
||||
ST_A9_IRQ_MASK, ddata->config);
|
||||
}
|
||||
|
||||
static int st_irq_syscfg_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct device_node *np = pdev->dev.of_node;
|
||||
const struct of_device_id *match;
|
||||
struct st_irq_syscfg *ddata;
|
||||
|
||||
ddata = devm_kzalloc(&pdev->dev, sizeof(*ddata), GFP_KERNEL);
|
||||
if (!ddata)
|
||||
return -ENOMEM;
|
||||
|
||||
match = of_match_device(st_irq_syscfg_match, &pdev->dev);
|
||||
if (!match)
|
||||
return -ENODEV;
|
||||
|
||||
ddata->syscfg = (unsigned int)match->data;
|
||||
|
||||
ddata->regmap = syscon_regmap_lookup_by_phandle(np, "st,syscfg");
|
||||
if (IS_ERR(ddata->regmap)) {
|
||||
dev_err(&pdev->dev, "syscfg phandle missing\n");
|
||||
return PTR_ERR(ddata->regmap);
|
||||
}
|
||||
|
||||
dev_set_drvdata(&pdev->dev, ddata);
|
||||
|
||||
return st_irq_syscfg_enable(pdev);
|
||||
}
|
||||
|
||||
static int st_irq_syscfg_resume(struct device *dev)
|
||||
{
|
||||
struct st_irq_syscfg *ddata = dev_get_drvdata(dev);
|
||||
|
||||
return regmap_update_bits(ddata->regmap, ddata->syscfg,
|
||||
ST_A9_IRQ_MASK, ddata->config);
|
||||
}
|
||||
|
||||
static SIMPLE_DEV_PM_OPS(st_irq_syscfg_pm_ops, NULL, st_irq_syscfg_resume);
|
||||
|
||||
static struct platform_driver st_irq_syscfg_driver = {
|
||||
.driver = {
|
||||
.name = "st_irq_syscfg",
|
||||
.pm = &st_irq_syscfg_pm_ops,
|
||||
.of_match_table = st_irq_syscfg_match,
|
||||
},
|
||||
.probe = st_irq_syscfg_probe,
|
||||
};
|
||||
|
||||
static int __init st_irq_syscfg_init(void)
|
||||
{
|
||||
return platform_driver_register(&st_irq_syscfg_driver);
|
||||
}
|
||||
core_initcall(st_irq_syscfg_init);
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
/*
|
||||
* include/linux/irqchip/irq-st.h
|
||||
*
|
||||
* Copyright (C) 2014 STMicroelectronics – All Rights Reserved
|
||||
*
|
||||
* Author: Lee Jones <lee.jones@linaro.org>
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
#ifndef _DT_BINDINGS_INTERRUPT_CONTROLLER_ST_H
|
||||
#define _DT_BINDINGS_INTERRUPT_CONTROLLER_ST_H
|
||||
|
||||
#define ST_IRQ_SYSCFG_EXT_0 0
|
||||
#define ST_IRQ_SYSCFG_EXT_1 1
|
||||
#define ST_IRQ_SYSCFG_EXT_2 2
|
||||
#define ST_IRQ_SYSCFG_CTI_0 3
|
||||
#define ST_IRQ_SYSCFG_CTI_1 4
|
||||
#define ST_IRQ_SYSCFG_PMU_0 5
|
||||
#define ST_IRQ_SYSCFG_PMU_1 6
|
||||
#define ST_IRQ_SYSCFG_pl310_L2 7
|
||||
#define ST_IRQ_SYSCFG_DISABLED 0xFFFFFFFF
|
||||
|
||||
#define ST_IRQ_SYSCFG_EXT_1_INV 0x1
|
||||
#define ST_IRQ_SYSCFG_EXT_2_INV 0x2
|
||||
#define ST_IRQ_SYSCFG_EXT_3_INV 0x4
|
||||
|
||||
#endif
|
||||
Loading…
Reference in New Issue