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

Commit a6149c09 authored by Daein Moon's avatar Daein Moon Committed by Kukjin Kim
Browse files

ARM: SAMSUNG: Add the missed s3c_gpio_getpull() API 



This patch adds the s3c_gpio_getpull() API that has been missed in the
plat-samsung/gpio-config.c and actullay there is its extern declaration
in plat/gpio-cfg.h.

Signed-off-by: default avatarDaein Moon <moon9124@samsung.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent d07dc60c

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

+19 −0
Original line number Diff line number Diff line
@@ -111,6 +111,25 @@ int s3c_gpio_setpull(unsigned int pin, s3c_gpio_pull_t pull) 
}

EXPORT_SYMBOL(s3c_gpio_setpull);



s3c_gpio_pull_t s3c_gpio_getpull(unsigned int pin)

{

	struct s3c_gpio_chip *chip = s3c_gpiolib_getchip(pin);

	unsigned long flags;

	int offset;

	u32 pup = 0;



	if (chip) {

		offset = pin - chip->chip.base;



		s3c_gpio_lock(chip, flags);

		pup = s3c_gpio_do_getpull(chip, offset);

		s3c_gpio_unlock(chip, flags);

	}



	return (__force s3c_gpio_pull_t)pup;

}

EXPORT_SYMBOL(s3c_gpio_getpull);



#ifdef CONFIG_S3C_GPIO_CFG_S3C24XX

int s3c_gpio_setcfg_s3c24xx_a(struct s3c_gpio_chip *chip,

			      unsigned int off, unsigned int cfg)

arch/arm/plat-samsung/include/plat/gpio-cfg-helpers.h

+6 −0
Original line number Diff line number Diff line
@@ -42,6 +42,12 @@ static inline int s3c_gpio_do_setpull(struct s3c_gpio_chip *chip, 
	return (chip->config->set_pull)(chip, off, pull);

}



static inline s3c_gpio_pull_t s3c_gpio_do_getpull(struct s3c_gpio_chip *chip,

						  unsigned int off)

{

	return chip->config->get_pull(chip, off);

}



/**

 * s3c_gpio_setcfg_s3c24xx - S3C24XX style GPIO configuration.

 * @chip: The gpio chip that is being configured.