Commit 070276d5 authored by Ben Dooks's avatar Ben Dooks

[ARM] S3C24XX: GPIO: Change to macros for GPIO numbering

Prepare to remove the large number of S3C2410_GPxn defines
by moving to S3C2410_GPx(n) in arch/arm.

The following perl was used to change the files:

    perl -pi~ -e 's/S3C2410_GP([A-Z])([0-9]+)([^_^0-9])/S3C2410_GP\1\(\2\)\3/g'
Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 75cbcff3
...@@ -51,7 +51,7 @@ PIN Numbers ...@@ -51,7 +51,7 @@ PIN Numbers
----------- -----------
Each pin has an unique number associated with it in regs-gpio.h, Each pin has an unique number associated with it in regs-gpio.h,
eg S3C2410_GPA0 or S3C2410_GPF1. These defines are used to tell eg S3C2410_GPA(0) or S3C2410_GPF(1). These defines are used to tell
the GPIO functions which pin is to be used. the GPIO functions which pin is to be used.
...@@ -65,11 +65,11 @@ Configuring a pin ...@@ -65,11 +65,11 @@ Configuring a pin
Eg: Eg:
s3c2410_gpio_cfgpin(S3C2410_GPA0, S3C2410_GPA0_ADDR0); s3c2410_gpio_cfgpin(S3C2410_GPA(0), S3C2410_GPA0_ADDR0);
s3c2410_gpio_cfgpin(S3C2410_GPE8, S3C2410_GPE8_SDDAT1); s3c2410_gpio_cfgpin(S3C2410_GPE(8), S3C2410_GPE8_SDDAT1);
which would turn GPA0 into the lowest Address line A0, and set which would turn GPA(0) into the lowest Address line A0, and set
GPE8 to be connected to the SDIO/MMC controller's SDDAT1 line. GPE(8) to be connected to the SDIO/MMC controller's SDDAT1 line.
Reading the current configuration Reading the current configuration
......
...@@ -33,10 +33,10 @@ ...@@ -33,10 +33,10 @@
int s3c2400_gpio_getirq(unsigned int pin) int s3c2400_gpio_getirq(unsigned int pin)
{ {
if (pin < S3C2410_GPE0 || pin > S3C2400_GPE7_EINT7) if (pin < S3C2410_GPE(0) || pin > S3C2400_GPE7_EINT7)
return -1; /* not valid interrupts */ return -1; /* not valid interrupts */
return (pin - S3C2410_GPE0) + IRQ_EINT0; return (pin - S3C2410_GPE(0)) + IRQ_EINT0;
} }
EXPORT_SYMBOL(s3c2400_gpio_getirq); EXPORT_SYMBOL(s3c2400_gpio_getirq);
...@@ -39,12 +39,12 @@ int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on, ...@@ -39,12 +39,12 @@ int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on,
unsigned long flags; unsigned long flags;
unsigned long val; unsigned long val;
if (pin < S3C2410_GPG8 || pin > S3C2410_GPG15) if (pin < S3C2410_GPG(8) || pin > S3C2410_GPG(15))
return -1; return -1;
config &= 0xff; config &= 0xff;
pin -= S3C2410_GPG8; pin -= S3C2410_GPG(8);
reg += pin & ~3; reg += pin & ~3;
local_irq_save(flags); local_irq_save(flags);
......
...@@ -43,9 +43,9 @@ static void h1940bt_enable(int on) ...@@ -43,9 +43,9 @@ static void h1940bt_enable(int on)
h1940_latch_control(0, H1940_LATCH_BLUETOOTH_POWER); h1940_latch_control(0, H1940_LATCH_BLUETOOTH_POWER);
/* Reset the chip */ /* Reset the chip */
mdelay(10); mdelay(10);
s3c2410_gpio_setpin(S3C2410_GPH1, 1); s3c2410_gpio_setpin(S3C2410_GPH(1), 1);
mdelay(10); mdelay(10);
s3c2410_gpio_setpin(S3C2410_GPH1, 0); s3c2410_gpio_setpin(S3C2410_GPH(1), 0);
state = 1; state = 1;
} }
...@@ -54,9 +54,9 @@ static void h1940bt_enable(int on) ...@@ -54,9 +54,9 @@ static void h1940bt_enable(int on)
led_trigger_event(bt_led_trigger, 0); led_trigger_event(bt_led_trigger, 0);
#endif #endif
s3c2410_gpio_setpin(S3C2410_GPH1, 1); s3c2410_gpio_setpin(S3C2410_GPH(1), 1);
mdelay(10); mdelay(10);
s3c2410_gpio_setpin(S3C2410_GPH1, 0); s3c2410_gpio_setpin(S3C2410_GPH(1), 0);
mdelay(10); mdelay(10);
h1940_latch_control(H1940_LATCH_BLUETOOTH_POWER, 0); h1940_latch_control(H1940_LATCH_BLUETOOTH_POWER, 0);
...@@ -89,14 +89,14 @@ static DEVICE_ATTR(enable, 0644, ...@@ -89,14 +89,14 @@ static DEVICE_ATTR(enable, 0644,
static int __init h1940bt_probe(struct platform_device *pdev) static int __init h1940bt_probe(struct platform_device *pdev)
{ {
/* Configures BT serial port GPIOs */ /* Configures BT serial port GPIOs */
s3c2410_gpio_cfgpin(S3C2410_GPH0, S3C2410_GPH0_nCTS0); s3c2410_gpio_cfgpin(S3C2410_GPH(0), S3C2410_GPH0_nCTS0);
s3c2410_gpio_pullup(S3C2410_GPH0, 1); s3c2410_gpio_pullup(S3C2410_GPH(0), 1);
s3c2410_gpio_cfgpin(S3C2410_GPH1, S3C2410_GPIO_OUTPUT); s3c2410_gpio_cfgpin(S3C2410_GPH(1), S3C2410_GPIO_OUTPUT);
s3c2410_gpio_pullup(S3C2410_GPH1, 1); s3c2410_gpio_pullup(S3C2410_GPH(1), 1);
s3c2410_gpio_cfgpin(S3C2410_GPH2, S3C2410_GPH2_TXD0); s3c2410_gpio_cfgpin(S3C2410_GPH(2), S3C2410_GPH2_TXD0);
s3c2410_gpio_pullup(S3C2410_GPH2, 1); s3c2410_gpio_pullup(S3C2410_GPH(2), 1);
s3c2410_gpio_cfgpin(S3C2410_GPH3, S3C2410_GPH3_RXD0); s3c2410_gpio_cfgpin(S3C2410_GPH(3), S3C2410_GPH3_RXD0);
s3c2410_gpio_pullup(S3C2410_GPH3, 1); s3c2410_gpio_pullup(S3C2410_GPH(3), 1);
#ifdef CONFIG_LEDS_H1940 #ifdef CONFIG_LEDS_H1940
led_trigger_register_simple("h1940-bluetooth", &bt_led_trigger); led_trigger_register_simple("h1940-bluetooth", &bt_led_trigger);
......
...@@ -24,7 +24,7 @@ static inline struct s3c_gpio_chip *s3c_gpiolib_getchip(unsigned int pin) ...@@ -24,7 +24,7 @@ static inline struct s3c_gpio_chip *s3c_gpiolib_getchip(unsigned int pin)
{ {
struct s3c_gpio_chip *chip; struct s3c_gpio_chip *chip;
if (pin > S3C2410_GPG10) if (pin > S3C2410_GPG(10))
return NULL; return NULL;
chip = &s3c24xx_gpios[pin/32]; chip = &s3c24xx_gpios[pin/32];
......
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
* set the configuration of the given pin to the value passed. * set the configuration of the given pin to the value passed.
* *
* eg: * eg:
* s3c2410_gpio_cfgpin(S3C2410_GPA0, S3C2410_GPA0_ADDR0); * s3c2410_gpio_cfgpin(S3C2410_GPA(0), S3C2410_GPA0_ADDR0);
* s3c2410_gpio_cfgpin(S3C2410_GPE8, S3C2410_GPE8_SDDAT1); * s3c2410_gpio_cfgpin(S3C2410_GPE(8), S3C2410_GPE8_SDDAT1);
*/ */
extern void s3c2410_gpio_cfgpin(unsigned int pin, unsigned int function); extern void s3c2410_gpio_cfgpin(unsigned int pin, unsigned int function);
...@@ -80,8 +80,8 @@ extern int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on, ...@@ -80,8 +80,8 @@ extern int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on,
* *
* eg; * eg;
* *
* s3c2410_gpio_pullup(S3C2410_GPB0, 0); * s3c2410_gpio_pullup(S3C2410_GPB(0), 0);
* s3c2410_gpio_pullup(S3C2410_GPE8, 0); * s3c2410_gpio_pullup(S3C2410_GPE(8), 0);
*/ */
extern void s3c2410_gpio_pullup(unsigned int pin, unsigned int to); extern void s3c2410_gpio_pullup(unsigned int pin, unsigned int to);
......
...@@ -68,5 +68,26 @@ enum s3c_gpio_number { ...@@ -68,5 +68,26 @@ enum s3c_gpio_number {
#define S3C2410_GPG(_nr) (S3C2410_GPIO_G_START + (_nr)) #define S3C2410_GPG(_nr) (S3C2410_GPIO_G_START + (_nr))
#define S3C2410_GPH(_nr) (S3C2410_GPIO_H_START + (_nr)) #define S3C2410_GPH(_nr) (S3C2410_GPIO_H_START + (_nr))
/* compatibility until drivers can be modified */
#define S3C2410_GPA0 S3C2410_GPA(0)
#define S3C2410_GPA1 S3C2410_GPA(1)
#define S3C2410_GPA3 S3C2410_GPA(3)
#define S3C2410_GPA7 S3C2410_GPA(7)
#define S3C2410_GPE0 S3C2410_GPE(0)
#define S3C2410_GPE1 S3C2410_GPE(1)
#define S3C2410_GPE2 S3C2410_GPE(2)
#define S3C2410_GPE3 S3C2410_GPE(3)
#define S3C2410_GPE4 S3C2410_GPE(4)
#define S3C2410_GPE5 S3C2410_GPE(5)
#define S3C2410_GPE6 S3C2410_GPE(6)
#define S3C2410_GPE7 S3C2410_GPE(7)
#define S3C2410_GPE8 S3C2410_GPE(8)
#define S3C2410_GPE9 S3C2410_GPE(9)
#define S3C2410_GPE10 S3C2410_GPE(10)
#define S3C2410_GPH10 S3C2410_GPH(10)
#endif /* __MACH_GPIONRS_H */ #endif /* __MACH_GPIONRS_H */
...@@ -225,8 +225,8 @@ static void amlm5900_init_pm(void) ...@@ -225,8 +225,8 @@ static void amlm5900_init_pm(void)
} else { } else {
enable_irq_wake(IRQ_EINT9); enable_irq_wake(IRQ_EINT9);
/* configure the suspend/resume status pin */ /* configure the suspend/resume status pin */
s3c2410_gpio_cfgpin(S3C2410_GPF2, S3C2410_GPIO_OUTPUT); s3c2410_gpio_cfgpin(S3C2410_GPF(2), S3C2410_GPIO_OUTPUT);
s3c2410_gpio_pullup(S3C2410_GPF2, 0); s3c2410_gpio_pullup(S3C2410_GPF(2), 0);
} }
} }
static void __init amlm5900_init(void) static void __init amlm5900_init(void)
......
...@@ -213,15 +213,15 @@ static struct s3c2410_uartcfg bast_uartcfgs[] __initdata = { ...@@ -213,15 +213,15 @@ static struct s3c2410_uartcfg bast_uartcfgs[] __initdata = {
static int bast_pm_suspend(struct sys_device *sd, pm_message_t state) static int bast_pm_suspend(struct sys_device *sd, pm_message_t state)
{ {
/* ensure that an nRESET is not generated on resume. */ /* ensure that an nRESET is not generated on resume. */
s3c2410_gpio_setpin(S3C2410_GPA21, 1); s3c2410_gpio_setpin(S3C2410_GPA(21), 1);
s3c2410_gpio_cfgpin(S3C2410_GPA21, S3C2410_GPIO_OUTPUT); s3c2410_gpio_cfgpin(S3C2410_GPA(21), S3C2410_GPIO_OUTPUT);
return 0; return 0;
} }
static int bast_pm_resume(struct sys_device *sd) static int bast_pm_resume(struct sys_device *sd)
{ {
s3c2410_gpio_cfgpin(S3C2410_GPA21, S3C2410_GPA21_nRSTOUT); s3c2410_gpio_cfgpin(S3C2410_GPA(21), S3C2410_GPA21_nRSTOUT);
return 0; return 0;
} }
......
...@@ -127,7 +127,7 @@ static void h1940_udc_pullup(enum s3c2410_udc_cmd_e cmd) ...@@ -127,7 +127,7 @@ static void h1940_udc_pullup(enum s3c2410_udc_cmd_e cmd)
static struct s3c2410_udc_mach_info h1940_udc_cfg __initdata = { static struct s3c2410_udc_mach_info h1940_udc_cfg __initdata = {
.udc_command = h1940_udc_pullup, .udc_command = h1940_udc_pullup,
.vbus_pin = S3C2410_GPG5, .vbus_pin = S3C2410_GPG(5),
.vbus_pin_inverted = 1, .vbus_pin_inverted = 1,
}; };
......
...@@ -86,10 +86,10 @@ static void n30_udc_pullup(enum s3c2410_udc_cmd_e cmd) ...@@ -86,10 +86,10 @@ static void n30_udc_pullup(enum s3c2410_udc_cmd_e cmd)
{ {
switch (cmd) { switch (cmd) {
case S3C2410_UDC_P_ENABLE : case S3C2410_UDC_P_ENABLE :
s3c2410_gpio_setpin(S3C2410_GPB3, 1); s3c2410_gpio_setpin(S3C2410_GPB(3), 1);
break; break;
case S3C2410_UDC_P_DISABLE : case S3C2410_UDC_P_DISABLE :
s3c2410_gpio_setpin(S3C2410_GPB3, 0); s3c2410_gpio_setpin(S3C2410_GPB(3), 0);
break; break;
case S3C2410_UDC_P_RESET : case S3C2410_UDC_P_RESET :
break; break;
...@@ -100,55 +100,55 @@ static void n30_udc_pullup(enum s3c2410_udc_cmd_e cmd) ...@@ -100,55 +100,55 @@ static void n30_udc_pullup(enum s3c2410_udc_cmd_e cmd)
static struct s3c2410_udc_mach_info n30_udc_cfg __initdata = { static struct s3c2410_udc_mach_info n30_udc_cfg __initdata = {
.udc_command = n30_udc_pullup, .udc_command = n30_udc_pullup,
.vbus_pin = S3C2410_GPG1, .vbus_pin = S3C2410_GPG(1),
.vbus_pin_inverted = 0, .vbus_pin_inverted = 0,
}; };
static struct gpio_keys_button n30_buttons[] = { static struct gpio_keys_button n30_buttons[] = {
{ {
.gpio = S3C2410_GPF0, .gpio = S3C2410_GPF(0),
.code = KEY_POWER, .code = KEY_POWER,
.desc = "Power", .desc = "Power",
.active_low = 0, .active_low = 0,
}, },
{ {
.gpio = S3C2410_GPG9, .gpio = S3C2410_GPG(9),
.code = KEY_UP, .code = KEY_UP,
.desc = "Thumbwheel Up", .desc = "Thumbwheel Up",
.active_low = 0, .active_low = 0,
}, },
{ {
.gpio = S3C2410_GPG8, .gpio = S3C2410_GPG(8),
.code = KEY_DOWN, .code = KEY_DOWN,
.desc = "Thumbwheel Down", .desc = "Thumbwheel Down",
.active_low = 0, .active_low = 0,
}, },
{ {
.gpio = S3C2410_GPG7, .gpio = S3C2410_GPG(7),
.code = KEY_ENTER, .code = KEY_ENTER,
.desc = "Thumbwheel Press", .desc = "Thumbwheel Press",
.active_low = 0, .active_low = 0,
}, },
{ {
.gpio = S3C2410_GPF7, .gpio = S3C2410_GPF(7),
.code = KEY_HOMEPAGE, .code = KEY_HOMEPAGE,
.desc = "Home", .desc = "Home",
.active_low = 0, .active_low = 0,
}, },
{ {
.gpio = S3C2410_GPF6, .gpio = S3C2410_GPF(6),
.code = KEY_CALENDAR, .code = KEY_CALENDAR,
.desc = "Calendar", .desc = "Calendar",
.active_low = 0, .active_low = 0,
}, },
{ {
.gpio = S3C2410_GPF5, .gpio = S3C2410_GPF(5),
.code = KEY_ADDRESSBOOK, .code = KEY_ADDRESSBOOK,
.desc = "Contacts", .desc = "Contacts",
.active_low = 0, .active_low = 0,
}, },
{ {
.gpio = S3C2410_GPF4, .gpio = S3C2410_GPF(4),
.code = KEY_MAIL, .code = KEY_MAIL,
.desc = "Mail", .desc = "Mail",
.active_low = 0, .active_low = 0,
...@@ -170,73 +170,73 @@ static struct platform_device n30_button_device = { ...@@ -170,73 +170,73 @@ static struct platform_device n30_button_device = {
static struct gpio_keys_button n35_buttons[] = { static struct gpio_keys_button n35_buttons[] = {
{ {
.gpio = S3C2410_GPF0, .gpio = S3C2410_GPF(0),
.code = KEY_POWER, .code = KEY_POWER,
.desc = "Power", .desc = "Power",
.active_low = 0, .active_low = 0,
}, },
{ {
.gpio = S3C2410_GPG9, .gpio = S3C2410_GPG(9),
.code = KEY_UP, .code = KEY_UP,
.desc = "Joystick Up", .desc = "Joystick Up",
.active_low = 0, .active_low = 0,
}, },
{ {
.gpio = S3C2410_GPG8, .gpio = S3C2410_GPG(8),
.code = KEY_DOWN, .code = KEY_DOWN,
.desc = "Joystick Down", .desc = "Joystick Down",
.active_low = 0, .active_low = 0,
}, },
{ {
.gpio = S3C2410_GPG6, .gpio = S3C2410_GPG(6),
.code = KEY_DOWN, .code = KEY_DOWN,
.desc = "Joystick Left", .desc = "Joystick Left",
.active_low = 0, .active_low = 0,
}, },
{ {
.gpio = S3C2410_GPG5, .gpio = S3C2410_GPG(5),
.code = KEY_DOWN, .code = KEY_DOWN,
.desc = "Joystick Right", .desc = "Joystick Right",
.active_low = 0, .active_low = 0,
}, },
{ {
.gpio = S3C2410_GPG7, .gpio = S3C2410_GPG(7),
.code = KEY_ENTER, .code = KEY_ENTER,
.desc = "Joystick Press", .desc = "Joystick Press",
.active_low = 0, .active_low = 0,
}, },
{ {
.gpio = S3C2410_GPF7, .gpio = S3C2410_GPF(7),
.code = KEY_HOMEPAGE, .code = KEY_HOMEPAGE,
.desc = "Home", .desc = "Home",
.active_low = 0, .active_low = 0,
}, },
{ {
.gpio = S3C2410_GPF6, .gpio = S3C2410_GPF(6),
.code = KEY_CALENDAR, .code = KEY_CALENDAR,
.desc = "Calendar", .desc = "Calendar",
.active_low = 0, .active_low = 0,
}, },
{ {
.gpio = S3C2410_GPF5, .gpio = S3C2410_GPF(5),
.code = KEY_ADDRESSBOOK, .code = KEY_ADDRESSBOOK,
.desc = "Contacts", .desc = "Contacts",
.active_low = 0, .active_low = 0,
}, },
{ {
.gpio = S3C2410_GPF4, .gpio = S3C2410_GPF(4),
.code = KEY_MAIL, .code = KEY_MAIL,
.desc = "Mail", .desc = "Mail",
.active_low = 0, .active_low = 0,
}, },
{ {
.gpio = S3C2410_GPF3, .gpio = S3C2410_GPF(3),
.code = SW_RADIO, .code = SW_RADIO,
.desc = "GPS Antenna", .desc = "GPS Antenna",
.active_low = 0, .active_low = 0,
}, },
{ {
.gpio = S3C2410_GPG2, .gpio = S3C2410_GPG(2),
.code = SW_HEADPHONE_INSERT, .code = SW_HEADPHONE_INSERT,
.desc = "Headphone", .desc = "Headphone",
.active_low = 0, .active_low = 0,
...@@ -260,7 +260,7 @@ static struct platform_device n35_button_device = { ...@@ -260,7 +260,7 @@ static struct platform_device n35_button_device = {
/* This is the bluetooth LED on the device. */ /* This is the bluetooth LED on the device. */
static struct s3c24xx_led_platdata n30_blue_led_pdata = { static struct s3c24xx_led_platdata n30_blue_led_pdata = {
.name = "blue_led", .name = "blue_led",
.gpio = S3C2410_GPG6, .gpio = S3C2410_GPG(6),
.def_trigger = "", .def_trigger = "",
}; };
...@@ -271,7 +271,7 @@ static struct s3c24xx_led_platdata n30_blue_led_pdata = { ...@@ -271,7 +271,7 @@ static struct s3c24xx_led_platdata n30_blue_led_pdata = {
static struct s3c24xx_led_platdata n30_warning_led_pdata = { static struct s3c24xx_led_platdata n30_warning_led_pdata = {
.name = "warning_led", .name = "warning_led",
.flags = S3C24XX_LEDF_ACTLOW, .flags = S3C24XX_LEDF_ACTLOW,
.gpio = S3C2410_GPD9, .gpio = S3C2410_GPD(9),
.def_trigger = "", .def_trigger = "",
}; };
......
...@@ -199,7 +199,7 @@ static struct platform_device qt2410_cs89x0 = { ...@@ -199,7 +199,7 @@ static struct platform_device qt2410_cs89x0 = {
/* LED */ /* LED */
static struct s3c24xx_led_platdata qt2410_pdata_led = { static struct s3c24xx_led_platdata qt2410_pdata_led = {
.gpio = S3C2410_GPB0, .gpio = S3C2410_GPB(0),
.flags = S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE, .flags = S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE,
.name = "led", .name = "led",
.def_trigger = "timer", .def_trigger = "timer",
...@@ -219,18 +219,18 @@ static void spi_gpio_cs(struct s3c2410_spigpio_info *spi, int cs) ...@@ -219,18 +219,18 @@ static void spi_gpio_cs(struct s3c2410_spigpio_info *spi, int cs)
{ {
switch (cs) { switch (cs) {
case BITBANG_CS_ACTIVE: case BITBANG_CS_ACTIVE:
s3c2410_gpio_setpin(S3C2410_GPB5, 0); s3c2410_gpio_setpin(S3C2410_GPB(5), 0);
break; break;
case BITBANG_CS_INACTIVE: case BITBANG_CS_INACTIVE:
s3c2410_gpio_setpin(S3C2410_GPB5, 1); s3c2410_gpio_setpin(S3C2410_GPB(5), 1);
break; break;
} }
} }
static struct s3c2410_spigpio_info spi_gpio_cfg = { static struct s3c2410_spigpio_info spi_gpio_cfg = {
.pin_clk = S3C2410_GPG7, .pin_clk = S3C2410_GPG(7),
.pin_mosi = S3C2410_GPG6, .pin_mosi = S3C2410_GPG(6),
.pin_miso = S3C2410_GPG5, .pin_miso = S3C2410_GPG(5),
.chip_select = &spi_gpio_cs, .chip_select = &spi_gpio_cs,
}; };
...@@ -347,13 +347,13 @@ static void __init qt2410_machine_init(void) ...@@ -347,13 +347,13 @@ static void __init qt2410_machine_init(void)
} }
s3c24xx_fb_set_platdata(&qt2410_fb_info); s3c24xx_fb_set_platdata(&qt2410_fb_info);
s3c2410_gpio_cfgpin(S3C2410_GPB0, S3C2410_GPIO_OUTPUT); s3c2410_gpio_cfgpin(S3C2410_GPB(0), S3C2410_GPIO_OUTPUT);
s3c2410_gpio_setpin(S3C2410_GPB0, 1); s3c2410_gpio_setpin(S3C2410_GPB(0), 1);
s3c24xx_udc_set_platdata(&qt2410_udc_cfg); s3c24xx_udc_set_platdata(&qt2410_udc_cfg);
s3c_i2c0_set_platdata(NULL); s3c_i2c0_set_platdata(NULL);
s3c2410_gpio_cfgpin(S3C2410_GPB5, S3C2410_GPIO_OUTPUT); s3c2410_gpio_cfgpin(S3C2410_GPB(5), S3C2410_GPIO_OUTPUT);
platform_add_devices(qt2410_devices, ARRAY_SIZE(qt2410_devices)); platform_add_devices(qt2410_devices, ARRAY_SIZE(qt2410_devices));
s3c_pm_init(); s3c_pm_init();
......
...@@ -278,19 +278,19 @@ static struct platform_device vr1000_dm9k1 = { ...@@ -278,19 +278,19 @@ static struct platform_device vr1000_dm9k1 = {
static struct s3c24xx_led_platdata vr1000_led1_pdata = { static struct s3c24xx_led_platdata vr1000_led1_pdata = {
.name = "led1", .name = "led1",
.gpio = S3C2410_GPB0, .gpio = S3C2410_GPB(0),
.def_trigger = "", .def_trigger = "",
}; };
static struct s3c24xx_led_platdata vr1000_led2_pdata = { static struct s3c24xx_led_platdata vr1000_led2_pdata = {
.name = "led2", .name = "led2",
.gpio = S3C2410_GPB1, .gpio = S3C2410_GPB(1),
.def_trigger = "", .def_trigger = "",
}; };
static struct s3c24xx_led_platdata vr1000_led3_pdata = { static struct s3c24xx_led_platdata vr1000_led3_pdata = {
.name = "led3", .name = "led3",
.gpio = S3C2410_GPB2, .gpio = S3C2410_GPB(2),
.def_trigger = "", .def_trigger = "",
}; };
...@@ -356,8 +356,8 @@ static struct clk *vr1000_clocks[] __initdata = { ...@@ -356,8 +356,8 @@ static struct clk *vr1000_clocks[] __initdata = {
static void vr1000_power_off(void) static void vr1000_power_off(void)
{ {
s3c2410_gpio_cfgpin(S3C2410_GPB9, S3C2410_GPIO_OUTPUT); s3c2410_gpio_cfgpin(S3C2410_GPB(9), S3C2410_GPIO_OUTPUT);
s3c2410_gpio_setpin(S3C2410_GPB9, 1); s3c2410_gpio_setpin(S3C2410_GPB(9), 1);
} }
static void __init vr1000_map_io(void) static void __init vr1000_map_io(void)
......
...@@ -77,7 +77,7 @@ static void s3c2410_pm_prepare(void) ...@@ -77,7 +77,7 @@ static void s3c2410_pm_prepare(void)
} }
if ( machine_is_aml_m5900() ) if ( machine_is_aml_m5900() )
s3c2410_gpio_setpin(S3C2410_GPF2, 1); s3c2410_gpio_setpin(S3C2410_GPF(2), 1);
} }
...@@ -92,7 +92,7 @@ static int s3c2410_pm_resume(struct sys_device *dev) ...@@ -92,7 +92,7 @@ static int s3c2410_pm_resume(struct sys_device *dev)
__raw_writel(tmp, S3C2410_GSTATUS2); __raw_writel(tmp, S3C2410_GSTATUS2);
if ( machine_is_aml_m5900() ) if ( machine_is_aml_m5900() )
s3c2410_gpio_setpin(S3C2410_GPF2, 0); s3c2410_gpio_setpin(S3C2410_GPF(2), 0);
return 0; return 0;
} }
......
...@@ -54,9 +54,9 @@ usb_simtec_powercontrol(int port, int to) ...@@ -54,9 +54,9 @@ usb_simtec_powercontrol(int port, int to)
power_state[port] = to; power_state[port] = to;
if (power_state[0] && power_state[1]) if (power_state[0] && power_state[1])
s3c2410_gpio_setpin(S3C2410_GPB4, 0); s3c2410_gpio_setpin(S3C2410_GPB(4), 0);
else else
s3c2410_gpio_setpin(S3C2410_GPB4, 1); s3c2410_gpio_setpin(S3C2410_GPB(4), 1);
} }
static irqreturn_t static irqreturn_t
...@@ -64,7 +64,7 @@ usb_simtec_ocirq(int irq, void *pw) ...@@ -64,7 +64,7 @@ usb_simtec_ocirq(int irq, void *pw)
{ {
struct s3c2410_hcd_info *info = pw; struct s3c2410_hcd_info *info = pw;
if (s3c2410_gpio_getpin(S3C2410_GPG10) == 0) { if (s3c2410_gpio_getpin(S3C2410_GPG(10)) == 0) {
pr_debug("usb_simtec: over-current irq (oc detected)\n"); pr_debug("usb_simtec: over-current irq (oc detected)\n");
s3c2410_usb_report_oc(info, 3); s3c2410_usb_report_oc(info, 3);
} else { } else {
...@@ -110,7 +110,7 @@ int usb_simtec_init(void) ...@@ -110,7 +110,7 @@ int usb_simtec_init(void)
printk("USB Power Control, (c) 2004 Simtec Electronics\n"); printk("USB Power Control, (c) 2004 Simtec Electronics\n");
s3c_device_usb.dev.platform_data = &usb_simtec_info; s3c_device_usb.dev.platform_data = &usb_simtec_info;
s3c2410_gpio_cfgpin(S3C2410_GPB4, S3C2410_GPIO_OUTPUT); s3c2410_gpio_cfgpin(S3C2410_GPB(4), S3C2410_GPIO_OUTPUT);
s3c2410_gpio_setpin(S3C2410_GPB4, 1); s3c2410_gpio_setpin(S3C2410_GPB(4), 1);
return 0; return 0;
} }
...@@ -357,8 +357,8 @@ static void jive_lcm_reset(unsigned int set) ...@@ -357,8 +357,8 @@ static void jive_lcm_reset(unsigned int set)
{ {
printk(KERN_DEBUG "%s(%d)\n", __func__, set); printk(KERN_DEBUG "%s(%d)\n", __func__, set);
s3c2410_gpio_setpin(S3C2410_GPG13, set); s3c2410_gpio_setpin(S3C2410_GPG(13), set);
s3c2410_gpio_cfgpin(S3C2410_GPG13, S3C2410_GPIO_OUTPUT); s3c2410_gpio_cfgpin(S3C2410_GPG(13), S3C2410_GPIO_OUTPUT);
} }
#undef LCD_UPPER_MARGIN #undef LCD_UPPER_MARGIN
...@@ -391,13 +391,13 @@ static struct ili9320_platdata jive_lcm_config = { ...@@ -391,13 +391,13 @@ static struct ili9320_platdata jive_lcm_config = {
static void jive_lcd_spi_chipselect(struct s3c2410_spigpio_info *spi, int cs) static void jive_lcd_spi_chipselect(struct s3c2410_spigpio_info *spi, int cs)
{ {
s3c2410_gpio_setpin(S3C2410_GPB7, cs ? 0 : 1); s3c2410_gpio_setpin(S3C2410_GPB(7), cs ? 0 : 1);
} }
static struct s3c2410_spigpio_info jive_lcd_spi = { static struct s3c2410_spigpio_info jive_lcd_spi = {
.bus_num = 1, .bus_num = 1,
.pin_clk = S3C2410_GPG8, .pin_clk = S3C2410_GPG(8),
.pin_mosi = S3C2410_GPB8, .pin_mosi = S3C2410_GPB(8),
.num_chipselect = 1, .num_chipselect = 1,
.chip_select = jive_lcd_spi_chipselect, .chip_select = jive_lcd_spi_chipselect,
}; };
...@@ -413,13 +413,13 @@ static struct platform_device jive_device_lcdspi = { ...@@ -413,13 +413,13 @@ static struct platform_device jive_device_lcdspi = {
static void jive_wm8750_chipselect(struct s3c2410_spigpio_info *spi, int cs) static void jive_wm8750_chipselect(struct s3c2410_spigpio_info *spi, int cs)
{ {
s3c2410_gpio_setpin(S3C2410_GPH10, cs ? 0 : 1); s3c2410_gpio_setpin(S3C2410_GPH(10), cs ? 0 : 1);
} }
static struct s3c2410_spigpio_info jive_wm8750_spi = { static struct s3c2410_spigpio_info jive_wm8750_spi = {
.bus_num = 2, .bus_num = 2,
.pin_clk = S3C2410_GPB4, .pin_clk = S3C2410_GPB(4),
.pin_mosi = S3C2410_GPB9, .pin_mosi = S3C2410_GPB(9),
.num_chipselect = 1, .num_chipselect = 1,
.chip_select = jive_wm8750_chipselect, .chip_select = jive_wm8750_chipselect,
}; };
...@@ -480,7 +480,7 @@ static struct platform_device *jive_devices[] __initdata = { ...@@ -480,7 +480,7 @@ static struct platform_device *jive_devices[] __initdata = {
}; };
static struct s3c2410_udc_mach_info jive_udc_cfg __initdata = { static struct s3c2410_udc_mach_info jive_udc_cfg __initdata = {
.vbus_pin = S3C2410_GPG1, /* detect is on GPG1 */ .vbus_pin = S3C2410_GPG(1), /* detect is on GPG1 */
}; };
/* Jive power management device */ /* Jive power management device */
...@@ -530,8 +530,8 @@ static void jive_power_off(void) ...@@ -530,8 +530,8 @@ static void jive_power_off(void)
{ {
printk(KERN_INFO "powering system down...\n"); printk(KERN_INFO "powering system down...\n");
s3c2410_gpio_setpin(S3C2410_GPC5, 1); s3c2410_gpio_setpin(S3C2410_GPC(5), 1);
s3c2410_gpio_cfgpin(S3C2410_GPC5, S3C2410_GPIO_OUTPUT); s3c2410_gpio_cfgpin(S3C2410_GPC(5), S3C2410_GPIO_OUTPUT);
} }
static void __init jive_machine_init(void) static void __init jive_machine_init(void)
...@@ -635,22 +635,22 @@ static void __init jive_machine_init(void) ...@@ -635,22 +635,22 @@ static void __init jive_machine_init(void)
/* initialise the spi */ /* initialise the spi */
s3c2410_gpio_setpin(S3C2410_GPG13, 0); s3c2410_gpio_setpin(S3C2410_GPG(13), 0);
s3c2410_gpio_cfgpin(S3C2410_GPG13, S3C2410_GPIO_OUTPUT); s3c2410_gpio_cfgpin(S3C2410_GPG(13), S3C2410_GPIO_OUTPUT);
s3c2410_gpio_setpin(S3C2410_GPB7, 1); s3c2410_gpio_setpin(S3C2410_GPB(7), 1);
s3c2410_gpio_cfgpin(S3C2410_GPB7, S3C2410_GPIO_OUTPUT); s3c2410_gpio_cfgpin(S3C2410_GPB(7), S3C2410_GPIO_OUTPUT);
s3c2410_gpio_setpin(S3C2410_GPB6, 0); s3c2410_gpio_setpin(S3C2410_GPB(6), 0);
s3c2410_gpio_cfgpin(S3C2410_GPB6, S3C2410_GPIO_OUTPUT); s3c2410_gpio_cfgpin(S3C2410_GPB(6), S3C2410_GPIO_OUTPUT);
s3c2410_gpio_setpin(S3C2410_GPG8, 1); s3c2410_gpio_setpin(S3C2410_GPG(8), 1);
s3c2410_gpio_cfgpin(S3C2410_GPG8, S3C2410_GPIO_OUTPUT); s3c2410_gpio_cfgpin(S3C2410_GPG(8), S3C2410_GPIO_OUTPUT);
/* initialise the WM8750 spi */ /* initialise the WM8750 spi */
s3c2410_gpio_setpin(S3C2410_GPH10, 1); s3c2410_gpio_setpin(S3C2410_GPH(10), 1);
s3c2410_gpio_cfgpin(S3C2410_GPH10, S3C2410_GPIO_OUTPUT); s3c2410_gpio_cfgpin(S3C2410_GPH(10), S3C2410_GPIO_OUTPUT);
/* Turn off suspend on both USB ports, and switch the /* Turn off suspend on both USB ports, and switch the
* selectable USB port to USB device mode. */ * selectable USB port to USB device mode. */
......
...@@ -85,10 +85,10 @@ static void smdk2413_udc_pullup(enum s3c2410_udc_cmd_e cmd) ...@@ -85,10 +85,10 @@ static void smdk2413_udc_pullup(enum s3c2410_udc_cmd_e cmd)
switch (cmd) switch (cmd)
{ {
case S3C2410_UDC_P_ENABLE : case S3C2410_UDC_P_ENABLE :
s3c2410_gpio_setpin(S3C2410_GPF2, 1); s3c2410_gpio_setpin(S3C2410_GPF(2), 1);
break; break;
case S3C2410_UDC_P_DISABLE : case S3C2410_UDC_P_DISABLE :
s3c2410_gpio_setpin(S3C2410_GPF2, 0); s3c2410_gpio_setpin(S3C2410_GPF(2), 0);
break; break;
case S3C2410_UDC_P_RESET : case S3C2410_UDC_P_RESET :
break; break;
...@@ -135,8 +135,8 @@ static void __init smdk2413_machine_init(void) ...@@ -135,8 +135,8 @@ static void __init smdk2413_machine_init(void)
{ /* Turn off suspend on both USB ports, and switch the { /* Turn off suspend on both USB ports, and switch the
* selectable USB port to USB device mode. */ * selectable USB port to USB device mode. */
s3c2410_gpio_setpin(S3C2410_GPF2, 0); s3c2410_gpio_setpin(S3C2410_GPF(2), 0);
s3c2410_gpio_cfgpin(S3C2410_GPF2, S3C2410_GPIO_OUTPUT); s3c2410_gpio_cfgpin(S3C2410_GPF(2), S3C2410_GPIO_OUTPUT);
s3c2410_modify_misccr(S3C2410_MISCCR_USBHOST | s3c2410_modify_misccr(S3C2410_MISCCR_USBHOST |
S3C2410_MISCCR_USBSUSPND0 | S3C2410_MISCCR_USBSUSPND0 |
......
...@@ -469,7 +469,7 @@ static void __init anubis_map_io(void) ...@@ -469,7 +469,7 @@ static void __init anubis_map_io(void)
anubis_nand_sets[0].nr_partitions = ARRAY_SIZE(anubis_default_nand_part_large); anubis_nand_sets[0].nr_partitions = ARRAY_SIZE(anubis_default_nand_part_large);
} else { } else {
/* ensure that the GPIO is setup */ /* ensure that the GPIO is setup */
s3c2410_gpio_setpin(S3C2410_GPA0, 1); s3c2410_gpio_setpin(S3C2410_GPA(0), 1);
} }
} }
......
...@@ -166,7 +166,7 @@ static struct platform_device at2440evb_device_eth = { ...@@ -166,7 +166,7 @@ static struct platform_device at2440evb_device_eth = {
}; };
static struct s3c24xx_mci_pdata at2440evb_mci_pdata = { static struct s3c24xx_mci_pdata at2440evb_mci_pdata = {
.gpio_detect = S3C2410_GPG10, .gpio_detect = S3C2410_GPG(10),
}; };
/* 7" LCD panel */ /* 7" LCD panel */
......
...@@ -121,16 +121,16 @@ static struct platform_device *nexcoder_devices[] __initdata = { ...@@ -121,16 +121,16 @@ static struct platform_device *nexcoder_devices[] __initdata = {
static void __init nexcoder_sensorboard_init(void) static void __init nexcoder_sensorboard_init(void)
{ {
// Initialize SCCB bus // Initialize SCCB bus
s3c2410_gpio_setpin(S3C2410_GPE14, 1); // IICSCL s3c2410_gpio_setpin(S3C2410_GPE(14), 1); // IICSCL
s3c2410_gpio_cfgpin(S3C2410_GPE14, S3C2410_GPIO_OUTPUT); s3c2410_gpio_cfgpin(S3C2410_GPE(14), S3C2410_GPIO_OUTPUT);
s3c2410_gpio_setpin(S3C2410_GPE15, 1); // IICSDA s3c2410_gpio_setpin(S3C2410_GPE(15), 1); // IICSDA
s3c2410_gpio_cfgpin(S3C2410_GPE15, S3C2410_GPIO_OUTPUT); s3c2410_gpio_cfgpin(S3C2410_GPE(15), S3C2410_GPIO_OUTPUT);
// Power up the sensor board // Power up the sensor board
s3c2410_gpio_setpin(S3C2410_GPF1, 1); s3c2410_gpio_setpin(S3C2410_GPF(1), 1);
s3c2410_gpio_cfgpin(S3C2410_GPF1, S3C2410_GPIO_OUTPUT); // CAM_GPIO7 => nLDO_PWRDN s3c2410_gpio_cfgpin(S3C2410_GPF(1), S3C2410_GPIO_OUTPUT); // CAM_GPIO7 => nLDO_PWRDN
s3c2410_gpio_setpin(S3C2410_GPF2, 0); s3c2410_gpio_setpin(S3C2410_GPF(2), 0);
s3c2410_gpio_cfgpin(S3C2410_GPF2, S3C2410_GPIO_OUTPUT); // CAM_GPIO6 => CAM_PWRDN s3c2410_gpio_cfgpin(S3C2410_GPF(2), S3C2410_GPIO_OUTPUT); // CAM_GPIO6 => CAM_PWRDN
} }
static void __init nexcoder_map_io(void) static void __init nexcoder_map_io(void)
......
...@@ -292,8 +292,8 @@ static int osiris_pm_suspend(struct sys_device *sd, pm_message_t state) ...@@ -292,8 +292,8 @@ static int osiris_pm_suspend(struct sys_device *sd, pm_message_t state)
__raw_writeb(tmp, OSIRIS_VA_CTRL0); __raw_writeb(tmp, OSIRIS_VA_CTRL0);
/* ensure that an nRESET is not generated on resume. */ /* ensure that an nRESET is not generated on resume. */
s3c2410_gpio_setpin(S3C2410_GPA21, 1); s3c2410_gpio_setpin(S3C2410_GPA(21), 1);
s3c2410_gpio_cfgpin(S3C2410_GPA21, S3C2410_GPIO_OUTPUT); s3c2410_gpio_cfgpin(S3C2410_GPA(21), S3C2410_GPIO_OUTPUT);
return 0; return 0;
} }
...@@ -305,7 +305,7 @@ static int osiris_pm_resume(struct sys_device *sd) ...@@ -305,7 +305,7 @@ static int osiris_pm_resume(struct sys_device *sd)
__raw_writeb(pm_osiris_ctrl0, OSIRIS_VA_CTRL0); __raw_writeb(pm_osiris_ctrl0, OSIRIS_VA_CTRL0);
s3c2410_gpio_cfgpin(S3C2410_GPA21, S3C2410_GPA21_nRSTOUT); s3c2410_gpio_cfgpin(S3C2410_GPA(21), S3C2410_GPA21_nRSTOUT);
return 0; return 0;
} }
...@@ -385,7 +385,7 @@ static void __init osiris_map_io(void) ...@@ -385,7 +385,7 @@ static void __init osiris_map_io(void)
osiris_nand_sets[0].nr_partitions = ARRAY_SIZE(osiris_default_nand_part_large); osiris_nand_sets[0].nr_partitions = ARRAY_SIZE(osiris_default_nand_part_large);
} else { } else {
/* write-protect line to the NAND */ /* write-protect line to the NAND */
s3c2410_gpio_setpin(S3C2410_GPA0, 1); s3c2410_gpio_setpin(S3C2410_GPA(0), 1);
} }
/* fix bus configuration (nBE settings wrong on ABLE pre v2.20) */ /* fix bus configuration (nBE settings wrong on ABLE pre v2.20) */
......
...@@ -48,27 +48,27 @@ ...@@ -48,27 +48,27 @@
/* LED devices */ /* LED devices */
static struct s3c24xx_led_platdata smdk_pdata_led4 = { static struct s3c24xx_led_platdata smdk_pdata_led4 = {
.gpio = S3C2410_GPF4, .gpio = S3C2410_GPF(4),
.flags = S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE, .flags = S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE,
.name = "led4", .name = "led4",
.def_trigger = "timer", .def_trigger = "timer",
}; };
static struct s3c24xx_led_platdata smdk_pdata_led5 = { static struct s3c24xx_led_platdata smdk_pdata_led5 = {
.gpio = S3C2410_GPF5, .gpio = S3C2410_GPF(5),
.flags = S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE, .flags = S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE,
.name = "led5", .name = "led5",
.def_trigger = "nand-disk", .def_trigger = "nand-disk",
}; };
static struct s3c24xx_led_platdata smdk_pdata_led6 = { static struct s3c24xx_led_platdata smdk_pdata_led6 = {
.gpio = S3C2410_GPF6, .gpio = S3C2410_GPF(6),
.flags = S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE, .flags = S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE,
.name = "led6", .name = "led6",
}; };
static struct s3c24xx_led_platdata smdk_pdata_led7 = { static struct s3c24xx_led_platdata smdk_pdata_led7 = {
.gpio = S3C2410_GPF7, .gpio = S3C2410_GPF(7),
.flags = S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE, .flags = S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE,
.name = "led7", .name = "led7",
}; };
...@@ -185,15 +185,15 @@ void __init smdk_machine_init(void) ...@@ -185,15 +185,15 @@ void __init smdk_machine_init(void)
{ {
/* Configure the LEDs (even if we have no LED support)*/ /* Configure the LEDs (even if we have no LED support)*/
s3c2410_gpio_cfgpin(S3C2410_GPF4, S3C2410_GPIO_OUTPUT); s3c2410_gpio_cfgpin(S3C2410_GPF(4), S3C2410_GPIO_OUTPUT);
s3c2410_gpio_cfgpin(S3C2410_GPF5, S3C2410_GPIO_OUTPUT); s3c2410_gpio_cfgpin(S3C2410_GPF(5), S3C2410_GPIO_OUTPUT);
s3c2410_gpio_cfgpin(S3C2410_GPF6, S3C2410_GPIO_OUTPUT); s3c2410_gpio_cfgpin(S3C2410_GPF(6), S3C2410_GPIO_OUTPUT);
s3c2410_gpio_cfgpin(S3C2410_GPF7, S3C2410_GPIO_OUTPUT); s3c2410_gpio_cfgpin(S3C2410_GPF(7), S3C2410_GPIO_OUTPUT);
s3c2410_gpio_setpin(S3C2410_GPF4, 1); s3c2410_gpio_setpin(S3C2410_GPF(4), 1);
s3c2410_gpio_setpin(S3C2410_GPF5, 1); s3c2410_gpio_setpin(S3C2410_GPF(5), 1);
s3c2410_gpio_setpin(S3C2410_GPF6, 1); s3c2410_gpio_setpin(S3C2410_GPF(6), 1);
s3c2410_gpio_setpin(S3C2410_GPF7, 1); s3c2410_gpio_setpin(S3C2410_GPF(7), 1);
if (machine_is_smdk2443()) if (machine_is_smdk2443())
smdk_nand_info.twrph0 = 50; smdk_nand_info.twrph0 = 50;
......
...@@ -183,19 +183,19 @@ EXPORT_SYMBOL(s3c2410_modify_misccr); ...@@ -183,19 +183,19 @@ EXPORT_SYMBOL(s3c2410_modify_misccr);
int s3c2410_gpio_getirq(unsigned int pin) int s3c2410_gpio_getirq(unsigned int pin)
{ {
if (pin < S3C2410_GPF0 || pin > S3C2410_GPG15) if (pin < S3C2410_GPF(0) || pin > S3C2410_GPG(15))
return -1; /* not valid interrupts */ return -1; /* not valid interrupts */
if (pin < S3C2410_GPG0 && pin > S3C2410_GPF7) if (pin < S3C2410_GPG(0) && pin > S3C2410_GPF(7))
return -1; /* not valid pin */ return -1; /* not valid pin */
if (pin < S3C2410_GPF4) if (pin < S3C2410_GPF(4))
return (pin - S3C2410_GPF0) + IRQ_EINT0; return (pin - S3C2410_GPF(0)) + IRQ_EINT0;
if (pin < S3C2410_GPG0) if (pin < S3C2410_GPG(0))
return (pin - S3C2410_GPF4) + IRQ_EINT4; return (pin - S3C2410_GPF(4)) + IRQ_EINT4;
return (pin - S3C2410_GPG0) + IRQ_EINT8; return (pin - S3C2410_GPG(0)) + IRQ_EINT8;
} }
EXPORT_SYMBOL(s3c2410_gpio_getirq); EXPORT_SYMBOL(s3c2410_gpio_getirq);
...@@ -82,7 +82,7 @@ struct s3c_gpio_chip s3c24xx_gpios[] = { ...@@ -82,7 +82,7 @@ struct s3c_gpio_chip s3c24xx_gpios[] = {
.base = S3C2410_GPACON, .base = S3C2410_GPACON,
.pm = __gpio_pm(&s3c_gpio_pm_1bit), .pm = __gpio_pm(&s3c_gpio_pm_1bit),
.chip = { .chip = {
.base = S3C2410_GPA0, .base = S3C2410_GPA(0),
.owner = THIS_MODULE, .owner = THIS_MODULE,
.label = "GPIOA", .label = "GPIOA",
.ngpio = 24, .ngpio = 24,
...@@ -94,7 +94,7 @@ struct s3c_gpio_chip s3c24xx_gpios[] = { ...@@ -94,7 +94,7 @@ struct s3c_gpio_chip s3c24xx_gpios[] = {
.base = S3C2410_GPBCON, .base = S3C2410_GPBCON,
.pm = __gpio_pm(&s3c_gpio_pm_2bit), .pm = __gpio_pm(&s3c_gpio_pm_2bit),
.chip = { .chip = {
.base = S3C2410_GPB0, .base = S3C2410_GPB(0),
.owner = THIS_MODULE, .owner = THIS_MODULE,
.label = "GPIOB", .label = "GPIOB",
.ngpio = 16, .ngpio = 16,
...@@ -104,7 +104,7 @@ struct s3c_gpio_chip s3c24xx_gpios[] = { ...@@ -104,7 +104,7 @@ struct s3c_gpio_chip s3c24xx_gpios[] = {
.base = S3C2410_GPCCON, .base = S3C2410_GPCCON,
.pm = __gpio_pm(&s3c_gpio_pm_2bit), .pm = __gpio_pm(&s3c_gpio_pm_2bit),
.chip = { .chip = {
.base = S3C2410_GPC0, .base = S3C2410_GPC(0),
.owner = THIS_MODULE, .owner = THIS_MODULE,
.label = "GPIOC", .label = "GPIOC",
.ngpio = 16, .ngpio = 16,
...@@ -114,7 +114,7 @@ struct s3c_gpio_chip s3c24xx_gpios[] = { ...@@ -114,7 +114,7 @@ struct s3c_gpio_chip s3c24xx_gpios[] = {
.base = S3C2410_GPDCON, .base = S3C2410_GPDCON,
.pm = __gpio_pm(&s3c_gpio_pm_2bit), .pm = __gpio_pm(&s3c_gpio_pm_2bit),
.chip = { .chip = {
.base = S3C2410_GPD0, .base = S3C2410_GPD(0),
.owner = THIS_MODULE, .owner = THIS_MODULE,
.label = "GPIOD", .label = "GPIOD",
.ngpio = 16, .ngpio = 16,
...@@ -124,7 +124,7 @@ struct s3c_gpio_chip s3c24xx_gpios[] = { ...@@ -124,7 +124,7 @@ struct s3c_gpio_chip s3c24xx_gpios[] = {
.base = S3C2410_GPECON, .base = S3C2410_GPECON,
.pm = __gpio_pm(&s3c_gpio_pm_2bit), .pm = __gpio_pm(&s3c_gpio_pm_2bit),
.chip = { .chip = {
.base = S3C2410_GPE0, .base = S3C2410_GPE(0),
.label = "GPIOE", .label = "GPIOE",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.ngpio = 16, .ngpio = 16,
...@@ -134,7 +134,7 @@ struct s3c_gpio_chip s3c24xx_gpios[] = { ...@@ -134,7 +134,7 @@ struct s3c_gpio_chip s3c24xx_gpios[] = {
.base = S3C2410_GPFCON, .base = S3C2410_GPFCON,
.pm = __gpio_pm(&s3c_gpio_pm_2bit), .pm = __gpio_pm(&s3c_gpio_pm_2bit),
.chip = { .chip = {
.base = S3C2410_GPF0, .base = S3C2410_GPF(0),
.owner = THIS_MODULE, .owner = THIS_MODULE,
.label = "GPIOF", .label = "GPIOF",
.ngpio = 8, .ngpio = 8,
...@@ -145,7 +145,7 @@ struct s3c_gpio_chip s3c24xx_gpios[] = { ...@@ -145,7 +145,7 @@ struct s3c_gpio_chip s3c24xx_gpios[] = {
.base = S3C2410_GPGCON, .base = S3C2410_GPGCON,
.pm = __gpio_pm(&s3c_gpio_pm_2bit), .pm = __gpio_pm(&s3c_gpio_pm_2bit),
.chip = { .chip = {
.base = S3C2410_GPG0, .base = S3C2410_GPG(0),
.owner = THIS_MODULE, .owner = THIS_MODULE,
.label = "GPIOG", .label = "GPIOG",
.ngpio = 10, .ngpio = 10,
......
...@@ -124,12 +124,12 @@ void s3c_pm_configure_extint(void) ...@@ -124,12 +124,12 @@ void s3c_pm_configure_extint(void)
* and then configure it as an input if it is not * and then configure it as an input if it is not
*/ */
for (pin = S3C2410_GPF0; pin <= S3C2410_GPF7; pin++) { for (pin = S3C2410_GPF(0); pin <= S3C2410_GPF(7); pin++) {
s3c_pm_check_resume_pin(pin, pin - S3C2410_GPF0); s3c_pm_check_resume_pin(pin, pin - S3C2410_GPF(0));
} }
for (pin = S3C2410_GPG0; pin <= S3C2410_GPG7; pin++) { for (pin = S3C2410_GPG(0); pin <= S3C2410_GPG(7); pin++) {
s3c_pm_check_resume_pin(pin, (pin - S3C2410_GPG0)+8); s3c_pm_check_resume_pin(pin, (pin - S3C2410_GPG(0))+8);
} }
} }
......
...@@ -21,6 +21,6 @@ struct platform_device; ...@@ -21,6 +21,6 @@ struct platform_device;
void s3c_i2c0_cfg_gpio(struct platform_device *dev) void s3c_i2c0_cfg_gpio(struct platform_device *dev)
{ {
s3c2410_gpio_cfgpin(S3C2410_GPE15, S3C2410_GPE15_IICSDA); s3c2410_gpio_cfgpin(S3C2410_GPE(15), S3C2410_GPE15_IICSDA);
s3c2410_gpio_cfgpin(S3C2410_GPE14, S3C2410_GPE14_IICSCL); s3c2410_gpio_cfgpin(S3C2410_GPE(14), S3C2410_GPE14_IICSCL);
} }
...@@ -22,16 +22,16 @@ void s3c24xx_spi_gpiocfg_bus0_gpe11_12_13(struct s3c2410_spi_info *spi, ...@@ -22,16 +22,16 @@ void s3c24xx_spi_gpiocfg_bus0_gpe11_12_13(struct s3c2410_spi_info *spi,
int enable) int enable)
{ {
if (enable) { if (enable) {
s3c2410_gpio_cfgpin(S3C2410_GPE13, S3C2410_GPE13_SPICLK0); s3c2410_gpio_cfgpin(S3C2410_GPE(13), S3C2410_GPE13_SPICLK0);
s3c2410_gpio_cfgpin(S3C2410_GPE12, S3C2410_GPE12_SPIMOSI0); s3c2410_gpio_cfgpin(S3C2410_GPE(12), S3C2410_GPE12_SPIMOSI0);
s3c2410_gpio_cfgpin(S3C2410_GPE11, S3C2410_GPE11_SPIMISO0); s3c2410_gpio_cfgpin(S3C2410_GPE(11), S3C2410_GPE11_SPIMISO0);
s3c2410_gpio_pullup(S3C2410_GPE11, 0); s3c2410_gpio_pullup(S3C2410_GPE(11), 0);
s3c2410_gpio_pullup(S3C2410_GPE13, 0); s3c2410_gpio_pullup(S3C2410_GPE(13), 0);
} else { } else {
s3c2410_gpio_cfgpin(S3C2410_GPE13, S3C2410_GPIO_INPUT); s3c2410_gpio_cfgpin(S3C2410_GPE(13), S3C2410_GPIO_INPUT);
s3c2410_gpio_cfgpin(S3C2410_GPE11, S3C2410_GPIO_INPUT); s3c2410_gpio_cfgpin(S3C2410_GPE(11), S3C2410_GPIO_INPUT);
s3c2410_gpio_pullup(S3C2410_GPE11, 1); s3c2410_gpio_pullup(S3C2410_GPE(11), 1);
s3c2410_gpio_pullup(S3C2410_GPE12, 1); s3c2410_gpio_pullup(S3C2410_GPE(12), 1);
s3c2410_gpio_pullup(S3C2410_GPE13, 1); s3c2410_gpio_pullup(S3C2410_GPE(13), 1);
} }
} }
...@@ -22,16 +22,16 @@ void s3c24xx_spi_gpiocfg_bus1_gpg5_6_7(struct s3c2410_spi_info *spi, ...@@ -22,16 +22,16 @@ void s3c24xx_spi_gpiocfg_bus1_gpg5_6_7(struct s3c2410_spi_info *spi,
int enable) int enable)
{ {
if (enable) { if (enable) {
s3c2410_gpio_cfgpin(S3C2410_GPG7, S3C2410_GPG7_SPICLK1); s3c2410_gpio_cfgpin(S3C2410_GPG(7), S3C2410_GPG7_SPICLK1);
s3c2410_gpio_cfgpin(S3C2410_GPG6, S3C2410_GPG6_SPIMOSI1); s3c2410_gpio_cfgpin(S3C2410_GPG(6), S3C2410_GPG6_SPIMOSI1);
s3c2410_gpio_cfgpin(S3C2410_GPG5, S3C2410_GPG5_SPIMISO1); s3c2410_gpio_cfgpin(S3C2410_GPG(5), S3C2410_GPG5_SPIMISO1);
s3c2410_gpio_pullup(S3C2410_GPG5, 0); s3c2410_gpio_pullup(S3C2410_GPG(5), 0);
s3c2410_gpio_pullup(S3C2410_GPG6, 0); s3c2410_gpio_pullup(S3C2410_GPG(6), 0);
} else { } else {
s3c2410_gpio_cfgpin(S3C2410_GPG7, S3C2410_GPIO_INPUT); s3c2410_gpio_cfgpin(S3C2410_GPG(7), S3C2410_GPIO_INPUT);
s3c2410_gpio_cfgpin(S3C2410_GPG5, S3C2410_GPIO_INPUT); s3c2410_gpio_cfgpin(S3C2410_GPG(5), S3C2410_GPIO_INPUT);
s3c2410_gpio_pullup(S3C2410_GPG5, 1); s3c2410_gpio_pullup(S3C2410_GPG(5), 1);
s3c2410_gpio_pullup(S3C2410_GPG6, 1); s3c2410_gpio_pullup(S3C2410_GPG(6), 1);
s3c2410_gpio_pullup(S3C2410_GPG7, 1); s3c2410_gpio_pullup(S3C2410_GPG(7), 1);
} }
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment