android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spi: dw: Add Elkhart Lake PSE DMA support

Browse Source 
Elkhart Lake PSE SPI is capable to utilize PSE DMA engine which is described
in ACPI. With help of acpi-dma module the support becomes a generic one.

Thus, add Elkhart Lake PSE DMA support and generic DMA hooks in SPI DesignWare
driver.

Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20200506153025.21441-8-andriy.shevchenko@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Jarkko Nikula 2020-05-06 18:30:25 +03:00 committed by Mark Brown
parent 6370ababce
commit 22d48ad7bf
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
3 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/spi/spi-dw-mid.c
View File

@ -75,6 +75,24 @@ static int mid_spi_dma_init_mfld(struct device *dev, struct dw_spi *dws)
return -EBUSY; return -EBUSY;
} }
static int mid_spi_dma_init_generic(struct device *dev, struct dw_spi *dws)
{
dws->rxchan = dma_request_slave_channel(dev, "rx");
if (!dws->rxchan)
return -ENODEV;
dws->master->dma_rx = dws->rxchan;
dws->txchan = dma_request_slave_channel(dev, "tx");
if (!dws->txchan) {
dma_release_channel(dws->rxchan);
return -ENODEV;
}
dws->master->dma_tx = dws->txchan;
dws->dma_inited = 1;
return 0;
}
static void mid_spi_dma_exit(struct dw_spi *dws) static void mid_spi_dma_exit(struct dw_spi *dws)
{ {
if (!dws->dma_inited) if (!dws->dma_inited)
@ -291,8 +309,25 @@ static void dw_spi_mid_setup_dma_mfld(struct dw_spi *dws)
dws->dma_rx = &mid_dma_rx; dws->dma_rx = &mid_dma_rx;
dws->dma_ops = &mfld_dma_ops; dws->dma_ops = &mfld_dma_ops;
} }
static const struct dw_spi_dma_ops generic_dma_ops = {
.dma_init = mid_spi_dma_init_generic,
.dma_exit = mid_spi_dma_exit,
.dma_setup = mid_spi_dma_setup,
.can_dma = mid_spi_can_dma,
.dma_transfer = mid_spi_dma_transfer,
.dma_stop = mid_spi_dma_stop,
};
static void dw_spi_mid_setup_dma_generic(struct dw_spi *dws)
{
dws->dma_tx = &mid_dma_tx;
dws->dma_rx = &mid_dma_rx;
dws->dma_ops = &generic_dma_ops;
}
#else /* CONFIG_SPI_DW_MID_DMA */ #else /* CONFIG_SPI_DW_MID_DMA */
static inline void dw_spi_mid_setup_dma_mfld(struct dw_spi *dws) {} static inline void dw_spi_mid_setup_dma_mfld(struct dw_spi *dws) {}
static inline void dw_spi_mid_setup_dma_generic(struct dw_spi *dws) {}
#endif #endif
/* Some specific info for SPI0 controller on Intel MID */ /* Some specific info for SPI0 controller on Intel MID */
@ -329,3 +364,12 @@ int dw_spi_mid_init_mfld(struct dw_spi *dws)
dw_spi_mid_setup_dma_mfld(dws); dw_spi_mid_setup_dma_mfld(dws);
return 0; return 0;
} }
int dw_spi_mid_init_generic(struct dw_spi *dws)
{
/* Register hook to configure CTRLR0 */
dws->update_cr0 = dw_spi_update_cr0;
dw_spi_mid_setup_dma_generic(dws);
return 0;
}

1
drivers/spi/spi-dw-pci.c
View File

@ -35,6 +35,7 @@ static struct spi_pci_desc spi_pci_mid_desc_2 = {
}; };
static struct spi_pci_desc spi_pci_ehl_desc = { static struct spi_pci_desc spi_pci_ehl_desc = {
.setup = dw_spi_mid_init_generic,
.num_cs = 2, .num_cs = 2,
.bus_num = -1, .bus_num = -1,
.max_freq = 100000000, .max_freq = 100000000,

1
drivers/spi/spi-dw.h
View File

@ -261,5 +261,6 @@ extern u32 dw_spi_update_cr0_v1_01a(struct spi_controller *master,
/* platform related setup */ /* platform related setup */
extern int dw_spi_mid_init_mfld(struct dw_spi *dws); extern int dw_spi_mid_init_mfld(struct dw_spi *dws);
extern int dw_spi_mid_init_generic(struct dw_spi *dws);
#endif /* DW_SPI_HEADER_H */ #endif /* DW_SPI_HEADER_H */