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

Commit c034b184 authored by Tushar Behera's avatar Tushar Behera Committed by Kukjin Kim
Browse files

gpio/samsung: Move SoC specific codes within macro 



In drivers/gpio/gpio-samsung.c, there are certain structures
and functions which are not getting used if the particular
CPU is not selected. These code segments are moved under CPU
specific macros to remove compilation warnings.

Signed-off-by: default avatarTushar Behera <tushar.behera@linaro.org>
Acked-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent b82cee24

drivers/gpio/gpio-samsung.c

+10 −0
Original line number Diff line number Diff line
@@ -318,6 +318,7 @@ static unsigned samsung_gpio_getcfg_4bit(struct samsung_gpio_chip *chip, 
	return S3C_GPIO_SPECIAL(con);

}



#ifdef CONFIG_PLAT_S3C24XX

/*

 * s3c24xx_gpio_setcfg_abank - S3C24XX style GPIO configuration (Bank A)

 * @chip: The gpio chip that is being configured.
@@ -379,7 +380,9 @@ static unsigned s3c24xx_gpio_getcfg_abank(struct samsung_gpio_chip *chip, 


	return S3C_GPIO_SFN(con);

}

#endif



#if defined(CONFIG_CPU_S5P6440) || defined(CONFIG_CPU_S5P6450)

static int s5p64x0_gpio_setcfg_rbank(struct samsung_gpio_chip *chip,

				     unsigned int off, unsigned int cfg)

{
@@ -417,6 +420,7 @@ static int s5p64x0_gpio_setcfg_rbank(struct samsung_gpio_chip *chip, 


	return 0;

}

#endif



static void __init samsung_gpiolib_set_cfg(struct samsung_gpio_cfg *chipcfg,

					   int nr_chips)
@@ -438,10 +442,12 @@ struct samsung_gpio_cfg s3c24xx_gpiocfg_default = { 
	.get_config	= samsung_gpio_getcfg_2bit,

};



#ifdef CONFIG_PLAT_S3C24XX

static struct samsung_gpio_cfg s3c24xx_gpiocfg_banka = {

	.set_config	= s3c24xx_gpio_setcfg_abank,

	.get_config	= s3c24xx_gpio_getcfg_abank,

};

#endif



static struct samsung_gpio_cfg exynos4_gpio_cfg = {

	.set_pull	= exynos4_gpio_setpull,
@@ -450,6 +456,7 @@ static struct samsung_gpio_cfg exynos4_gpio_cfg = { 
	.get_config	= samsung_gpio_getcfg_4bit,

};



#if defined(CONFIG_CPU_S5P6440) || defined(CONFIG_CPU_S5P6450)

static struct samsung_gpio_cfg s5p64x0_gpio_cfg_rbank = {

	.cfg_eint	= 0x3,

	.set_config	= s5p64x0_gpio_setcfg_rbank,
@@ -457,6 +464,7 @@ static struct samsung_gpio_cfg s5p64x0_gpio_cfg_rbank = { 
	.set_pull	= samsung_gpio_setpull_updown,

	.get_pull	= samsung_gpio_getpull_updown,

};

#endif



static struct samsung_gpio_cfg samsung_gpio_cfgs[] = {

	{
@@ -689,6 +697,7 @@ static int samsung_gpiolib_4bit2_output(struct gpio_chip *chip, 
	return 0;

}



#ifdef CONFIG_PLAT_S3C24XX

/* The next set of routines are for the case of s3c24xx bank a */



static int s3c24xx_gpiolib_banka_input(struct gpio_chip *chip, unsigned offset)
@@ -724,6 +733,7 @@ static int s3c24xx_gpiolib_banka_output(struct gpio_chip *chip, 
	local_irq_restore(flags);

	return 0;

}

#endif



/* The next set of routines are for the case of s5p64x0 bank r */