Merge branch 'next' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx

diff --combined arch/powerpc/boot/Makefile
index 25d9fb0433ffb63c825a709a29c7436c291d3249,e98841d60330649383ab255f94839cccf02af55b..3463253893f2f11a0c580569820771e658950cb6
--- 1/arch/powerpc/boot/Makefile
--- 2/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@@ -66,7 -66,7 +66,7 @@@ src-plat := of.c cuboot-52xx.c cuboot-8
                fixed-head.S ep88xc.c ep405.c cuboot-c2k.c \
                cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.c \
                cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \
-               virtex405-head.S redboot-83xx.c
+               virtex405-head.S redboot-83xx.c cuboot-sam440ep.c
  src-boot := $(src-wlib) $(src-plat) empty.c
  
  src-boot := $(addprefix $(obj)/, $(src-boot))
@@@ -213,6 -213,7 +213,7 @@@ image-$(CONFIG_WALNUT)                     += treeImage.w
  # Board ports in arch/powerpc/platform/44x/Kconfig
  image-$(CONFIG_EBONY)                 += treeImage.ebony cuImage.ebony
  image-$(CONFIG_BAMBOO)                        += treeImage.bamboo cuImage.bamboo
+ image-$(CONFIG_SAM440EP)              += cuImage.sam440ep
  image-$(CONFIG_SEQUOIA)                       += cuImage.sequoia
  image-$(CONFIG_RAINIER)                       += cuImage.rainier
  image-$(CONFIG_TAISHAN)                       += cuImage.taishan
@@@ -255,7 -256,6 +256,7 @@@ image-$(CONFIG_MPC85xx_DS)         += cuImage.
                                           cuImage.mpc8572ds
  image-$(CONFIG_TQM8540)                       += cuImage.tqm8540
  image-$(CONFIG_TQM8541)                       += cuImage.tqm8541
 +image-$(CONFIG_TQM8548)                       += cuImage.tqm8548
  image-$(CONFIG_TQM8555)                       += cuImage.tqm8555
  image-$(CONFIG_TQM8560)                       += cuImage.tqm8560
  image-$(CONFIG_SBC8548)                       += cuImage.sbc8548

diff --combined arch/powerpc/kernel/cputable.c
index c5397c11ae913367239280ba97286e1da05c546f,31283cdab61c836c968ab5d46a7b953a1faf7de5..f247fc6ad12dc04d760e966c50b349f7760c03d7
--- 1/arch/powerpc/kernel/cputable.c
--- 2/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@@ -37,6 -37,7 +37,7 @@@ extern void __setup_cpu_440gx(unsigned 
  extern void __setup_cpu_440grx(unsigned long offset, struct cpu_spec* spec);
  extern void __setup_cpu_440spe(unsigned long offset, struct cpu_spec* spec);
  extern void __setup_cpu_460ex(unsigned long offset, struct cpu_spec* spec);
+ extern void __setup_cpu_460gt(unsigned long offset, struct cpu_spec* spec);
  extern void __setup_cpu_603(unsigned long offset, struct cpu_spec* spec);
  extern void __setup_cpu_604(unsigned long offset, struct cpu_spec* spec);
  extern void __setup_cpu_750(unsigned long offset, struct cpu_spec* spec);
@@@ -1427,9 -1428,10 +1428,10 @@@ static struct cpu_spec __initdata cpu_s
                .pvr_value              = 0x13020000,
                .cpu_name               = "460GT",
                .cpu_features           = CPU_FTRS_44X,
-               .cpu_user_features      = COMMON_USER_BOOKE,
+               .cpu_user_features      = COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU,
                .icache_bsize           = 32,
                .dcache_bsize           = 32,
+               .cpu_setup              = __setup_cpu_460gt,
                .machine_check          = machine_check_440A,
                .platform               = "ppc440",
        },
@@@ -1491,6 -1493,7 +1493,6 @@@
                .pvr_mask               = 0xffff0000,
                .pvr_value              = 0x80200000,
                .cpu_name               = "e500",
 -              /* xxx - galak: add CPU_FTR_MAYBE_CAN_DOZE */
                .cpu_features           = CPU_FTRS_E500,
                .cpu_user_features      = COMMON_USER_BOOKE |
                        PPC_FEATURE_HAS_SPE_COMP |
@@@ -1507,6 -1510,7 +1509,6 @@@
                .pvr_mask               = 0xffff0000,
                .pvr_value              = 0x80210000,
                .cpu_name               = "e500v2",
 -              /* xxx - galak: add CPU_FTR_MAYBE_CAN_DOZE */
                .cpu_features           = CPU_FTRS_E500_2,
                .cpu_user_features      = COMMON_USER_BOOKE |
                        PPC_FEATURE_HAS_SPE_COMP |
@@@ -1520,20 -1524,6 +1522,20 @@@
                .machine_check          = machine_check_e500,
                .platform               = "ppc8548",
        },
 +      {       /* e500mc */
 +              .pvr_mask               = 0xffff0000,
 +              .pvr_value              = 0x80230000,
 +              .cpu_name               = "e500mc",
 +              .cpu_features           = CPU_FTRS_E500MC,
 +              .cpu_user_features      = COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU,
 +              .icache_bsize           = 64,
 +              .dcache_bsize           = 64,
 +              .num_pmcs               = 4,
 +              .oprofile_cpu_type      = "ppc/e500", /* xxx - galak, e500mc? */
 +              .oprofile_type          = PPC_OPROFILE_FSL_EMB,
 +              .machine_check          = machine_check_e500,
 +              .platform               = "ppce500mc",
 +      },
        {       /* default match */
                .pvr_mask               = 0x00000000,
                .pvr_value              = 0x00000000,