mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
dmaengine: dw: substitute dma_read_byaddr by dma_readl_native
Since struct dw_dma is allocated and regs member is assigned properly we can use standard IO accessors to the DMA registers. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
This commit is contained in:
parent
a3e557999b
commit
897e40d3b1
2 changed files with 3 additions and 9 deletions
|
@ -1529,7 +1529,7 @@ int dw_dma_probe(struct dw_dma_chip *chip, struct dw_dma_platform_data *pdata)
|
||||||
pm_runtime_get_sync(chip->dev);
|
pm_runtime_get_sync(chip->dev);
|
||||||
|
|
||||||
if (!pdata) {
|
if (!pdata) {
|
||||||
dw_params = dma_read_byaddr(chip->regs, DW_PARAMS);
|
dw_params = dma_readl(dw, DW_PARAMS);
|
||||||
dev_dbg(chip->dev, "DW_PARAMS: 0x%08x\n", dw_params);
|
dev_dbg(chip->dev, "DW_PARAMS: 0x%08x\n", dw_params);
|
||||||
|
|
||||||
autocfg = dw_params >> DW_PARAMS_EN & 1;
|
autocfg = dw_params >> DW_PARAMS_EN & 1;
|
||||||
|
@ -1629,11 +1629,9 @@ int dw_dma_probe(struct dw_dma_chip *chip, struct dw_dma_platform_data *pdata)
|
||||||
|
|
||||||
/* Hardware configuration */
|
/* Hardware configuration */
|
||||||
if (autocfg) {
|
if (autocfg) {
|
||||||
unsigned int dwc_params;
|
|
||||||
unsigned int r = DW_DMA_MAX_NR_CHANNELS - i - 1;
|
unsigned int r = DW_DMA_MAX_NR_CHANNELS - i - 1;
|
||||||
void __iomem *addr = chip->regs + r * sizeof(u32);
|
void __iomem *addr = &__dw_regs(dw)->DWC_PARAMS[r];
|
||||||
|
unsigned int dwc_params = dma_readl_native(addr);
|
||||||
dwc_params = dma_read_byaddr(addr, DWC_PARAMS);
|
|
||||||
|
|
||||||
dev_dbg(chip->dev, "DWC_PARAMS[%d]: 0x%08x\n", i,
|
dev_dbg(chip->dev, "DWC_PARAMS[%d]: 0x%08x\n", i,
|
||||||
dwc_params);
|
dwc_params);
|
||||||
|
|
|
@ -114,10 +114,6 @@ struct dw_dma_regs {
|
||||||
#define dma_writel_native writel
|
#define dma_writel_native writel
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* To access the registers in early stage of probe */
|
|
||||||
#define dma_read_byaddr(addr, name) \
|
|
||||||
dma_readl_native((addr) + offsetof(struct dw_dma_regs, name))
|
|
||||||
|
|
||||||
/* Bitfields in DW_PARAMS */
|
/* Bitfields in DW_PARAMS */
|
||||||
#define DW_PARAMS_NR_CHAN 8 /* number of channels */
|
#define DW_PARAMS_NR_CHAN 8 /* number of channels */
|
||||||
#define DW_PARAMS_NR_MASTER 11 /* number of AHB masters */
|
#define DW_PARAMS_NR_MASTER 11 /* number of AHB masters */
|
||||||
|
|
Loading…
Reference in a new issue