diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2012-08-13 09:53:12 +0000 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-09-01 14:58:25 +0200 |
| commit | fa7a51cb8272bd6076ea4701fd6bdc65a68703ba (patch) | |
| tree | b1dd7f9cc3921fb5eb1cd0cbd9a34b1e197f7ae9 /drivers/dma | |
| parent | af963ba8f4f301475d13faa42b5dec8f0ed3c23a (diff) | |
| download | talos-obmc-uboot-fa7a51cb8272bd6076ea4701fd6bdc65a68703ba.tar.gz talos-obmc-uboot-fa7a51cb8272bd6076ea4701fd6bdc65a68703ba.zip | |
mxs: Convert sys_proto.h prefixes to 'mxs'
The sys_proto.h functions (except the boot modes) are compatible with
i.MX233 and i.MX28 so we use 'mxs' prefix for its methods.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/apbh_dma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/apbh_dma.c b/drivers/dma/apbh_dma.c index 38eff4f4f5..ca5a32fc09 100644 --- a/drivers/dma/apbh_dma.c +++ b/drivers/dma/apbh_dma.c @@ -512,7 +512,7 @@ static int mxs_dma_wait_complete(uint32_t timeout, unsigned int chan) if (ret) return ret; - if (mx28_wait_mask_set(&apbh_regs->hw_apbh_ctrl1_reg, + if (mxs_wait_mask_set(&apbh_regs->hw_apbh_ctrl1_reg, 1 << chan, timeout)) { ret = -ETIMEDOUT; mxs_dma_reset(chan); @@ -557,7 +557,7 @@ void mxs_dma_init(void) struct mxs_apbh_regs *apbh_regs = (struct mxs_apbh_regs *)MXS_APBH_BASE; - mx28_reset_block(&apbh_regs->hw_apbh_ctrl0_reg); + mxs_reset_block(&apbh_regs->hw_apbh_ctrl0_reg); #ifdef CONFIG_APBH_DMA_BURST8 writel(APBH_CTRL0_AHB_BURST8_EN, |
