diff options
author | Tom Rini <trini@ti.com> | 2014-09-02 16:37:17 -0400 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-09-02 16:37:17 -0400 |
commit | 2c19478e01ab145c8b3a1f5b1beca9958d942e98 (patch) | |
tree | 4a0a44f23307f94f8c5672757f27531f10d3301f /board | |
parent | 141e1faec2cd594dafb2edad6da8baa6a681cf37 (diff) | |
parent | 2fea4f5addb40d7551ed754175acbec7f2750005 (diff) | |
download | u-boot-imx-2c19478e01ab145c8b3a1f5b1beca9958d942e98.zip u-boot-imx-2c19478e01ab145c8b3a1f5b1beca9958d942e98.tar.gz u-boot-imx-2c19478e01ab145c8b3a1f5b1beca9958d942e98.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-arc
Diffstat (limited to 'board')
-rw-r--r-- | board/synopsys/axs101/nand.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/board/synopsys/axs101/nand.c b/board/synopsys/axs101/nand.c index c7f90c4..ff35286 100644 --- a/board/synopsys/axs101/nand.c +++ b/board/synopsys/axs101/nand.c @@ -62,8 +62,10 @@ struct nand_bd { uint32_t buffer_ptr1; /* DES3 */ }; -#define NAND_REG_WRITE(r, v) writel(v, CONFIG_SYS_NAND_BASE + r) -#define NAND_REG_READ(r) readl(CONFIG_SYS_NAND_BASE + r) +#define NAND_REG_WRITE(r, v) \ + writel(v, (volatile void __iomem *)(CONFIG_SYS_NAND_BASE + r)) +#define NAND_REG_READ(r) \ + readl((const volatile void __iomem *)(CONFIG_SYS_NAND_BASE + r)) static struct nand_bd *bd; /* DMA buffer descriptors */ |