[PATCH] ppc64: SMU based macs cpufreq support

[karo-tx-linux.git] / arch / ppc64 / Kconfig

diff --git a/arch/ppc64/Kconfig b/arch/ppc64/Kconfig
index deca68ad644ae41681537867c7e8accdb6d2a18b..94a81279deaca182ba00768b0727460c7ae99229 100644 (file)
--- a/arch/ppc64/Kconfig
+++ b/arch/ppc64/Kconfig
@@ -10,6 +10,9 @@ config MMU
        bool
        default y
 
        bool
        default y
 

+config PPC_STD_MMU
+       def_bool y
+

 config UID16
        bool
 
 config UID16
        bool
 


@@ -28,10 +31,6 @@ config GENERIC_ISA_DMA
        bool
        default y
 
        bool
        default y
 

-config HAVE_DEC_LOCK
-       bool
-       default y
-

 config EARLY_PRINTK
        bool
        default y
 config EARLY_PRINTK
        bool
        default y


@@ -48,6 +47,10 @@ config ARCH_MAY_HAVE_PC_FDC
        bool
        default y
 
        bool
        default y
 

+config PPC_STD_MMU
+       bool
+       default y
+

 # We optimistically allocate largepages from the VM, so make the limit
 # large enough (16MB). This badly named config option is actually
 # max order + 1
 # We optimistically allocate largepages from the VM, so make the limit
 # large enough (16MB). This badly named config option is actually
 # max order + 1


@@ -90,12 +93,14 @@ config PPC_PMAC
        bool "  Apple G5 based machines"
        default y
        select U3_DART
        bool "  Apple G5 based machines"
        default y
        select U3_DART

+       select GENERIC_TBSYNC

 
 config PPC_MAPLE
        depends on PPC_MULTIPLATFORM
        bool "  Maple 970FX Evaluation Board"
        select U3_DART
        select MPIC_BROKEN_U3
 
 config PPC_MAPLE
        depends on PPC_MULTIPLATFORM
        bool "  Maple 970FX Evaluation Board"
        select U3_DART
        select MPIC_BROKEN_U3

+       select GENERIC_TBSYNC

        default n
        help
           This option enables support for the Maple 970FX Evaluation Board.
        default n
        help
           This option enables support for the Maple 970FX Evaluation Board.


@@ -124,6 +129,11 @@ config MPIC
        bool
        default y
 
        bool
        default y
 

+config PPC_I8259
+       depends on PPC_PSERIES
+       bool
+       default y
+

 config BPA_IIC
        depends on PPC_BPA
        bool
 config BPA_IIC
        depends on PPC_BPA
        bool


@@ -163,6 +173,16 @@ config KEXEC
          support.  As of this writing the exact hardware interface is
          strongly in flux, so no good recommendation can be made.
 
          support.  As of this writing the exact hardware interface is
          strongly in flux, so no good recommendation can be made.
 

+source "drivers/cpufreq/Kconfig"
+
+config CPU_FREQ_PMAC64
+       bool "Support for some Apple G5s"
+       depends on CPU_FREQ && PMAC_SMU && PPC64
+       select CPU_FREQ_TABLE
+       help
+         This adds support for frequency switching on Apple iMac G5,
+         and some of the more recent desktop G5 machines as well.
+

 config IBMVIO
        depends on PPC_PSERIES || PPC_ISERIES
        bool
 config IBMVIO
        depends on PPC_PSERIES || PPC_ISERIES
        bool


@@ -178,6 +198,9 @@ config MPIC_BROKEN_U3
        depends on PPC_MAPLE
        default y
 
        depends on PPC_MAPLE
        default y
 

+config GENERIC_TBSYNC
+       def_bool n
+

 config PPC_PMAC64
        bool
        depends on PPC_PMAC
 config PPC_PMAC64
        bool
        depends on PPC_PMAC


