diff options
author | Jonas Gorski <jogo@openwrt.org> | 2015-10-12 06:24:21 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-10-12 12:24:32 -0400 |
commit | 682b5280bf00c0618606ecb26cf4a9342d5e282e (patch) | |
tree | d6ead94da96677292a7e535efc6f450aea5e02a2 | |
parent | 158fcc4e050a75b609bbef1007cf7bf2a01ca043 (diff) |
spi/bcm63xx: fix standard accessors and compile guard
Use the correct guard CONFIG_CPU_BIG_ENDIAN and the *be accessors to
follow native endianness on big endian systems.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | drivers/spi/spi-bcm63xx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c index ef05387c1341..461891fbc198 100644 --- a/drivers/spi/spi-bcm63xx.c +++ b/drivers/spi/spi-bcm63xx.c | |||
@@ -62,8 +62,8 @@ static inline u8 bcm_spi_readb(struct bcm63xx_spi *bs, | |||
62 | static inline u16 bcm_spi_readw(struct bcm63xx_spi *bs, | 62 | static inline u16 bcm_spi_readw(struct bcm63xx_spi *bs, |
63 | unsigned int offset) | 63 | unsigned int offset) |
64 | { | 64 | { |
65 | #ifdef CONFIG_BIG_ENDIAN | 65 | #ifdef CONFIG_CPU_BIG_ENDIAN |
66 | return ioread16(bs->regs + bcm63xx_spireg(offset)); | 66 | return ioread16be(bs->regs + bcm63xx_spireg(offset)); |
67 | #else | 67 | #else |
68 | return readw(bs->regs + bcm63xx_spireg(offset)); | 68 | return readw(bs->regs + bcm63xx_spireg(offset)); |
69 | #endif | 69 | #endif |
@@ -78,8 +78,8 @@ static inline void bcm_spi_writeb(struct bcm63xx_spi *bs, | |||
78 | static inline void bcm_spi_writew(struct bcm63xx_spi *bs, | 78 | static inline void bcm_spi_writew(struct bcm63xx_spi *bs, |
79 | u16 value, unsigned int offset) | 79 | u16 value, unsigned int offset) |
80 | { | 80 | { |
81 | #ifdef CONFIG_BIG_ENDIAN | 81 | #ifdef CONFIG_CPU_BIG_ENDIAN |
82 | iowrite16(value, bs->regs + bcm63xx_spireg(offset)); | 82 | iowrite16be(value, bs->regs + bcm63xx_spireg(offset)); |
83 | #else | 83 | #else |
84 | writew(value, bs->regs + bcm63xx_spireg(offset)); | 84 | writew(value, bs->regs + bcm63xx_spireg(offset)); |
85 | #endif | 85 | #endif |