| Message ID | 20170627005550.59771-1-xow@google.com |
|---|---|
| State | Accepted, archived |
| Headers | show |
Hi Xo, On Tue, Jun 27, 2017 at 10:25 AM, Xo Wang <xow@google.com> wrote: > Zaius changes FSI GPIO mappings dynamically based on board revision > fuses. The GPIO lookup tables used matches the FSI device tree node name > that is used prior to a3f0f300d74d05977a21a6941979414a78360d89. Now they > no longer work as intended to configure the FSI driver. Owch. It's unfortunate that it can't be done based on the compatible, but I guess that could go wrong where there are multiple nodes with the same string. > > Update the lookup table device name match string. > > Signed-off-by: Xo Wang <xow@google.com> Doh, this didn't make it to my inbox :( Found the patch in patchwork and applied to dev-4.10. Please ping me on irc if you think I'm missing any of your mail. Cheers, Joel > --- > arch/arm/mach-aspeed/aspeed.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mach-aspeed/aspeed.c b/arch/arm/mach-aspeed/aspeed.c > index 32eb36183e92..420a8d0344da 100644 > --- a/arch/arm/mach-aspeed/aspeed.c > +++ b/arch/arm/mach-aspeed/aspeed.c > @@ -138,7 +138,7 @@ static void __init do_zaius_setup(void) > /* EVT boards have different FSI pin mappings */ > if (board_rev < 0x08) { > static struct gpiod_lookup_table fsi_evt_gpio_lookup = { > - .dev_id = "fsi-master", > + .dev_id = "gpio-fsi", > .table = { > GPIO_LOOKUP("1e780000.gpio", ASPEED_GPIO(C, 3), > "clock", GPIO_ACTIVE_HIGH), > @@ -150,7 +150,7 @@ static void __init do_zaius_setup(void) > gpiod_add_lookup_table(&fsi_evt_gpio_lookup); > } else { > static struct gpiod_lookup_table fsi_gpio_lookup = { > - .dev_id = "fsi-master", > + .dev_id = "gpio-fsi", > .table = { > GPIO_LOOKUP("1e780000.gpio", ASPEED_GPIO(G, 0), > "clock", GPIO_ACTIVE_HIGH),
diff --git a/arch/arm/mach-aspeed/aspeed.c b/arch/arm/mach-aspeed/aspeed.c index 32eb36183e92..420a8d0344da 100644 --- a/arch/arm/mach-aspeed/aspeed.c +++ b/arch/arm/mach-aspeed/aspeed.c @@ -138,7 +138,7 @@ static void __init do_zaius_setup(void) /* EVT boards have different FSI pin mappings */ if (board_rev < 0x08) { static struct gpiod_lookup_table fsi_evt_gpio_lookup = { - .dev_id = "fsi-master", + .dev_id = "gpio-fsi", .table = { GPIO_LOOKUP("1e780000.gpio", ASPEED_GPIO(C, 3), "clock", GPIO_ACTIVE_HIGH), @@ -150,7 +150,7 @@ static void __init do_zaius_setup(void) gpiod_add_lookup_table(&fsi_evt_gpio_lookup); } else { static struct gpiod_lookup_table fsi_gpio_lookup = { - .dev_id = "fsi-master", + .dev_id = "gpio-fsi", .table = { GPIO_LOOKUP("1e780000.gpio", ASPEED_GPIO(G, 0), "clock", GPIO_ACTIVE_HIGH),
Zaius changes FSI GPIO mappings dynamically based on board revision fuses. The GPIO lookup tables used matches the FSI device tree node name that is used prior to a3f0f300d74d05977a21a6941979414a78360d89. Now they no longer work as intended to configure the FSI driver. Update the lookup table device name match string. Signed-off-by: Xo Wang <xow@google.com> --- arch/arm/mach-aspeed/aspeed.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)