4 files changed, 168 insertions, 1 deletions

diff --git a/arch/powerpc/boot/4xx.c b/arch/powerpc/boot/4xx.c
index 642d8780bb31..ebf9e217612d 100644
--- a/arch/powerpc/boot/4xx.c
+++ b/arch/powerpc/boot/4xx.c
@@ -39,6 +39,114 @@ void ibm4xx_fixup_memsize(void)
         dt_fixup_memory(0, memsize);
 }
 
+/* 4xx DDR1/2 Denali memory controller support */
+/* DDR0 registers */
+#define DDR0_02                 2
+#define DDR0_08                 8
+#define DDR0_10                 10
+#define DDR0_14                 14
+#define DDR0_42                 42
+#define DDR0_43                 43
+
+/* DDR0_02 */
+#define DDR_START               0x1
+#define DDR_START_SHIFT         0
+#define DDR_MAX_CS_REG          0x3
+#define DDR_MAX_CS_REG_SHIFT    24
+#define DDR_MAX_COL_REG         0xf
+#define DDR_MAX_COL_REG_SHIFT   16
+#define DDR_MAX_ROW_REG         0xf
+#define DDR_MAX_ROW_REG_SHIFT   8
+/* DDR0_08 */
+#define DDR_DDR2_MODE           0x1
+#define DDR_DDR2_MODE_SHIFT     0
+/* DDR0_10 */
+#define DDR_CS_MAP              0x3
+#define DDR_CS_MAP_SHIFT        8
+/* DDR0_14 */
+#define DDR_REDUC               0x1
+#define DDR_REDUC_SHIFT         16
+/* DDR0_42 */
+#define DDR_APIN                0x7
+#define DDR_APIN_SHIFT          24
+/* DDR0_43 */
+#define DDR_COL_SZ              0x7
+#define DDR_COL_SZ_SHIFT        8
+#define DDR_BANK8               0x1
+#define DDR_BANK8_SHIFT         0
+
+#define DDR_GET_VAL(val, mask, shift)   (((val) >> (shift)) & (mask))
+
+static inline u32 mfdcr_sdram0(u32 reg)
+{
+        mtdcr(DCRN_SDRAM0_CFGADDR, reg);
+        return mfdcr(DCRN_SDRAM0_CFGDATA);
+}
+
+void ibm4xx_denali_fixup_memsize(void)
+{
+        u32 val, max_cs, max_col, max_row;
+        u32 cs, col, row, bank, dpath;
+        unsigned long memsize;
+
+        val = mfdcr_sdram0(DDR0_02);
+        if (!DDR_GET_VAL(val, DDR_START, DDR_START_SHIFT))
+                fatal("DDR controller is not initialized\n");
+
+        /* get maximum cs col and row values */
+        max_cs  = DDR_GET_VAL(val, DDR_MAX_CS_REG, DDR_MAX_CS_REG_SHIFT);
+        max_col = DDR_GET_VAL(val, DDR_MAX_COL_REG, DDR_MAX_COL_REG_SHIFT);
+        max_row = DDR_GET_VAL(val, DDR_MAX_ROW_REG, DDR_MAX_ROW_REG_SHIFT);
+
+        /* get CS value */
+        val = mfdcr_sdram0(DDR0_10);
+
+        val = DDR_GET_VAL(val, DDR_CS_MAP, DDR_CS_MAP_SHIFT);
+        cs = 0;
+        while (val) {
+                if (val && 0x1)
+                        cs++;
+                val = val >> 1;
+        }
+
+        if (!cs)
+                fatal("No memory installed\n");
+        if (cs > max_cs)
+                fatal("DDR wrong CS configuration\n");
+
+        /* get data path bytes */
+        val = mfdcr_sdram0(DDR0_14);
+
+        if (DDR_GET_VAL(val, DDR_REDUC, DDR_REDUC_SHIFT))
+                dpath = 8; /* 64 bits */
+        else
+                dpath = 4; /* 32 bits */
+
+        /* get adress pins (rows) */
+        val = mfdcr_sdram0(DDR0_42);
+
+        row = DDR_GET_VAL(val, DDR_APIN, DDR_APIN_SHIFT);
+        if (row > max_row)
+                fatal("DDR wrong APIN configuration\n");
+        row = max_row - row;
+
+        /* get collomn size and banks */
+        val = mfdcr_sdram0(DDR0_43);
+
+        col = DDR_GET_VAL(val, DDR_COL_SZ, DDR_COL_SZ_SHIFT);
+        if (col > max_col)
+                fatal("DDR wrong COL configuration\n");
+        col = max_col - col;
+
+        if (DDR_GET_VAL(val, DDR_BANK8, DDR_BANK8_SHIFT))
+                bank = 8; /* 8 banks */
+        else
+                bank = 4; /* 4 banks */
+
+        memsize = cs * (1 << (col+row)) * bank * dpath;
+        dt_fixup_memory(0, memsize);
+}
+
 #define SPRN_DBCR0_40X 0x3F2
 #define SPRN_DBCR0_44X 0x134
 #define DBCR0_RST_SYSTEM 0x30000000
diff --git a/arch/powerpc/boot/4xx.h b/arch/powerpc/boot/4xx.h
index 8f26e480dcd3..adba6a599a93 100644
--- a/arch/powerpc/boot/4xx.h
+++ b/arch/powerpc/boot/4xx.h
@@ -12,6 +12,7 @@
 #define _POWERPC_BOOT_4XX_H_
 
 void ibm4xx_fixup_memsize(void);
+void ibm4xx_denali_fixup_memsize(void);
 void ibm44x_dbcr_reset(void);
 void ibm40x_dbcr_reset(void);
 void ibm4xx_quiesce_eth(u32 *emac0, u32 *emac1);
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index cd7c05769e41..2766069e6a2b 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -48,7 +48,8 @@ src-wlib := string.S crt0.S stdio.c main.c flatdevtree.c flatdevtree_misc.c \
                 cpm-serial.c
 src-plat := of.c cuboot-83xx.c cuboot-85xx.c holly.c \
                 cuboot-ebony.c treeboot-ebony.c prpmc2800.c \
-                ps3-head.S ps3-hvcall.S ps3.c treeboot-bamboo.c cuboot-8xx.c cuboot-pq2.c
+                ps3-head.S ps3-hvcall.S ps3.c treeboot-bamboo.c cuboot-8xx.c \
+                cuboot-pq2.c cuboot-sequoia.c
 src-boot := $(src-wlib) $(src-plat) empty.c
 
 src-boot := $(addprefix $(obj)/, $(src-boot))
@@ -146,6 +147,7 @@ image-$(CONFIG_PPC_83xx)		+= cuImage.83xx
 image-$(CONFIG_PPC_85xx)                += cuImage.85xx
 image-$(CONFIG_EBONY)                   += treeImage.ebony cuImage.ebony
 image-$(CONFIG_BAMBOO)                  += treeImage.bamboo
+image-$(CONFIG_SEQUOIA)                 += cuImage.sequoia
 endif
 
 # For 32-bit powermacs, build the COFF and miboot images
diff --git a/arch/powerpc/boot/cuboot-sequoia.c b/arch/powerpc/boot/cuboot-sequoia.c
new file mode 100644
index 000000000000..ec635e0bd4ec
--- /dev/null
+++ b/arch/powerpc/boot/cuboot-sequoia.c
@@ -0,0 +1,56 @@
+/*
+ * Old U-boot compatibility for Sequoia
+ *
+ * Valentine Barshak <vbarshak@ru.mvista.com>
+ * Copyright 2007 MontaVista Software, Inc
+ *
+ * Based on Ebony code by David Gibson <david@gibson.dropbear.id.au>
+ * Copyright IBM Corporation, 2007
+ *
+ * Based on Bamboo code by Josh Boyer <jwboyer@linux.vnet.ibm.com>
+ * Copyright IBM Corporation, 2007
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2 of the License
+ */
+
+#include <stdarg.h>
+#include <stddef.h>
+#include "types.h"
+#include "elf.h"
+#include "string.h"
+#include "stdio.h"
+#include "page.h"
+#include "ops.h"
+#include "dcr.h"
+#include "4xx.h"
+#include "44x.h"
+#include "cuboot.h"
+
+#define TARGET_4xx
+#define TARGET_44x
+#include "ppcboot.h"
+
+static bd_t bd;
+
+
+static void sequoia_fixups(void)
+{
+        unsigned long sysclk = 33333333;
+
+        ibm440ep_fixup_clocks(sysclk, 11059200);
+        ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
+        ibm4xx_denali_fixup_memsize();
+        dt_fixup_mac_addresses(&bd.bi_enetaddr, &bd.bi_enet1addr);
+}
+
+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
+                   unsigned long r6, unsigned long r7)
+{
+        CUBOOT_INIT();
+        platform_ops.fixups = sequoia_fixups;
+        platform_ops.exit = ibm44x_dbcr_reset;
+        ft_init(_dtb_start, 0, 32);
+        serial_console_init();
+}