Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 22820
b: refs/heads/master
c: 5481536
h: refs/heads/master
v: v3
  • Loading branch information
Russell King authored and Russell King committed Mar 21, 2006
1 parent d682b32 commit ce86ecd
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 27 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: 5d25ac038a317d454a4321cba955f756400835a5
refs/heads/master: 548153663bbf33ca7c244a6bbddd82c26a17c331
42 changes: 21 additions & 21 deletions trunk/arch/arm/common/locomo.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ struct locomo {
unsigned long phys;
unsigned int irq;
spinlock_t lock;
void *base;
void __iomem *base;
};

struct locomo_dev_info {
Expand Down Expand Up @@ -162,7 +162,7 @@ static void locomo_handler(unsigned int irq, struct irqdesc *desc,
{
int req, i;
struct irqdesc *d;
void *mapbase = get_irq_chipdata(irq);
void __iomem *mapbase = get_irq_chipdata(irq);

/* Acknowledge the parent IRQ */
desc->chip->ack(irq);
Expand All @@ -189,7 +189,7 @@ static void locomo_ack_irq(unsigned int irq)

static void locomo_mask_irq(unsigned int irq)
{
void *mapbase = get_irq_chipdata(irq);
void __iomem *mapbase = get_irq_chipdata(irq);
unsigned int r;
r = locomo_readl(mapbase + LOCOMO_ICR);
r &= ~(0x0010 << (irq - LOCOMO_IRQ_START));
Expand All @@ -198,7 +198,7 @@ static void locomo_mask_irq(unsigned int irq)

static void locomo_unmask_irq(unsigned int irq)
{
void *mapbase = get_irq_chipdata(irq);
void __iomem *mapbase = get_irq_chipdata(irq);
unsigned int r;
r = locomo_readl(mapbase + LOCOMO_ICR);
r |= (0x0010 << (irq - LOCOMO_IRQ_START));
Expand All @@ -215,7 +215,7 @@ static void locomo_key_handler(unsigned int irq, struct irqdesc *desc,
struct pt_regs *regs)
{
struct irqdesc *d;
void *mapbase = get_irq_chipdata(irq);
void __iomem *mapbase = get_irq_chipdata(irq);

if (locomo_readl(mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC) & 0x0001) {
d = irq_desc + LOCOMO_IRQ_KEY_START;
Expand All @@ -225,7 +225,7 @@ static void locomo_key_handler(unsigned int irq, struct irqdesc *desc,

static void locomo_key_ack_irq(unsigned int irq)
{
void *mapbase = get_irq_chipdata(irq);
void __iomem *mapbase = get_irq_chipdata(irq);
unsigned int r;
r = locomo_readl(mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC);
r &= ~(0x0100 << (irq - LOCOMO_IRQ_KEY_START));
Expand All @@ -234,7 +234,7 @@ static void locomo_key_ack_irq(unsigned int irq)

static void locomo_key_mask_irq(unsigned int irq)
{
void *mapbase = get_irq_chipdata(irq);
void __iomem *mapbase = get_irq_chipdata(irq);
unsigned int r;
r = locomo_readl(mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC);
r &= ~(0x0010 << (irq - LOCOMO_IRQ_KEY_START));
Expand All @@ -243,7 +243,7 @@ static void locomo_key_mask_irq(unsigned int irq)

static void locomo_key_unmask_irq(unsigned int irq)
{
void *mapbase = get_irq_chipdata(irq);
void __iomem *mapbase = get_irq_chipdata(irq);
unsigned int r;
r = locomo_readl(mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC);
r |= (0x0010 << (irq - LOCOMO_IRQ_KEY_START));
Expand All @@ -261,7 +261,7 @@ static void locomo_gpio_handler(unsigned int irq, struct irqdesc *desc,
{
int req, i;
struct irqdesc *d;
void *mapbase = get_irq_chipdata(irq);
void __iomem *mapbase = get_irq_chipdata(irq);

req = locomo_readl(mapbase + LOCOMO_GIR) &
locomo_readl(mapbase + LOCOMO_GPD) &
Expand All @@ -280,7 +280,7 @@ static void locomo_gpio_handler(unsigned int irq, struct irqdesc *desc,

static void locomo_gpio_ack_irq(unsigned int irq)
{
void *mapbase = get_irq_chipdata(irq);
void __iomem *mapbase = get_irq_chipdata(irq);
unsigned int r;
r = locomo_readl(mapbase + LOCOMO_GWE);
r |= (0x0001 << (irq - LOCOMO_IRQ_GPIO_START));
Expand All @@ -297,7 +297,7 @@ static void locomo_gpio_ack_irq(unsigned int irq)

static void locomo_gpio_mask_irq(unsigned int irq)
{
void *mapbase = get_irq_chipdata(irq);
void __iomem *mapbase = get_irq_chipdata(irq);
unsigned int r;
r = locomo_readl(mapbase + LOCOMO_GIE);
r &= ~(0x0001 << (irq - LOCOMO_IRQ_GPIO_START));
Expand All @@ -306,7 +306,7 @@ static void locomo_gpio_mask_irq(unsigned int irq)

static void locomo_gpio_unmask_irq(unsigned int irq)
{
void *mapbase = get_irq_chipdata(irq);
void __iomem *mapbase = get_irq_chipdata(irq);
unsigned int r;
r = locomo_readl(mapbase + LOCOMO_GIE);
r |= (0x0001 << (irq - LOCOMO_IRQ_GPIO_START));
Expand All @@ -323,7 +323,7 @@ static void locomo_lt_handler(unsigned int irq, struct irqdesc *desc,
struct pt_regs *regs)
{
struct irqdesc *d;
void *mapbase = get_irq_chipdata(irq);
void __iomem *mapbase = get_irq_chipdata(irq);

if (locomo_readl(mapbase + LOCOMO_LTINT) & 0x0001) {
d = irq_desc + LOCOMO_IRQ_LT_START;
Expand All @@ -333,7 +333,7 @@ static void locomo_lt_handler(unsigned int irq, struct irqdesc *desc,

static void locomo_lt_ack_irq(unsigned int irq)
{
void *mapbase = get_irq_chipdata(irq);
void __iomem *mapbase = get_irq_chipdata(irq);
unsigned int r;
r = locomo_readl(mapbase + LOCOMO_LTINT);
r &= ~(0x0100 << (irq - LOCOMO_IRQ_LT_START));
Expand All @@ -342,7 +342,7 @@ static void locomo_lt_ack_irq(unsigned int irq)

static void locomo_lt_mask_irq(unsigned int irq)
{
void *mapbase = get_irq_chipdata(irq);
void __iomem *mapbase = get_irq_chipdata(irq);
unsigned int r;
r = locomo_readl(mapbase + LOCOMO_LTINT);
r &= ~(0x0010 << (irq - LOCOMO_IRQ_LT_START));
Expand All @@ -351,7 +351,7 @@ static void locomo_lt_mask_irq(unsigned int irq)

static void locomo_lt_unmask_irq(unsigned int irq)
{
void *mapbase = get_irq_chipdata(irq);
void __iomem *mapbase = get_irq_chipdata(irq);
unsigned int r;
r = locomo_readl(mapbase + LOCOMO_LTINT);
r |= (0x0010 << (irq - LOCOMO_IRQ_LT_START));
Expand All @@ -369,7 +369,7 @@ static void locomo_spi_handler(unsigned int irq, struct irqdesc *desc,
{
int req, i;
struct irqdesc *d;
void *mapbase = get_irq_chipdata(irq);
void __iomem *mapbase = get_irq_chipdata(irq);

req = locomo_readl(mapbase + LOCOMO_SPIIR) & 0x000F;
if (req) {
Expand All @@ -386,7 +386,7 @@ static void locomo_spi_handler(unsigned int irq, struct irqdesc *desc,

static void locomo_spi_ack_irq(unsigned int irq)
{
void *mapbase = get_irq_chipdata(irq);
void __iomem *mapbase = get_irq_chipdata(irq);
unsigned int r;
r = locomo_readl(mapbase + LOCOMO_SPIWE);
r |= (0x0001 << (irq - LOCOMO_IRQ_SPI_START));
Expand All @@ -403,7 +403,7 @@ static void locomo_spi_ack_irq(unsigned int irq)

static void locomo_spi_mask_irq(unsigned int irq)
{
void *mapbase = get_irq_chipdata(irq);
void __iomem *mapbase = get_irq_chipdata(irq);
unsigned int r;
r = locomo_readl(mapbase + LOCOMO_SPIIE);
r &= ~(0x0001 << (irq - LOCOMO_IRQ_SPI_START));
Expand All @@ -412,7 +412,7 @@ static void locomo_spi_mask_irq(unsigned int irq)

static void locomo_spi_unmask_irq(unsigned int irq)
{
void *mapbase = get_irq_chipdata(irq);
void __iomem *mapbase = get_irq_chipdata(irq);
unsigned int r;
r = locomo_readl(mapbase + LOCOMO_SPIIE);
r |= (0x0001 << (irq - LOCOMO_IRQ_SPI_START));
Expand All @@ -428,7 +428,7 @@ static struct irqchip locomo_spi_chip = {
static void locomo_setup_irq(struct locomo *lchip)
{
int irq;
void *irqbase = lchip->base;
void __iomem *irqbase = lchip->base;

/*
* Install handler for IRQ_LOCOMO_HW.
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/arm/mach-at91rm9200/gpio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ static void gpio_irq_handler(unsigned irq, struct irqdesc *desc, struct pt_regs
void __iomem *pio;
u32 isr;

pio = (void __force __iomem *) desc->chipdata;
pio = desc->base;

/* temporarily mask (level sensitive) parent IRQ */
desc->chip->ack(irq);
Expand Down Expand Up @@ -312,7 +312,7 @@ void __init at91_gpio_irq_setup(unsigned banks)
__raw_writel(~0, controller + PIO_IDR);

set_irq_data(id, (void *) pin);
set_irq_chipdata(id, (void __force *) controller);
set_irq_chipdata(id, controller);

for (i = 0; i < 32; i++, pin++) {
set_irq_chip(pin, &gpio_irqchip);
Expand Down
6 changes: 3 additions & 3 deletions trunk/include/asm-arm/mach/irq.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ struct irqdesc {
struct irqchip *chip;
struct irqaction *action;
struct list_head pend;
void *chipdata;
void __iomem *base;
void *data;
unsigned int disable_depth;

Expand Down Expand Up @@ -113,8 +113,8 @@ void __set_irq_handler(unsigned int irq, irq_handler_t, int);
#define set_irq_handler(irq,handler) __set_irq_handler(irq,handler,0)
#define set_irq_chained_handler(irq,handler) __set_irq_handler(irq,handler,1)
#define set_irq_data(irq,d) do { irq_desc[irq].data = d; } while (0)
#define set_irq_chipdata(irq,d) do { irq_desc[irq].chipdata = d; } while (0)
#define get_irq_chipdata(irq) (irq_desc[irq].chipdata)
#define set_irq_chipdata(irq,d) do { irq_desc[irq].base = d; } while (0)
#define get_irq_chipdata(irq) (irq_desc[irq].base)

void set_irq_chip(unsigned int irq, struct irqchip *);
void set_irq_flags(unsigned int irq, unsigned int flags);
Expand Down

0 comments on commit ce86ecd

Please sign in to comment.