Merge git://git.infradead.org/mtd-2.6

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / cell / Kconfig

diff --git a/arch/powerpc/platforms/cell/Kconfig b/arch/powerpc/platforms/cell/Kconfig
index 9b2b386ccf48aa2f6ed0650aeca471a2dad29ea3..c14d7d8d96c853441a2bc6e4bbfac3b7753d558a 100644 (file)
--- a/arch/powerpc/platforms/cell/Kconfig
+++ b/arch/powerpc/platforms/cell/Kconfig
@@ -10,6 +10,10 @@ config PPC_CELL_NATIVE
        select PPC_INDIRECT_IO
        select PPC_NATIVE
        select MPIC
        select PPC_INDIRECT_IO
        select PPC_NATIVE
        select MPIC

+       select IBM_NEW_EMAC_EMAC4
+       select IBM_NEW_EMAC_RGMII
+       select IBM_NEW_EMAC_ZMII #test only
+       select IBM_NEW_EMAC_TAH  #test only

        default n
 
 config PPC_IBM_CELL_BLADE
        default n
 
 config PPC_IBM_CELL_BLADE


@@ -21,6 +25,19 @@ config PPC_IBM_CELL_BLADE
        select PPC_UDBG_16550
        select UDBG_RTAS_CONSOLE
 
        select PPC_UDBG_16550
        select UDBG_RTAS_CONSOLE
 

+config PPC_CELLEB
+       bool "Toshiba's Cell Reference Set 'Celleb' Architecture"
+       depends on PPC_MULTIPLATFORM && PPC64
+       select PPC_CELL
+       select PPC_CELL_NATIVE
+       select PPC_RTAS
+       select PPC_INDIRECT_IO
+       select PPC_OF_PLATFORM_PCI
+       select HAS_TXX9_SERIAL
+       select PPC_UDBG_BEAT
+       select USB_OHCI_BIG_ENDIAN_MMIO
+       select USB_EHCI_BIG_ENDIAN_MMIO
+

 menu "Cell Broadband Engine options"
        depends on PPC_CELL
 
 menu "Cell Broadband Engine options"
        depends on PPC_CELL
 


@@ -50,6 +67,13 @@ config SPU_FS_64K_LS
          uses 4K pages. This can improve performances of applications
          using multiple SPEs by lowering the TLB pressure on them.
 
          uses 4K pages. This can improve performances of applications
          using multiple SPEs by lowering the TLB pressure on them.
 

+config SPU_TRACE
+       tristate "SPU event tracing support"
+       depends on SPU_FS && MARKERS
+       help
+         This option allows reading a trace of spu-related events through
+         the sputrace file in procfs.
+

 config SPU_BASE
        bool
        default n
 config SPU_BASE
        bool
        default n


@@ -59,6 +83,22 @@ config CBE_RAS
        depends on PPC_CELL_NATIVE
        default y
 
        depends on PPC_CELL_NATIVE
        default y
 

+config PPC_IBM_CELL_RESETBUTTON
+       bool "IBM Cell Blade Pinhole reset button"
+       depends on CBE_RAS && PPC_IBM_CELL_BLADE
+       default y
+       help
+         Support Pinhole Resetbutton on IBM Cell blades.
+         This adds a method to trigger system reset via front panel pinhole button.
+
+config PPC_IBM_CELL_POWERBUTTON
+       tristate "IBM Cell Blade power button"
+       depends on PPC_IBM_CELL_BLADE && PPC_PMI && INPUT_EVDEV
+       default y
+       help
+         Support Powerbutton on IBM Cell blades.
+         This will enable the powerbutton as an input device.
+

 config CBE_THERM
        tristate "CBE thermal support"
        default m
 config CBE_THERM
        tristate "CBE thermal support"
        default m


@@ -73,4 +113,28 @@ config CBE_CPUFREQ
          For details, take a look at <file:Documentation/cpu-freq/>.
          If you don't have such processor, say N
 
          For details, take a look at <file:Documentation/cpu-freq/>.
          If you don't have such processor, say N
 

+config CBE_CPUFREQ_PMI
+       tristate "CBE frequency scaling using PMI interface"
+       depends on CBE_CPUFREQ && PPC_PMI && EXPERIMENTAL
+       default n
+       help
+         Select this, if you want to use the PMI interface
+         to switch frequencies. Using PMI, the
+         processor will not only be able to run at lower speed,
+         but also at lower core voltage.
+
+config CBE_CPUFREQ_SPU_GOVERNOR
+       tristate "CBE frequency scaling based on SPU usage"
+       depends on SPU_FS && CPU_FREQ
+       default m
+       help
+         This governor checks for spu usage to adjust the cpu frequency.
+         If no spu is running on a given cpu, that cpu will be throttled to
+         the minimal possible frequency.
+

 endmenu
 endmenu

+
+config OPROFILE_CELL
+       def_bool y
+       depends on PPC_CELL_NATIVE && (OPROFILE = m || OPROFILE = y)
+