* [PATCH 1/2] gpio: tn48m: Add support for Delta TN4810M CPLD @ 2021-07-16 22:17 Robert Marko 2021-07-16 22:17 ` [PATCH 2/2] dt-bindings: gpio: tn48m: document TN4810M support Robert Marko 2021-08-02 12:10 ` [PATCH 1/2] gpio: tn48m: Add support for Delta TN4810M CPLD Bartosz Golaszewski 0 siblings, 2 replies; 7+ messages in thread From: Robert Marko @ 2021-07-16 22:17 UTC (permalink / raw) To: linus.walleij, bgolaszewski, robh+dt, linux-gpio, devicetree, linux-kernel Cc: luka.perkov, Robert Marko Delta TN4810M uses a similar CPLD GPIO expander like the TN48M, but it has pins for 48 SFP+ ports, making a total of 192 pins. It also provides the TX fault pins which the TN48M does not. Only TX disable pins like on the TN48M are output ones. Thankfully, regmap GPIO allows for the driver to be easily extended to support the TN4810M. Note that this patch depends on the following series: https://patchwork.ozlabs.org/project/linux-gpio/list/?series=247538 Signed-off-by: Robert Marko <robert.marko@sartura.hr> --- drivers/gpio/gpio-tn48m.c | 56 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 52 insertions(+), 4 deletions(-) diff --git a/drivers/gpio/gpio-tn48m.c b/drivers/gpio/gpio-tn48m.c index b12a6b4bc4b3..e429e7ade941 100644 --- a/drivers/gpio/gpio-tn48m.c +++ b/drivers/gpio/gpio-tn48m.c @@ -19,6 +19,10 @@ enum tn48m_gpio_type { TN48M_SFP_TX_DISABLE = 1, TN48M_SFP_PRESENT, TN48M_SFP_LOS, + TN4810M_SFP_TX_DISABLE, + TN4810M_SFP_TX_FAULT, + TN4810M_SFP_PRESENT, + TN4810M_SFP_LOS, }; static int tn48m_gpio_probe(struct platform_device *pdev) @@ -46,17 +50,36 @@ static int tn48m_gpio_probe(struct platform_device *pdev) config.regmap = regmap; config.parent = &pdev->dev; - config.ngpio = 4; + config.ngpio_per_reg = 8; switch (type) { case TN48M_SFP_TX_DISABLE: config.reg_set_base = base; + config.ngpio = 4; break; case TN48M_SFP_PRESENT: config.reg_dat_base = base; + config.ngpio = 4; break; case TN48M_SFP_LOS: config.reg_dat_base = base; + config.ngpio = 4; + break; + case TN4810M_SFP_TX_DISABLE: + config.reg_set_base = base; + config.ngpio = 48; + break; + case TN4810M_SFP_TX_FAULT: + config.reg_dat_base = base; + config.ngpio = 48; + break; + case TN4810M_SFP_PRESENT: + config.reg_dat_base = base; + config.ngpio = 48; + break; + case TN4810M_SFP_LOS: + config.reg_dat_base = base; + config.ngpio = 48; break; default: dev_err(&pdev->dev, "unknown type %d\n", type); @@ -67,9 +90,34 @@ static int tn48m_gpio_probe(struct platform_device *pdev) } static const struct of_device_id tn48m_gpio_of_match[] = { - { .compatible = "delta,tn48m-gpio-sfp-tx-disable", .data = (void *)TN48M_SFP_TX_DISABLE }, - { .compatible = "delta,tn48m-gpio-sfp-present", .data = (void *)TN48M_SFP_PRESENT }, - { .compatible = "delta,tn48m-gpio-sfp-los", .data = (void *)TN48M_SFP_LOS }, + { + .compatible = "delta,tn48m-gpio-sfp-tx-disable", + .data = (void *)TN48M_SFP_TX_DISABLE + }, + { + .compatible = "delta,tn48m-gpio-sfp-present", + .data = (void *)TN48M_SFP_PRESENT + }, + { + .compatible = "delta,tn48m-gpio-sfp-los", + .data = (void *)TN48M_SFP_LOS + }, + { + .compatible = "delta,tn4810m-gpio-sfp-tx-disable", + .data = (void *)TN4810M_SFP_TX_DISABLE + }, + { + .compatible = "delta,tn4810m-gpio-sfp-tx-fault", + .data = (void *)TN4810M_SFP_TX_FAULT + }, + { + .compatible = "delta,tn4810m-gpio-sfp-present", + .data = (void *)TN4810M_SFP_PRESENT + }, + { + .compatible = "delta,tn4810m-gpio-sfp-los", + .data = (void *)TN4810M_SFP_LOS + }, { } }; MODULE_DEVICE_TABLE(of, tn48m_gpio_of_match); -- 2.31.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/2] dt-bindings: gpio: tn48m: document TN4810M support 2021-07-16 22:17 [PATCH 1/2] gpio: tn48m: Add support for Delta TN4810M CPLD Robert Marko @ 2021-07-16 22:17 ` Robert Marko 2021-09-22 10:16 ` Bartosz Golaszewski 2021-08-02 12:10 ` [PATCH 1/2] gpio: tn48m: Add support for Delta TN4810M CPLD Bartosz Golaszewski 1 sibling, 1 reply; 7+ messages in thread From: Robert Marko @ 2021-07-16 22:17 UTC (permalink / raw) To: linus.walleij, bgolaszewski, robh+dt, linux-gpio, devicetree, linux-kernel Cc: luka.perkov, Robert Marko Delta TN4810M expands the existing TN48M drivers, so lets document the new compatibles. Note that this patch depends on the following series: https://patchwork.ozlabs.org/project/linux-gpio/list/?series=247538 Signed-off-by: Robert Marko <robert.marko@sartura.hr> --- Documentation/devicetree/bindings/gpio/delta,tn48m-gpio.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Documentation/devicetree/bindings/gpio/delta,tn48m-gpio.yaml b/Documentation/devicetree/bindings/gpio/delta,tn48m-gpio.yaml index aca646aecb12..d729c5dbed65 100644 --- a/Documentation/devicetree/bindings/gpio/delta,tn48m-gpio.yaml +++ b/Documentation/devicetree/bindings/gpio/delta,tn48m-gpio.yaml @@ -24,6 +24,10 @@ properties: - delta,tn48m-gpio-sfp-tx-disable - delta,tn48m-gpio-sfp-present - delta,tn48m-gpio-sfp-los + - delta,tn4810m-gpio-sfp-tx-disable + - delta,tn4810m-gpio-sfp-tx-fault + - delta,tn4810m-gpio-sfp-present + - delta,tn4810m-gpio-sfp-los reg: maxItems: 1 -- 2.31.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] dt-bindings: gpio: tn48m: document TN4810M support 2021-07-16 22:17 ` [PATCH 2/2] dt-bindings: gpio: tn48m: document TN4810M support Robert Marko @ 2021-09-22 10:16 ` Bartosz Golaszewski 2021-09-22 10:24 ` Robert Marko 0 siblings, 1 reply; 7+ messages in thread From: Bartosz Golaszewski @ 2021-09-22 10:16 UTC (permalink / raw) To: Robert Marko Cc: Linus Walleij, Rob Herring, linux-gpio, linux-devicetree, LKML, luka.perkov On Sat, Jul 17, 2021 at 12:17 AM Robert Marko <robert.marko@sartura.hr> wrote: > > Delta TN4810M expands the existing TN48M drivers, so lets > document the new compatibles. > > Note that this patch depends on the following series: > https://patchwork.ozlabs.org/project/linux-gpio/list/?series=247538 > > Signed-off-by: Robert Marko <robert.marko@sartura.hr> > --- > Documentation/devicetree/bindings/gpio/delta,tn48m-gpio.yaml | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/Documentation/devicetree/bindings/gpio/delta,tn48m-gpio.yaml b/Documentation/devicetree/bindings/gpio/delta,tn48m-gpio.yaml > index aca646aecb12..d729c5dbed65 100644 > --- a/Documentation/devicetree/bindings/gpio/delta,tn48m-gpio.yaml > +++ b/Documentation/devicetree/bindings/gpio/delta,tn48m-gpio.yaml > @@ -24,6 +24,10 @@ properties: > - delta,tn48m-gpio-sfp-tx-disable > - delta,tn48m-gpio-sfp-present > - delta,tn48m-gpio-sfp-los > + - delta,tn4810m-gpio-sfp-tx-disable > + - delta,tn4810m-gpio-sfp-tx-fault > + - delta,tn4810m-gpio-sfp-present > + - delta,tn4810m-gpio-sfp-los > > reg: > maxItems: 1 > -- > 2.31.1 > This series is still not upstream - what happened to it? Bart ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] dt-bindings: gpio: tn48m: document TN4810M support 2021-09-22 10:16 ` Bartosz Golaszewski @ 2021-09-22 10:24 ` Robert Marko 0 siblings, 0 replies; 7+ messages in thread From: Robert Marko @ 2021-09-22 10:24 UTC (permalink / raw) To: Bartosz Golaszewski Cc: Linus Walleij, Rob Herring, linux-gpio, linux-devicetree, LKML, Luka Perkov On Wed, Sep 22, 2021 at 12:16 PM Bartosz Golaszewski <bgolaszewski@baylibre.com> wrote: > > On Sat, Jul 17, 2021 at 12:17 AM Robert Marko <robert.marko@sartura.hr> wrote: > > > > Delta TN4810M expands the existing TN48M drivers, so lets > > document the new compatibles. > > > > Note that this patch depends on the following series: > > https://patchwork.ozlabs.org/project/linux-gpio/list/?series=247538 > > > > Signed-off-by: Robert Marko <robert.marko@sartura.hr> > > --- > > Documentation/devicetree/bindings/gpio/delta,tn48m-gpio.yaml | 4 ++++ > > 1 file changed, 4 insertions(+) > > > > diff --git a/Documentation/devicetree/bindings/gpio/delta,tn48m-gpio.yaml b/Documentation/devicetree/bindings/gpio/delta,tn48m-gpio.yaml > > index aca646aecb12..d729c5dbed65 100644 > > --- a/Documentation/devicetree/bindings/gpio/delta,tn48m-gpio.yaml > > +++ b/Documentation/devicetree/bindings/gpio/delta,tn48m-gpio.yaml > > @@ -24,6 +24,10 @@ properties: > > - delta,tn48m-gpio-sfp-tx-disable > > - delta,tn48m-gpio-sfp-present > > - delta,tn48m-gpio-sfp-los > > + - delta,tn4810m-gpio-sfp-tx-disable > > + - delta,tn4810m-gpio-sfp-tx-fault > > + - delta,tn4810m-gpio-sfp-present > > + - delta,tn4810m-gpio-sfp-los > > > > reg: > > maxItems: 1 > > -- > > 2.31.1 > > > > This series is still not upstream - what happened to it? Hi Bartosz, The TN48M path series that this depends on got stuck, and I haven't received a reply in a while. GPIO driver was initially reviewed and ACK-ed but then Linus W. requested further information to see if this truly fits as a GPIO driver, but then the discussion died a month ago. You can see the whole discussion here: https://patchwork.ozlabs.org/project/linux-gpio/patch/20210607123317.3242031-5-robert.marko@sartura.hr/ I have multiple devices in the queue with a similar approach, so until that one gets merged it makes no sense to send stuff upstream. I was hoping that we would reach some kind of a middle ground a long time ago. Regards, Robert > > Bart -- Robert Marko Staff Embedded Linux Engineer Sartura Ltd. Lendavska ulica 16a 10000 Zagreb, Croatia Email: robert.marko@sartura.hr Web: www.sartura.hr ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] gpio: tn48m: Add support for Delta TN4810M CPLD 2021-07-16 22:17 [PATCH 1/2] gpio: tn48m: Add support for Delta TN4810M CPLD Robert Marko 2021-07-16 22:17 ` [PATCH 2/2] dt-bindings: gpio: tn48m: document TN4810M support Robert Marko @ 2021-08-02 12:10 ` Bartosz Golaszewski 2021-08-02 12:12 ` Bartosz Golaszewski 1 sibling, 1 reply; 7+ messages in thread From: Bartosz Golaszewski @ 2021-08-02 12:10 UTC (permalink / raw) To: Robert Marko Cc: Linus Walleij, Rob Herring, linux-gpio, linux-devicetree, LKML, luka.perkov On Sat, Jul 17, 2021 at 12:17 AM Robert Marko <robert.marko@sartura.hr> wrote: > > Delta TN4810M uses a similar CPLD GPIO expander > like the TN48M, but it has pins for 48 SFP+ ports, > making a total of 192 pins. > It also provides the TX fault pins which the TN48M > does not. > > Only TX disable pins like on the TN48M are output > ones. > > Thankfully, regmap GPIO allows for the driver to be > easily extended to support the TN4810M. > > Note that this patch depends on the following series: > https://patchwork.ozlabs.org/project/linux-gpio/list/?series=247538 > > Signed-off-by: Robert Marko <robert.marko@sartura.hr> > --- > drivers/gpio/gpio-tn48m.c | 56 ++++++++++++++++++++++++++++++++++++--- > 1 file changed, 52 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpio/gpio-tn48m.c b/drivers/gpio/gpio-tn48m.c > index b12a6b4bc4b3..e429e7ade941 100644 > --- a/drivers/gpio/gpio-tn48m.c > +++ b/drivers/gpio/gpio-tn48m.c > @@ -19,6 +19,10 @@ enum tn48m_gpio_type { > TN48M_SFP_TX_DISABLE = 1, > TN48M_SFP_PRESENT, > TN48M_SFP_LOS, > + TN4810M_SFP_TX_DISABLE, > + TN4810M_SFP_TX_FAULT, > + TN4810M_SFP_PRESENT, > + TN4810M_SFP_LOS, > }; > > static int tn48m_gpio_probe(struct platform_device *pdev) > @@ -46,17 +50,36 @@ static int tn48m_gpio_probe(struct platform_device *pdev) > > config.regmap = regmap; > config.parent = &pdev->dev; > - config.ngpio = 4; > + config.ngpio_per_reg = 8; > > switch (type) { > case TN48M_SFP_TX_DISABLE: > config.reg_set_base = base; > + config.ngpio = 4; > break; > case TN48M_SFP_PRESENT: > config.reg_dat_base = base; > + config.ngpio = 4; > break; > case TN48M_SFP_LOS: > config.reg_dat_base = base; > + config.ngpio = 4; > + break; > + case TN4810M_SFP_TX_DISABLE: > + config.reg_set_base = base; > + config.ngpio = 48; > + break; > + case TN4810M_SFP_TX_FAULT: > + config.reg_dat_base = base; > + config.ngpio = 48; > + break; > + case TN4810M_SFP_PRESENT: > + config.reg_dat_base = base; > + config.ngpio = 48; > + break; > + case TN4810M_SFP_LOS: > + config.reg_dat_base = base; > + config.ngpio = 48; > break; > default: > dev_err(&pdev->dev, "unknown type %d\n", type); > @@ -67,9 +90,34 @@ static int tn48m_gpio_probe(struct platform_device *pdev) > } > > static const struct of_device_id tn48m_gpio_of_match[] = { > - { .compatible = "delta,tn48m-gpio-sfp-tx-disable", .data = (void *)TN48M_SFP_TX_DISABLE }, > - { .compatible = "delta,tn48m-gpio-sfp-present", .data = (void *)TN48M_SFP_PRESENT }, > - { .compatible = "delta,tn48m-gpio-sfp-los", .data = (void *)TN48M_SFP_LOS }, > + { > + .compatible = "delta,tn48m-gpio-sfp-tx-disable", > + .data = (void *)TN48M_SFP_TX_DISABLE > + }, > + { > + .compatible = "delta,tn48m-gpio-sfp-present", > + .data = (void *)TN48M_SFP_PRESENT > + }, > + { > + .compatible = "delta,tn48m-gpio-sfp-los", > + .data = (void *)TN48M_SFP_LOS > + }, > + { > + .compatible = "delta,tn4810m-gpio-sfp-tx-disable", > + .data = (void *)TN4810M_SFP_TX_DISABLE > + }, > + { > + .compatible = "delta,tn4810m-gpio-sfp-tx-fault", > + .data = (void *)TN4810M_SFP_TX_FAULT > + }, > + { > + .compatible = "delta,tn4810m-gpio-sfp-present", > + .data = (void *)TN4810M_SFP_PRESENT > + }, > + { > + .compatible = "delta,tn4810m-gpio-sfp-los", > + .data = (void *)TN4810M_SFP_LOS > + }, > { } > }; > MODULE_DEVICE_TABLE(of, tn48m_gpio_of_match); > -- > 2.31.1 > This looks good to me. I suppose the other patches are going in through the MFD tree. I don't see anything that can fail here at build-time - can you confirm that I can pick these patches up separately for v5.15? Bartosz ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] gpio: tn48m: Add support for Delta TN4810M CPLD 2021-08-02 12:10 ` [PATCH 1/2] gpio: tn48m: Add support for Delta TN4810M CPLD Bartosz Golaszewski @ 2021-08-02 12:12 ` Bartosz Golaszewski 2021-08-03 19:24 ` Robert Marko 0 siblings, 1 reply; 7+ messages in thread From: Bartosz Golaszewski @ 2021-08-02 12:12 UTC (permalink / raw) To: Robert Marko Cc: Linus Walleij, Rob Herring, linux-gpio, linux-devicetree, LKML, luka.perkov On Mon, Aug 2, 2021 at 2:10 PM Bartosz Golaszewski <bgolaszewski@baylibre.com> wrote: > > On Sat, Jul 17, 2021 at 12:17 AM Robert Marko <robert.marko@sartura.hr> wrote: > > > > Delta TN4810M uses a similar CPLD GPIO expander > > like the TN48M, but it has pins for 48 SFP+ ports, > > making a total of 192 pins. > > It also provides the TX fault pins which the TN48M > > does not. > > > > Only TX disable pins like on the TN48M are output > > ones. > > > > Thankfully, regmap GPIO allows for the driver to be > > easily extended to support the TN4810M. > > > > Note that this patch depends on the following series: > > https://patchwork.ozlabs.org/project/linux-gpio/list/?series=247538 > > > > Signed-off-by: Robert Marko <robert.marko@sartura.hr> > > --- > > drivers/gpio/gpio-tn48m.c | 56 ++++++++++++++++++++++++++++++++++++--- > > 1 file changed, 52 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/gpio/gpio-tn48m.c b/drivers/gpio/gpio-tn48m.c > > index b12a6b4bc4b3..e429e7ade941 100644 > > --- a/drivers/gpio/gpio-tn48m.c > > +++ b/drivers/gpio/gpio-tn48m.c > > @@ -19,6 +19,10 @@ enum tn48m_gpio_type { > > TN48M_SFP_TX_DISABLE = 1, > > TN48M_SFP_PRESENT, > > TN48M_SFP_LOS, > > + TN4810M_SFP_TX_DISABLE, > > + TN4810M_SFP_TX_FAULT, > > + TN4810M_SFP_PRESENT, > > + TN4810M_SFP_LOS, > > }; > > > > static int tn48m_gpio_probe(struct platform_device *pdev) > > @@ -46,17 +50,36 @@ static int tn48m_gpio_probe(struct platform_device *pdev) > > > > config.regmap = regmap; > > config.parent = &pdev->dev; > > - config.ngpio = 4; > > + config.ngpio_per_reg = 8; > > > > switch (type) { > > case TN48M_SFP_TX_DISABLE: > > config.reg_set_base = base; > > + config.ngpio = 4; > > break; > > case TN48M_SFP_PRESENT: > > config.reg_dat_base = base; > > + config.ngpio = 4; > > break; > > case TN48M_SFP_LOS: > > config.reg_dat_base = base; > > + config.ngpio = 4; > > + break; > > + case TN4810M_SFP_TX_DISABLE: > > + config.reg_set_base = base; > > + config.ngpio = 48; > > + break; > > + case TN4810M_SFP_TX_FAULT: > > + config.reg_dat_base = base; > > + config.ngpio = 48; > > + break; > > + case TN4810M_SFP_PRESENT: > > + config.reg_dat_base = base; > > + config.ngpio = 48; > > + break; > > + case TN4810M_SFP_LOS: > > + config.reg_dat_base = base; > > + config.ngpio = 48; > > break; > > default: > > dev_err(&pdev->dev, "unknown type %d\n", type); > > @@ -67,9 +90,34 @@ static int tn48m_gpio_probe(struct platform_device *pdev) > > } > > > > static const struct of_device_id tn48m_gpio_of_match[] = { > > - { .compatible = "delta,tn48m-gpio-sfp-tx-disable", .data = (void *)TN48M_SFP_TX_DISABLE }, > > - { .compatible = "delta,tn48m-gpio-sfp-present", .data = (void *)TN48M_SFP_PRESENT }, > > - { .compatible = "delta,tn48m-gpio-sfp-los", .data = (void *)TN48M_SFP_LOS }, > > + { > > + .compatible = "delta,tn48m-gpio-sfp-tx-disable", > > + .data = (void *)TN48M_SFP_TX_DISABLE > > + }, > > + { > > + .compatible = "delta,tn48m-gpio-sfp-present", > > + .data = (void *)TN48M_SFP_PRESENT > > + }, > > + { > > + .compatible = "delta,tn48m-gpio-sfp-los", > > + .data = (void *)TN48M_SFP_LOS > > + }, > > + { > > + .compatible = "delta,tn4810m-gpio-sfp-tx-disable", > > + .data = (void *)TN4810M_SFP_TX_DISABLE > > + }, > > + { > > + .compatible = "delta,tn4810m-gpio-sfp-tx-fault", > > + .data = (void *)TN4810M_SFP_TX_FAULT > > + }, > > + { > > + .compatible = "delta,tn4810m-gpio-sfp-present", > > + .data = (void *)TN4810M_SFP_PRESENT > > + }, > > + { > > + .compatible = "delta,tn4810m-gpio-sfp-los", > > + .data = (void *)TN4810M_SFP_LOS > > + }, > > { } > > }; > > MODULE_DEVICE_TABLE(of, tn48m_gpio_of_match); > > -- > > 2.31.1 > > > > This looks good to me. I suppose the other patches are going in > through the MFD tree. I don't see anything that can fail here at > build-time - can you confirm that I can pick these patches up > separately for v5.15? > > Bartosz Scratch that, I now saw Linus' comment about the special purpose pins under the other series. Let's clear that up first. Bart ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] gpio: tn48m: Add support for Delta TN4810M CPLD 2021-08-02 12:12 ` Bartosz Golaszewski @ 2021-08-03 19:24 ` Robert Marko 0 siblings, 0 replies; 7+ messages in thread From: Robert Marko @ 2021-08-03 19:24 UTC (permalink / raw) To: Bartosz Golaszewski Cc: Linus Walleij, Rob Herring, linux-gpio, linux-devicetree, LKML, Luka Perkov On Mon, Aug 2, 2021 at 2:12 PM Bartosz Golaszewski <bgolaszewski@baylibre.com> wrote: > > On Mon, Aug 2, 2021 at 2:10 PM Bartosz Golaszewski > <bgolaszewski@baylibre.com> wrote: > > > > On Sat, Jul 17, 2021 at 12:17 AM Robert Marko <robert.marko@sartura.hr> wrote: > > > > > > Delta TN4810M uses a similar CPLD GPIO expander > > > like the TN48M, but it has pins for 48 SFP+ ports, > > > making a total of 192 pins. > > > It also provides the TX fault pins which the TN48M > > > does not. > > > > > > Only TX disable pins like on the TN48M are output > > > ones. > > > > > > Thankfully, regmap GPIO allows for the driver to be > > > easily extended to support the TN4810M. > > > > > > Note that this patch depends on the following series: > > > https://patchwork.ozlabs.org/project/linux-gpio/list/?series=247538 > > > > > > Signed-off-by: Robert Marko <robert.marko@sartura.hr> > > > --- > > > drivers/gpio/gpio-tn48m.c | 56 ++++++++++++++++++++++++++++++++++++--- > > > 1 file changed, 52 insertions(+), 4 deletions(-) > > > > > > diff --git a/drivers/gpio/gpio-tn48m.c b/drivers/gpio/gpio-tn48m.c > > > index b12a6b4bc4b3..e429e7ade941 100644 > > > --- a/drivers/gpio/gpio-tn48m.c > > > +++ b/drivers/gpio/gpio-tn48m.c > > > @@ -19,6 +19,10 @@ enum tn48m_gpio_type { > > > TN48M_SFP_TX_DISABLE = 1, > > > TN48M_SFP_PRESENT, > > > TN48M_SFP_LOS, > > > + TN4810M_SFP_TX_DISABLE, > > > + TN4810M_SFP_TX_FAULT, > > > + TN4810M_SFP_PRESENT, > > > + TN4810M_SFP_LOS, > > > }; > > > > > > static int tn48m_gpio_probe(struct platform_device *pdev) > > > @@ -46,17 +50,36 @@ static int tn48m_gpio_probe(struct platform_device *pdev) > > > > > > config.regmap = regmap; > > > config.parent = &pdev->dev; > > > - config.ngpio = 4; > > > + config.ngpio_per_reg = 8; > > > > > > switch (type) { > > > case TN48M_SFP_TX_DISABLE: > > > config.reg_set_base = base; > > > + config.ngpio = 4; > > > break; > > > case TN48M_SFP_PRESENT: > > > config.reg_dat_base = base; > > > + config.ngpio = 4; > > > break; > > > case TN48M_SFP_LOS: > > > config.reg_dat_base = base; > > > + config.ngpio = 4; > > > + break; > > > + case TN4810M_SFP_TX_DISABLE: > > > + config.reg_set_base = base; > > > + config.ngpio = 48; > > > + break; > > > + case TN4810M_SFP_TX_FAULT: > > > + config.reg_dat_base = base; > > > + config.ngpio = 48; > > > + break; > > > + case TN4810M_SFP_PRESENT: > > > + config.reg_dat_base = base; > > > + config.ngpio = 48; > > > + break; > > > + case TN4810M_SFP_LOS: > > > + config.reg_dat_base = base; > > > + config.ngpio = 48; > > > break; > > > default: > > > dev_err(&pdev->dev, "unknown type %d\n", type); > > > @@ -67,9 +90,34 @@ static int tn48m_gpio_probe(struct platform_device *pdev) > > > } > > > > > > static const struct of_device_id tn48m_gpio_of_match[] = { > > > - { .compatible = "delta,tn48m-gpio-sfp-tx-disable", .data = (void *)TN48M_SFP_TX_DISABLE }, > > > - { .compatible = "delta,tn48m-gpio-sfp-present", .data = (void *)TN48M_SFP_PRESENT }, > > > - { .compatible = "delta,tn48m-gpio-sfp-los", .data = (void *)TN48M_SFP_LOS }, > > > + { > > > + .compatible = "delta,tn48m-gpio-sfp-tx-disable", > > > + .data = (void *)TN48M_SFP_TX_DISABLE > > > + }, > > > + { > > > + .compatible = "delta,tn48m-gpio-sfp-present", > > > + .data = (void *)TN48M_SFP_PRESENT > > > + }, > > > + { > > > + .compatible = "delta,tn48m-gpio-sfp-los", > > > + .data = (void *)TN48M_SFP_LOS > > > + }, > > > + { > > > + .compatible = "delta,tn4810m-gpio-sfp-tx-disable", > > > + .data = (void *)TN4810M_SFP_TX_DISABLE > > > + }, > > > + { > > > + .compatible = "delta,tn4810m-gpio-sfp-tx-fault", > > > + .data = (void *)TN4810M_SFP_TX_FAULT > > > + }, > > > + { > > > + .compatible = "delta,tn4810m-gpio-sfp-present", > > > + .data = (void *)TN4810M_SFP_PRESENT > > > + }, > > > + { > > > + .compatible = "delta,tn4810m-gpio-sfp-los", > > > + .data = (void *)TN4810M_SFP_LOS > > > + }, > > > { } > > > }; > > > MODULE_DEVICE_TABLE(of, tn48m_gpio_of_match); > > > -- > > > 2.31.1 > > > > > > > This looks good to me. I suppose the other patches are going in > > through the MFD tree. I don't see anything that can fail here at > > build-time - can you confirm that I can pick these patches up > > separately for v5.15? > > > > Bartosz > > Scratch that, I now saw Linus' comment about the special purpose pins > under the other series. Let's clear that up first. Yeah, I have finally replied to Linus, hopefully, we can clear it up. Thanks, Robert > > Bart -- Robert Marko Staff Embedded Linux Engineer Sartura Ltd. Lendavska ulica 16a 10000 Zagreb, Croatia Email: robert.marko@sartura.hr Web: www.sartura.hr ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-09-22 10:24 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-07-16 22:17 [PATCH 1/2] gpio: tn48m: Add support for Delta TN4810M CPLD Robert Marko 2021-07-16 22:17 ` [PATCH 2/2] dt-bindings: gpio: tn48m: document TN4810M support Robert Marko 2021-09-22 10:16 ` Bartosz Golaszewski 2021-09-22 10:24 ` Robert Marko 2021-08-02 12:10 ` [PATCH 1/2] gpio: tn48m: Add support for Delta TN4810M CPLD Bartosz Golaszewski 2021-08-02 12:12 ` Bartosz Golaszewski 2021-08-03 19:24 ` Robert Marko
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).