Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f05f6a9 authored by Ben Dooks's avatar Ben Dooks
Browse files

[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: default avatarBen Dooks <ben-linux@fluff.org>
parent ec7f4d5d

arch/arm/mach-s3c2410/h1940-bluetooth.c

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static int __init h1940bt_probe(struct platform_device *pdev) 
	/* Configures BT serial port GPIOs */

	s3c2410_gpio_cfgpin(S3C2410_GPH0, S3C2410_GPH0_nCTS0);

	s3c2410_gpio_pullup(S3C2410_GPH0, 1);

	s3c2410_gpio_cfgpin(S3C2410_GPH1, S3C2410_GPH1_OUTP);

	s3c2410_gpio_cfgpin(S3C2410_GPH1, S3C2410_GPIO_OUTPUT);

	s3c2410_gpio_pullup(S3C2410_GPH1, 1);

	s3c2410_gpio_cfgpin(S3C2410_GPH2, S3C2410_GPH2_TXD0);

	s3c2410_gpio_pullup(S3C2410_GPH2, 1);

arch/arm/mach-s3c2410/mach-amlm5900.c

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ static void amlm5900_init_pm(void) 
	} else {

		enable_irq_wake(IRQ_EINT9);

		/* configure the suspend/resume status pin */

		s3c2410_gpio_cfgpin(S3C2410_GPF2, S3C2410_GPF2_OUTP);

		s3c2410_gpio_cfgpin(S3C2410_GPF2, S3C2410_GPIO_OUTPUT);

		s3c2410_gpio_pullup(S3C2410_GPF2, 0);

	}

}

arch/arm/mach-s3c2410/mach-bast.c

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ static int bast_pm_suspend(struct sys_device *sd, pm_message_t state) 
{

	/* ensure that an nRESET is not generated on resume. */

	s3c2410_gpio_setpin(S3C2410_GPA21, 1);

	s3c2410_gpio_cfgpin(S3C2410_GPA21, S3C2410_GPA21_OUT);

	s3c2410_gpio_cfgpin(S3C2410_GPA21, S3C2410_GPIO_OUTPUT);



	return 0;

}

arch/arm/mach-s3c2410/mach-vr1000.c

+1 −1
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ static struct clk *vr1000_clocks[] __initdata = { 


static void vr1000_power_off(void)

{

	s3c2410_gpio_cfgpin(S3C2410_GPB9, S3C2410_GPB9_OUTP);

	s3c2410_gpio_cfgpin(S3C2410_GPB9, S3C2410_GPIO_OUTPUT);

	s3c2410_gpio_setpin(S3C2410_GPB9, 1);

}

arch/arm/mach-s3c2410/usb-simtec.c

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ int usb_simtec_init(void) 
	printk("USB Power Control, (c) 2004 Simtec Electronics\n");

	s3c_device_usb.dev.platform_data = &usb_simtec_info;



	s3c2410_gpio_cfgpin(S3C2410_GPB4, S3C2410_GPB4_OUTP);

	s3c2410_gpio_cfgpin(S3C2410_GPB4, S3C2410_GPIO_OUTPUT);

	s3c2410_gpio_setpin(S3C2410_GPB4, 1);

	return 0;

}