[POWERPC] Convert powermac ide blink to new led infrastructure

[pandora-kernel.git] / drivers / macintosh / Kconfig

diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig
index a0ea44c..062dac2 100644 (file)
--- a/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
@@ -78,6 +78,17 @@ config ADB_PMU
          this device; you should do so if your machine is one of those
          mentioned above.
 
          this device; you should do so if your machine is one of those
          mentioned above.
 

+config ADB_PMU_LED
+       bool "Support for the Power/iBook front LED"
+       depends on ADB_PMU
+       select LEDS_CLASS
+       help
+         Support the front LED on Power/iBooks as a generic LED that can
+         be triggered by any of the supported triggers. To get the
+         behaviour of the old CONFIG_BLK_DEV_IDE_PMAC_BLINK, select this
+         and the ide-disk LED trigger and configure appropriately through
+         sysfs.
+

 config PMAC_SMU
        bool "Support for SMU  based PowerMacs"
        depends on PPC_PMAC64
 config PMAC_SMU
        bool "Support for SMU  based PowerMacs"
        depends on PPC_PMAC64


@@ -99,17 +110,22 @@ config PMAC_MEDIABAY
          devices are not fully supported in the bay as I never had one to
          try with
 
          devices are not fully supported in the bay as I never had one to
          try with
 

-# made a separate option since backlight may end up beeing used
-# on non-powerbook machines (but only on PMU based ones AFAIK)

 config PMAC_BACKLIGHT
        bool "Backlight control for LCD screens"
        depends on ADB_PMU && (BROKEN || !PPC64)
        help
 config PMAC_BACKLIGHT
        bool "Backlight control for LCD screens"
        depends on ADB_PMU && (BROKEN || !PPC64)
        help

-         Say Y here to build in code to manage the LCD backlight on a
-         Macintosh PowerBook.  With this code, the backlight will be turned
-         on and off appropriately on power-management and lid-open/lid-closed
-         events; also, the PowerBook button device will be enabled so you can
-         change the screen brightness.
+         Say Y here to enable Macintosh specific extensions of the generic
+         backlight code. With this enabled, the brightness keys on older
+         PowerBooks will be enabled so you can change the screen brightness.
+         Newer models should use an userspace daemon like pbbuttonsd.
+
+config PMAC_BACKLIGHT_LEGACY
+       bool "Provide legacy ioctl's on /dev/pmu for the backlight"
+       depends on PMAC_BACKLIGHT && (BROKEN || !PPC64)
+       help
+         Say Y if you want to enable legacy ioctl's on /dev/pmu. This is for
+         programs which use this old interface. New and updated programs
+         should use the backlight classes in sysfs.

 
 config ADB_MACIO
        bool "Include MacIO (CHRP) ADB driver"
 
 config ADB_MACIO
        bool "Include MacIO (CHRP) ADB driver"


@@ -149,14 +165,14 @@ config MAC_EMUMOUSEBTN
 
 config THERM_WINDTUNNEL
        tristate "Support for thermal management on Windtunnel G4s"
 
 config THERM_WINDTUNNEL
        tristate "Support for thermal management on Windtunnel G4s"

-       depends on I2C && I2C_KEYWEST && PPC_PMAC && !PPC_PMAC64
+       depends on I2C && I2C_POWERMAC && PPC_PMAC && !PPC_PMAC64

        help
          This driver provides some thermostat and fan control for the desktop
          G4 "Windtunnel"
 
 config THERM_ADT746X
        tristate "Support for thermal mgmnt on laptops with ADT 746x chipset"
        help
          This driver provides some thermostat and fan control for the desktop
          G4 "Windtunnel"
 
 config THERM_ADT746X
        tristate "Support for thermal mgmnt on laptops with ADT 746x chipset"

-       depends on I2C && I2C_KEYWEST && PPC_PMAC && !PPC_PMAC64
+       depends on I2C && I2C_POWERMAC && PPC_PMAC && !PPC_PMAC64

        help
          This driver provides some thermostat and fan control for the
           iBook G4, and the ATI based aluminium PowerBooks, allowing slighlty
        help
          This driver provides some thermostat and fan control for the
           iBook G4, and the ATI based aluminium PowerBooks, allowing slighlty


@@ -164,29 +180,38 @@ config THERM_ADT746X
 
 config THERM_PM72
        tristate "Support for thermal management on PowerMac G5"
 
 config THERM_PM72
        tristate "Support for thermal management on PowerMac G5"

-       depends on I2C && I2C_KEYWEST && PPC_PMAC64
+       depends on I2C && I2C_POWERMAC && PPC_PMAC64

        help
          This driver provides thermostat and fan control for the desktop
          G5 machines. 
 
 config WINDFARM
        tristate "New PowerMac thermal control infrastructure"
        help
          This driver provides thermostat and fan control for the desktop
          G5 machines. 
 
 config WINDFARM
        tristate "New PowerMac thermal control infrastructure"

+       depends on PPC

 
 config WINDFARM_PM81
        tristate "Support for thermal management on iMac G5"
        depends on WINDFARM && I2C && CPU_FREQ_PMAC64 && PMAC_SMU
 
 config WINDFARM_PM81
        tristate "Support for thermal management on iMac G5"
        depends on WINDFARM && I2C && CPU_FREQ_PMAC64 && PMAC_SMU

-       select I2C_PMAC_SMU
+       select I2C_POWERMAC

        help
          This driver provides thermal control for the iMacG5
 
 config WINDFARM_PM91
        tristate "Support for thermal management on PowerMac9,1"
        depends on WINDFARM && I2C && CPU_FREQ_PMAC64 && PMAC_SMU
        help
          This driver provides thermal control for the iMacG5
 
 config WINDFARM_PM91
        tristate "Support for thermal management on PowerMac9,1"
        depends on WINDFARM && I2C && CPU_FREQ_PMAC64 && PMAC_SMU

-       select I2C_PMAC_SMU
+       select I2C_POWERMAC

        help
          This driver provides thermal control for the PowerMac9,1
           which is the recent (SMU based) single CPU desktop G5
 
        help
          This driver provides thermal control for the PowerMac9,1
           which is the recent (SMU based) single CPU desktop G5
 

+config WINDFARM_PM112
+       tristate "Support for thermal management on PowerMac11,2"
+       depends on WINDFARM && I2C && PMAC_SMU
+       select I2C_POWERMAC
+       help
+         This driver provides thermal control for the PowerMac11,2
+         which are the recent dual and quad G5 machines using the
+         970MP dual-core processor.

 
 config ANSLCD
        tristate "Support for ANS LCD display"
 
 config ANSLCD
        tristate "Support for ANS LCD display"