Merge commit 'kumar/kumar-mmu'

1 files changed, 10 insertions, 7 deletions

diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index 7f6512733862..439c5ba34ecf 100644
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -50,6 +50,7 @@ config 44x
         select PPC_UDBG_16550
         select 4xx_SOC
         select PPC_PCI_CHOICE
+        select PHYS_64BIT
 
 config E200
         bool "Freescale e200"
@@ -128,18 +129,20 @@ config FSL_EMB_PERFMON
 
 config PTE_64BIT
         bool
-        depends on 44x || E500
-        default y if 44x
-        default y if E500 && PHYS_64BIT
+        depends on 44x || E500 || PPC_86xx
+        default y if PHYS_64BIT
 
 config PHYS_64BIT
-        bool 'Large physical address support' if E500
-        depends on 44x || E500
+        bool 'Large physical address support' if E500 || PPC_86xx
+        depends on (44x || E500 || PPC_86xx) && !PPC_83xx && !PPC_82xx
         select RESOURCES_64BIT
-        default y if 44x
         ---help---
           This option enables kernel support for larger than 32-bit physical
-          addresses.  This features is not be available on all e500 cores.
+          addresses.  This feature may not be available on all cores.
+
+          If you have more than 3.5GB of RAM or so, you also need to enable
+          SWIOTLB under Kernel Options for this to work.  The actual number
+          is platform-dependent.
 
           If in doubt, say N here.