ARM: davinci: fix label names in GPIO lookup entries
cover ARM: davinci: fix label names in GPIO lookup entries
From: Bartosz Golaszewski <[email protected]>
Hi Sekhar,
I noticed some more breakage resulting from commit 587f7a694f01 ("gpio:
davinci: Use dev name for label and automatic base selection"). This series fixes GPIO lookups in legacy mode for DaVinci.
Bartosz Golaszewski (5):
ARM: davinci: da830-evm: fix label names in GPIO lookup entries
ARM: davinci: da850-evm: fix label names in GPIO lookup entries
ARM: davinci: dm355-evm: fix label names in GPIO lookup entries
ARM: davinci: dm644x-evm: fix label names in GPIO lookup entries
ARM: davinci: omapl138-hawk: fix label names in GPIO lookup entries
arch/arm/mach-davinci/board-da830-evm.c | 4 ++-- arch/arm/mach-davinci/board-da850-evm.c | 4 ++-- arch/arm/mach-davinci/board-dm355-evm.c | 4 ++-- arch/arm/mach-davinci/board-dm644x-evm.c | 4 ++-- arch/arm/mach-davinci/board-omapl138-hawk.c | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-)
Signature · 1 line
2.19.1
PATCH 1/5 ARM: davinci: da830-evm: fix label names in GPIO lookup entries
From: Bartosz Golaszewski <[email protected]>
Since commit 587f7a694f01 ("gpio: davinci: Use dev name for label and automatic base selection") the gpiochip label no longer has an ID suffix. Update the GPIO lookup entries.
--- arch/arm/mach-davinci/board-da830-evm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-davinci/board-da830-evm.c +2 -2
@@ -208,9 +208,9 @@ static struct gpiod_lookup_table mmc_gpios_table = { .dev_id = "da830-mmc.0", .table = {/* gpio chip 1 contains gpio range 32-63 */ -GPIO_LOOKUP ("davinci_gpio.0" ,DA830_MMCSD_CD_PIN ,"cd" , +GPIO_LOOKUP ("davinci_gpio" ,DA830_MMCSD_CD_PIN ,"cd" ,GPIO_ACTIVE_LOW ), -GPIO_LOOKUP ("davinci_gpio.0" ,DA830_MMCSD_WP_PIN ,"wp" , +GPIO_LOOKUP ("davinci_gpio" ,DA830_MMCSD_WP_PIN ,"wp" , GPIO_ACTIVE_LOW), }, };
Signature · 1 line
2.19.1
Re: [PATCH 1/5] ARM: davinci: da830-evm: fix label names in GPIO lookup entries
Quoted 9 lines · Bartosz Golaszewski
From: Bartosz Golaszewski <[email protected]>
Since commit
587f7a694f01("gpio: davinci: Use dev name for label and automatic base selection") the gpiochip label no longer has an ID suffix. Update the GPIO lookup entries.Fixes 587f7a694f01 ("gpio: davinci: Use dev name for label and automatic base selection")Signed-off-by Bartosz Golaszewski <[email protected]>
The series:
I suppose you will push this upstream through ARM SoC.
Yours,
Linus Walleij
Re: [PATCH 1/5] ARM: davinci: da830-evm: fix label names in GPIO lookup entries
Hi Linus,
Quoted 8 lines · Linus Walleij
Quoted 6 lines · Bartosz Golaszewski
From: Bartosz Golaszewski <[email protected]>
Since commit
587f7a694f01("gpio: davinci: Use dev name for label and automatic base selection") the gpiochip label no longer has an ID suffix. Update the GPIO lookup entries.
Quoted 8 lines
Quoted 3 lines
Fixes 587f7a694f01 ("gpio: davinci: Use dev name for label and automatic base selection")Signed-off-by Bartosz Golaszewski <[email protected]>The series:
Reviewed-by Linus Walleij <[email protected]>I suppose you will push this upstream through ARM SoC.
I sent a pull request with these applied to ARM SoC yesterday.
Thanks,
Sekhar
PATCH 2/5 ARM: davinci: da850-evm: fix label names in GPIO lookup entries
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
Since commit 587f7a694f01 ("gpio: davinci: Use dev name for label and automatic base selection") the gpiochip label no longer has an ID suffix. Update the GPIO lookup entries.
--- arch/arm/mach-davinci/board-da850-evm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-davinci/board-da850-evm.c +2 -2
@@ -805,9 +805,9 @@ static struct gpiod_lookup_table mmc_gpios_table = { .dev_id = "da830-mmc.0", .table = {/* gpio chip 2 contains gpio range 64-95 */ -GPIO_LOOKUP ("davinci_gpio.0" ,DA850_MMCSD_CD_PIN ,"cd" , +GPIO_LOOKUP ("davinci_gpio" ,DA850_MMCSD_CD_PIN ,"cd" ,GPIO_ACTIVE_LOW ), -GPIO_LOOKUP ("davinci_gpio.0" ,DA850_MMCSD_WP_PIN ,"wp" , +GPIO_LOOKUP ("davinci_gpio" ,DA850_MMCSD_WP_PIN ,"wp" , GPIO_ACTIVE_HIGH), }, };
Signature · 1 line
2.19.1
PATCH 3/5 ARM: davinci: dm355-evm: fix label names in GPIO lookup entries
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
Since commit 587f7a694f01 ("gpio: davinci: Use dev name for label and automatic base selection") the gpiochip label no longer has an ID suffix. Update the GPIO lookup entries.
--- arch/arm/mach-davinci/board-dm355-evm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-davinci/board-dm355-evm.c +2 -2
@@ -117,9 +117,9 @@ static struct platform_device davinci_nand_device = {static struct gpiod_lookup_table i2c_recovery_gpiod_table = { .dev_id ="i2c_davinci.1" , .table = { -GPIO_LOOKUP ("davinci_gpio.0" ,DM355_I2C_SDA_PIN ,"sda" , +GPIO_LOOKUP ("davinci_gpio" ,DM355_I2C_SDA_PIN ,"sda" ,GPIO_ACTIVE_HIGH |GPIO_OPEN_DRAIN ), -GPIO_LOOKUP ("davinci_gpio.0" ,DM355_I2C_SCL_PIN ,"scl" , +GPIO_LOOKUP ("davinci_gpio" ,DM355_I2C_SCL_PIN ,"scl" ,GPIO_ACTIVE_HIGH |GPIO_OPEN_DRAIN ), }, };
Signature · 1 line
2.19.1
PATCH 4/5 ARM: davinci: dm644x-evm: fix label names in GPIO lookup entries
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
Since commit 587f7a694f01 ("gpio: davinci: Use dev name for label and automatic base selection") the gpiochip label no longer has an ID suffix. Update the GPIO lookup entries.
--- arch/arm/mach-davinci/board-dm644x-evm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-davinci/board-dm644x-evm.c +2 -2
@@ -660,9 +660,9 @@ static struct i2c_board_info __initdata i2c_info[] = {static struct gpiod_lookup_table i2c_recovery_gpiod_table = { .dev_id ="i2c_davinci.1" , .table = { -GPIO_LOOKUP ("davinci_gpio.0" ,DM644X_I2C_SDA_PIN ,"sda" , +GPIO_LOOKUP ("davinci_gpio" ,DM644X_I2C_SDA_PIN ,"sda" ,GPIO_ACTIVE_HIGH |GPIO_OPEN_DRAIN ), -GPIO_LOOKUP ("davinci_gpio.0" ,DM644X_I2C_SCL_PIN ,"scl" , +GPIO_LOOKUP ("davinci_gpio" ,DM644X_I2C_SCL_PIN ,"scl" ,GPIO_ACTIVE_HIGH |GPIO_OPEN_DRAIN ), }, };
Signature · 1 line
2.19.1
PATCH 5/5 ARM: davinci: omapl138-hawk: fix label names in GPIO lookup entries
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
Since commit 587f7a694f01 ("gpio: davinci: Use dev name for label and automatic base selection") the gpiochip label no longer has an ID suffix. Update the GPIO lookup entries.
--- arch/arm/mach-davinci/board-omapl138-hawk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-davinci/board-omapl138-hawk.c +2 -2
@@ -134,9 +134,9 @@ static const short hawk_mmcsd0_pins[] = {static struct gpiod_lookup_table mmc_gpios_table = { .dev_id ="da830-mmc.0" , .table = { -GPIO_LOOKUP ("davinci_gpio.0" ,DA850_HAWK_MMCSD_CD_PIN ,"cd" , +GPIO_LOOKUP ("davinci_gpio" ,DA850_HAWK_MMCSD_CD_PIN ,"cd" ,GPIO_ACTIVE_LOW ), -GPIO_LOOKUP ("davinci_gpio.0" ,DA850_HAWK_MMCSD_WP_PIN ,"wp" , +GPIO_LOOKUP ("davinci_gpio" ,DA850_HAWK_MMCSD_WP_PIN ,"wp" ,GPIO_ACTIVE_LOW ), }, };
Signature · 1 line
2.19.1
Hi Bartosz,
Quoted 7 lines · Bartosz Golaszewski
From: Bartosz Golaszewski <[email protected]>
Hi Sekhar,
I noticed some more breakage resulting from commit
587f7a694f01("gpio:
davinci: Use dev name for label and automatic base selection"). This series fixes GPIO lookups in legacy mode for DaVinci.
Thanks for the fixes, look good to me. Will send them once v4.21-rc1 comes out.
Thanks,
Sekhar