Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (158 commits)
  powerpc: Fix CHRP PCI config access for indirect_pci
  powerpc/chrp: Fix detection of Python PCI host bridge on IBM CHRPs
  powerpc: Fix 32-bit SMP boot on CHRP
  powerpc: Fix link errors on 32-bit machines using legacy DMA
  powerpc/pci: Improve detection of unassigned bridge resources
  hvc_console: Fix free_irq in spinlocked section
  powerpc: Get USE_STRICT_MM_TYPECHECKS working again
  powerpc: Reflect the used arguments in machine_init() prototype
  powerpc: Fix DMA offset for non-coherent DMA
  powerpc: fix fsl_upm nand driver modular build
  powerpc/83xx: add NAND support for the MPC8360E-RDK boards
  powerpc: FPGA support for GE Fanuc SBC610
  i2c: MPC8349E-mITX Power Management and GPIO expander driver
  powerpc: reserve two DMA channels for audio in MPC8610 HPCD device tree
  powerpc: document the "fsl,ssi-dma-channel" compatible property
  powerpc: disable CHRP and PMAC support in various defconfigs
  OF: add fsl,mcu-mpc8349emitx to the exception list
  powerpc/83xx: add DS1374 RTC support for the MPC837xE-MDS boards
  powerpc: remove support for bootmem-allocated memory for the DIU driver
  powerpc: remove non-dependent load fsl_booke PTE_64BIT
  ...

1 files changed, 15 insertions, 2 deletions

diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index 9cc5a52711e5..5ec56ff03e86 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -254,8 +254,21 @@ static int show_cpuinfo(struct seq_file *m, void *v)
         /* If we are a Freescale core do a simple check so
          * we dont have to keep adding cases in the future */
         if (PVR_VER(pvr) & 0x8000) {
-                maj = PVR_MAJ(pvr);
-                min = PVR_MIN(pvr);
+                switch (PVR_VER(pvr)) {
+                case 0x8000:    /* 7441/7450/7451, Voyager */
+                case 0x8001:    /* 7445/7455, Apollo 6 */
+                case 0x8002:    /* 7447/7457, Apollo 7 */
+                case 0x8003:    /* 7447A, Apollo 7 PM */
+                case 0x8004:    /* 7448, Apollo 8 */
+                case 0x800c:    /* 7410, Nitro */
+                        maj = ((pvr >> 8) & 0xF);
+                        min = PVR_MIN(pvr);
+                        break;
+                default:        /* e500/book-e */
+                        maj = PVR_MAJ(pvr);
+                        min = PVR_MIN(pvr);
+                        break;
+                }
         } else {
                 switch (PVR_VER(pvr)) {
                         case 0x0020:    /* 403 family */