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

Commit 782d8a3c authored Aug 30, 2011 by Kukjin Kim

ARM: SAMSUNG: Update the name of regarding Samsung GPIO



According to gpio-samsung.c, this patch updates the name of
regarding Samsung GPIO. Basically the samsung_xxx prefix is
used in gpio-samsung.c instead of s3c_xxx, because unified
name can reduce its complexity.

Note: some s3c_xxx stil remains because it is used widely.
It will be updated next time.

Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

parent 1b39d5f2

arch/arm/mach-exynos4/include/mach/pm-core.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@ static inline void s3c_pm_restored_gpios(void)
		/* nothing here yet */
		}

		static inline void s3c_pm_saved_gpios(void)
		static inline void samsung_pm_saved_gpios(void)
		{
		/* nothing here yet */
		}

arch/arm/mach-s3c2410/include/mach/gpio-fns.h

+1 −98

Original line number	Diff line number	Diff line
		/* arch/arm/mach-s3c2410/include/mach/gpio-fns.h
		*
		* Copyright (c) 2003-2009 Simtec Electronics
		* Ben Dooks <ben@simtec.co.uk>
		*
		* S3C2410 - hardware
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 as
		* published by the Free Software Foundation.
		*/

		#ifndef __MACH_GPIO_FNS_H
		#define __MACH_GPIO_FNS_H __FILE__

		/* These functions are in the to-be-removed category and it is strongly
		* encouraged not to use these in new code. They will be marked deprecated
		* very soon.
		*
		* Most of the functionality can be either replaced by the gpiocfg calls
		* for the s3c platform or by the generic GPIOlib API.
		*
		* As of 2.6.35-rc, these will be removed, with the few drivers using them
		* either replaced or given a wrapper until the calls can be removed.
		*/

		#include <plat/gpio-cfg.h>

		static inline void s3c2410_gpio_cfgpin(unsigned int pin, unsigned int cfg)
		{
		/* 1:1 mapping between cfgpin and setcfg calls at the moment */
		s3c_gpio_cfgpin(pin, cfg);
		}

		/* external functions for GPIO support
		*
		* These allow various different clients to access the same GPIO
		* registers without conflicting. If your driver only owns the entire
		* GPIO register, then it is safe to ioremap/__raw_{read\|write} to it.
		*/

		extern unsigned int s3c2410_gpio_getcfg(unsigned int pin);

		/* s3c2410_gpio_getirq
		*
		* turn the given pin number into the corresponding IRQ number
		*
		* returns:
		* < 0 = no interrupt for this pin
		* >=0 = interrupt number for the pin
		*/

		extern int s3c2410_gpio_getirq(unsigned int pin);

		/* s3c2410_gpio_irqfilter
		*
		* set the irq filtering on the given pin
		*
		* on = 0 => disable filtering
		* 1 => enable filtering
		*
		* config = S3C2410_EINTFLT_PCLK or S3C2410_EINTFLT_EXTCLK orred with
		* width of filter (0 through 63)
		*
		*
		*/

		extern int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on,
		unsigned int config);

		/* s3c2410_gpio_pullup
		*
		* This call should be replaced with s3c_gpio_setpull().
		*
		* As a note, there is currently no distinction between pull-up and pull-down
		* in the s3c24xx series devices with only an on/off configuration.
		*/

		/* s3c2410_gpio_pullup
		*
		* configure the pull-up control on the given pin
		*
		* to = 1 => disable the pull-up
		* 0 => enable the pull-up
		*
		* eg;
		*
		* s3c2410_gpio_pullup(S3C2410_GPB(0), 0);
		* s3c2410_gpio_pullup(S3C2410_GPE(8), 0);
		*/

		extern void s3c2410_gpio_pullup(unsigned int pin, unsigned int to);

		extern void s3c2410_gpio_setpin(unsigned int pin, unsigned int to);

		extern unsigned int s3c2410_gpio_getpin(unsigned int pin);

		#endif /* __MACH_GPIO_FNS_H */
		#include <plat/gpio-fns.h>

arch/arm/mach-s3c2410/include/mach/gpio-track.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -17,11 +17,11 @@

		#include <mach/regs-gpio.h>

		extern struct s3c_gpio_chip s3c24xx_gpios[];
		extern struct samsung_gpio_chip s3c24xx_gpios[];

		static inline struct s3c_gpio_chip *s3c_gpiolib_getchip(unsigned int pin)
		static inline struct samsung_gpio_chip *samsung_gpiolib_getchip(unsigned int pin)
		{
		struct s3c_gpio_chip *chip;
		struct samsung_gpio_chip *chip;

		if (pin > S3C_GPIO_END)
		return NULL;

arch/arm/mach-s3c2410/include/mach/pm-core.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -64,4 +64,4 @@ static inline void s3c_pm_arch_update_uart(void __iomem *regs,
		}

		static inline void s3c_pm_restored_gpios(void) { }
		static inline void s3c_pm_saved_gpios(void) { }
		static inline void samsung_pm_saved_gpios(void) { }

arch/arm/mach-s3c2410/s3c2410.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -72,8 +72,8 @@ void __init s3c2410_init_uarts(struct s3c2410_uartcfg *cfg, int no)

		void __init s3c2410_map_io(void)
		{
		s3c24xx_gpiocfg_default.set_pull = s3c_gpio_setpull_1up;
		s3c24xx_gpiocfg_default.get_pull = s3c_gpio_getpull_1up;
		s3c24xx_gpiocfg_default.set_pull = s3c24xx_gpio_setpull_1up;
		s3c24xx_gpiocfg_default.get_pull = s3c24xx_gpio_getpull_1up;

		iotable_init(s3c2410_iodesc, ARRAY_SIZE(s3c2410_iodesc));
		}