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

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

ARM: S3C24XX: Add initial s3c_gpio configuration code 



Add support for s3c_gpio_setcfg() and s3c_gpio_setpull() implementations
to get ready for removal of the specific code being used by s3c24xx.

Also rename the s3c_gpio_setcfg_s3c24xx_banka to s3c_gpio_setcfg_s3c24xx_a
as seen in the header file to correct a build warning.

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 7ebd4675

arch/arm/plat-s3c24xx/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ config PLAT_S3C24XX 
	select NO_IOPORT

	select ARCH_REQUIRE_GPIOLIB

	select S3C_DEVICE_NAND

	select S3C_GPIO_CFG_S3C24XX

	help

	  Base platform code for any Samsung S3C24XX device

arch/arm/plat-s3c24xx/gpiolib.c

+16 −1
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
#include <linux/gpio.h>



#include <plat/gpio-core.h>

#include <plat/gpio-cfg.h>

#include <plat/gpio-cfg-helpers.h>

#include <mach/hardware.h>

#include <asm/irq.h>

#include <plat/pm.h>
@@ -77,10 +79,19 @@ static int s3c24xx_gpiolib_bankg_toirq(struct gpio_chip *chip, unsigned offset) 
	return IRQ_EINT8 + offset;

}



static struct s3c_gpio_cfg s3c24xx_gpiocfg_banka = {

	.set_config	= s3c_gpio_setcfg_s3c24xx_a,

};



struct s3c_gpio_cfg s3c24xx_gpiocfg_default = {

	.set_config	= s3c_gpio_setcfg_s3c24xx,

};



struct s3c_gpio_chip s3c24xx_gpios[] = {

	[0] = {

		.base	= S3C2410_GPACON,

		.pm	= __gpio_pm(&s3c_gpio_pm_1bit),

		.config	= &s3c24xx_gpiocfg_banka,

		.chip	= {

			.base			= S3C2410_GPA(0),

			.owner			= THIS_MODULE,
@@ -168,8 +179,12 @@ static __init int s3c24xx_gpiolib_init(void) 
	struct s3c_gpio_chip *chip = s3c24xx_gpios;

	int gpn;



	for (gpn = 0; gpn < ARRAY_SIZE(s3c24xx_gpios); gpn++, chip++)

	for (gpn = 0; gpn < ARRAY_SIZE(s3c24xx_gpios); gpn++, chip++) {

		if (!chip->config)

			chip->config = &s3c24xx_gpiocfg_default;



		s3c_gpiolib_add(chip);

	}



	return 0;

}

arch/arm/plat-samsung/gpio-config.c

+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ int s3c_gpio_setpull(unsigned int pin, s3c_gpio_pull_t pull) 
EXPORT_SYMBOL(s3c_gpio_setpull);



#ifdef CONFIG_S3C_GPIO_CFG_S3C24XX

int s3c_gpio_setcfg_s3c24xx_banka(struct s3c_gpio_chip *chip,

int s3c_gpio_setcfg_s3c24xx_a(struct s3c_gpio_chip *chip,

			      unsigned int off, unsigned int cfg)

{

	void __iomem *reg = chip->base;

arch/arm/plat-samsung/include/plat/gpio-core.h

+3 −0
Original line number Diff line number Diff line
@@ -108,6 +108,9 @@ extern void samsung_gpiolib_add_4bit2_chips(struct s3c_gpio_chip *chip, 
extern void samsung_gpiolib_add_4bit(struct s3c_gpio_chip *chip);

extern void samsung_gpiolib_add_4bit2(struct s3c_gpio_chip *chip);



/* exported for core SoC support to change */

extern struct s3c_gpio_cfg s3c24xx_gpiocfg_default;



#ifdef CONFIG_S3C_GPIO_TRACK

extern struct s3c_gpio_chip *s3c_gpios[S3C_GPIO_END];