leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spi: pxa2xx: Utilize MMIO and physical base from struct ssp_device

Browse Source 
We have a duplication of MMIO and physical base addresses in
the struct driver_data, get rid of it and reuse members from
struct ssp_device instead.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20210423182441.50272-3-andriy.shevchenko@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Andy Shevchenko
2021-04-23 21:24:29 +03:00
committed by Mark Brown
parent f2eed8caa3
commit 9e43c9a8d5
3 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/spi/spi-pxa2xx-dma.c
View File

@@ -94,14 +94,14 @@ pxa2xx_spi_dma_prepare_one(struct driver_data *drv_data,
cfg.direction = dir; cfg.direction = dir;
if (dir == DMA_MEM_TO_DEV) { if (dir == DMA_MEM_TO_DEV) {
cfg.dst_addr = drv_data->ssdr_physical; cfg.dst_addr = drv_data->ssp->phys_base + SSDR;
cfg.dst_addr_width = width; cfg.dst_addr_width = width;
cfg.dst_maxburst = chip->dma_burst_size; cfg.dst_maxburst = chip->dma_burst_size;
sgt = &xfer->tx_sg; sgt = &xfer->tx_sg;
chan = drv_data->controller->dma_tx; chan = drv_data->controller->dma_tx;
} else { } else {
cfg.src_addr = drv_data->ssdr_physical; cfg.src_addr = drv_data->ssp->phys_base + SSDR;
cfg.src_addr_width = width; cfg.src_addr_width = width;
cfg.src_maxburst = chip->dma_burst_size; cfg.src_maxburst = chip->dma_burst_size;

4
drivers/spi/spi-pxa2xx.c
View File

@@ -325,7 +325,7 @@ static void lpss_ssp_setup(struct driver_data *drv_data)
u32 value; u32 value;
config = lpss_get_config(drv_data); config = lpss_get_config(drv_data);
drv_data->lpss_base = drv_data->ioaddr + config->offset; drv_data->lpss_base = drv_data->ssp->mmio_base + config->offset;
/* Enable software chip select control */ /* Enable software chip select control */
value = __lpss_ssp_read_priv(drv_data, config->reg_cs_ctrl); value = __lpss_ssp_read_priv(drv_data, config->reg_cs_ctrl);
@@ -1733,8 +1733,6 @@ static int pxa2xx_spi_probe(struct platform_device *pdev)
drv_data->ssp_type = ssp->type; drv_data->ssp_type = ssp->type;
drv_data->ioaddr = ssp->mmio_base;
drv_data->ssdr_physical = ssp->phys_base + SSDR;
if (pxa25x_ssp_comp(drv_data)) { if (pxa25x_ssp_comp(drv_data)) {
switch (drv_data->ssp_type) { switch (drv_data->ssp_type) {
case QUARK_X1000_SSP: case QUARK_X1000_SSP:

14
drivers/spi/spi-pxa2xx.h
View File

@@ -33,10 +33,6 @@ struct driver_data {
/* PXA hookup */ /* PXA hookup */
struct pxa2xx_spi_controller *controller_info; struct pxa2xx_spi_controller *controller_info;
/* SSP register addresses */
void __iomem *ioaddr;
phys_addr_t ssdr_physical;
/* SSP masks*/ /* SSP masks*/
u32 dma_cr1; u32 dma_cr1;
u32 int_cr1; u32 int_cr1;
@@ -87,16 +83,14 @@ struct chip_data {
void (*cs_control)(u32 command); void (*cs_control)(u32 command);
}; };
static inline u32 pxa2xx_spi_read(const struct driver_data *drv_data, static inline u32 pxa2xx_spi_read(const struct driver_data *drv_data, u32 reg)
unsigned reg)
{ {
return __raw_readl(drv_data->ioaddr + reg); return pxa_ssp_read_reg(drv_data->ssp, reg);
} }
static inline void pxa2xx_spi_write(const struct driver_data *drv_data, static inline void pxa2xx_spi_write(const struct driver_data *drv_data, u32 reg, u32 val)
unsigned reg, u32 val)
{ {
__raw_writel(val, drv_data->ioaddr + reg); pxa_ssp_write_reg(drv_data->ssp, reg, val);
} }
#define DMA_ALIGNMENT 8 #define DMA_ALIGNMENT 8