diff options
author | Ben Dooks <ben-linux@fluff.org> | 2009-05-13 16:46:15 -0400 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2009-05-17 17:21:26 -0400 |
commit | 9f05f6a921353f4293cda37f221b9bfa532d3c57 (patch) | |
tree | ea0a863a139765c5816260a07b3b1d2015f06d95 | |
parent | ec7f4d5d67ef63c724ab6d4bdc7d2ffa8861071a (diff) |
[ARM] S3C24XX: GPIO: Remove pin specific input and output defines
The use of S3C2410_GP[A-Z]x_INP and S3C2410_GP[A-Z]x_OUTP are
very rare and are taking up large amounts of space in the
regs-gpio.h header.
The GPIO layer has had generic input and out defines called
S3C2410_GPIO_INPUT and S3C2410_GPIO_OUTPUT for a while which work
for all S3C24XX GPIOs.
Do the following replacements:
S3C2410_GP[A-Z][0-9]*_\OUTP => S3C2410_GPIO_OUTPUT
S3C2410_GP[A-Z][0-9]*_\INP => /S3C2410_GPIO_INPUT
S3C2410_GPA[0-9]*_OUT => S3C2410_GPIO_OUTPUT
to remove any usages of these and prepare the header for
the removal of these.
The following command was used to acheive this:
find . -type f -writable ! -name regs-gpio.h ! -name "*~" | xargs sed -i~ -e 's/S3C2410_GP[A-Z][0-9]*_\OUTP/S3C2410_GPIO_OUTPUT/g' -e 's/S3C2410_GP[A-Z][0-9]*_\INP/S3C2410_GPIO_INPUT/g' -e 's/S3C2410_GPA[0-9]*_OUT/S3C2410_GPIO_OUTPUT/g'
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
-rw-r--r-- | arch/arm/mach-s3c2410/h1940-bluetooth.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/mach-amlm5900.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/mach-bast.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/mach-vr1000.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/usb-simtec.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2440/mach-nexcoder.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-s3c2440/mach-osiris.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/common-smdk.c | 8 |
8 files changed, 14 insertions, 14 deletions
diff --git a/arch/arm/mach-s3c2410/h1940-bluetooth.c b/arch/arm/mach-s3c2410/h1940-bluetooth.c index 5a6bc56f186b..1f332b38f15b 100644 --- a/arch/arm/mach-s3c2410/h1940-bluetooth.c +++ b/arch/arm/mach-s3c2410/h1940-bluetooth.c | |||
@@ -89,7 +89,7 @@ static int __init h1940bt_probe(struct platform_device *pdev) | |||
89 | /* Configures BT serial port GPIOs */ | 89 | /* Configures BT serial port GPIOs */ |
90 | s3c2410_gpio_cfgpin(S3C2410_GPH0, S3C2410_GPH0_nCTS0); | 90 | s3c2410_gpio_cfgpin(S3C2410_GPH0, S3C2410_GPH0_nCTS0); |
91 | s3c2410_gpio_pullup(S3C2410_GPH0, 1); | 91 | s3c2410_gpio_pullup(S3C2410_GPH0, 1); |
92 | s3c2410_gpio_cfgpin(S3C2410_GPH1, S3C2410_GPH1_OUTP); | 92 | s3c2410_gpio_cfgpin(S3C2410_GPH1, S3C2410_GPIO_OUTPUT); |
93 | s3c2410_gpio_pullup(S3C2410_GPH1, 1); | 93 | s3c2410_gpio_pullup(S3C2410_GPH1, 1); |
94 | s3c2410_gpio_cfgpin(S3C2410_GPH2, S3C2410_GPH2_TXD0); | 94 | s3c2410_gpio_cfgpin(S3C2410_GPH2, S3C2410_GPH2_TXD0); |
95 | s3c2410_gpio_pullup(S3C2410_GPH2, 1); | 95 | s3c2410_gpio_pullup(S3C2410_GPH2, 1); |
diff --git a/arch/arm/mach-s3c2410/mach-amlm5900.c b/arch/arm/mach-s3c2410/mach-amlm5900.c index 6d6995afeb43..79428ed789b2 100644 --- a/arch/arm/mach-s3c2410/mach-amlm5900.c +++ b/arch/arm/mach-s3c2410/mach-amlm5900.c | |||
@@ -224,7 +224,7 @@ static void amlm5900_init_pm(void) | |||
224 | } else { | 224 | } else { |
225 | enable_irq_wake(IRQ_EINT9); | 225 | enable_irq_wake(IRQ_EINT9); |
226 | /* configure the suspend/resume status pin */ | 226 | /* configure the suspend/resume status pin */ |
227 | s3c2410_gpio_cfgpin(S3C2410_GPF2, S3C2410_GPF2_OUTP); | 227 | s3c2410_gpio_cfgpin(S3C2410_GPF2, S3C2410_GPIO_OUTPUT); |
228 | s3c2410_gpio_pullup(S3C2410_GPF2, 0); | 228 | s3c2410_gpio_pullup(S3C2410_GPF2, 0); |
229 | } | 229 | } |
230 | } | 230 | } |
diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c index 4389c160f7d0..10ba91b7744e 100644 --- a/arch/arm/mach-s3c2410/mach-bast.c +++ b/arch/arm/mach-s3c2410/mach-bast.c | |||
@@ -213,7 +213,7 @@ static int bast_pm_suspend(struct sys_device *sd, pm_message_t state) | |||
213 | { | 213 | { |
214 | /* ensure that an nRESET is not generated on resume. */ | 214 | /* ensure that an nRESET is not generated on resume. */ |
215 | s3c2410_gpio_setpin(S3C2410_GPA21, 1); | 215 | s3c2410_gpio_setpin(S3C2410_GPA21, 1); |
216 | s3c2410_gpio_cfgpin(S3C2410_GPA21, S3C2410_GPA21_OUT); | 216 | s3c2410_gpio_cfgpin(S3C2410_GPA21, S3C2410_GPIO_OUTPUT); |
217 | 217 | ||
218 | return 0; | 218 | return 0; |
219 | } | 219 | } |
diff --git a/arch/arm/mach-s3c2410/mach-vr1000.c b/arch/arm/mach-s3c2410/mach-vr1000.c index 61a1ea9c5c5c..7e002f9473bb 100644 --- a/arch/arm/mach-s3c2410/mach-vr1000.c +++ b/arch/arm/mach-s3c2410/mach-vr1000.c | |||
@@ -355,7 +355,7 @@ static struct clk *vr1000_clocks[] __initdata = { | |||
355 | 355 | ||
356 | static void vr1000_power_off(void) | 356 | static void vr1000_power_off(void) |
357 | { | 357 | { |
358 | s3c2410_gpio_cfgpin(S3C2410_GPB9, S3C2410_GPB9_OUTP); | 358 | s3c2410_gpio_cfgpin(S3C2410_GPB9, S3C2410_GPIO_OUTPUT); |
359 | s3c2410_gpio_setpin(S3C2410_GPB9, 1); | 359 | s3c2410_gpio_setpin(S3C2410_GPB9, 1); |
360 | } | 360 | } |
361 | 361 | ||
diff --git a/arch/arm/mach-s3c2410/usb-simtec.c b/arch/arm/mach-s3c2410/usb-simtec.c index 8331e8d97e20..b209749b78eb 100644 --- a/arch/arm/mach-s3c2410/usb-simtec.c +++ b/arch/arm/mach-s3c2410/usb-simtec.c | |||
@@ -109,7 +109,7 @@ int usb_simtec_init(void) | |||
109 | printk("USB Power Control, (c) 2004 Simtec Electronics\n"); | 109 | printk("USB Power Control, (c) 2004 Simtec Electronics\n"); |
110 | s3c_device_usb.dev.platform_data = &usb_simtec_info; | 110 | s3c_device_usb.dev.platform_data = &usb_simtec_info; |
111 | 111 | ||
112 | s3c2410_gpio_cfgpin(S3C2410_GPB4, S3C2410_GPB4_OUTP); | 112 | s3c2410_gpio_cfgpin(S3C2410_GPB4, S3C2410_GPIO_OUTPUT); |
113 | s3c2410_gpio_setpin(S3C2410_GPB4, 1); | 113 | s3c2410_gpio_setpin(S3C2410_GPB4, 1); |
114 | return 0; | 114 | return 0; |
115 | } | 115 | } |
diff --git a/arch/arm/mach-s3c2440/mach-nexcoder.c b/arch/arm/mach-s3c2440/mach-nexcoder.c index 7aeaa972d7f5..3d4c61e1fa49 100644 --- a/arch/arm/mach-s3c2440/mach-nexcoder.c +++ b/arch/arm/mach-s3c2440/mach-nexcoder.c | |||
@@ -121,15 +121,15 @@ static void __init nexcoder_sensorboard_init(void) | |||
121 | { | 121 | { |
122 | // Initialize SCCB bus | 122 | // Initialize SCCB bus |
123 | s3c2410_gpio_setpin(S3C2410_GPE14, 1); // IICSCL | 123 | s3c2410_gpio_setpin(S3C2410_GPE14, 1); // IICSCL |
124 | s3c2410_gpio_cfgpin(S3C2410_GPE14, S3C2410_GPE14_OUTP); | 124 | s3c2410_gpio_cfgpin(S3C2410_GPE14, S3C2410_GPIO_OUTPUT); |
125 | s3c2410_gpio_setpin(S3C2410_GPE15, 1); // IICSDA | 125 | s3c2410_gpio_setpin(S3C2410_GPE15, 1); // IICSDA |
126 | s3c2410_gpio_cfgpin(S3C2410_GPE15, S3C2410_GPE15_OUTP); | 126 | s3c2410_gpio_cfgpin(S3C2410_GPE15, S3C2410_GPIO_OUTPUT); |
127 | 127 | ||
128 | // Power up the sensor board | 128 | // Power up the sensor board |
129 | s3c2410_gpio_setpin(S3C2410_GPF1, 1); | 129 | s3c2410_gpio_setpin(S3C2410_GPF1, 1); |
130 | s3c2410_gpio_cfgpin(S3C2410_GPF1, S3C2410_GPF1_OUTP); // CAM_GPIO7 => nLDO_PWRDN | 130 | s3c2410_gpio_cfgpin(S3C2410_GPF1, S3C2410_GPIO_OUTPUT); // CAM_GPIO7 => nLDO_PWRDN |
131 | s3c2410_gpio_setpin(S3C2410_GPF2, 0); | 131 | s3c2410_gpio_setpin(S3C2410_GPF2, 0); |
132 | s3c2410_gpio_cfgpin(S3C2410_GPF2, S3C2410_GPF2_OUTP); // CAM_GPIO6 => CAM_PWRDN | 132 | s3c2410_gpio_cfgpin(S3C2410_GPF2, S3C2410_GPIO_OUTPUT); // CAM_GPIO6 => CAM_PWRDN |
133 | } | 133 | } |
134 | 134 | ||
135 | static void __init nexcoder_map_io(void) | 135 | static void __init nexcoder_map_io(void) |
diff --git a/arch/arm/mach-s3c2440/mach-osiris.c b/arch/arm/mach-s3c2440/mach-osiris.c index c8a46685ce38..e05f9557ed56 100644 --- a/arch/arm/mach-s3c2440/mach-osiris.c +++ b/arch/arm/mach-s3c2440/mach-osiris.c | |||
@@ -292,7 +292,7 @@ static int osiris_pm_suspend(struct sys_device *sd, pm_message_t state) | |||
292 | 292 | ||
293 | /* ensure that an nRESET is not generated on resume. */ | 293 | /* ensure that an nRESET is not generated on resume. */ |
294 | s3c2410_gpio_setpin(S3C2410_GPA21, 1); | 294 | s3c2410_gpio_setpin(S3C2410_GPA21, 1); |
295 | s3c2410_gpio_cfgpin(S3C2410_GPA21, S3C2410_GPA21_OUT); | 295 | s3c2410_gpio_cfgpin(S3C2410_GPA21, S3C2410_GPIO_OUTPUT); |
296 | 296 | ||
297 | return 0; | 297 | return 0; |
298 | } | 298 | } |
diff --git a/arch/arm/plat-s3c24xx/common-smdk.c b/arch/arm/plat-s3c24xx/common-smdk.c index 1a8347cec20a..ef4c8fde169f 100644 --- a/arch/arm/plat-s3c24xx/common-smdk.c +++ b/arch/arm/plat-s3c24xx/common-smdk.c | |||
@@ -184,10 +184,10 @@ void __init smdk_machine_init(void) | |||
184 | { | 184 | { |
185 | /* Configure the LEDs (even if we have no LED support)*/ | 185 | /* Configure the LEDs (even if we have no LED support)*/ |
186 | 186 | ||
187 | s3c2410_gpio_cfgpin(S3C2410_GPF4, S3C2410_GPF4_OUTP); | 187 | s3c2410_gpio_cfgpin(S3C2410_GPF4, S3C2410_GPIO_OUTPUT); |
188 | s3c2410_gpio_cfgpin(S3C2410_GPF5, S3C2410_GPF5_OUTP); | 188 | s3c2410_gpio_cfgpin(S3C2410_GPF5, S3C2410_GPIO_OUTPUT); |
189 | s3c2410_gpio_cfgpin(S3C2410_GPF6, S3C2410_GPF6_OUTP); | 189 | s3c2410_gpio_cfgpin(S3C2410_GPF6, S3C2410_GPIO_OUTPUT); |
190 | s3c2410_gpio_cfgpin(S3C2410_GPF7, S3C2410_GPF7_OUTP); | 190 | s3c2410_gpio_cfgpin(S3C2410_GPF7, S3C2410_GPIO_OUTPUT); |
191 | 191 | ||
192 | s3c2410_gpio_setpin(S3C2410_GPF4, 1); | 192 | s3c2410_gpio_setpin(S3C2410_GPF4, 1); |
193 | s3c2410_gpio_setpin(S3C2410_GPF5, 1); | 193 | s3c2410_gpio_setpin(S3C2410_GPF5, 1); |