spi/bcm63xx: move register definitions into the driver

Move all register definitions and structs into the driver. This allows
us dropping the platform_data struct and drop any arch specific
includes. Make use of different device names to identify the version of
the block we have.

Since we now have full control over the message width, we can drop the
size check, which was broken anyway, since it never set ret to any error
code.

Also since we now have no arch depedendent resources, we can now allow
compiling it for any arch, hidden behind COMPILE_TEST.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>
Signed-off-by: Mark Brown <broonie@kernel.org>

2 files changed, 6 insertions, 70 deletions

diff --git a/arch/mips/bcm63xx/dev-spi.c b/arch/mips/bcm63xx/dev-spi.c
index b21225647e03..232385441e46 100644
--- a/arch/mips/bcm63xx/dev-spi.c
+++ b/arch/mips/bcm63xx/dev-spi.c
@@ -18,29 +18,6 @@
 #include <bcm63xx_dev_spi.h>
 #include <bcm63xx_regs.h>
 
-/*
- * register offsets
- */
-static const unsigned long bcm6348_regs_spi[] = {
-        __GEN_SPI_REGS_TABLE(6348)
-};
-
-static const unsigned long bcm6358_regs_spi[] = {
-        __GEN_SPI_REGS_TABLE(6358)
-};
-
-const unsigned long *bcm63xx_regs_spi;
-EXPORT_SYMBOL(bcm63xx_regs_spi);
-
-static __init void bcm63xx_spi_regs_init(void)
-{
-        if (BCMCPU_IS_6338() || BCMCPU_IS_6348())
-                bcm63xx_regs_spi = bcm6348_regs_spi;
-        if (BCMCPU_IS_3368() || BCMCPU_IS_6358() ||
-                BCMCPU_IS_6362() || BCMCPU_IS_6368())
-                bcm63xx_regs_spi = bcm6358_regs_spi;
-}
-
 static struct resource spi_resources[] = {
         {
                 .start          = -1, /* filled at runtime */
@@ -54,7 +31,6 @@ static struct resource spi_resources[] = {
 };
 
 static struct platform_device bcm63xx_spi_device = {
-        .name           = "bcm63xx-spi",
         .id             = -1,
         .num_resources  = ARRAY_SIZE(spi_resources),
         .resource       = spi_resources,
@@ -69,14 +45,16 @@ int __init bcm63xx_spi_register(void)
         spi_resources[0].end = spi_resources[0].start;
         spi_resources[1].start = bcm63xx_get_irq_number(IRQ_SPI);
 
-        if (BCMCPU_IS_6338() || BCMCPU_IS_6348())
+        if (BCMCPU_IS_6338() || BCMCPU_IS_6348()) {
+                bcm63xx_spi_device.name = "bcm6348-spi",
                 spi_resources[0].end += BCM_6348_RSET_SPI_SIZE - 1;
+        }
 
         if (BCMCPU_IS_3368() || BCMCPU_IS_6358() || BCMCPU_IS_6362() ||
-                BCMCPU_IS_6368())
+                BCMCPU_IS_6368()) {
+                bcm63xx_spi_device.name = "bcm6358-spi",
                 spi_resources[0].end += BCM_6358_RSET_SPI_SIZE - 1;
-
-        bcm63xx_spi_regs_init();
+        }
 
         return platform_device_register(&bcm63xx_spi_device);
 }
diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h
index 1d121fd5b6f5..dd299548860d 100644
--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h
+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h
@@ -7,46 +7,4 @@
 
 int __init bcm63xx_spi_register(void);
 
-enum bcm63xx_regs_spi {
-        SPI_CMD,
-        SPI_INT_STATUS,
-        SPI_INT_MASK_ST,
-        SPI_INT_MASK,
-        SPI_ST,
-        SPI_CLK_CFG,
-        SPI_FILL_BYTE,
-        SPI_MSG_TAIL,
-        SPI_RX_TAIL,
-        SPI_MSG_CTL,
-        SPI_MSG_DATA,
-        SPI_RX_DATA,
-        SPI_MSG_TYPE_SHIFT,
-        SPI_MSG_CTL_WIDTH,
-        SPI_MSG_DATA_SIZE,
-};
-
-#define __GEN_SPI_REGS_TABLE(__cpu)                                     \
-        [SPI_CMD]               = SPI_## __cpu ##_CMD,                  \
-        [SPI_INT_STATUS]        = SPI_## __cpu ##_INT_STATUS,           \
-        [SPI_INT_MASK_ST]       = SPI_## __cpu ##_INT_MASK_ST,          \
-        [SPI_INT_MASK]          = SPI_## __cpu ##_INT_MASK,             \
-        [SPI_ST]                = SPI_## __cpu ##_ST,                   \
-        [SPI_CLK_CFG]           = SPI_## __cpu ##_CLK_CFG,              \
-        [SPI_FILL_BYTE]         = SPI_## __cpu ##_FILL_BYTE,            \
-        [SPI_MSG_TAIL]          = SPI_## __cpu ##_MSG_TAIL,             \
-        [SPI_RX_TAIL]           = SPI_## __cpu ##_RX_TAIL,              \
-        [SPI_MSG_CTL]           = SPI_## __cpu ##_MSG_CTL,              \
-        [SPI_MSG_DATA]          = SPI_## __cpu ##_MSG_DATA,             \
-        [SPI_RX_DATA]           = SPI_## __cpu ##_RX_DATA,              \
-        [SPI_MSG_TYPE_SHIFT]    = SPI_## __cpu ##_MSG_TYPE_SHIFT,       \
-        [SPI_MSG_CTL_WIDTH]     = SPI_## __cpu ##_MSG_CTL_WIDTH,        \
-        [SPI_MSG_DATA_SIZE]     = SPI_## __cpu ##_MSG_DATA_SIZE,
-
-static inline unsigned long bcm63xx_spireg(enum bcm63xx_regs_spi reg)
-{
-        extern const unsigned long *bcm63xx_regs_spi;
-
-        return bcm63xx_regs_spi[reg];
-}
-
 #endif /* BCM63XX_DEV_SPI_H */