Merge remote-tracking branch 'powerpc/next'

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/powerpc/kernel/legacy_serial.c
Simple merge

diff --cc arch/powerpc/kernel/trace/ftrace.c
Simple merge

diff --cc arch/powerpc/platforms/512x/Kconfig
Simple merge

diff --cc arch/powerpc/platforms/52xx/Kconfig
index b46850e039eea562159ba7014b643bae58e733df,67f8c2d8fc0e9bf73c0f839712507b506d89355e..99d60acc20c8ceb34186ab5e26ce98dbcdaafbd8
--- 1/arch/powerpc/platforms/52xx/Kconfig
--- 2/arch/powerpc/platforms/52xx/Kconfig
+++ b/arch/powerpc/platforms/52xx/Kconfig
@@@ -1,9 -1,9 +1,9 @@@
  # SPDX-License-Identifier: GPL-2.0
  config PPC_MPC52xx
        bool "52xx-based boards"
-       depends on 6xx
+       depends on PPC_BOOK3S_32
        select COMMON_CLK
 -      select PPC_PCI_CHOICE
 +      select HAVE_PCI
  
  config PPC_MPC5200_SIMPLE
        bool "Generic support for simple MPC5200 based boards"

diff --cc arch/powerpc/platforms/83xx/Kconfig
index 9b225d2341c7ad56dbf74f14c91613d916116881,ff0c69dfdf1a99454a825cf2d1567ff90367d3ad..bee119725f6174e0569dae6a8da017290fea47e4
--- 1/arch/powerpc/platforms/83xx/Kconfig
--- 2/arch/powerpc/platforms/83xx/Kconfig
+++ b/arch/powerpc/platforms/83xx/Kconfig
@@@ -1,9 -1,9 +1,9 @@@
  # SPDX-License-Identifier: GPL-2.0
  menuconfig PPC_83xx
        bool "83xx-based boards"
-       depends on 6xx
+       depends on PPC_BOOK3S_32
        select PPC_UDBG_16550
 -      select PPC_PCI_CHOICE
 +      select HAVE_PCI
        select FSL_PCI if PCI
        select FSL_SOC
        select IPIC

diff --cc arch/powerpc/platforms/86xx/Kconfig
Simple merge

diff --cc arch/powerpc/platforms/Kconfig
Simple merge

diff --cc arch/powerpc/platforms/Kconfig.cputype
Simple merge

diff --cc arch/powerpc/platforms/amigaone/Kconfig
Simple merge

diff --cc arch/powerpc/platforms/chrp/Kconfig
Simple merge

diff --cc arch/powerpc/platforms/embedded6xx/Kconfig
Simple merge

diff --cc arch/powerpc/platforms/pseries/vio.c
Simple merge