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

Commit 321655ef authored by Jingoo Han's avatar Jingoo Han Committed by Kukjin Kim
Browse files

ARM: EXYNOS: Use gpio_request_one 



By using gpio_request_one it is possible to set the direction
and initial value in one shot. Thus, using gpio_request_one can
make the code simpler.

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 2f4f0b42

arch/arm/mach-exynos/mach-nuri.c

+2 −7
Original line number Diff line number Diff line
@@ -247,13 +247,8 @@ static void nuri_lcd_power_on(struct plat_lcd_data *pd, unsigned int power) 


static int nuri_bl_init(struct device *dev)

{

	int ret, gpio = EXYNOS4_GPE2(3);



	ret = gpio_request(gpio, "LCD_LDO_EN");

	if (!ret)

		gpio_direction_output(gpio, 0);



	return ret;

	return gpio_request_one(EXYNOS4_GPE2(3), GPIOF_OUT_INIT_LOW,

				"LCD_LD0_EN");

}



static int nuri_bl_notify(struct device *dev, int brightness)

arch/arm/mach-exynos/mach-smdkv310.c

+1 −3
Original line number Diff line number Diff line
@@ -129,9 +129,7 @@ static void lcd_lte480wv_set_power(struct plat_lcd_data *pd, 
		gpio_free(EXYNOS4_GPD0(1));

#endif

		/* fire nRESET on power up */

		gpio_request(EXYNOS4_GPX0(6), "GPX0");



		gpio_direction_output(EXYNOS4_GPX0(6), 1);

		gpio_request_one(EXYNOS4_GPX0(6), GPIOF_OUT_INIT_HIGH, "GPX0");

		mdelay(100);



		gpio_set_value(EXYNOS4_GPX0(6), 0);

arch/arm/mach-exynos/mach-universal_c210.c

+3 −7
Original line number Diff line number Diff line
@@ -608,8 +608,7 @@ static void __init universal_tsp_init(void) 


	/* TSP_LDO_ON: XMDMADDR_11 */

	gpio = EXYNOS4_GPE2(3);

	gpio_request(gpio, "TSP_LDO_ON");

	gpio_direction_output(gpio, 1);

	gpio_request_one(gpio, GPIOF_OUT_INIT_HIGH, "TSP_LDO_ON");

	gpio_export(gpio, 0);



	/* TSP_INT: XMDMADDR_7 */
@@ -669,8 +668,7 @@ static void __init universal_touchkey_init(void) 
	i2c_gpio12_devs[0].irq = gpio_to_irq(gpio);



	gpio = EXYNOS4_GPE3(3);			/* XMDMDATA_3 */

	gpio_request(gpio, "3_TOUCH_EN");

	gpio_direction_output(gpio, 1);

	gpio_request_one(gpio, GPIOF_OUT_INIT_HIGH, "3_TOUCH_EN");

}



static struct s3c2410_platform_i2c universal_i2c0_platdata __initdata = {
@@ -1000,9 +998,7 @@ static void __init universal_map_io(void) 
void s5p_tv_setup(void)

{

	/* direct HPD to HDMI chip */

	gpio_request(EXYNOS4_GPX3(7), "hpd-plug");



	gpio_direction_input(EXYNOS4_GPX3(7));

	gpio_request_one(EXYNOS4_GPX3(7), GPIOF_IN, "hpd-plug");

	s3c_gpio_cfgpin(EXYNOS4_GPX3(7), S3C_GPIO_SFN(0x3));

	s3c_gpio_setpull(EXYNOS4_GPX3(7), S3C_GPIO_PULL_NONE);