Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 158fcc4e authored by Jonas Gorski's avatar Jonas Gorski Committed by Mark Brown
Browse files

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: default avatarJonas Gorski <jogo@openwrt.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent a45fcea5

drivers/spi/spi-bcm63xx.c

+12 −4
Original line number Diff line number Diff line
@@ -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] = {