Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 58843
b: refs/heads/master
c: e3f2300
h: refs/heads/master
i:
  58841: d6c1b3c
  58839: bab2b9f
v: v3
  • Loading branch information
Michael Hennerich authored and Bryan Wu committed Jul 12, 2007
1 parent 7bfce45 commit 7468d7b
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 18 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 34e0fc89bdc1e6f50032dc43ed23167f5dbad6da
refs/heads/master: e3f2300036b5e0f60cb64063a9686361b6be8555
2 changes: 1 addition & 1 deletion trunk/arch/blackfin/mach-common/ints-priority-dc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ int __init init_arch_irq(void)
bfin_write_EVT15(evt_system_call);
CSYNC();

for (irq = 0; irq < SYS_IRQS; irq++) {
for (irq = 0; irq <= SYS_IRQS; irq++) {
if (irq <= IRQ_CORETMR)
set_irq_chip(irq, &bf561_core_irqchip);
else
Expand Down
43 changes: 27 additions & 16 deletions trunk/arch/blackfin/mach-common/ints-priority-sc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,7 @@ static void bfin_demux_gpio_irq(unsigned int intb_irq,
struct irq_desc *intb_desc)
{
u16 i;
struct irq_desc *desc;

for (i = 0; i < MAX_BLACKFIN_GPIOS; i += 16) {
int irq = IRQ_PF0 + i;
Expand All @@ -443,7 +444,7 @@ static void bfin_demux_gpio_irq(unsigned int intb_irq,

while (mask) {
if (mask & 1) {
struct irq_desc *desc = irq_desc + irq;
desc = irq_desc + irq;
desc->handle_irq(irq, desc);
}
irq++;
Expand All @@ -464,7 +465,7 @@ static void bfin_demux_gpio_irq(unsigned int intb_irq,
#define PINT_BIT(x) (1 << (PINT_2_BIT(x)))

static unsigned char irq2pint_lut[NR_PINTS];
static unsigned short pint2irq_lut[NR_PINT_SYS_IRQS * NR_PINT_BITS];
static unsigned char pint2irq_lut[NR_PINT_SYS_IRQS * NR_PINT_BITS];

struct pin_int_t {
unsigned int mask_set;
Expand Down Expand Up @@ -523,7 +524,7 @@ void init_pint_lut(void)
irq_base += (bit % 8) + ((bit / 8) & 1 ? 8 : 0);
bit_pos = bit + bank * NR_PINT_BITS;

pint2irq_lut[bit_pos] = irq_base;
pint2irq_lut[bit_pos] = irq_base - SYS_IRQS;
irq2pint_lut[irq_base - SYS_IRQS] = bit_pos;

}
Expand All @@ -545,9 +546,11 @@ static void bfin_gpio_ack_irq(unsigned int irq)
static void bfin_gpio_mask_ack_irq(unsigned int irq)
{
u8 pint_val = irq2pint_lut[irq - SYS_IRQS];
u32 pintbit = PINT_BIT(pint_val);
u8 bank = PINT_2_BANK(pint_val);

pint[PINT_2_BANK(pint_val)]->request = PINT_BIT(pint_val);
pint[PINT_2_BANK(pint_val)]->mask_clear = PINT_BIT(pint_val);
pint[bank]->request = pintbit;
pint[bank]->mask_clear = pintbit;
SSYNC();
}

Expand All @@ -562,9 +565,11 @@ static void bfin_gpio_mask_irq(unsigned int irq)
static void bfin_gpio_unmask_irq(unsigned int irq)
{
u8 pint_val = irq2pint_lut[irq - SYS_IRQS];
u32 pintbit = PINT_BIT(pint_val);
u8 bank = PINT_2_BANK(pint_val);

pint[PINT_2_BANK(pint_val)]->request = PINT_BIT(pint_val);
pint[PINT_2_BANK(pint_val)]->mask_set = PINT_BIT(pint_val);
pint[bank]->request = pintbit;
pint[bank]->mask_set = pintbit;
SSYNC();
}

Expand Down Expand Up @@ -602,6 +607,8 @@ static int bfin_gpio_irq_type(unsigned int irq, unsigned int type)
unsigned int ret;
u16 gpionr = irq - IRQ_PA0;
u8 pint_val = irq2pint_lut[irq - SYS_IRQS];
u32 pintbit = PINT_BIT(pint_val);
u8 bank = PINT_2_BANK(pint_val);

if (pint_val == IRQ_NOT_AVAIL)
return -ENODEV;
Expand Down Expand Up @@ -630,20 +637,20 @@ static int bfin_gpio_irq_type(unsigned int irq, unsigned int type)
gpio_direction_input(gpionr);

if (type & (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING)) {
pint[PINT_2_BANK(pint_val)]->edge_set = PINT_BIT(pint_val);
pint[bank]->edge_set = pintbit;
} else {
pint[PINT_2_BANK(pint_val)]->edge_clear = PINT_BIT(pint_val);
pint[bank]->edge_clear = pintbit;
}

if ((type & (IRQ_TYPE_EDGE_FALLING | IRQ_TYPE_LEVEL_LOW)))
pint[PINT_2_BANK(pint_val)]->invert_set = PINT_BIT(pint_val); /* low or falling edge denoted by one */
pint[bank]->invert_set = pintbit; /* low or falling edge denoted by one */
else
pint[PINT_2_BANK(pint_val)]->invert_set = PINT_BIT(pint_val); /* high or rising edge denoted by zero */
pint[bank]->invert_set = pintbit; /* high or rising edge denoted by zero */

if (type & (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING))
pint[PINT_2_BANK(pint_val)]->invert_set = PINT_BIT(pint_val);
pint[bank]->invert_set = pintbit;
else
pint[PINT_2_BANK(pint_val)]->invert_set = PINT_BIT(pint_val);
pint[bank]->invert_set = pintbit;

SSYNC();

Expand All @@ -670,6 +677,7 @@ static void bfin_demux_gpio_irq(unsigned int intb_irq,
{
u8 bank, pint_val;
u32 request, irq;
struct irq_desc *desc;

switch (intb_irq) {
case IRQ_PINT0:
Expand All @@ -684,6 +692,8 @@ static void bfin_demux_gpio_irq(unsigned int intb_irq,
case IRQ_PINT1:
bank = 1;
break;
default:
return;
}

pint_val = bank * NR_PINT_BITS;
Expand All @@ -692,8 +702,8 @@ static void bfin_demux_gpio_irq(unsigned int intb_irq,

while (request) {
if (request & 1) {
irq = pint2irq_lut[pint_val];
struct irq_desc *desc = irq_desc + irq;
irq = pint2irq_lut[pint_val] + SYS_IRQS;
desc = irq_desc + irq;
desc->handle_irq(irq, desc);
}
pint_val++;
Expand Down Expand Up @@ -868,7 +878,8 @@ void do_irq(int vec, struct pt_regs *fp)
sic_status[0] = bfin_read_SIC_ISR(0) & bfin_read_SIC_IMASK(0);
sic_status[1] = bfin_read_SIC_ISR(1) & bfin_read_SIC_IMASK(1);
sic_status[2] = bfin_read_SIC_ISR(2) & bfin_read_SIC_IMASK(2);
SSYNC();


for (;; ivg++) {
if (ivg >= ivg_stop) {
atomic_inc(&num_spurious);
Expand Down

0 comments on commit 7468d7b

Please sign in to comment.