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

Commit da963437 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

ARM: pxa: maybe fix gpio lookup tables 



commit 2672a4bff6c03a20d5ae460a091f67ee782c3eff upstream.

From inspection I found a couple of GPIO lookups that are
listed with device "gpio-pxa", but actually have a number
from a different gpio controller.

Try to rectify that here, with a guess of what the actual
device name is.

Acked-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1668ad10

arch/arm/mach-pxa/cm-x300.c

+4 −4
Original line number Diff line number Diff line
@@ -355,13 +355,13 @@ static struct platform_device cm_x300_spi_gpio = { 
static struct gpiod_lookup_table cm_x300_spi_gpiod_table = {

	.dev_id         = "spi_gpio",

	.table          = {

		GPIO_LOOKUP("gpio-pxa", GPIO_LCD_SCL,

		GPIO_LOOKUP("pca9555.1", GPIO_LCD_SCL - GPIO_LCD_BASE,

			    "sck", GPIO_ACTIVE_HIGH),

		GPIO_LOOKUP("gpio-pxa", GPIO_LCD_DIN,

		GPIO_LOOKUP("pca9555.1", GPIO_LCD_DIN - GPIO_LCD_BASE,

			    "mosi", GPIO_ACTIVE_HIGH),

		GPIO_LOOKUP("gpio-pxa", GPIO_LCD_DOUT,

		GPIO_LOOKUP("pca9555.1", GPIO_LCD_DOUT - GPIO_LCD_BASE,

			    "miso", GPIO_ACTIVE_HIGH),

		GPIO_LOOKUP("gpio-pxa", GPIO_LCD_CS,

		GPIO_LOOKUP("pca9555.1", GPIO_LCD_CS - GPIO_LCD_BASE,

			    "cs", GPIO_ACTIVE_HIGH),

		{ },

	},

arch/arm/mach-pxa/magician.c

+1 −1
Original line number Diff line number Diff line
@@ -675,7 +675,7 @@ static struct platform_device bq24022 = { 
static struct gpiod_lookup_table bq24022_gpiod_table = {

	.dev_id = "gpio-regulator",

	.table = {

		GPIO_LOOKUP("gpio-pxa", EGPIO_MAGICIAN_BQ24022_ISET2,

		GPIO_LOOKUP("htc-egpio-0", EGPIO_MAGICIAN_BQ24022_ISET2 - MAGICIAN_EGPIO_BASE,

			    NULL, GPIO_ACTIVE_HIGH),

		GPIO_LOOKUP("gpio-pxa", GPIO30_MAGICIAN_BQ24022_nCHARGE_EN,

			    "enable", GPIO_ACTIVE_LOW),

arch/arm/mach-pxa/tosa.c

+2 −2
Original line number Diff line number Diff line
@@ -295,9 +295,9 @@ static struct gpiod_lookup_table tosa_mci_gpio_table = { 
	.table = {

		GPIO_LOOKUP("gpio-pxa", TOSA_GPIO_nSD_DETECT,

			    "cd", GPIO_ACTIVE_LOW),

		GPIO_LOOKUP("gpio-pxa", TOSA_GPIO_SD_WP,

		GPIO_LOOKUP("sharp-scoop.0", TOSA_GPIO_SD_WP - TOSA_SCOOP_GPIO_BASE,

			    "wp", GPIO_ACTIVE_LOW),

		GPIO_LOOKUP("gpio-pxa", TOSA_GPIO_PWR_ON,

		GPIO_LOOKUP("sharp-scoop.0", TOSA_GPIO_PWR_ON - TOSA_SCOOP_GPIO_BASE,

			    "power", GPIO_ACTIVE_HIGH),

		{ },

	},