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

Commit a1524eeb authored by Philippe Langlais's avatar Philippe Langlais Committed by Linus Walleij
Browse files

ARM: ux500: fix around AB8500 GPIO macro name 



AB8500 GPIO1 is the base of AB8500 gpio number too.

Signed-off-by: default avatarPhilippe Langlais <philippe.langlais@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 70227a45

arch/arm/mach-ux500/board-mop500.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -72,7 +72,7 @@ static struct platform_device snowball_led_dev = { 
};

};





static struct ab8500_gpio_platform_data ab8500_gpio_pdata = {

static struct ab8500_gpio_platform_data ab8500_gpio_pdata = {

	.gpio_base		= MOP500_AB8500_GPIO(0),

	.gpio_base		= MOP500_AB8500_PIN_GPIO(1),

	.irq_base		= MOP500_AB8500_VIR_GPIO_IRQ_BASE,

	.irq_base		= MOP500_AB8500_VIR_GPIO_IRQ_BASE,

	/* config_reg is the initial configuration of ab8500 pins.

	/* config_reg is the initial configuration of ab8500 pins.

	 * The pins can be configured as GPIO or alt functions based

	 * The pins can be configured as GPIO or alt functions based

arch/arm/mach-ux500/board-mop500.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -63,7 +63,7 @@ 
 * because the AB8500 GPIO pins are enumbered starting from 1, so the value in

 * because the AB8500 GPIO pins are enumbered starting from 1, so the value in

 * parens matches the GPIO pin number in the data sheet.

 * parens matches the GPIO pin number in the data sheet.

 */

 */

#define MOP500_AB8500_GPIO(x)		(MOP500_EGPIO_END + (x) - 1)

#define MOP500_AB8500_PIN_GPIO(x)	(MOP500_EGPIO_END + (x) - 1)

/*Snowball AB8500 GPIO */

/*Snowball AB8500 GPIO */

#define SNOWBALL_VSMPS2_1V8_GPIO	MOP500_AB8500_PIN_GPIO(1)	/* SYSCLKREQ2/GPIO1 */

#define SNOWBALL_VSMPS2_1V8_GPIO	MOP500_AB8500_PIN_GPIO(1)	/* SYSCLKREQ2/GPIO1 */

#define SNOWBALL_PM_GPIO1_GPIO		MOP500_AB8500_PIN_GPIO(2)	/* SYSCLKREQ3/GPIO2 */

#define SNOWBALL_PM_GPIO1_GPIO		MOP500_AB8500_PIN_GPIO(2)	/* SYSCLKREQ3/GPIO2 */