mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
MIPS: BCM63xx: Remove !RUNTIME_DETECT from spi code
Signed-off-by: Jonas Gorski <jogo@openwrt.org> Cc: linux-mips@linux-mips.org Cc: John Crispin <blogic@openwrt.org> Cc: Maxime Bizon <mbizon@freebox.fr> Cc: Florian Fainelli <florian@openwrt.org> Cc: Kevin Cernekee <cernekee@gmail.com> Patchwork: https://patchwork.linux-mips.org/patch/7271/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
parent
53a02272e4
commit
ee68580824
|
@ -18,7 +18,6 @@
|
|||
#include <bcm63xx_dev_spi.h>
|
||||
#include <bcm63xx_regs.h>
|
||||
|
||||
#ifdef BCMCPU_RUNTIME_DETECT
|
||||
/*
|
||||
* register offsets
|
||||
*/
|
||||
|
@ -41,9 +40,6 @@ static __init void bcm63xx_spi_regs_init(void)
|
|||
BCMCPU_IS_6362() || BCMCPU_IS_6368())
|
||||
bcm63xx_regs_spi = bcm6358_regs_spi;
|
||||
}
|
||||
#else
|
||||
static __init void bcm63xx_spi_regs_init(void) { }
|
||||
#endif
|
||||
|
||||
static struct resource spi_resources[] = {
|
||||
{
|
||||
|
|
|
@ -30,26 +30,6 @@ enum bcm63xx_regs_spi {
|
|||
SPI_RX_DATA,
|
||||
};
|
||||
|
||||
#define __GEN_SPI_RSET_BASE(__cpu, __rset) \
|
||||
case SPI_## __rset: \
|
||||
return SPI_## __cpu ##_## __rset;
|
||||
|
||||
#define __GEN_SPI_RSET(__cpu) \
|
||||
switch (reg) { \
|
||||
__GEN_SPI_RSET_BASE(__cpu, CMD) \
|
||||
__GEN_SPI_RSET_BASE(__cpu, INT_STATUS) \
|
||||
__GEN_SPI_RSET_BASE(__cpu, INT_MASK_ST) \
|
||||
__GEN_SPI_RSET_BASE(__cpu, INT_MASK) \
|
||||
__GEN_SPI_RSET_BASE(__cpu, ST) \
|
||||
__GEN_SPI_RSET_BASE(__cpu, CLK_CFG) \
|
||||
__GEN_SPI_RSET_BASE(__cpu, FILL_BYTE) \
|
||||
__GEN_SPI_RSET_BASE(__cpu, MSG_TAIL) \
|
||||
__GEN_SPI_RSET_BASE(__cpu, RX_TAIL) \
|
||||
__GEN_SPI_RSET_BASE(__cpu, MSG_CTL) \
|
||||
__GEN_SPI_RSET_BASE(__cpu, MSG_DATA) \
|
||||
__GEN_SPI_RSET_BASE(__cpu, RX_DATA) \
|
||||
}
|
||||
|
||||
#define __GEN_SPI_REGS_TABLE(__cpu) \
|
||||
[SPI_CMD] = SPI_## __cpu ##_CMD, \
|
||||
[SPI_INT_STATUS] = SPI_## __cpu ##_INT_STATUS, \
|
||||
|
@ -66,20 +46,9 @@ enum bcm63xx_regs_spi {
|
|||
|
||||
static inline unsigned long bcm63xx_spireg(enum bcm63xx_regs_spi reg)
|
||||
{
|
||||
#ifdef BCMCPU_RUNTIME_DETECT
|
||||
extern const unsigned long *bcm63xx_regs_spi;
|
||||
|
||||
return bcm63xx_regs_spi[reg];
|
||||
#else
|
||||
#if defined(CONFIG_BCM63XX_CPU_6338) || defined(CONFIG_BCM63XX_CPU_6348)
|
||||
__GEN_SPI_RSET(6348)
|
||||
#endif
|
||||
#if defined(CONFIG_BCM63XX_CPU_6358) || defined(CONFIG_BCM63XX_CPU_6362) || \
|
||||
defined(CONFIG_BCM63XX_CPU_6368)
|
||||
__GEN_SPI_RSET(6358)
|
||||
#endif
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
#endif /* BCM63XX_DEV_SPI_H */
|
||||
|
|
Loading…
Reference in a new issue