Merge branch 'sf' of git://git.denx.de/u-boot-blackfin
[oweals/u-boot.git] / board / keymile / km_arm / km_arm.c
index ed5ed448263c3b9babed1d2ea9387e7cb8edaf6f..9e9940c51f0bbd584780ec8376fec13481680045 100644 (file)
@@ -34,6 +34,7 @@
 #include <netdev.h>
 #include <miiphy.h>
 #include <asm/io.h>
+#include <asm/arch/cpu.h>
 #include <asm/arch/kirkwood.h>
 #include <asm/arch/mpp.h>
 
 
 DECLARE_GLOBAL_DATA_PTR;
 
-static int     io_dev;
-extern I2C_MUX_DEVICE *i2c_mux_ident_muxstring (uchar *buf);
+/*
+ * BOCO FPGA definitions
+ */
+#define BOCO           0x10
+#define REG_CTRL_H             0x02
+#define MASK_WRL_UNITRUN       0x01
+#define MASK_RBX_PGY_PRESENT   0x40
+#define REG_IRQ_CIRQ2          0x2d
+#define MASK_RBI_DEFECT_16     0x01
 
 /* Multi-Purpose Pins Functionality configuration */
 u32 kwmpp_config[] = {
@@ -96,7 +104,7 @@ u32 kwmpp_config[] = {
        MPP41_GPIO,             /* Piggy3 LED[4] */
        MPP42_GPIO,             /* Piggy3 LED[5] */
        MPP43_GPIO,             /* Piggy3 LED[6] */
-       MPP44_GPIO,             /* Piggy3 LED[7] */
+       MPP44_GPIO,             /* Piggy3 LED[7], BIST_EN_L */
        MPP45_GPIO,             /* Piggy3 LED[8] */
        MPP46_GPIO,             /* Reserved */
        MPP47_GPIO,             /* Reserved */
@@ -105,45 +113,134 @@ u32 kwmpp_config[] = {
        0
 };
 
+#if defined(CONFIG_MGCOGE3UN)
+/*
+ * Wait for startup OK from mgcoge3ne
+ */
+int startup_allowed(void)
+{
+       unsigned char buf;
+
+       /*
+        * Read CIRQ16 bit (bit 0)
+        */
+       if (i2c_read(BOCO, REG_IRQ_CIRQ2, 1, &buf, 1) != 0)
+               printf("%s: Error reading Boco\n", __func__);
+       else
+               if ((buf & MASK_RBI_DEFECT_16) == MASK_RBI_DEFECT_16)
+                       return 1;
+       return 0;
+}
+#endif
+
+#if (defined(CONFIG_MGCOGE3UN)|defined(CONFIG_PORTL2))
+/*
+ * These two boards have always ethernet present. Its connected to the mv
+ * switch.
+ */
+int ethernet_present(void)
+{
+       return 1;
+}
+#else
 int ethernet_present(void)
 {
        uchar   buf;
        int     ret = 0;
 
-       if (i2c_read(0x10, 2, 1, &buf, 1) != 0) {
-               printf ("%s: Error reading Boco\n", __FUNCTION__);
+       if (i2c_read(BOCO, REG_CTRL_H, 1, &buf, 1) != 0) {
+               printf("%s: Error reading Boco\n", __func__);
                return -1;
        }
-       if ((buf & 0x40) == 0x40) {
+       if ((buf & MASK_RBX_PGY_PRESENT) == MASK_RBX_PGY_PRESENT)
                ret = 1;
-       }
+
        return ret;
 }
+#endif
+
+int initialize_unit_leds(void)
+{
+       /*
+        * Init the unit LEDs per default they all are
+        * ok apart from bootstat
+        */
+       uchar buf;
+
+       if (i2c_read(BOCO, REG_CTRL_H, 1, &buf, 1) != 0) {
+               printf("%s: Error reading Boco\n", __func__);
+               return -1;
+       }
+       buf |= MASK_WRL_UNITRUN;
+       if (i2c_write(BOCO, REG_CTRL_H, 1, &buf, 1) != 0) {
+               printf("%s: Error writing Boco\n", __func__);
+               return -1;
+       }
+       return 0;
+}
+
+#if defined(CONFIG_BOOTCOUNT_LIMIT)
+void set_bootcount_addr(void)
+{
+       uchar buf[32];
+       unsigned int bootcountaddr;
+       bootcountaddr = gd->ram_size - BOOTCOUNT_ADDR;
+       sprintf((char *)buf, "0x%x", bootcountaddr);
+       setenv("bootcountaddr", (char *)buf);
+}
+#endif
 
 int misc_init_r(void)
 {
-       I2C_MUX_DEVICE  *i2cdev;
        char *str;
        int mach_type;
 
-       /* add I2C Bus for I/O Expander */
-       i2cdev = i2c_mux_ident_muxstring((uchar *)"pca9554a:70:a");
-       io_dev = i2cdev->busid;
-       puts("Piggy:");
-       if (ethernet_present() == 0)
-               puts (" not");
-       puts(" present\n");
-
        str = getenv("mach_type");
        if (str != NULL) {
                mach_type = simple_strtoul(str, NULL, 10);
                printf("Overwriting MACH_TYPE with %d!!!\n", mach_type);
                gd->bd->bi_arch_number = mach_type;
        }
+#if defined(CONFIG_MGCOGE3UN)
+       char *wait_for_ne;
+       wait_for_ne = getenv("waitforne");
+       if (wait_for_ne != NULL) {
+               if (strcmp(wait_for_ne, "true") == 0) {
+                       int cnt = 0;
+                       int abort = 0;
+                       puts("NE go: ");
+                       while (startup_allowed() == 0) {
+                               if (tstc()) {
+                                       (void) getc(); /* consume input */
+                                       abort = 1;
+                                       break;
+                               }
+                               udelay(200000);
+                               cnt++;
+                               if (cnt == 5)
+                                       puts("wait\b\b\b\b");
+                               if (cnt == 10) {
+                                       cnt = 0;
+                                       puts("    \b\b\b\b");
+                               }
+                       }
+                       if (abort == 1)
+                               printf("\nAbort waiting for ne\n");
+                       else
+                               puts("OK\n");
+               }
+       }
+#endif
+
+       initialize_unit_leds();
+       set_km_env();
+#if defined(CONFIG_BOOTCOUNT_LIMIT)
+       set_bootcount_addr();
+#endif
        return 0;
 }
 
-int board_init(void)
+int board_early_init_f(void)
 {
        u32 tmp;
 
@@ -158,30 +255,35 @@ int board_init(void)
        writel(tmp | FLASH_GPIO_PIN , KW_GPIO0_BASE);
        tmp = readl(KW_GPIO0_BASE + 4);
        writel(tmp & (~FLASH_GPIO_PIN) , KW_GPIO0_BASE + 4);
-       printf("KM: setting NAND mode\n");
-
-       /*
-        * arch number of board
-        */
-       gd->bd->bi_arch_number = MACH_TYPE_SUEN3;
-
-       /* address of boot parameters */
-       gd->bd->bi_boot_params = kw_sdram_bar(0) + 0x100;
 
 #if defined(CONFIG_SOFT_I2C)
        /* init the GPIO for I2C Bitbang driver */
-       kw_gpio_set_valid(SUEN3_SDA_PIN, 1);
-       kw_gpio_set_valid(SUEN3_SCL_PIN, 1);
-       kw_gpio_direction_output(SUEN3_SDA_PIN, 0);
-       kw_gpio_direction_output(SUEN3_SCL_PIN, 0);
+       kw_gpio_set_valid(KM_KIRKWOOD_SDA_PIN, 1);
+       kw_gpio_set_valid(KM_KIRKWOOD_SCL_PIN, 1);
+       kw_gpio_direction_output(KM_KIRKWOOD_SDA_PIN, 0);
+       kw_gpio_direction_output(KM_KIRKWOOD_SCL_PIN, 0);
 #endif
 #if defined(CONFIG_SYS_EEPROM_WREN)
-       kw_gpio_set_valid(SUEN3_ENV_WP, 38);
-       kw_gpio_direction_output(SUEN3_ENV_WP, 1);
+       kw_gpio_set_valid(KM_KIRKWOOD_ENV_WP, 38);
+       kw_gpio_direction_output(KM_KIRKWOOD_ENV_WP, 1);
+#endif
+#if defined(CONFIG_KM_RECONFIG_XLX)
+       /* trigger the reconfiguration of the xilinx fpga */
+       kw_gpio_set_valid(KM_XLX_PROGRAM_B_PIN, 1);
+       kw_gpio_direction_output(KM_XLX_PROGRAM_B_PIN, 0);
+       kw_gpio_direction_input(KM_XLX_PROGRAM_B_PIN);
 #endif
        return 0;
 }
 
+int board_init(void)
+{
+       /* address of boot parameters */
+       gd->bd->bi_boot_params = kw_sdram_bar(0) + 0x100;
+
+       return 0;
+}
+
 #if defined(CONFIG_CMD_SF)
 int do_spi_toggle(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
@@ -229,7 +331,7 @@ int dram_init(void)
 {
        /* dram_init must store complete ramsize in gd->ram_size */
        /* Fix this */
-       gd->ram_size = get_ram_size((volatile void *)kw_sdram_bar(0),
+       gd->ram_size = get_ram_size((void *)kw_sdram_bar(0),
                                kw_sdram_bs(0));
        return 0;
 }
@@ -240,13 +342,47 @@ void dram_init_banksize(void)
 
        for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
                gd->bd->bi_dram[i].start = kw_sdram_bar(i);
-               gd->bd->bi_dram[i].size = kw_sdram_bs(i);
                gd->bd->bi_dram[i].size = get_ram_size((long *)kw_sdram_bar(i),
                                                       kw_sdram_bs(i));
        }
 }
 
-/* Configure and enable MV88E1118 PHY */
+#if (defined(CONFIG_MGCOGE3UN)|defined(CONFIG_PORTL2))
+
+#define        PHY_LED_SEL     0x18
+#define PHY_LED0_LINK  (0x5)
+#define PHY_LED1_ACT   (0x8<<4)
+#define PHY_LED2_INT   (0xe<<8)
+#define        PHY_SPEC_CTRL   0x1c
+#define PHY_RGMII_CLK_STABLE   (0x1<<10)
+#define PHY_CLSA       (0x1<<1)
+
+/* Configure and enable MV88E3018 PHY */
+void reset_phy(void)
+{
+       char *name = "egiga0";
+       unsigned short reg;
+
+       if (miiphy_set_current_dev(name))
+               return;
+
+       /* RGMII clk transition on data stable */
+       if (miiphy_read(name, CONFIG_PHY_BASE_ADR, PHY_SPEC_CTRL, &reg) != 0)
+               printf("Error reading PHY spec ctrl reg\n");
+       if (miiphy_write(name, CONFIG_PHY_BASE_ADR, PHY_SPEC_CTRL,
+               reg | PHY_RGMII_CLK_STABLE | PHY_CLSA) != 0)
+               printf("Error writing PHY spec ctrl reg\n");
+
+       /* leds setup */
+       if (miiphy_write(name, CONFIG_PHY_BASE_ADR, PHY_LED_SEL,
+               PHY_LED0_LINK | PHY_LED1_ACT | PHY_LED2_INT) != 0)
+               printf("Error writing PHY LED reg\n");
+
+       /* reset the phy */
+       miiphy_reset(name, CONFIG_PHY_BASE_ADR);
+}
+#else
+/* Configure and enable MV88E1118 PHY on the piggy*/
 void reset_phy(void)
 {
        char *name = "egiga0";
@@ -257,74 +393,130 @@ void reset_phy(void)
        /* reset the phy */
        miiphy_reset(name, CONFIG_PHY_BASE_ADR);
 }
+#endif
+
 
 #if defined(CONFIG_HUSH_INIT_VAR)
-int hush_init_var (void)
+int hush_init_var(void)
 {
-       ivm_read_eeprom ();
+       ivm_read_eeprom();
        return 0;
 }
 #endif
 
 #if defined(CONFIG_BOOTCOUNT_LIMIT)
-void bootcount_store (ulong a)
+const ulong patterns[]      = {        0x00000000,
+                               0xFFFFFFFF,
+                               0xFF00FF00,
+                               0x0F0F0F0F,
+                               0xF0F0F0F0};
+const ulong NBR_OF_PATTERNS = sizeof(patterns)/sizeof(*patterns);
+const ulong OFFS_PATTERN    = 3;
+const ulong REPEAT_PATTERN  = 1000;
+
+void bootcount_store(ulong a)
 {
-       volatile ulong *save_addr;
-       volatile ulong size = 0;
+       ulong *save_addr;
+       ulong size = 0;
        int i;
-       for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
+
+       for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++)
                size += gd->bd->bi_dram[i].size;
-       }
-       save_addr = (ulong*)(size - BOOTCOUNT_ADDR);
+       save_addr = (ulong *)(size - BOOTCOUNT_ADDR);
        writel(a, save_addr);
        writel(BOOTCOUNT_MAGIC, &save_addr[1]);
+
+       for (i = 0; i < REPEAT_PATTERN; i++)
+               writel(patterns[i % NBR_OF_PATTERNS],
+                       &save_addr[i+OFFS_PATTERN]);
+
 }
 
-ulong bootcount_load (void)
+ulong bootcount_load(void)
 {
-       volatile ulong *save_addr;
-       volatile ulong size = 0;
-       int i;
-       for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
+       ulong *save_addr;
+       ulong size = 0;
+       ulong counter = 0;
+       int i, tmp;
+
+       for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++)
                size += gd->bd->bi_dram[i].size;
+       save_addr = (ulong *)(size - BOOTCOUNT_ADDR);
+
+       counter = readl(&save_addr[0]);
+
+       /* Is the counter reliable, check in the big pattern for bit errors */
+       for (i = 0; (i < REPEAT_PATTERN) && (counter != 0); i++) {
+               tmp = readl(&save_addr[i+OFFS_PATTERN]);
+               if (tmp != patterns[i % NBR_OF_PATTERNS])
+                       counter = 0;
        }
-       save_addr = (ulong*)(size - BOOTCOUNT_ADDR);
-       if (readl(&save_addr[1]) != BOOTCOUNT_MAGIC)
-               return 0;
-       else
-               return readl(save_addr);
+       return counter;
 }
 #endif
 
 #if defined(CONFIG_SOFT_I2C)
