Skip to contentSkip to conversation

ARM: davinci: fix label names in GPIO lookup entries

PATCH In review Bartosz Golaszewski 3 participants 9 messages Jan 3, 2019 – Jan 11, 2019

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

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
#1 lore raw

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.

Fixes 587f7a694f01 ("gpio: davinci: Use dev name for label and automatic base selection")
---
 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
index e52ec1619b70..c4da635ee4ce 100644
@@ -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
Reviewed-by on v1 1/5
#2 lore raw

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")

The series:

I suppose you will push this upstream through ARM SoC.

Yours,
Linus Walleij

#3 lore raw

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")

The series:

I suppose you will push this upstream through ARM SoC.

I sent a pull request with these applied to ARM SoC yesterday.

Thanks,
Sekhar

#4 lore raw

PATCH 2/5 ARM: davinci: da850-evm: fix label names in GPIO lookup entries

In reply to 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")
---
 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
index 6a29baf0a289..44bca048dfd0 100644
@@ -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
#5 lore raw

PATCH 3/5 ARM: davinci: dm355-evm: fix label names in GPIO lookup entries

In reply to 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")
---
 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
index f53a461a606f..f7fa960c23e3 100644
@@ -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
#6 lore raw

PATCH 4/5 ARM: davinci: dm644x-evm: fix label names in GPIO lookup entries

In reply to 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")
---
 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
index e1428115067f..b80c4ee76217 100644
@@ -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
#7 lore raw

PATCH 5/5 ARM: davinci: omapl138-hawk: fix label names in GPIO lookup entries

In reply to 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")
---
 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
index 8e8d51f4a276..94c4f126ef86 100644
@@ -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
#8 lore raw
In reply to Bartosz Golaszewski

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