ppc4xx: Add basic support for AMCC PPC460EX/460GT rev B chips

This patch is based on a diff created by Phong Vo from AMCC.

Signed-off-by: Phong Vo <pvo@amcc.com>
Signed-off-by: Stefan Roese <sr@denx.de>

diff --git a/cpu/ppc4xx/cpu.c b/cpu/ppc4xx/cpu.c
index e12a784812c48b487301305eeefa2f2c73404dea..e9861abe76292a0c73b3ef81488b110f53270bb9 100644 (file)
--- a/cpu/ppc4xx/cpu.c
+++ b/cpu/ppc4xx/cpu.c
@@ -285,6 +285,9 @@ int checkcpu (void)
        uint pvr = get_pvr();
        ulong clock = gd->cpu_clk;
        char buf[32];
+#if defined(CONFIG_460EX) || defined(CONFIG_460GT)
+       u32 reg;
+#endif
 
 #if !defined(CONFIG_IOP480)
        char addstr[64] = "";
@@ -526,6 +529,7 @@ int checkcpu (void)
                strcpy(addstr, "No RAID 6 support");
                break;
 
+#if defined(CONFIG_460EX) || defined(CONFIG_460GT)
        case PVR_460EX_RA:
                puts("EX Rev. A");
                strcpy(addstr, "No Security/Kasumi support");
@@ -536,6 +540,15 @@ int checkcpu (void)
                strcpy(addstr, "Security/Kasumi support");
                break;
 
+       case PVR_460EX_RB:
+               puts("EX Rev. B");
+               mfsdr(SDR0_ECID3, reg);
+               if (reg & 0x00100000)
+                       strcpy(addstr, "No Security/Kasumi support");
+               else
+                       strcpy(addstr, "Security/Kasumi support");
+               break;
+
        case PVR_460GT_RA:
                puts("GT Rev. A");
                strcpy(addstr, "No Security/Kasumi support");
@@ -546,6 +559,16 @@ int checkcpu (void)
                strcpy(addstr, "Security/Kasumi support");
                break;
 
+       case PVR_460GT_RB:
+               puts("GT Rev. B");
+               mfsdr(SDR0_ECID3, reg);
+               if (reg & 0x00100000)
+                       strcpy(addstr, "No Security/Kasumi support");
+               else
+                       strcpy(addstr, "Security/Kasumi support");
+               break;
+#endif
+
        case PVR_460SX_RA:
                puts("SX Rev. A");
                strcpy(addstr, "Security support");

diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h
index 2c0c0cee40f67ea6ba22eda65d8e984fe020783f..2841104515147921028c199f747aa7bfb923f519 100644 (file)
--- a/include/asm-ppc/processor.h
+++ b/include/asm-ppc/processor.h
@@ -883,8 +883,10 @@
 #define PVR_440SPe_RB  0x53521891 /* 440SPe rev B without RAID 6 support       */
 #define PVR_460EX_SE_RA        0x130218A2 /* 460EX rev A with Security Engine    */
 #define PVR_460EX_RA   0x130218A3 /* 460EX rev A without Security Engine */
+#define PVR_460EX_RB   0x130218A4 /* 460EX rev B with and without Sec Eng*/
 #define PVR_460GT_SE_RA        0x130218A0 /* 460GT rev A with Security Engine    */
 #define PVR_460GT_RA   0x130218A1 /* 460GT rev A without Security Engine */
+#define PVR_460GT_RB   0x130218A5 /* 460GT rev B with and without Sec Eng*/
 #define PVR_460SX_RA    0x13541800 /* 460SX rev A                   */
 #define PVR_460SX_RA_V1 0x13541801 /* 460SX rev A Variant 1 Security disabled */
 #define PVR_460GX_RA    0x13541802 /* 460GX rev A                   */

diff --git a/include/ppc440.h b/include/ppc440.h
index 6ce53a6ef2ca34a34205f76ad46378c6af1683ca..e6dc7406f48fc92c642954f33b85fb5429a1ca3c 100644 (file)
--- a/include/ppc440.h
+++ b/include/ppc440.h
@@ -1156,6 +1156,11 @@
 #define SDR0_PFC1_SIS_SCP_SEL  0x00000000      /* SCP Selected */
 #define SDR0_PFC1_SIS_IIC1_SEL 0x00020000      /* IIC1 Selected */
 
+#define SDR0_ECID0             0x0080
+#define SDR0_ECID1             0x0081
+#define SDR0_ECID2             0x0082
+#define SDR0_ECID3             0x0083
+
 /* Ethernet PLL Configuration Register (SDR0_ETH_PLL) */
 #define SDR0_ETH_PLL           0x4102
 #define SDR0_ETH_PLL_PLLLOCK    0x80000000     /*Ethernet PLL lock indication*/