-void set_sda (int state)
+void set_sda(int state)
 {
        I2C_ACTIVE;
        I2C_SDA(state);
 }
 
-void set_scl (int state)
+void set_scl(int state)
 {
        I2C_SCL(state);
 }
 
-int get_sda (void)
+int get_sda(void)
 {
        I2C_TRISTATE;
        return I2C_READ;
 }
 
-int get_scl (void)
+int get_scl(void)
+{
+       return kw_gpio_get_value(KM_KIRKWOOD_SCL_PIN) ? 1 : 0;
+}
+#endif
+
+#if defined(CONFIG_POST)
+
+#define KM_POST_EN_L   44
+#define POST_WORD_OFF  8
+
+int post_hotkeys_pressed(void)
+{
+       return !kw_gpio_get_value(KM_POST_EN_L);
+}
+
+ulong post_word_load(void)
+{
+       void* addr = (void *) (gd->ram_size - BOOTCOUNT_ADDR + POST_WORD_OFF);
+       return in_le32(addr);
+
+}
+void post_word_store(ulong value)
 {
-       return (kw_gpio_get_value(SUEN3_SCL_PIN) ? 1 : 0);
+       void* addr = (void *) (gd->ram_size - BOOTCOUNT_ADDR + POST_WORD_OFF);
+       out_le32(addr, value);
+}
+
+int arch_memory_test_prepare(u32 *vstart, u32 *size, phys_addr_t *phys_offset)
+{
+       *vstart = CONFIG_SYS_SDRAM_BASE;
+
+       /* we go up to relocation plus a 1 MB margin */
+       *size = CONFIG_SYS_TEXT_BASE - (1<<20);
+
+       return 0;
 }
 #endif
 
 #if defined(CONFIG_SYS_EEPROM_WREN)
-int eeprom_write_enable (unsigned dev_addr, int state)
+int eeprom_write_enable(unsigned dev_addr, int state)
 {
-       kw_gpio_set_value(SUEN3_ENV_WP, !state);
+       kw_gpio_set_value(KM_KIRKWOOD_ENV_WP, !state);
 
-       return !kw_gpio_get_value(SUEN3_ENV_WP);
+       return !kw_gpio_get_value(KM_KIRKWOOD_ENV_WP);
 }
 #endif