From 27a483a5541cff1b1c3ff38b6cdb35c2d1a05a55 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E6=B2=88=E7=9D=BF=E6=B1=80?= Date: Fri, 30 Apr 2010 02:52:30 +0000 Subject: [PATCH] update for gpio --- arch/arm/mach-rk2818/board-midsdk.c | 16 ++++++++-------- arch/arm/mach-rk2818/gpio.c | 16 ++++++++-------- arch/arm/mach-rk2818/include/mach/gpio.h | 16 ++++++++-------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/arch/arm/mach-rk2818/board-midsdk.c b/arch/arm/mach-rk2818/board-midsdk.c index 97d89ccc18cc..36ef1d27cb1f 100644 --- a/arch/arm/mach-rk2818/board-midsdk.c +++ b/arch/arm/mach-rk2818/board-midsdk.c @@ -44,42 +44,42 @@ static struct rk2818_gpio_bank rk2818_gpioBank[] = { { - .id = AT2818_ID_PIOA, + .id = RK2818_ID_PIOA, .offset = RK2818_GPIO0_BASE, .clock = NULL, }, { - .id = AT2818_ID_PIOB, + .id = RK2818_ID_PIOB, .offset = RK2818_GPIO0_BASE, .clock = NULL, }, { - .id = AT2818_ID_PIOC, + .id = RK2818_ID_PIOC, .offset = RK2818_GPIO0_BASE, .clock = NULL, }, { - .id = AT2818_ID_PIOD, + .id = RK2818_ID_PIOD, .offset = RK2818_GPIO0_BASE, .clock = NULL, }, { - .id = AT2818_ID_PIOE, + .id = RK2818_ID_PIOE, .offset = RK2818_GPIO1_BASE, .clock = NULL, }, { - .id = AT2818_ID_PIOF, + .id = RK2818_ID_PIOF, .offset = RK2818_GPIO1_BASE, .clock = NULL, }, { - .id = AT2818_ID_PIOG, + .id = RK2818_ID_PIOG, .offset = RK2818_GPIO1_BASE, .clock = NULL, }, { - .id = AT2818_ID_PIOH, + .id = RK2818_ID_PIOH, .offset = RK2818_GPIO1_BASE, .clock = NULL, } diff --git a/arch/arm/mach-rk2818/gpio.c b/arch/arm/mach-rk2818/gpio.c index 920c4679be9e..6f7682c92a21 100644 --- a/arch/arm/mach-rk2818/gpio.c +++ b/arch/arm/mach-rk2818/gpio.c @@ -518,23 +518,23 @@ static int GPIOPullUpDown(struct gpio_chip *chip, unsigned int offset, eGPIOPull } mask1 = 0x03<<(2*offset+temp); mask2 = GPIOPullUpDown <<(2*offset+temp); - if(rk2818_gpio->bank->id==AT2818_ID_PIOA || rk2818_gpio->bank->id==AT2818_ID_PIOB) + if(rk2818_gpio->bank->id==RK2818_ID_PIOA || rk2818_gpio->bank->id==RK2818_ID_PIOB) { rk2818_gpio_bitOp(pAPBRegBase,GPIO0_AB_PU_CON,mask1,0); rk2818_gpio_bitOp(pAPBRegBase,GPIO0_AB_PU_CON,mask2,1); } - else if(rk2818_gpio->bank->id==AT2818_ID_PIOC || rk2818_gpio->bank->id==AT2818_ID_PIOD) + else if(rk2818_gpio->bank->id==RK2818_ID_PIOC || rk2818_gpio->bank->id==RK2818_ID_PIOD) { rk2818_gpio_bitOp(pAPBRegBase,GPIO0_CD_PU_CON,mask1,0); rk2818_gpio_bitOp(pAPBRegBase,GPIO0_CD_PU_CON,mask2,1); } - else if(rk2818_gpio->bank->id==AT2818_ID_PIOE || rk2818_gpio->bank->id==AT2818_ID_PIOF) + else if(rk2818_gpio->bank->id==RK2818_ID_PIOE || rk2818_gpio->bank->id==RK2818_ID_PIOF) { rk2818_gpio_bitOp(pAPBRegBase,GPIO1_AB_PU_CON,mask1,0); rk2818_gpio_bitOp(pAPBRegBase,GPIO1_AB_PU_CON,mask2,1); } - else if(rk2818_gpio->bank->id==AT2818_ID_PIOG|| rk2818_gpio->bank->id==AT2818_ID_PIOH) + else if(rk2818_gpio->bank->id==RK2818_ID_PIOG|| rk2818_gpio->bank->id==RK2818_ID_PIOH) { rk2818_gpio_bitOp(pAPBRegBase,GPIO1_CD_PU_CON,mask1,0); rk2818_gpio_bitOp(pAPBRegBase,GPIO1_CD_PU_CON,mask2,1); @@ -935,12 +935,12 @@ void __init rk2818_gpio_irq_setup(void) set_irq_handler(pin+j, handle_simple_irq); set_irq_flags(pin+j, IRQF_VALID); } - if(this->bank->id == AT2818_ID_PIOA) + if(this->bank->id == RK2818_ID_PIOA) { irq = IRQ_NR_GPIO0; } - else if(this->bank->id == AT2818_ID_PIOE) + else if(this->bank->id == RK2818_ID_PIOE) { irq = IRQ_NR_GPIO1; } @@ -1078,11 +1078,11 @@ static int rk2818_gpiolib_to_irq(struct gpio_chip *chip, { return -1; } - if(rk2818_gpio->bank->id==AT2818_ID_PIOA) + if(rk2818_gpio->bank->id==RK2818_ID_PIOA) { return offset + NR_AIC_IRQS; } - else if(rk2818_gpio->bank->id==AT2818_ID_PIOE) + else if(rk2818_gpio->bank->id==RK2818_ID_PIOE) { return offset + NR_AIC_IRQS + NUM_GROUP; } diff --git a/arch/arm/mach-rk2818/include/mach/gpio.h b/arch/arm/mach-rk2818/include/mach/gpio.h index 88f0a4cb872b..914e768d157e 100755 --- a/arch/arm/mach-rk2818/include/mach/gpio.h +++ b/arch/arm/mach-rk2818/include/mach/gpio.h @@ -83,14 +83,14 @@ struct rk2818_gpio_bank { #define GPIO_EXT_PORTD 0x5c #define GPIO_LS_SYNC 0x60 -#define AT2818_ID_PIOA 0 -#define AT2818_ID_PIOB 1 -#define AT2818_ID_PIOC 2 -#define AT2818_ID_PIOD 3 -#define AT2818_ID_PIOE 4 -#define AT2818_ID_PIOF 5 -#define AT2818_ID_PIOG 6 -#define AT2818_ID_PIOH 7 +#define RK2818_ID_PIOA 0 +#define RK2818_ID_PIOB 1 +#define RK2818_ID_PIOC 2 +#define RK2818_ID_PIOD 3 +#define RK2818_ID_PIOE 4 +#define RK2818_ID_PIOF 5 +#define RK2818_ID_PIOG 6 +#define RK2818_ID_PIOH 7 /* these pin numbers double as IRQ numbers, like RK2818xxx_ID_* values */ #define RK2818_PIN_PA0 (PIN_BASE + 0*NUM_GROUP + 0) -- 2.34.1