ppc4xx: Canyonlands: Remove unnecessary FDT warning upon DTB fixup

[karo-tx-uboot.git] / board / amcc / canyonlands / canyonlands.c

diff --git a/board/amcc/canyonlands/canyonlands.c b/board/amcc/canyonlands/canyonlands.c
index 9986e9a9c6ef8a87684f91282919222af5f82a30..47667eeec39964f5ca1fcf5af21e648d4559d3e1 100644 (file)
--- a/board/amcc/canyonlands/canyonlands.c
+++ b/board/amcc/canyonlands/canyonlands.c
@@ -22,6 +22,7 @@
 #include <ppc440.h>
 #include <libfdt.h>
 #include <fdt_support.h>
+#include <i2c.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/mmu.h>
@@ -205,50 +206,12 @@ u32 ddr_clktr(u32 default_val) {
  * I2C SPD DIMM autodetection/calibration doesn't fit into the 4k of boot
  * code.
  */
-long int initdram(int board_type)
+phys_size_t initdram(int board_type)
 {
        return CFG_MBYTES_SDRAM << 20;
 }
 #endif
 
-#if defined(CFG_DRAM_TEST)
-int testdram(void)
-{
-       unsigned long *mem = (unsigned long *)0;
-       const unsigned long kend = (1024 / sizeof(unsigned long));
-       unsigned long k, n;
-
-       mtmsr(0);
-
-       for (k = 0; k < CFG_KBYTES_SDRAM;
-            ++k, mem += (1024 / sizeof(unsigned long))) {
-               if ((k & 1023) == 0) {
-                       printf("%3d MB\r", k / 1024);
-               }
-
-               memset(mem, 0xaaaaaaaa, 1024);
-               for (n = 0; n < kend; ++n) {
-                       if (mem[n] != 0xaaaaaaaa) {
-                               printf("SDRAM test fails at: %08x\n",
-                                      (uint) & mem[n]);
-                               return 1;
-                       }
-               }
-
-               memset(mem, 0x55555555, 1024);
-               for (n = 0; n < kend; ++n) {
-                       if (mem[n] != 0x55555555) {
-                               printf("SDRAM test fails at: %08x\n",
-                                      (uint) & mem[n]);
-                               return 1;
-                       }
-               }
-       }
-       printf("SDRAM test passes\n");
-       return 0;
-}
-#endif
-
 /*
  *  pci_target_init
  *
@@ -431,6 +394,7 @@ int misc_init_r(void)
        u32 sdr0_srst1 = 0;
        u32 eth_cfg;
        u32 pvr = get_pvr();
+       u8 val;
 
        /*
         * Set EMAC mode/configuration (GMII, SGMII, RGMII...).
@@ -458,6 +422,15 @@ int misc_init_r(void)
        sdr0_srst1 &= ~SDR0_SRST1_AHB;
        mtsdr(SDR0_SRST1, sdr0_srst1);
 
+       /*
+        * RTC/M41T62:
+        * Disable square wave output: Batterie will be drained
+        * quickly, when this output is not disabled
+        */
+       val = i2c_reg_read(CFG_I2C_RTC_ADDR, 0xa);
+       val &= ~0x40;
+       i2c_reg_write(CFG_I2C_RTC_ADDR, 0xa, val);
+
        return 0;
 }
 
@@ -476,8 +449,29 @@ void ft_board_setup(void *blob, bd_t *bd)
        val[3] = gd->bd->bi_flashsize;
        rc = fdt_find_and_setprop(blob, "/plb/opb/ebc", "ranges",
                                  val, sizeof(val), 1);
-       if (rc)
+       if (rc) {
                printf("Unable to update property NOR mapping, err=%s\n",
                       fdt_strerror(rc));
+       }
+
+       if (gd->board_type == BOARD_CANYONLANDS_SATA) {
+               /*
+                * When SATA is selected we need to disable the first PCIe
+                * node in the device tree, so that Linux doesn't initialize
+                * it.
+                */
+               fdt_find_and_setprop(blob, "/plb/pciex@d00000000", "status",
+                                    "disabled", sizeof("disabled"), 1);
+       }
+
+       if (gd->board_type == BOARD_CANYONLANDS_PCIE) {
+               /*
+                * When PCIe is selected we need to disable the SATA
+                * node in the device tree, so that Linux doesn't initialize
+                * it.
+                */
+               fdt_find_and_setprop(blob, "/plb/sata@bffd1000", "status",
+                                    "disabled", sizeof("disabled"), 1);
+       }
 }
 #endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */