Merge linux-2.6 with linux-acpi-2.6

8 files changed, 133 insertions, 78 deletions

diff --git a/arch/ppc/boot/simple/Makefile b/arch/ppc/boot/simple/Makefile
index d4dc4fa79647..b7bd8f61a4ad 100644
--- a/arch/ppc/boot/simple/Makefile
+++ b/arch/ppc/boot/simple/Makefile
@@ -96,10 +96,6 @@ zimageinitrd-$(CONFIG_OCOTEA)		:= zImage.initrd-TREE
 zimageinitrd-$(CONFIG_GEMINI)           := zImage.initrd-STRIPELF
          end-$(CONFIG_GEMINI)           := gemini
 
-     extra.o-$(CONFIG_K2)               := prepmap.o
-         end-$(CONFIG_K2)               := k2
-   cacheflag-$(CONFIG_K2)               := -include $(clear_L2_L3)
-
      extra.o-$(CONFIG_KATANA)           := misc-katana.o
          end-$(CONFIG_KATANA)           := katana
    cacheflag-$(CONFIG_KATANA)           := -include $(clear_L2_L3)
@@ -108,12 +104,15 @@ zimageinitrd-$(CONFIG_GEMINI)		:= zImage.initrd-STRIPELF
          end-$(CONFIG_RADSTONE_PPC7D)   := radstone_ppc7d
    cacheflag-$(CONFIG_RADSTONE_PPC7D)   := -include $(clear_L2_L3)
 
+     extra.o-$(CONFIG_EV64360)          := misc-ev64360.o
+         end-$(CONFIG_EV64360)          := ev64360
+   cacheflag-$(CONFIG_EV64360)          := -include $(clear_L2_L3)
+
 # kconfig 'feature', only one of these will ever be 'y' at a time.
 # The rest will be unset.
-motorola := $(CONFIG_MCPN765)$(CONFIG_MVME5100)$(CONFIG_PRPMC750) \
+motorola := $(CONFIG_MVME5100)$(CONFIG_PRPMC750) \
 $(CONFIG_PRPMC800)$(CONFIG_LOPEC)$(CONFIG_PPLUS)
 motorola := $(strip $(motorola))
-pcore := $(CONFIG_PCORE)$(CONFIG_POWERPMC250)
 
       zimage-$(motorola)                := zImage-PPLUS
 zimageinitrd-$(motorola)                := zImage.initrd-PPLUS
@@ -123,12 +122,6 @@ zimageinitrd-$(motorola)		:= zImage.initrd-PPLUS
      extra.o-$(CONFIG_PPLUS)            := prepmap.o
      extra.o-$(CONFIG_LOPEC)            := mpc10x_memory.o
 
-      zimage-$(pcore)                   := zImage-STRIPELF
-zimageinitrd-$(pcore)                   := zImage.initrd-STRIPELF
-     extra.o-$(pcore)                   := chrpmap.o
-         end-$(pcore)                   := pcore
-   cacheflag-$(pcore)                   := -include $(clear_L2_L3)
-
 # Really only valid if CONFIG_6xx=y
       zimage-$(CONFIG_PPC_PREP)         := zImage-PPLUS
 zimageinitrd-$(CONFIG_PPC_PREP)         := zImage.initrd-PPLUS
@@ -158,8 +151,6 @@ zimageinitrd-$(CONFIG_LITE5200)		:= zImage.initrd-STRIPELF
 
 # This is a treeboot that needs init functions until the
 # boot rom is sorted out (i.e. this is short lived)
-extra-aflags-$(CONFIG_REDWOOD_4)        := -Wa,-m405
-extra.o-$(CONFIG_REDWOOD_4)             := rw4/rw4_init.o rw4/rw4_init_brd.o
 EXTRA_AFLAGS := $(extra-aflags-y)
 # head.o needs to get the cacheflags defined.
 AFLAGS_head.o                           += $(cacheflag-y)
diff --git a/arch/ppc/boot/simple/embed_config.c b/arch/ppc/boot/simple/embed_config.c
index c342b47e763e..491a691d10cc 100644
--- a/arch/ppc/boot/simple/embed_config.c
+++ b/arch/ppc/boot/simple/embed_config.c
@@ -784,28 +784,12 @@ embed_config(bd_t ** bdp)
 #ifdef CONFIG_IBM_OPENBIOS
 /* This could possibly work for all treeboot roms.
 */
-#if defined(CONFIG_ASH) || defined(CONFIG_BEECH) || defined(CONFIG_BUBINGA)
+#if defined(CONFIG_BUBINGA)
 #define BOARD_INFO_VECTOR       0xFFF80B50 /* openbios 1.19 moved this vector down  - armin */
 #else
 #define BOARD_INFO_VECTOR       0xFFFE0B50
 #endif
 
-#ifdef CONFIG_BEECH
-static void
-get_board_info(bd_t **bdp)
-{
-        typedef void (*PFV)(bd_t *bd);
-        ((PFV)(*(unsigned long *)BOARD_INFO_VECTOR))(*bdp);
-        return;
-}
-
-void
-embed_config(bd_t **bdp)
-{
-        *bdp = &bdinfo;
-        get_board_info(bdp);
-}
-#else /* !CONFIG_BEECH */
 void
 embed_config(bd_t **bdp)
 {
@@ -860,7 +844,6 @@ embed_config(bd_t **bdp)
 #endif
         timebase_period_ns = 1000000000 / bd->bi_tbfreq;
 }
-#endif /* CONFIG_BEECH */
 #endif /* CONFIG_IBM_OPENBIOS */
 
 #ifdef CONFIG_EP405
@@ -943,39 +926,3 @@ embed_config(bd_t **bdp)
 #endif
 }
 #endif
-
-#ifdef CONFIG_RAINIER
-/* Rainier uses vxworks bootrom */
-void
-embed_config(bd_t **bdp)
-{
-        u_char  *cp;
-        int     i;
-        bd_t    *bd;
-        
-        bd = &bdinfo;
-        *bdp = bd;
-        
-        for(i=0;i<8192;i+=32) {
-                __asm__("dccci 0,%0" :: "r" (i));
-        }
-        __asm__("iccci 0,0");
-        __asm__("sync;isync");
-
-        /* init ram for parity */
-        memset(0, 0,0x400000);  /* Lo memory */
-
-
-        bd->bi_memsize   = (32 * 1024 * 1024) ;
-        bd->bi_intfreq = 133000000; //the internal clock is 133 MHz
-        bd->bi_busfreq   = 100000000;
-        bd->bi_pci_busfreq= 33000000;
-
-        cp = (u_char *)def_enet_addr;
-        for (i=0; i<6; i++) {
-                bd->bi_enetaddr[i] = *cp++;
-        }
-
-}
-#endif
-
diff --git a/arch/ppc/boot/simple/head.S b/arch/ppc/boot/simple/head.S
index 524053202bb4..5e4adc298bf9 100644
--- a/arch/ppc/boot/simple/head.S
+++ b/arch/ppc/boot/simple/head.S
@@ -120,15 +120,6 @@ haveOF:
         mtspr   SPRN_DER,r4
 #endif
 
-#ifdef CONFIG_REDWOOD_4
-        /* All of this Redwood 4 stuff will soon disappear when the
-         * boot rom is straightened out.
-         */
-        mr      r29, r3         /* Easier than changing the other code */
-        bl      HdwInit
-        mr      r3, r29
-#endif
-
 #if defined(CONFIG_MBX) || defined(CONFIG_RPX8260) || defined(CONFIG_PPC_PREP)
         mr      r4,r29  /* put the board info pointer where the relocate
                          * routine will find it
diff --git a/arch/ppc/boot/simple/misc-cpci690.c b/arch/ppc/boot/simple/misc-cpci690.c
index ef08e86c9b25..26860300fa09 100644
--- a/arch/ppc/boot/simple/misc-cpci690.c
+++ b/arch/ppc/boot/simple/misc-cpci690.c
@@ -12,16 +12,56 @@
  */
 
 #include <linux/types.h>
+#include <asm/io.h>
 #include <platforms/cpci690.h>
 
+#define KB      (1024UL)
+#define MB      (1024UL*KB)
+#define GB      (1024UL*MB)
+
 extern u32 mv64x60_console_baud;
 extern u32 mv64x60_mpsc_clk_src;
 extern u32 mv64x60_mpsc_clk_freq;
 
+u32 mag = 0xffff;
+
+unsigned long
+get_mem_size(void)
+{
+        u32     size;
+
+        switch (in_8(((void __iomem *)CPCI690_BR_BASE + CPCI690_BR_MEM_CTLR))
+                        & 0x07) {
+        case 0x01:
+                size = 256*MB;
+                break;
+        case 0x02:
+                size = 512*MB;
+                break;
+        case 0x03:
+                size = 768*MB;
+                break;
+        case 0x04:
+                size = 1*GB;
+                break;
+        case 0x05:
+                size = 1*GB + 512*MB;
+                break;
+        case 0x06:
+                size = 2*GB;
+                break;
+        default:
+                size = 0;
+        }
+
+        return size;
+}
+
 void
 mv64x60_board_init(void __iomem *old_base, void __iomem *new_base)
 {
         mv64x60_console_baud = CPCI690_MPSC_BAUD;
         mv64x60_mpsc_clk_src = CPCI690_MPSC_CLK_SRC;
-        mv64x60_mpsc_clk_freq = CPCI690_BUS_FREQ;
+        mv64x60_mpsc_clk_freq =
+                (get_mem_size() >= (1*GB)) ? 100000000 : 133333333;
 }
