1 files changed, 68 insertions, 6 deletions

diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c
index 7b11e552bc5a..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>
@@ -146,7 +147,6 @@ void __init orion5x_ehci1_init(void)
  ****************************************************************************/
 struct mv643xx_eth_shared_platform_data orion5x_eth_shared_data = {
         .dram           = &orion5x_mbus_dram_info,
-        .t_clk          = ORION5X_TCLK,
 };
 
 static struct resource orion5x_eth_shared_resources[] = {
@@ -154,6 +154,10 @@ static struct resource orion5x_eth_shared_resources[] = {
                 .start  = ORION5X_ETH_PHYS_BASE + 0x2000,
                 .end    = ORION5X_ETH_PHYS_BASE + 0x3fff,
                 .flags  = IORESOURCE_MEM,
+        }, {
+                .start  = IRQ_ORION5X_ETH_ERR,
+                .end    = IRQ_ORION5X_ETH_ERR,
+                .flags  = IORESOURCE_IRQ,
         },
 };
 
@@ -163,7 +167,7 @@ static struct platform_device orion5x_eth_shared = {
         .dev            = {
                 .platform_data  = &orion5x_eth_shared_data,
         },
-        .num_resources  = 1,
+        .num_resources  = ARRAY_SIZE(orion5x_eth_shared_resources),
         .resource       = orion5x_eth_shared_resources,
 };
 
@@ -268,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[] = {
@@ -278,7 +314,7 @@ static struct plat_serial8250_port orion5x_uart0_data[] = {
                 .flags          = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF,
                 .iotype         = UPIO_MEM,
                 .regshift       = 2,
-                .uartclk        = ORION5X_TCLK,
+                .uartclk        = 0,
         }, {
         },
 };
@@ -322,7 +358,7 @@ static struct plat_serial8250_port orion5x_uart1_data[] = {
                 .flags          = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF,
                 .iotype         = UPIO_MEM,
                 .regshift       = 2,
-                .uartclk        = ORION5X_TCLK,
+                .uartclk        = 0,
         }, {
         },
 };
@@ -455,9 +491,24 @@ void __init orion5x_xor_init(void)
 /*****************************************************************************
  * Time handling
  ****************************************************************************/
+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;
+}
+
 static void orion5x_timer_init(void)
 {
-        orion_time_init(IRQ_ORION5X_BRIDGE, ORION5X_TCLK);
+        orion5x_tclk = orion5x_find_tclk();
+        orion_time_init(IRQ_ORION5X_BRIDGE, orion5x_tclk);
 }
 
 struct sys_timer orion5x_timer = {
@@ -499,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";
         }
@@ -510,7 +567,12 @@ void __init orion5x_init(void)
         u32 dev, rev;
 
         orion5x_id(&dev, &rev, &dev_name);
-        printk(KERN_INFO "Orion ID: %s. TCLK=%d.\n", dev_name, ORION5X_TCLK);
+        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;
 
         /*
          * Setup Orion address map