| Message ID | 1650654583-89933-2-git-send-email-zhouyanjie@wanyeetech.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Improve SPI support for Ingenic SoCs. | expand |
Hi Zhou, Le sam., avril 23 2022 at 03:09:41 +0800, 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com> a écrit : > Add support for using GPIOs as chip select lines on Ingenic SoCs. > > Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com> > --- > > Notes: > v1->v2: > Use "device_property_read_u32()" instead > "of_property_read_u32()" as Paul Cercueil's suggestion. > > drivers/spi/spi-ingenic.c | 11 +++++++++-- > 1 file changed, 9 insertions(+), 2 deletions(-) > > diff --git a/drivers/spi/spi-ingenic.c b/drivers/spi/spi-ingenic.c > index 03077a7..bb512ca 100644 > --- a/drivers/spi/spi-ingenic.c > +++ b/drivers/spi/spi-ingenic.c > @@ -380,7 +380,7 @@ static int spi_ingenic_probe(struct > platform_device *pdev) > struct spi_controller *ctlr; > struct ingenic_spi *priv; > void __iomem *base; > - int ret; > + int num_cs, ret; > > pdata = of_device_get_match_data(dev); > if (!pdata) { > @@ -416,6 +416,11 @@ static int spi_ingenic_probe(struct > platform_device *pdev) > if (IS_ERR(priv->flen_field)) > return PTR_ERR(priv->flen_field); > > + if (device_property_read_u32(dev, "num-cs", &num_cs)) { > + dev_warn(dev, "Number of chip select lines not specified.\n"); > + num_cs = 2; The "num-cs" property is not required in the binding, so I don't think the dev_warn() is warranted. Just silently set num_cs = 2. With this addressed: Reviewed-by: Paul Cercueil <paul@crapouillou.net> Cheers, -Paul > + } > + > platform_set_drvdata(pdev, ctlr); > > ctlr->prepare_transfer_hardware = spi_ingenic_prepare_hardware; > @@ -429,7 +434,9 @@ static int spi_ingenic_probe(struct > platform_device *pdev) > ctlr->bits_per_word_mask = pdata->bits_per_word_mask; > ctlr->min_speed_hz = 7200; > ctlr->max_speed_hz = 54000000; > - ctlr->num_chipselect = 2; > + ctlr->use_gpio_descriptors = true; > + ctlr->max_native_cs = 2; > + ctlr->num_chipselect = num_cs; > ctlr->dev.of_node = pdev->dev.of_node; > > if (spi_ingenic_request_dma(ctlr, dev)) > -- > 2.7.4 >
Hi Paul, On 2022/4/23 上午3:20, Paul Cercueil wrote: > Hi Zhou, > > Le sam., avril 23 2022 at 03:09:41 +0800, 周琰杰 (Zhou Yanjie) > <zhouyanjie@wanyeetech.com> a écrit : >> Add support for using GPIOs as chip select lines on Ingenic SoCs. >> >> Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com> >> --- >> >> Notes: >> v1->v2: >> Use "device_property_read_u32()" instead >> "of_property_read_u32()" as Paul Cercueil's suggestion. >> >> drivers/spi/spi-ingenic.c | 11 +++++++++-- >> 1 file changed, 9 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/spi/spi-ingenic.c b/drivers/spi/spi-ingenic.c >> index 03077a7..bb512ca 100644 >> --- a/drivers/spi/spi-ingenic.c >> +++ b/drivers/spi/spi-ingenic.c >> @@ -380,7 +380,7 @@ static int spi_ingenic_probe(struct >> platform_device *pdev) >> struct spi_controller *ctlr; >> struct ingenic_spi *priv; >> void __iomem *base; >> - int ret; >> + int num_cs, ret; >> >> pdata = of_device_get_match_data(dev); >> if (!pdata) { >> @@ -416,6 +416,11 @@ static int spi_ingenic_probe(struct >> platform_device *pdev) >> if (IS_ERR(priv->flen_field)) >> return PTR_ERR(priv->flen_field); >> >> + if (device_property_read_u32(dev, "num-cs", &num_cs)) { >> + dev_warn(dev, "Number of chip select lines not specified.\n"); >> + num_cs = 2; > > The "num-cs" property is not required in the binding, so I don't think > the dev_warn() is warranted. Just silently set num_cs = 2. > Sure. > With this addressed: > Reviewed-by: Paul Cercueil <paul@crapouillou.net> > > Cheers, > -Paul > >> + } >> + >> platform_set_drvdata(pdev, ctlr); >> >> ctlr->prepare_transfer_hardware = spi_ingenic_prepare_hardware; >> @@ -429,7 +434,9 @@ static int spi_ingenic_probe(struct >> platform_device *pdev) >> ctlr->bits_per_word_mask = pdata->bits_per_word_mask; >> ctlr->min_speed_hz = 7200; >> ctlr->max_speed_hz = 54000000; >> - ctlr->num_chipselect = 2; >> + ctlr->use_gpio_descriptors = true; >> + ctlr->max_native_cs = 2; >> + ctlr->num_chipselect = num_cs; >> ctlr->dev.of_node = pdev->dev.of_node; >> >> if (spi_ingenic_request_dma(ctlr, dev)) >> -- >> 2.7.4 >> >
diff --git a/drivers/spi/spi-ingenic.c b/drivers/spi/spi-ingenic.c index 03077a7..bb512ca 100644 --- a/drivers/spi/spi-ingenic.c +++ b/drivers/spi/spi-ingenic.c @@ -380,7 +380,7 @@ static int spi_ingenic_probe(struct platform_device *pdev) struct spi_controller *ctlr; struct ingenic_spi *priv; void __iomem *base; - int ret; + int num_cs, ret; pdata = of_device_get_match_data(dev); if (!pdata) { @@ -416,6 +416,11 @@ static int spi_ingenic_probe(struct platform_device *pdev) if (IS_ERR(priv->flen_field)) return PTR_ERR(priv->flen_field); + if (device_property_read_u32(dev, "num-cs", &num_cs)) { + dev_warn(dev, "Number of chip select lines not specified.\n"); + num_cs = 2; + } + platform_set_drvdata(pdev, ctlr); ctlr->prepare_transfer_hardware = spi_ingenic_prepare_hardware; @@ -429,7 +434,9 @@ static int spi_ingenic_probe(struct platform_device *pdev) ctlr->bits_per_word_mask = pdata->bits_per_word_mask; ctlr->min_speed_hz = 7200; ctlr->max_speed_hz = 54000000; - ctlr->num_chipselect = 2; + ctlr->use_gpio_descriptors = true; + ctlr->max_native_cs = 2; + ctlr->num_chipselect = num_cs; ctlr->dev.of_node = pdev->dev.of_node; if (spi_ingenic_request_dma(ctlr, dev))
Add support for using GPIOs as chip select lines on Ingenic SoCs. Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com> --- Notes: v1->v2: Use "device_property_read_u32()" instead "of_property_read_u32()" as Paul Cercueil's suggestion. drivers/spi/spi-ingenic.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)