diff --git a/arch/ppc/boot/simple/misc-ev64360.c b/arch/ppc/boot/simple/misc-ev64360.c
new file mode 100644
index 000000000000..cd1ccf2a1582
--- /dev/null
+++ b/arch/ppc/boot/simple/misc-ev64360.c
@@ -0,0 +1,44 @@
+/*
+ * arch/ppc/boot/simple/misc-ev64360.c
+ * Copyright (C) 2005 Lee Nicks <allinux@gmail.com>
+ *
+ * Based on arch/ppc/boot/simple/misc-katana.c from:
+ * Mark A. Greer <source@mvista.com>
+ *
+ * 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; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#include <linux/config.h>
+#include <linux/types.h>
+#include <asm/io.h>
+#include <asm/mv64x60_defs.h>
+#include <platforms/ev64360.h>
+
+extern u32 mv64x60_console_baud;
+extern u32 mv64x60_mpsc_clk_src;
+extern u32 mv64x60_mpsc_clk_freq;
+
+/* Not in the kernel so won't include kernel.h to get its 'min' definition */
+#ifndef min
+#define min(a,b)        (((a) < (b)) ? (a) : (b))
+#endif
+
+void
+mv64x60_board_init(void __iomem *old_base, void __iomem *new_base)
+{
+        mv64x60_console_baud  = EV64360_DEFAULT_BAUD;
+        mv64x60_mpsc_clk_src  = EV64360_MPSC_CLK_SRC;
+        mv64x60_mpsc_clk_freq = EV64360_MPSC_CLK_FREQ;
+}
diff --git a/arch/ppc/boot/simple/misc-katana.c b/arch/ppc/boot/simple/misc-katana.c
index b6e1bb833157..ec94a11bacac 100644
--- a/arch/ppc/boot/simple/misc-katana.c
+++ b/arch/ppc/boot/simple/misc-katana.c
@@ -26,6 +26,8 @@ extern u32 mv64x60_mpsc_clk_freq;
 #define min(a,b)        (((a) < (b)) ? (a) : (b))
 #endif
 
+unsigned long mv64360_get_mem_size(void);
+
 void
 mv64x60_board_init(void __iomem *old_base, void __iomem *new_base)
 {
@@ -35,3 +37,9 @@ mv64x60_board_init(void __iomem *old_base, void __iomem *new_base)
                 min(katana_bus_freq((void __iomem *)KATANA_CPLD_BASE),
                         MV64x60_TCLK_FREQ_MAX);
 }
+
+unsigned long
+get_mem_size(void)
+{
+        return mv64360_get_mem_size();
+}
diff --git a/arch/ppc/boot/simple/misc-mv64x60.c b/arch/ppc/boot/simple/misc-mv64x60.c
index 7e88fc6d207d..258d4599fadc 100644
--- a/arch/ppc/boot/simple/misc-mv64x60.c
+++ b/arch/ppc/boot/simple/misc-mv64x60.c
@@ -19,6 +19,33 @@
 extern struct bi_record *decompress_kernel(unsigned long load_addr,
         int num_words, unsigned long cksum);
 
+
+u32 size_reg[MV64x60_CPU2MEM_WINDOWS] = {
+        MV64x60_CPU2MEM_0_SIZE, MV64x60_CPU2MEM_1_SIZE,
+        MV64x60_CPU2MEM_2_SIZE, MV64x60_CPU2MEM_3_SIZE
+};
+
+/* Read mem ctlr to get the amount of mem in system */
+unsigned long
+mv64360_get_mem_size(void)
+{
+        u32     enables, i, v;
+        u32     mem = 0;
+
+        enables = in_le32((void __iomem *)CONFIG_MV64X60_NEW_BASE +
+                MV64360_CPU_BAR_ENABLE) & 0xf;
+
+        for (i=0; i<MV64x60_CPU2MEM_WINDOWS; i++)
+                if (!(enables & (1<<i))) {
+                        v = in_le32((void __iomem *)CONFIG_MV64X60_NEW_BASE
+                                + size_reg[i]) & 0xffff;
+                        v = (v + 1) << 16;
+                        mem += v;
+                }
+
+        return mem;
+}
+
 void
 mv64x60_move_base(void __iomem *old_base, void __iomem *new_base)
 {
diff --git a/arch/ppc/boot/simple/mv64x60_tty.c b/arch/ppc/boot/simple/mv64x60_tty.c
index 5b45eb46b669..b9c24d4c738b 100644
--- a/arch/ppc/boot/simple/mv64x60_tty.c
+++ b/arch/ppc/boot/simple/mv64x60_tty.c
@@ -22,9 +22,16 @@
 #include <asm/mv64x60_defs.h>
 #include <mpsc_defs.h>
 
+#ifdef CONFIG_EV64360
+#include <platforms/ev64360.h>
+u32     mv64x60_console_baud = EV64360_DEFAULT_BAUD;
+u32     mv64x60_mpsc_clk_src = EV64360_MPSC_CLK_SRC; /* TCLK */
+u32     mv64x60_mpsc_clk_freq = EV64360_MPSC_CLK_FREQ;
+#else
 u32     mv64x60_console_baud = 9600;
 u32     mv64x60_mpsc_clk_src = 8; /* TCLK */
 u32     mv64x60_mpsc_clk_freq = 100000000;
+#endif
 
 extern void udelay(long);
 static void stop_dma(int chan);