| Message ID | 4B20D81A.7010503@elphinstone.net (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Kumar Gala |
| Headers | show |
On Dec 10, 2009, at 5:14 AM, Mark Ware wrote: > Port C interrupts can be either falling edge, or either edge. > Other external interrupts are either falling edge or active low. > Tested on a custom 8280 based board. > > Signed-off-by: Mark Ware <mware@elphinstone.net> > --- > Changed in v3: > - Cosmetic improvements as suggested by Anton and Scott > - Added tested note to changelog > > arch/powerpc/sysdev/cpm2_pic.c | 28 +++++++++++++++++++++------- > 1 files changed, 21 insertions(+), 7 deletions(-) Scott, Anton do you want to add an Ack to this version? - k
On Thu, Dec 10, 2009 at 08:52:01AM -0600, Kumar Gala wrote: > > On Dec 10, 2009, at 5:14 AM, Mark Ware wrote: > > > Port C interrupts can be either falling edge, or either edge. > > Other external interrupts are either falling edge or active low. > > Tested on a custom 8280 based board. > > > > Signed-off-by: Mark Ware <mware@elphinstone.net> > > --- > > Changed in v3: > > - Cosmetic improvements as suggested by Anton and Scott > > - Added tested note to changelog > > > > arch/powerpc/sysdev/cpm2_pic.c | 28 +++++++++++++++++++++------- > > 1 files changed, 21 insertions(+), 7 deletions(-) > > Scott, Anton do you want to add an Ack to this version? Acked-by: Anton Vorontsov <avorontsov@ru.mvista.com> Thanks!
Anton Vorontsov wrote: > On Thu, Dec 10, 2009 at 08:52:01AM -0600, Kumar Gala wrote: >> On Dec 10, 2009, at 5:14 AM, Mark Ware wrote: >> >>> Port C interrupts can be either falling edge, or either edge. >>> Other external interrupts are either falling edge or active low. >>> Tested on a custom 8280 based board. >>> >>> Signed-off-by: Mark Ware <mware@elphinstone.net> >>> --- >>> Changed in v3: >>> - Cosmetic improvements as suggested by Anton and Scott >>> - Added tested note to changelog >>> >>> arch/powerpc/sysdev/cpm2_pic.c | 28 +++++++++++++++++++++------- >>> 1 files changed, 21 insertions(+), 7 deletions(-) >> Scott, Anton do you want to add an Ack to this version? > > Acked-by: Anton Vorontsov <avorontsov@ru.mvista.com> Acked-by: Scott Wood <scottwood@freescale.com> -Scott
On Dec 10, 2009, at 5:14 AM, Mark Ware wrote: > Port C interrupts can be either falling edge, or either edge. > Other external interrupts are either falling edge or active low. > Tested on a custom 8280 based board. > > Signed-off-by: Mark Ware <mware@elphinstone.net> > --- > Changed in v3: > - Cosmetic improvements as suggested by Anton and Scott > - Added tested note to changelog > > arch/powerpc/sysdev/cpm2_pic.c | 28 +++++++++++++++++++++------- > 1 files changed, 21 insertions(+), 7 deletions(-) Applied to next - k
diff --git a/arch/powerpc/sysdev/cpm2_pic.c b/arch/powerpc/sysdev/cpm2_pic.c index 78f1f7c..b1e9206 100644 --- a/arch/powerpc/sysdev/cpm2_pic.c +++ b/arch/powerpc/sysdev/cpm2_pic.c @@ -141,13 +141,23 @@ static int cpm2_set_irq_type(unsigned int virq, unsigned int flow_type) struct irq_desc *desc = get_irq_desc(virq); unsigned int vold, vnew, edibit; - if (flow_type == IRQ_TYPE_NONE) - flow_type = IRQ_TYPE_LEVEL_LOW; - - if (flow_type & IRQ_TYPE_EDGE_RISING) { - printk(KERN_ERR "CPM2 PIC: sense type 0x%x not supported\n", - flow_type); - return -EINVAL; + /* Port C interrupts are either IRQ_TYPE_EDGE_FALLING or + * IRQ_TYPE_EDGE_BOTH (default). All others are IRQ_TYPE_EDGE_FALLING + * or IRQ_TYPE_LEVEL_LOW (default) + */ + if (src >= CPM2_IRQ_PORTC15 && src <= CPM2_IRQ_PORTC0) { + if (flow_type == IRQ_TYPE_NONE) + flow_type = IRQ_TYPE_EDGE_BOTH; + + if (flow_type != IRQ_TYPE_EDGE_BOTH && + flow_type != IRQ_TYPE_EDGE_FALLING) + goto err_sense; + } else { + if (flow_type == IRQ_TYPE_NONE) + flow_type = IRQ_TYPE_LEVEL_LOW; + + if (flow_type & (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_LEVEL_HIGH)) + goto err_sense; } desc->status &= ~(IRQ_TYPE_SENSE_MASK | IRQ_LEVEL); @@ -179,6 +189,10 @@ static int cpm2_set_irq_type(unsigned int virq, unsigned int flow_type) if (vold != vnew) out_be32(&cpm2_intctl->ic_siexr, vnew); return 0; + +err_sense: + pr_err("CPM2 PIC: sense type 0x%x not supported\n", flow_type); + return -EINVAL; } static struct irq_chip cpm2_pic = {
Port C interrupts can be either falling edge, or either edge. Other external interrupts are either falling edge or active low. Tested on a custom 8280 based board. Signed-off-by: Mark Ware <mware@elphinstone.net> --- Changed in v3: - Cosmetic improvements as suggested by Anton and Scott - Added tested note to changelog arch/powerpc/sysdev/cpm2_pic.c | 28 +++++++++++++++++++++------- 1 files changed, 21 insertions(+), 7 deletions(-)