ARM: Orion: Eth: Add clk/clkdev support.
[linux-3.10.git] / arch / arm / mach-mv78xx0 / common.c
index 538f8f4..ad4d037 100644 (file)
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/serial_8250.h>
-#include <linux/mbus.h>
-#include <linux/mv643xx_eth.h>
 #include <linux/ata_platform.h>
+#include <linux/clk-provider.h>
+#include <linux/ethtool.h>
 #include <asm/mach/map.h>
 #include <asm/mach/time.h>
 #include <mach/mv78xx0.h>
+#include <mach/bridge-regs.h>
 #include <plat/cache-feroceon-l2.h>
 #include <plat/ehci-orion.h>
 #include <plat/orion_nand.h>
 #include <plat/time.h>
+#include <plat/common.h>
+#include <plat/addr-map.h>
 #include "common.h"
 
+static int get_tclk(void);
 
 /*****************************************************************************
  * Common bits
@@ -100,24 +104,24 @@ static void get_pclk_l2clk(int hclk, int core_index, int *pclk, int *l2clk)
 
 static int get_tclk(void)
 {
-       int tclk;
+       int tclk_freq;
 
        /*
         * TCLK tick rate is configured by DEV_A[2:0] strap pins.
         */
        switch ((readl(SAMPLE_AT_RESET_HIGH) >> 6) & 7) {
        case 1:
-               tclk = 166666667;
+               tclk_freq = 166666667;
                break;
        case 3:
-               tclk = 200000000;
+               tclk_freq = 200000000;
                break;
        default:
                panic("unknown TCLK PLL setting: %.8x\n",
                        readl(SAMPLE_AT_RESET_HIGH));
        }
 
-       return tclk;
+       return tclk_freq;
 }
 
 
@@ -163,552 +167,182 @@ void __init mv78xx0_map_io(void)
 
 
 /*****************************************************************************
- * EHCI
+ * CLK tree
  ****************************************************************************/
-static struct orion_ehci_data mv78xx0_ehci_data = {
-       .dram           = &mv78xx0_mbus_dram_info,
-       .phy_version    = EHCI_PHY_NA,
-};
+static struct clk *tclk;
 
-static u64 ehci_dmamask = 0xffffffffUL;
+static void __init clk_init(void)
+{
+       tclk = clk_register_fixed_rate(NULL, "tclk", NULL, CLK_IS_ROOT,
+                                      get_tclk());
 
+       orion_clkdev_init(tclk);
+}
 
 /*****************************************************************************
- * EHCI0
+ * EHCI
  ****************************************************************************/
