| Message ID | 20190831180402.10008-1-alexander.sverdlin@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 4fbc485324d2975c54201091dfad0a7dd4902324 |
| Headers | show |
| Series | spi: ep93xx: Repair SPI CS lookup tables | expand |
On Sat, Aug 31, 2019 at 8:05 PM Alexander Sverdlin <alexander.sverdlin@gmail.com> wrote: > The actual device name of the SPI controller being registered on EP93xx is > "spi0" (as seen by gpiod_find_lookup_table()). This patch fixes all > relevant lookup tables and the following failure (seen on EDB9302): > > ep93xx-spi ep93xx-spi.0: failed to register SPI master > ep93xx-spi: probe of ep93xx-spi.0 failed with error -22 > > Fixes: 1dfbf334f1236 ("spi: ep93xx: Convert to use CS GPIO descriptors") > Cc: stable@vger.kernel.org > Signed-off-by: Alexander Sverdlin <alexander.sverdlin@gmail.com> Sorry for the mistakes and thanks for fixing, much appreciated! Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
On Sat, 31 Aug 2019 20:04:02 +0200 Alexander Sverdlin <alexander.sverdlin@gmail.com> wrote: > The actual device name of the SPI controller being registered on > EP93xx is "spi0" (as seen by gpiod_find_lookup_table()). This patch > fixes all relevant lookup tables and the following failure (seen on > EDB9302): > > ep93xx-spi ep93xx-spi.0: failed to register SPI master > ep93xx-spi: probe of ep93xx-spi.0 failed with error -22 > > Fixes: 1dfbf334f1236 ("spi: ep93xx: Convert to use CS GPIO > descriptors") Cc: stable@vger.kernel.org > Signed-off-by: Alexander Sverdlin <alexander.sverdlin@gmail.com> > --- > arch/arm/mach-ep93xx/edb93xx.c | 2 +- > arch/arm/mach-ep93xx/simone.c | 2 +- > arch/arm/mach-ep93xx/ts72xx.c | 4 ++-- > arch/arm/mach-ep93xx/vision_ep9307.c | 2 +- > 4 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/arch/arm/mach-ep93xx/edb93xx.c > b/arch/arm/mach-ep93xx/edb93xx.c index 1f0da76a39de..7b7280c21ee0 > 100644 --- a/arch/arm/mach-ep93xx/edb93xx.c > +++ b/arch/arm/mach-ep93xx/edb93xx.c > @@ -103,7 +103,7 @@ static struct spi_board_info > edb93xx_spi_board_info[] __initdata = { }; > > static struct gpiod_lookup_table edb93xx_spi_cs_gpio_table = { > - .dev_id = "ep93xx-spi.0", > + .dev_id = "spi0", > .table = { > GPIO_LOOKUP("A", 6, "cs", GPIO_ACTIVE_LOW), > { }, > diff --git a/arch/arm/mach-ep93xx/simone.c > b/arch/arm/mach-ep93xx/simone.c index e2658e22bba1..8a53b74dc4b2 > 100644 --- a/arch/arm/mach-ep93xx/simone.c > +++ b/arch/arm/mach-ep93xx/simone.c > @@ -73,7 +73,7 @@ static struct spi_board_info simone_spi_devices[] > __initdata = { > * v1.3 parts will still work, since the signal on SFRMOUT is > automatic. */ > static struct gpiod_lookup_table simone_spi_cs_gpio_table = { > - .dev_id = "ep93xx-spi.0", > + .dev_id = "spi0", > .table = { > GPIO_LOOKUP("A", 1, "cs", GPIO_ACTIVE_LOW), > { }, > diff --git a/arch/arm/mach-ep93xx/ts72xx.c > b/arch/arm/mach-ep93xx/ts72xx.c index 582e06e104fd..e0e1b11032f1 > 100644 --- a/arch/arm/mach-ep93xx/ts72xx.c > +++ b/arch/arm/mach-ep93xx/ts72xx.c > @@ -267,7 +267,7 @@ static struct spi_board_info bk3_spi_board_info[] > __initdata = { > * goes through CPLD > */ > static struct gpiod_lookup_table bk3_spi_cs_gpio_table = { > - .dev_id = "ep93xx-spi.0", > + .dev_id = "spi0", > .table = { > GPIO_LOOKUP("F", 3, "cs", GPIO_ACTIVE_LOW), > { }, > @@ -316,7 +316,7 @@ static struct spi_board_info ts72xx_spi_devices[] > __initdata = { }; > > static struct gpiod_lookup_table ts72xx_spi_cs_gpio_table = { > - .dev_id = "ep93xx-spi.0", > + .dev_id = "spi0", > .table = { > /* DIO_17 */ > GPIO_LOOKUP("F", 2, "cs", GPIO_ACTIVE_LOW), > diff --git a/arch/arm/mach-ep93xx/vision_ep9307.c > b/arch/arm/mach-ep93xx/vision_ep9307.c index > a88a1d807b32..cbcba3136d74 100644 --- > a/arch/arm/mach-ep93xx/vision_ep9307.c +++ > b/arch/arm/mach-ep93xx/vision_ep9307.c @@ -242,7 +242,7 @@ static > struct spi_board_info vision_spi_board_info[] __initdata = { }; > > static struct gpiod_lookup_table vision_spi_cs_gpio_table = { > - .dev_id = "ep93xx-spi.0", > + .dev_id = "spi0", > .table = { > GPIO_LOOKUP_IDX("A", 6, "cs", 0, GPIO_ACTIVE_LOW), > GPIO_LOOKUP_IDX("A", 7, "cs", 1, GPIO_ACTIVE_LOW), Reviewed-by: Lukasz Majewski <lukma@denx.de> Best regards, Lukasz Majewski -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma@denx.de
diff --git a/arch/arm/mach-ep93xx/edb93xx.c b/arch/arm/mach-ep93xx/edb93xx.c index 1f0da76a39de..7b7280c21ee0 100644 --- a/arch/arm/mach-ep93xx/edb93xx.c +++ b/arch/arm/mach-ep93xx/edb93xx.c @@ -103,7 +103,7 @@ static struct spi_board_info edb93xx_spi_board_info[] __initdata = { }; static struct gpiod_lookup_table edb93xx_spi_cs_gpio_table = { - .dev_id = "ep93xx-spi.0", + .dev_id = "spi0", .table = { GPIO_LOOKUP("A", 6, "cs", GPIO_ACTIVE_LOW), { }, diff --git a/arch/arm/mach-ep93xx/simone.c b/arch/arm/mach-ep93xx/simone.c index e2658e22bba1..8a53b74dc4b2 100644 --- a/arch/arm/mach-ep93xx/simone.c +++ b/arch/arm/mach-ep93xx/simone.c @@ -73,7 +73,7 @@ static struct spi_board_info simone_spi_devices[] __initdata = { * v1.3 parts will still work, since the signal on SFRMOUT is automatic. */ static struct gpiod_lookup_table simone_spi_cs_gpio_table = { - .dev_id = "ep93xx-spi.0", + .dev_id = "spi0", .table = { GPIO_LOOKUP("A", 1, "cs", GPIO_ACTIVE_LOW), { }, diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c index 582e06e104fd..e0e1b11032f1 100644 --- a/arch/arm/mach-ep93xx/ts72xx.c +++ b/arch/arm/mach-ep93xx/ts72xx.c @@ -267,7 +267,7 @@ static struct spi_board_info bk3_spi_board_info[] __initdata = { * goes through CPLD */ static struct gpiod_lookup_table bk3_spi_cs_gpio_table = { - .dev_id = "ep93xx-spi.0", + .dev_id = "spi0", .table = { GPIO_LOOKUP("F", 3, "cs", GPIO_ACTIVE_LOW), { }, @@ -316,7 +316,7 @@ static struct spi_board_info ts72xx_spi_devices[] __initdata = { }; static struct gpiod_lookup_table ts72xx_spi_cs_gpio_table = { - .dev_id = "ep93xx-spi.0", + .dev_id = "spi0", .table = { /* DIO_17 */ GPIO_LOOKUP("F", 2, "cs", GPIO_ACTIVE_LOW), diff --git a/arch/arm/mach-ep93xx/vision_ep9307.c b/arch/arm/mach-ep93xx/vision_ep9307.c index a88a1d807b32..cbcba3136d74 100644 --- a/arch/arm/mach-ep93xx/vision_ep9307.c +++ b/arch/arm/mach-ep93xx/vision_ep9307.c @@ -242,7 +242,7 @@ static struct spi_board_info vision_spi_board_info[] __initdata = { }; static struct gpiod_lookup_table vision_spi_cs_gpio_table = { - .dev_id = "ep93xx-spi.0", + .dev_id = "spi0", .table = { GPIO_LOOKUP_IDX("A", 6, "cs", 0, GPIO_ACTIVE_LOW), GPIO_LOOKUP_IDX("A", 7, "cs", 1, GPIO_ACTIVE_LOW),
The actual device name of the SPI controller being registered on EP93xx is "spi0" (as seen by gpiod_find_lookup_table()). This patch fixes all relevant lookup tables and the following failure (seen on EDB9302): ep93xx-spi ep93xx-spi.0: failed to register SPI master ep93xx-spi: probe of ep93xx-spi.0 failed with error -22 Fixes: 1dfbf334f1236 ("spi: ep93xx: Convert to use CS GPIO descriptors") Cc: stable@vger.kernel.org Signed-off-by: Alexander Sverdlin <alexander.sverdlin@gmail.com> --- arch/arm/mach-ep93xx/edb93xx.c | 2 +- arch/arm/mach-ep93xx/simone.c | 2 +- arch/arm/mach-ep93xx/ts72xx.c | 4 ++-- arch/arm/mach-ep93xx/vision_ep9307.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)