4 files changed, 54 insertions, 2 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 4b8acd2851f4..2835fb5d21e2 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -434,7 +434,7 @@ config ARCH_ORION5X
         help
           Support for the following Marvell Orion 5x series SoCs:
           Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182),
-          Orion-2 (5281).
+          Orion-2 (5281), Orion-1-90 (6183).
 
 config ARCH_PNX4008
         bool "Philips Nexperia PNX4008 Mobile"
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;
 
diff --git a/arch/arm/mach-orion5x/common.h b/arch/arm/mach-orion5x/common.h
index c8598cc7cd58..af9588d23f29 100644
--- a/arch/arm/mach-orion5x/common.h
+++ b/arch/arm/mach-orion5x/common.h
@@ -31,6 +31,7 @@ void orion5x_ehci1_init(void);
 void orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data);
 void orion5x_i2c_init(void);
 void orion5x_sata_init(struct mv_sata_platform_data *sata_data);
+void orion5x_spi_init(void);
 void orion5x_uart0_init(void);
 void orion5x_uart1_init(void);
 void orion5x_xor_init(void);
diff --git a/arch/arm/mach-orion5x/include/mach/orion5x.h b/arch/arm/mach-orion5x/include/mach/orion5x.h
index 61eb74a88862..e67c843baa02 100644
--- a/arch/arm/mach-orion5x/include/mach/orion5x.h
+++ b/arch/arm/mach-orion5x/include/mach/orion5x.h
@@ -2,7 +2,7 @@
  * arch/arm/mach-orion5x/include/mach/orion5x.h
  *
  * Generic definitions of Orion SoC flavors:
- *  Orion-1, Orion-VoIP, Orion-NAS, and Orion-2.
+ *  Orion-1, Orion-VoIP, Orion-NAS, Orion-2, and Orion-1-90.
  *
  * Maintainer: Tzachi Perelstein <tzachi@marvell.com>
  *
@@ -76,6 +76,9 @@
 #define MV88F5281_REV_D0        4
 #define MV88F5281_REV_D1        5
 #define MV88F5281_REV_D2        6
+/* Orion-1-90 (88F6183) */
+#define MV88F6183_DEV_ID        0x6183
+#define MV88F6183_REV_B0        3
 
 /*******************************************************************************
  * Orion Registers Map
@@ -86,6 +89,7 @@
 #define ORION5X_DEV_BUS_PHYS_BASE       (ORION5X_REGS_PHYS_BASE | 0x10000)
 #define ORION5X_DEV_BUS_VIRT_BASE       (ORION5X_REGS_VIRT_BASE | 0x10000)
 #define ORION5X_DEV_BUS_REG(x)          (ORION5X_DEV_BUS_VIRT_BASE | (x))
+#define  SPI_PHYS_BASE                  (ORION5X_DEV_BUS_PHYS_BASE | 0x0600)
 #define  I2C_PHYS_BASE                  (ORION5X_DEV_BUS_PHYS_BASE | 0x1000)
 #define  UART0_PHYS_BASE                (ORION5X_DEV_BUS_PHYS_BASE | 0x2000)
 #define  UART0_VIRT_BASE                (ORION5X_DEV_BUS_VIRT_BASE | 0x2000)