-static struct resource mv78xx0_ehci0_resources[] = {
-       {
-               .start  = USB0_PHYS_BASE,
-               .end    = USB0_PHYS_BASE + 0x0fff,
-               .flags  = IORESOURCE_MEM,
-       }, {
-               .start  = IRQ_MV78XX0_USB_0,
-               .end    = IRQ_MV78XX0_USB_0,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device mv78xx0_ehci0 = {
-       .name           = "orion-ehci",
-       .id             = 0,
-       .dev            = {
-               .dma_mask               = &ehci_dmamask,
-               .coherent_dma_mask      = 0xffffffff,
-               .platform_data          = &mv78xx0_ehci_data,
-       },
-       .resource       = mv78xx0_ehci0_resources,
-       .num_resources  = ARRAY_SIZE(mv78xx0_ehci0_resources),
-};
-
 void __init mv78xx0_ehci0_init(void)
 {
-       platform_device_register(&mv78xx0_ehci0);
+       orion_ehci_init(USB0_PHYS_BASE, IRQ_MV78XX0_USB_0, EHCI_PHY_NA);
 }
 
 
 /*****************************************************************************
  * EHCI1
  ****************************************************************************/
-static struct resource mv78xx0_ehci1_resources[] = {
-       {
-               .start  = USB1_PHYS_BASE,
-               .end    = USB1_PHYS_BASE + 0x0fff,
-               .flags  = IORESOURCE_MEM,
-       }, {
-               .start  = IRQ_MV78XX0_USB_1,
-               .end    = IRQ_MV78XX0_USB_1,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device mv78xx0_ehci1 = {
-       .name           = "orion-ehci",
-       .id             = 1,
-       .dev            = {
-               .dma_mask               = &ehci_dmamask,
-               .coherent_dma_mask      = 0xffffffff,
-               .platform_data          = &mv78xx0_ehci_data,
-       },
-       .resource       = mv78xx0_ehci1_resources,
-       .num_resources  = ARRAY_SIZE(mv78xx0_ehci1_resources),
-};
-
 void __init mv78xx0_ehci1_init(void)
 {
-       platform_device_register(&mv78xx0_ehci1);
+       orion_ehci_1_init(USB1_PHYS_BASE, IRQ_MV78XX0_USB_1);
 }
 
 
 /*****************************************************************************
  * EHCI2
  ****************************************************************************/
-static struct resource mv78xx0_ehci2_resources[] = {
-       {
-               .start  = USB2_PHYS_BASE,
-               .end    = USB2_PHYS_BASE + 0x0fff,
-               .flags  = IORESOURCE_MEM,
-       }, {
-               .start  = IRQ_MV78XX0_USB_2,
-               .end    = IRQ_MV78XX0_USB_2,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device mv78xx0_ehci2 = {
-       .name           = "orion-ehci",
-       .id             = 2,
-       .dev            = {
-               .dma_mask               = &ehci_dmamask,
-               .coherent_dma_mask      = 0xffffffff,
-               .platform_data          = &mv78xx0_ehci_data,
-       },
-       .resource       = mv78xx0_ehci2_resources,
-       .num_resources  = ARRAY_SIZE(mv78xx0_ehci2_resources),
-};
-
 void __init mv78xx0_ehci2_init(void)
 {
-       platform_device_register(&mv78xx0_ehci2);
+       orion_ehci_2_init(USB2_PHYS_BASE, IRQ_MV78XX0_USB_2);
 }
 
 
 /*****************************************************************************
  * GE00
  ****************************************************************************/
-struct mv643xx_eth_shared_platform_data mv78xx0_ge00_shared_data = {
-       .t_clk          = 0,
-       .dram           = &mv78xx0_mbus_dram_info,
-};
-
-static struct resource mv78xx0_ge00_shared_resources[] = {
-       {
-               .name   = "ge00 base",
-               .start  = GE00_PHYS_BASE + 0x2000,
-               .end    = GE00_PHYS_BASE + 0x3fff,
-               .flags  = IORESOURCE_MEM,
-       }, {
-               .name   = "ge err irq",
-               .start  = IRQ_MV78XX0_GE_ERR,
-               .end    = IRQ_MV78XX0_GE_ERR,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device mv78xx0_ge00_shared = {
-       .name           = MV643XX_ETH_SHARED_NAME,
-       .id             = 0,
-       .dev            = {
-               .platform_data  = &mv78xx0_ge00_shared_data,
-       },
-       .num_resources  = ARRAY_SIZE(mv78xx0_ge00_shared_resources),
-       .resource       = mv78xx0_ge00_shared_resources,
-};
-
-static struct resource mv78xx0_ge00_resources[] = {
-       {
-               .name   = "ge00 irq",
-               .start  = IRQ_MV78XX0_GE00_SUM,
-               .end    = IRQ_MV78XX0_GE00_SUM,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device mv78xx0_ge00 = {
-       .name           = MV643XX_ETH_NAME,
-       .id             = 0,
-       .num_resources  = 1,
-       .resource       = mv78xx0_ge00_resources,
-};
-
 void __init mv78xx0_ge00_init(struct mv643xx_eth_platform_data *eth_data)
 {
-       eth_data->shared = &mv78xx0_ge00_shared;
-       mv78xx0_ge00.dev.platform_data = eth_data;
-
-       platform_device_register(&mv78xx0_ge00_shared);
-       platform_device_register(&mv78xx0_ge00);
+       orion_ge00_init(eth_data,
+                       GE00_PHYS_BASE, IRQ_MV78XX0_GE00_SUM,
+                       IRQ_MV78XX0_GE_ERR);
 }
 
 
 /*****************************************************************************
  * GE01
  ****************************************************************************/
-struct mv643xx_eth_shared_platform_data mv78xx0_ge01_shared_data = {
-       .t_clk          = 0,
-       .dram           = &mv78xx0_mbus_dram_info,
-       .shared_smi     = &mv78xx0_ge00_shared,
-};
-
-static struct resource mv78xx0_ge01_shared_resources[] = {
-       {
-               .name   = "ge01 base",
-               .start  = GE01_PHYS_BASE + 0x2000,
-               .end    = GE01_PHYS_BASE + 0x3fff,
-               .flags  = IORESOURCE_MEM,
-       },
-};
-
-static struct platform_device mv78xx0_ge01_shared = {
-       .name           = MV643XX_ETH_SHARED_NAME,
-       .id             = 1,
-       .dev            = {
-               .platform_data  = &mv78xx0_ge01_shared_data,
-       },
-       .num_resources  = 1,
-       .resource       = mv78xx0_ge01_shared_resources,
-};
-
-static struct resource mv78xx0_ge01_resources[] = {
-       {
-               .name   = "ge01 irq",
-               .start  = IRQ_MV78XX0_GE01_SUM,
-               .end    = IRQ_MV78XX0_GE01_SUM,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device mv78xx0_ge01 = {
-       .name           = MV643XX_ETH_NAME,
-       .id             = 1,
-       .num_resources  = 1,
-       .resource       = mv78xx0_ge01_resources,
-};
-
 void __init mv78xx0_ge01_init(struct mv643xx_eth_platform_data *eth_data)
 {
-       eth_data->shared = &mv78xx0_ge01_shared;
-       mv78xx0_ge01.dev.platform_data = eth_data;
-
-       platform_device_register(&mv78xx0_ge01_shared);
-       platform_device_register(&mv78xx0_ge01);
+       orion_ge01_init(eth_data,
+                       GE01_PHYS_BASE, IRQ_MV78XX0_GE01_SUM,
+                       NO_IRQ);
 }
 
 
 /*****************************************************************************
  * GE10
  ****************************************************************************/
-struct mv643xx_eth_shared_platform_data mv78xx0_ge10_shared_data = {
-       .t_clk          = 0,
-       .dram           = &mv78xx0_mbus_dram_info,
-       .shared_smi     = &mv78xx0_ge00_shared,
-};
-
-static struct resource mv78xx0_ge10_shared_resources[] = {
-       {
-               .name   = "ge10 base",
-               .start  = GE10_PHYS_BASE + 0x2000,
-               .end    = GE10_PHYS_BASE + 0x3fff,
-               .flags  = IORESOURCE_MEM,
-       },
-};
-
-static struct platform_device mv78xx0_ge10_shared = {
-       .name           = MV643XX_ETH_SHARED_NAME,
-       .id             = 2,
-       .dev            = {
-               .platform_data  = &mv78xx0_ge10_shared_data,
-       },
-       .num_resources  = 1,
-       .resource       = mv78xx0_ge10_shared_resources,
-};
-
-static struct resource mv78xx0_ge10_resources[] = {
-       {
-               .name   = "ge10 irq",
-               .start  = IRQ_MV78XX0_GE10_SUM,
-               .end    = IRQ_MV78XX0_GE10_SUM,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device mv78xx0_ge10 = {
-       .name           = MV643XX_ETH_NAME,
-       .id             = 2,
-       .num_resources  = 1,
-       .resource       = mv78xx0_ge10_resources,
-};
-
 void __init mv78xx0_ge10_init(struct mv643xx_eth_platform_data *eth_data)
 {
-       eth_data->shared = &mv78xx0_ge10_shared;
-       mv78xx0_ge10.dev.platform_data = eth_data;
+       u32 dev, rev;
 
-       platform_device_register(&mv78xx0_ge10_shared);
-       platform_device_register(&mv78xx0_ge10);
+       /*
+        * On the Z0, ge10 and ge11 are internally connected back
+        * to back, and not brought out.
+        */
+       mv78xx0_pcie_id(&dev, &rev);
+       if (dev == MV78X00_Z0_DEV_ID) {
+               eth_data->phy_addr = MV643XX_ETH_PHY_NONE;
+               eth_data->speed = SPEED_1000;
+               eth_data->duplex = DUPLEX_FULL;
+       }
+
+       orion_ge10_init(eth_data,
+                       GE10_PHYS_BASE, IRQ_MV78XX0_GE10_SUM,
+                       NO_IRQ);
 }
 
 
 /*****************************************************************************
  * GE11
  ****************************************************************************/
-struct mv643xx_eth_shared_platform_data mv78xx0_ge11_shared_data = {
-       .t_clk          = 0,
-       .dram           = &mv78xx0_mbus_dram_info,
-       .shared_smi     = &mv78xx0_ge00_shared,
-};
-
-static struct resource mv78xx0_ge11_shared_resources[] = {
-       {
-               .name   = "ge11 base",
-               .start  = GE11_PHYS_BASE + 0x2000,
-               .end    = GE11_PHYS_BASE + 0x3fff,
-               .flags  = IORESOURCE_MEM,
-       },
-};
-
-static struct platform_device mv78xx0_ge11_shared = {
-       .name           = MV643XX_ETH_SHARED_NAME,
-       .id             = 3,
-       .dev            = {
-               .platform_data  = &mv78xx0_ge11_shared_data,
-       },
-       .num_resources  = 1,
-       .resource       = mv78xx0_ge11_shared_resources,
-};
-
-static struct resource mv78xx0_ge11_resources[] = {
-       {
-               .name   = "ge11 irq",
-               .start  = IRQ_MV78XX0_GE11_SUM,
-               .end    = IRQ_MV78XX0_GE11_SUM,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device mv78xx0_ge11 = {
-       .name           = MV643XX_ETH_NAME,
-       .id             = 3,
-       .num_resources  = 1,
-       .resource       = mv78xx0_ge11_resources,
-};
-
 void __init mv78xx0_ge11_init(struct mv643xx_eth_platform_data *eth_data)
 {
-       eth_data->shared = &mv78xx0_ge11_shared;
-       mv78xx0_ge11.dev.platform_data = eth_data;
+       u32 dev, rev;
 
-       platform_device_register(&mv78xx0_ge11_shared);
-       platform_device_register(&mv78xx0_ge11);
+       /*
+        * On the Z0, ge10 and ge11 are internally connected back
+        * to back, and not brought out.
+        */
+       mv78xx0_pcie_id(&dev, &rev);
+       if (dev == MV78X00_Z0_DEV_ID) {
+               eth_data->phy_addr = MV643XX_ETH_PHY_NONE;
+               eth_data->speed = SPEED_1000;
+               eth_data->duplex = DUPLEX_FULL;
+       }
+
+       orion_ge11_init(eth_data,
+                       GE11_PHYS_BASE, IRQ_MV78XX0_GE11_SUM,
+                       NO_IRQ);
 }
 
+/*****************************************************************************
+ * I2C
+ ****************************************************************************/
+void __init mv78xx0_i2c_init(void)
+{
+       orion_i2c_init(I2C_0_PHYS_BASE, IRQ_MV78XX0_I2C_0, 8);
+       orion_i2c_1_init(I2C_1_PHYS_BASE, IRQ_MV78XX0_I2C_1, 8);
+}
 
 /*****************************************************************************
  * SATA
  ****************************************************************************/
-static struct resource mv78xx0_sata_resources[] = {
-       {
-               .name   = "sata base",
-               .start  = SATA_PHYS_BASE,
-               .end    = SATA_PHYS_BASE + 0x5000 - 1,
-               .flags  = IORESOURCE_MEM,
-       }, {
-               .name   = "sata irq",
-               .start  = IRQ_MV78XX0_SATA,
-               .end    = IRQ_MV78XX0_SATA,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device mv78xx0_sata = {
-       .name           = "sata_mv",
-       .id             = 0,
-       .dev            = {
-               .coherent_dma_mask      = 0xffffffff,
-       },
-       .num_resources  = ARRAY_SIZE(mv78xx0_sata_resources),
-       .resource       = mv78xx0_sata_resources,
-};
-
 void __init mv78xx0_sata_init(struct mv_sata_platform_data *sata_data)
 {
-       sata_data->dram = &mv78xx0_mbus_dram_info;
-       mv78xx0_sata.dev.platform_data = sata_data;
-       platform_device_register(&mv78xx0_sata);
+       orion_sata_init(sata_data, SATA_PHYS_BASE, IRQ_MV78XX0_SATA);
 }
 
 
 /*****************************************************************************
  * UART0
  ****************************************************************************/
-static struct plat_serial8250_port mv78xx0_uart0_data[] = {
-       {
-               .mapbase        = UART0_PHYS_BASE,
-               .membase        = (char *)UART0_VIRT_BASE,
-               .irq            = IRQ_MV78XX0_UART_0,
-               .flags          = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF,
-               .iotype         = UPIO_MEM,
-               .regshift       = 2,
-               .uartclk        = 0,
-       }, {
-       },
-};
-
-static struct resource mv78xx0_uart0_resources[] = {
-       {
-               .start          = UART0_PHYS_BASE,
-               .end            = UART0_PHYS_BASE + 0xff,
-               .flags          = IORESOURCE_MEM,
-       }, {
-               .start          = IRQ_MV78XX0_UART_0,
-               .end            = IRQ_MV78XX0_UART_0,
-               .flags          = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device mv78xx0_uart0 = {
-       .name                   = "serial8250",
-       .id                     = 0,
-       .dev                    = {
-               .platform_data  = mv78xx0_uart0_data,
-       },
-       .resource               = mv78xx0_uart0_resources,
-       .num_resources          = ARRAY_SIZE(mv78xx0_uart0_resources),
-};
-
 void __init mv78xx0_uart0_init(void)
 {
-       platform_device_register(&mv78xx0_uart0);
+       orion_uart0_init(UART0_VIRT_BASE, UART0_PHYS_BASE,
+                        IRQ_MV78XX0_UART_0, get_tclk());
 }
 
 
 /*****************************************************************************
  * UART1
  ****************************************************************************/
-static struct plat_serial8250_port mv78xx0_uart1_data[] = {
-       {
-               .mapbase        = UART1_PHYS_BASE,
-               .membase        = (char *)UART1_VIRT_BASE,
-               .irq            = IRQ_MV78XX0_UART_1,
-               .flags          = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF,
-               .iotype         = UPIO_MEM,
-               .regshift       = 2,
-               .uartclk        = 0,
-       }, {
-       },
-};
-
-static struct resource mv78xx0_uart1_resources[] = {
-       {
-               .start          = UART1_PHYS_BASE,
-               .end            = UART1_PHYS_BASE + 0xff,
-               .flags          = IORESOURCE_MEM,
-       }, {
-               .start          = IRQ_MV78XX0_UART_1,
-               .end            = IRQ_MV78XX0_UART_1,
-               .flags          = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device mv78xx0_uart1 = {
-       .name                   = "serial8250",
-       .id                     = 1,
-       .dev                    = {
-               .platform_data  = mv78xx0_uart1_data,
-       },
-       .resource               = mv78xx0_uart1_resources,
-       .num_resources          = ARRAY_SIZE(mv78xx0_uart1_resources),
-};
-
 void __init mv78xx0_uart1_init(void)
 {
-       platform_device_register(&mv78xx0_uart1);
+       orion_uart1_init(UART1_VIRT_BASE, UART1_PHYS_BASE,
+                        IRQ_MV78XX0_UART_1, get_tclk());
 }
 
 
 /*****************************************************************************
  * UART2
  ****************************************************************************/
-static struct plat_serial8250_port mv78xx0_uart2_data[] = {
-       {
-               .mapbase        = UART2_PHYS_BASE,
-               .membase        = (char *)UART2_VIRT_BASE,
-               .irq            = IRQ_MV78XX0_UART_2,
-               .flags          = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF,
-               .iotype         = UPIO_MEM,
-               .regshift       = 2,
-               .uartclk        = 0,
-       }, {
-       },
-};
-
-static struct resource mv78xx0_uart2_resources[] = {
-       {
-               .start          = UART2_PHYS_BASE,
-               .end            = UART2_PHYS_BASE + 0xff,
-               .flags          = IORESOURCE_MEM,
-       }, {
-               .start          = IRQ_MV78XX0_UART_2,
-               .end            = IRQ_MV78XX0_UART_2,
-               .flags          = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device mv78xx0_uart2 = {
-       .name                   = "serial8250",
-       .id                     = 2,
-       .dev                    = {
-               .platform_data  = mv78xx0_uart2_data,
-       },
-       .resource               = mv78xx0_uart2_resources,
-       .num_resources          = ARRAY_SIZE(mv78xx0_uart2_resources),
-};
-
 void __init mv78xx0_uart2_init(void)
 {
-       platform_device_register(&mv78xx0_uart2);
+       orion_uart2_init(UART2_VIRT_BASE, UART2_PHYS_BASE,
+                        IRQ_MV78XX0_UART_2, get_tclk());
 }
 
-
 /*****************************************************************************
  * UART3
  ****************************************************************************/
-static struct plat_serial8250_port mv78xx0_uart3_data[] = {
-       {
-               .mapbase        = UART3_PHYS_BASE,
-               .membase        = (char *)UART3_VIRT_BASE,
-               .irq            = IRQ_MV78XX0_UART_3,
-               .flags          = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF,
-               .iotype         = UPIO_MEM,
-               .regshift       = 2,
-               .uartclk        = 0,
-       }, {
-       },
-};
-
-static struct resource mv78xx0_uart3_resources[] = {
-       {
-               .start          = UART3_PHYS_BASE,
-               .end            = UART3_PHYS_BASE + 0xff,
-               .flags          = IORESOURCE_MEM,
-       }, {
-               .start          = IRQ_MV78XX0_UART_3,
-               .end            = IRQ_MV78XX0_UART_3,
-               .flags          = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device mv78xx0_uart3 = {
-       .name                   = "serial8250",
-       .id                     = 3,
-       .dev                    = {
-               .platform_data  = mv78xx0_uart3_data,
-       },
-       .resource               = mv78xx0_uart3_resources,
-       .num_resources          = ARRAY_SIZE(mv78xx0_uart3_resources),
-};
-
 void __init mv78xx0_uart3_init(void)
 {
-       platform_device_register(&mv78xx0_uart3);
+       orion_uart3_init(UART3_VIRT_BASE, UART3_PHYS_BASE,
+                        IRQ_MV78XX0_UART_3, get_tclk());
 }
 
-
 /*****************************************************************************
  * Time handling
  ****************************************************************************/
+void __init mv78xx0_init_early(void)
+{
+       orion_time_set_base(TIMER_VIRT_BASE);
+}
+
 static void mv78xx0_timer_init(void)
 {
-       orion_time_init(IRQ_MV78XX0_TIMER_1, get_tclk());
+       orion_time_init(BRIDGE_VIRT_BASE, BRIDGE_INT_TIMER1_CLR,
+                       IRQ_MV78XX0_TIMER_1, get_tclk());
 }
 
 struct sys_timer mv78xx0_timer = {
@@ -733,6 +367,8 @@ static char * __init mv78xx0_id(void)
        } else if (dev == MV78100_DEV_ID) {
                if (rev == MV78100_REV_A0)
                        return "MV78100-A0";
+               else if (rev == MV78100_REV_A1)
+                       return "MV78100-A1";
                else
                        return "MV78100-Rev-Unsupported";
        } else if (dev == MV78200_DEV_ID) {
@@ -756,19 +392,17 @@ void __init mv78xx0_init(void)
        int hclk;
        int pclk;
        int l2clk;
-       int tclk;
 
        core_index = mv78xx0_core_index();
        hclk = get_hclk();
        get_pclk_l2clk(hclk, core_index, &pclk, &l2clk);
-       tclk = get_tclk();
 
        printk(KERN_INFO "%s ", mv78xx0_id());
        printk("core #%d, ", core_index);
        printk("PCLK = %dMHz, ", (pclk + 499999) / 1000000);
        printk("L2 = %dMHz, ", (l2clk + 499999) / 1000000);
        printk("HCLK = %dMHz, ", (hclk + 499999) / 1000000);
-       printk("TCLK = %dMHz\n", (tclk + 499999) / 1000000);
+       printk("TCLK = %dMHz\n", (get_tclk() + 499999) / 1000000);
 
        mv78xx0_setup_cpu_mbus();
 
@@ -776,12 +410,22 @@ void __init mv78xx0_init(void)
        feroceon_l2_init(is_l2_writethrough());
 #endif
 
-       mv78xx0_ge00_shared_data.t_clk = tclk;
-       mv78xx0_ge01_shared_data.t_clk = tclk;
-       mv78xx0_ge10_shared_data.t_clk = tclk;
-       mv78xx0_ge11_shared_data.t_clk = tclk;
-       mv78xx0_uart0_data[0].uartclk = tclk;
-       mv78xx0_uart1_data[0].uartclk = tclk;
-       mv78xx0_uart2_data[0].uartclk = tclk;
-       mv78xx0_uart3_data[0].uartclk = tclk;
+       /* Setup root of clk tree */
+       clk_init();
+}
+
+void mv78xx0_restart(char mode, const char *cmd)
+{
+       /*
+        * Enable soft reset to assert RSTOUTn.
+        */
+       writel(SOFT_RESET_OUT_EN, RSTOUTn_MASK);
+
+       /*
+        * Assert soft reset.
+        */
+       writel(SOFT_RESET, SYSTEM_SOFT_RESET);
+
+       while (1)
+               ;
 }