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

Commit f96be91a authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Simon Horman
Browse files

ARM: shmobile: mackerel: Use gpio_request_one() 



Replace occurences of gpio_request() and gpio_direction_*() by calls to
gpio_request_one().

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent abb192f8

arch/arm/mach-shmobile/board-mackerel.c

+6 −10
Original line number Diff line number Diff line
@@ -1406,11 +1406,10 @@ static void __init mackerel_init(void) 
	gpio_request(GPIO_FN_LCDDISP,  NULL);

	gpio_request(GPIO_FN_LCDDCK,   NULL);



	gpio_request(GPIO_PORT31, NULL); /* backlight */

	gpio_direction_output(GPIO_PORT31, 0); /* off by default */

	/* backlight, off by default */

	gpio_request_one(GPIO_PORT31, GPIOF_OUT_INIT_LOW, NULL);



	gpio_request(GPIO_PORT151, NULL); /* LCDDON */

	gpio_direction_output(GPIO_PORT151, 1);

	gpio_request_one(GPIO_PORT151, GPIOF_OUT_INIT_HIGH, NULL); /* LCDDON */



	/* USBHS0 */

	gpio_request(GPIO_FN_VBUS0_0, NULL);
@@ -1426,8 +1425,7 @@ static void __init mackerel_init(void) 
	gpio_request(GPIO_FN_FSIAILR,	NULL);

	gpio_request(GPIO_FN_FSIAISLD,	NULL);

	gpio_request(GPIO_FN_FSIAOSLD,	NULL);

	gpio_request(GPIO_PORT161,	NULL);

	gpio_direction_output(GPIO_PORT161, 0); /* slave */

	gpio_request_one(GPIO_PORT161, GPIOF_OUT_INIT_LOW, NULL); /* slave */



	gpio_request(GPIO_PORT9,  NULL);

	gpio_request(GPIO_PORT10, NULL);
@@ -1481,8 +1479,7 @@ static void __init mackerel_init(void) 
	gpio_request(GPIO_FN_SDHID1_0, NULL);

#endif

	/* card detect pin for MMC slot (CN7) */

	gpio_request(GPIO_PORT41, NULL);

	gpio_direction_input(GPIO_PORT41);

	gpio_request_one(GPIO_PORT41, GPIOF_IN, NULL);



	/* enable SDHI2 */

	gpio_request(GPIO_FN_SDHICMD2, NULL);
@@ -1493,8 +1490,7 @@ static void __init mackerel_init(void) 
	gpio_request(GPIO_FN_SDHID2_0, NULL);



	/* card detect pin for microSD slot (CN23) */

	gpio_request(GPIO_PORT162, NULL);

	gpio_direction_input(GPIO_PORT162);

	gpio_request_one(GPIO_PORT162, GPIOF_IN, NULL);



	/* MMCIF */

	gpio_request(GPIO_FN_MMCD0_0, NULL);