Merge commit 'gcl/next' into next

diff --combined arch/powerpc/platforms/52xx/Kconfig
index e0b9454ae691df693908bbbe9173148548f64888,75f82ab0616e7ee2ae479cd83a98649c89bc6b4f..8b8e9560a315ed51127625b8544edc8a2f24b667
--- 1/arch/powerpc/platforms/52xx/Kconfig
--- 2/arch/powerpc/platforms/52xx/Kconfig
+++ b/arch/powerpc/platforms/52xx/Kconfig
@@@ -1,6 -1,6 +1,6 @@@
  config PPC_MPC52xx
        bool "52xx-based boards"
 -      depends on PPC_MULTIPLATFORM && PPC32
 +      depends on 6xx
        select PPC_CLOCK
        select PPC_PCI_CHOICE
  
@@@ -24,6 -24,7 +24,7 @@@ config PPC_MPC5200_SIMPL
          are:
             intercontrol,digsy-mtc
             phytec,pcm030
+            phytec,pcm032
             promess,motionpro
             schindler,cm5200
             tqc,tqm5200