@@ -190,6 +213,12 @@ config BOOTX_TEXT
          Say Y here to see progress messages from the boot firmware in text
          mode. Requires an Open Firmware compatible video card.
 
          Say Y here to see progress messages from the boot firmware in text
          mode. Requires an Open Firmware compatible video card.
 

+config POWER4
+       def_bool y
+
+config PPC_FPU
+       def_bool y
+

 config POWER4_ONLY
        bool "Optimize for POWER4"
        default n
 config POWER4_ONLY
        bool "Optimize for POWER4"
        default n


@@ -238,6 +267,10 @@ config HMT
          This option enables hardware multithreading on RS64 cpus.
          pSeries systems p620 and p660 have such a cpu type.
 
          This option enables hardware multithreading on RS64 cpus.
          pSeries systems p620 and p660 have such a cpu type.
 

+config NUMA
+       bool "NUMA support"
+       default y if SMP && PPC_PSERIES
+

 config ARCH_SELECT_MEMORY_MODEL
        def_bool y
 
 config ARCH_SELECT_MEMORY_MODEL
        def_bool y
 


@@ -253,9 +286,6 @@ config ARCH_DISCONTIGMEM_DEFAULT
        def_bool y
        depends on ARCH_DISCONTIGMEM_ENABLE
 
        def_bool y
        depends on ARCH_DISCONTIGMEM_ENABLE
 

-config ARCH_FLATMEM_ENABLE
-       def_bool y
-

 config ARCH_SPARSEMEM_ENABLE
        def_bool y
        depends on ARCH_DISCONTIGMEM_ENABLE
 config ARCH_SPARSEMEM_ENABLE
        def_bool y
        depends on ARCH_DISCONTIGMEM_ENABLE


@@ -278,9 +308,14 @@ config NODES_SPAN_OTHER_NODES
        def_bool y
        depends on NEED_MULTIPLE_NODES
 
        def_bool y
        depends on NEED_MULTIPLE_NODES
 

-config NUMA
-       bool "NUMA support"
-       default y if DISCONTIGMEM || SPARSEMEM
+config PPC_64K_PAGES
+       bool "64k page size"
+       help
+         This option changes the kernel logical page size to 64k. On machines
+          without processor support for 64k pages, the kernel will simulate
+          them by loading each individual 4k page on demand transparently,
+          while on hardware with such support, it will be used to map
+          normal application pages.

 
 config SCHED_SMT
        bool "SMT (Hyperthreading) scheduler support"
 
 config SCHED_SMT
        bool "SMT (Hyperthreading) scheduler support"


@@ -311,6 +346,11 @@ config PPC_RTAS
        depends on PPC_PSERIES || PPC_BPA
        default y
 
        depends on PPC_PSERIES || PPC_BPA
        default y
 

+config RTAS_ERROR_LOGGING
+       bool
+       depends on PPC_RTAS
+       default y
+

 config RTAS_PROC
        bool "Proc interface to RTAS"
        depends on PPC_RTAS
 config RTAS_PROC
        bool "Proc interface to RTAS"
        depends on PPC_RTAS


@@ -361,7 +401,6 @@ config HOTPLUG_CPU
 
 config PROC_DEVICETREE
        bool "Support for Open Firmware device tree in /proc"
 
 config PROC_DEVICETREE
        bool "Support for Open Firmware device tree in /proc"

-       depends on !PPC_ISERIES

        help
          This option adds a device-tree directory under /proc which contains
          an image of the device tree that the kernel copies from Open
        help
          This option adds a device-tree directory under /proc which contains
          an image of the device tree that the kernel copies from Open


@@ -465,7 +504,7 @@ config VIOPATH
        depends on VIOCONS || VIODASD || VIOCD || VIOTAPE || VETH
        default y
 
        depends on VIOCONS || VIODASD || VIOCD || VIOTAPE || VETH
        default y
 

-source "arch/ppc64/oprofile/Kconfig"
+source "arch/powerpc/oprofile/Kconfig"

 
 source "arch/ppc64/Kconfig.debug"
 
 
 source "arch/ppc64/Kconfig.debug"