Message ID | 20220308103331.4116-3-nandhini.srikandan@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | Add support for Intel Thunder Bay SPI controller | expand |
On Tue, Mar 08, 2022 at 06:33:30PM +0800, nandhini.srikandan@intel.com wrote: > From: Nandhini Srikandan <nandhini.srikandan@intel.com> > > Add support for Intel Thunder Bay SPI controller, which uses DesignWare > DWC_ssi core and also add common init function for both Keem Bay and > Thunder Bay. Please see my comments to the patch [PATCH v4 3/3] spi: dw: Add support for master mode selection for DWC SSI controller of this series. I think this patch should go after that one so to introduce a safer conversion of the DWC AHB SSI functionality. -Sergey > > Signed-off-by: Nandhini Srikandan <nandhini.srikandan@intel.com> > --- > drivers/spi/spi-dw-mmio.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/spi/spi-dw-mmio.c b/drivers/spi/spi-dw-mmio.c > index 5101c4c6017b..26c40ea6dd12 100644 > --- a/drivers/spi/spi-dw-mmio.c > +++ b/drivers/spi/spi-dw-mmio.c > @@ -214,11 +214,10 @@ static int dw_spi_hssi_init(struct platform_device *pdev, > return 0; > } > > -static int dw_spi_keembay_init(struct platform_device *pdev, > - struct dw_spi_mmio *dwsmmio) > +static int dw_spi_intel_init(struct platform_device *pdev, > + struct dw_spi_mmio *dwsmmio) > { > dwsmmio->dws.ip = DW_HSSI_ID; > - dwsmmio->dws.caps = DW_SPI_CAP_KEEMBAY_MST; > > return 0; > } > @@ -349,7 +348,8 @@ static const struct of_device_id dw_spi_mmio_of_match[] = { > { .compatible = "amazon,alpine-dw-apb-ssi", .data = dw_spi_alpine_init}, > { .compatible = "renesas,rzn1-spi", .data = dw_spi_pssi_init}, > { .compatible = "snps,dwc-ssi-1.01a", .data = dw_spi_hssi_init}, > - { .compatible = "intel,keembay-ssi", .data = dw_spi_keembay_init}, > + { .compatible = "intel,keembay-ssi", .data = dw_spi_intel_init}, > + { .compatible = "intel,thunderbay-ssi", .data = dw_spi_intel_init}, > { .compatible = "microchip,sparx5-spi", dw_spi_mscc_sparx5_init}, > { .compatible = "canaan,k210-spi", dw_spi_canaan_k210_init}, > { /* end of table */} > -- > 2.17.1 >
diff --git a/drivers/spi/spi-dw-mmio.c b/drivers/spi/spi-dw-mmio.c index 5101c4c6017b..26c40ea6dd12 100644 --- a/drivers/spi/spi-dw-mmio.c +++ b/drivers/spi/spi-dw-mmio.c @@ -214,11 +214,10 @@ static int dw_spi_hssi_init(struct platform_device *pdev, return 0; } -static int dw_spi_keembay_init(struct platform_device *pdev, - struct dw_spi_mmio *dwsmmio) +static int dw_spi_intel_init(struct platform_device *pdev, + struct dw_spi_mmio *dwsmmio) { dwsmmio->dws.ip = DW_HSSI_ID; - dwsmmio->dws.caps = DW_SPI_CAP_KEEMBAY_MST; return 0; } @@ -349,7 +348,8 @@ static const struct of_device_id dw_spi_mmio_of_match[] = { { .compatible = "amazon,alpine-dw-apb-ssi", .data = dw_spi_alpine_init}, { .compatible = "renesas,rzn1-spi", .data = dw_spi_pssi_init}, { .compatible = "snps,dwc-ssi-1.01a", .data = dw_spi_hssi_init}, - { .compatible = "intel,keembay-ssi", .data = dw_spi_keembay_init}, + { .compatible = "intel,keembay-ssi", .data = dw_spi_intel_init}, + { .compatible = "intel,thunderbay-ssi", .data = dw_spi_intel_init}, { .compatible = "microchip,sparx5-spi", dw_spi_mscc_sparx5_init}, { .compatible = "canaan,k210-spi", dw_spi_canaan_k210_init}, { /* end of table */}