[ARM] Orion: add 88F6183 (Orion-1-90) support

The Orion-1-90 (88F6183) is another member of the Orion SoC family,
which has a 16 bit DDR2 interface, one x1 PCIe port (configurable as
Root Complex or Endpoint), one 10/100/1000 ethernet interface, one
USB 2.0 port with PHY, one SPDIF/I2S interface, one SDIO interface,
one TWSI interface, two UARTs, one SPI interface, a NAND controller,
a crypto engine, and a 4-channel DMA engine.

Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>

1 files changed, 47 insertions, 0 deletions

diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c
index 8a8b089b8b74..9625ef5975d0 100644
--- a/arch/arm/mach-orion5x/common.c
+++ b/arch/arm/mach-orion5x/common.c
@@ -18,6 +18,7 @@
 #include <linux/mv643xx_eth.h>
 #include <linux/mv643xx_i2c.h>
 #include <linux/ata_platform.h>
+#include <linux/spi/orion_spi.h>
 #include <asm/page.h>
 #include <asm/setup.h>
 #include <asm/timex.h>
@@ -271,6 +272,38 @@ void __init orion5x_sata_init(struct mv_sata_platform_data *sata_data)
 
 
 /*****************************************************************************
+ * SPI
+ ****************************************************************************/
+static struct orion_spi_info orion5x_spi_plat_data = {
+        .tclk           = 0,
+};
+
+static struct resource orion5x_spi_resources[] = {
+        {
+                .name   = "spi base",
+                .start  = SPI_PHYS_BASE,
+                .end    = SPI_PHYS_BASE + 0x1f,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device orion5x_spi = {
+        .name           = "orion_spi",
+        .id             = 0,
+        .dev            = {
+                .platform_data  = &orion5x_spi_plat_data,
+        },
+        .num_resources  = ARRAY_SIZE(orion5x_spi_resources),
+        .resource       = orion5x_spi_resources,
+};
+
+void __init orion5x_spi_init()
+{
+        platform_device_register(&orion5x_spi);
+}
+
+
+/*****************************************************************************
  * UART0
  ****************************************************************************/
 static struct plat_serial8250_port orion5x_uart0_data[] = {
@@ -462,6 +495,13 @@ int orion5x_tclk;
 
 int __init orion5x_find_tclk(void)
 {
+        u32 dev, rev;
+
+        orion5x_pcie_id(&dev, &rev);
+        if (dev == MV88F6183_DEV_ID &&
+            (readl(MPP_RESET_SAMPLE) & 0x00000200) == 0)
+                return 133333333;
+
         return 166666667;
 }
 
@@ -510,6 +550,12 @@ static void __init orion5x_id(u32 *dev, u32 *rev, char **dev_name)
                 } else {
                         *dev_name = "MV88F5181(L)-Rev-Unsupported";
                 }
+        } else if (*dev == MV88F6183_DEV_ID) {
+                if (*rev == MV88F6183_REV_B0) {
+                        *dev_name = "MV88F6183-Rev-B0";
+                } else {
+                        *dev_name = "MV88F6183-Rev-Unsupported";
+                }
         } else {
                 *dev_name = "Device-Unknown";
         }
@@ -524,6 +570,7 @@ void __init orion5x_init(void)
         printk(KERN_INFO "Orion ID: %s. TCLK=%d.\n", dev_name, orion5x_tclk);
 
         orion5x_eth_shared_data.t_clk = orion5x_tclk;
+        orion5x_spi_plat_data.tclk = orion5x_tclk;
         orion5x_uart0_data[0].uartclk = orion5x_tclk;
         orion5x_uart1_data[0].uartclk = orion5x_tclk;