diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-09-10 17:11:42 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-09-14 21:48:16 +0300 |
| commit | 158fcc4e050a75b609bbef1007cf7bf2a01ca043 (patch) | |
| tree | 081ef46ba4c06d9a63a9e8dda8fed7d8808dfd1f | |
| parent | a45fcea5b20f1dcc2abb08aa29ecb2feacae60f2 (diff) | |
| download | linux-158fcc4e050a75b609bbef1007cf7bf2a01ca043.tar.xz | |
spi/bcm63xx: replace custom io accessors with standard ones
Replace all bcm_read* with (io)read. Due to this block following
system endianness, make sure we match that.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | drivers/spi/spi-bcm63xx.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c index c1364a8fa268..ef05387c1341 100644 --- a/drivers/spi/spi-bcm63xx.c +++ b/drivers/spi/spi-bcm63xx.c @@ -56,25 +56,33 @@ struct bcm63xx_spi { static inline u8 bcm_spi_readb(struct bcm63xx_spi *bs, unsigned int offset) { - return bcm_readb(bs->regs + bcm63xx_spireg(offset)); + return readb(bs->regs + bcm63xx_spireg(offset)); } static inline u16 bcm_spi_readw(struct bcm63xx_spi *bs, unsigned int offset) { - return bcm_readw(bs->regs + bcm63xx_spireg(offset)); +#ifdef CONFIG_BIG_ENDIAN + return ioread16(bs->regs + bcm63xx_spireg(offset)); +#else + return readw(bs->regs + bcm63xx_spireg(offset)); +#endif } static inline void bcm_spi_writeb(struct bcm63xx_spi *bs, u8 value, unsigned int offset) { - bcm_writeb(value, bs->regs + bcm63xx_spireg(offset)); + writeb(value, bs->regs + bcm63xx_spireg(offset)); } static inline void bcm_spi_writew(struct bcm63xx_spi *bs, u16 value, unsigned int offset) { - bcm_writew(value, bs->regs + bcm63xx_spireg(offset)); +#ifdef CONFIG_BIG_ENDIAN + iowrite16(value, bs->regs + bcm63xx_spireg(offset)); +#else + writew(value, bs->regs + bcm63xx_spireg(offset)); +#endif } static const unsigned bcm63xx_spi_freq_table[SPI_CLK_MASK][2] = { |