powerpc: use the new LED disk activity trigger

- dts: rename 'ide-disk' to 'disk-activity'
- defconfig: rename 'ADB_PMU_LED_IDE' to 'ADB_PMU_LED_DISK'

Cc: Joseph Jezak <josejx@gentoo.org>
Cc: Jörg Sommer <joerg@alea.gnuu.de>
Signed-off-by: Stephan Linz <linz@li-pro.net>
Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>

diff --git a/arch/powerpc/boot/dts/mpc8315erdb.dts b/arch/powerpc/boot/dts/mpc8315erdb.dts
index 4354684..ca5139e 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8315erdb.dts
+++ b/arch/powerpc/boot/dts/mpc8315erdb.dts
@@ -472,7 +472,7 @@
 
                hdd {
                        gpios = <&mcu_pio 1 0>;
-                       linux,default-trigger = "ide-disk";
+                       linux,default-trigger = "disk-activity";
                };
        };
 };

diff --git a/arch/powerpc/boot/dts/mpc8377_rdb.dts b/arch/powerpc/boot/dts/mpc8377_rdb.dts
index 2b4b653..e326139 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8377_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc8377_rdb.dts
@@ -496,7 +496,7 @@
 
                hdd {
                        gpios = <&mcu_pio 1 0>;
-                       linux,default-trigger = "ide-disk";
+                       linux,default-trigger = "disk-activity";
                };
        };
 };

diff --git a/arch/powerpc/boot/dts/mpc8378_rdb.dts b/arch/powerpc/boot/dts/mpc8378_rdb.dts
index 74b6a53..71842fc 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8378_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc8378_rdb.dts
@@ -480,7 +480,7 @@
 
                hdd {
                        gpios = <&mcu_pio 1 0>;
-                       linux,default-trigger = "ide-disk";
+                       linux,default-trigger = "disk-activity";
                };
        };
 };

diff --git a/arch/powerpc/boot/dts/mpc8379_rdb.dts b/arch/powerpc/boot/dts/mpc8379_rdb.dts
index 3b5cbac..e442a29 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8379_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc8379_rdb.dts
@@ -446,7 +446,7 @@
 
                hdd {
                        gpios = <&mcu_pio 1 0>;
-                       linux,default-trigger = "ide-disk";
+                       linux,default-trigger = "disk-activity";
                };
        };
 };

diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig
index ea8705f..3f6c9a6 100644 (file)
--- a/arch/powerpc/configs/pmac32_defconfig
+++ b/arch/powerpc/configs/pmac32_defconfig
@@ -158,7 +158,7 @@ CONFIG_ADB=y
 CONFIG_ADB_CUDA=y
 CONFIG_ADB_PMU=y
 CONFIG_ADB_PMU_LED=y
-CONFIG_ADB_PMU_LED_IDE=y
+CONFIG_ADB_PMU_LED_DISK=y
 CONFIG_PMAC_APM_EMU=m
 CONFIG_PMAC_MEDIABAY=y
 CONFIG_PMAC_BACKLIGHT=y

diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig
index 99ccbeb..1dde0be 100644 (file)
--- a/arch/powerpc/configs/ppc6xx_defconfig
+++ b/arch/powerpc/configs/ppc6xx_defconfig
@@ -442,7 +442,7 @@ CONFIG_ADB=y
 CONFIG_ADB_CUDA=y
 CONFIG_ADB_PMU=y
 CONFIG_ADB_PMU_LED=y
-CONFIG_ADB_PMU_LED_IDE=y
+CONFIG_ADB_PMU_LED_DISK=y
 CONFIG_PMAC_APM_EMU=y
 CONFIG_PMAC_MEDIABAY=y
 CONFIG_PMAC_BACKLIGHT=y

diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig
index 3e8b29e..d28690f 100644 (file)
--- a/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
@@ -96,19 +96,18 @@ config ADB_PMU_LED
          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.
+         and the disk LED trigger and configure appropriately through sysfs.
 
-config ADB_PMU_LED_IDE
-       bool "Use front LED as IDE LED by default"
+config ADB_PMU_LED_DISK
+       bool "Use front LED as DISK LED by default"
        depends on ADB_PMU_LED
        depends on LEDS_CLASS
        depends on IDE_GD_ATA
        select LEDS_TRIGGERS
-       select LEDS_TRIGGER_IDE_DISK
+       select LEDS_TRIGGER_DISK
        help
-         This option makes the front LED default to the IDE trigger
-         so that it blinks on IDE activity.
+         This option makes the front LED default to the disk trigger
+         so that it blinks on disk activity.
 
 config PMAC_SMU
        bool "Support for SMU  based PowerMacs"

diff --git a/drivers/macintosh/via-pmu-led.c b/drivers/macintosh/via-pmu-led.c
index 19c3718..ae067ab 100644 (file)
--- a/drivers/macintosh/via-pmu-led.c
+++ b/drivers/macintosh/via-pmu-led.c
@@ -73,8 +73,8 @@ static void pmu_led_set(struct led_classdev *led_cdev,
 
 static struct led_classdev pmu_led = {
        .name = "pmu-led::front",
-#ifdef CONFIG_ADB_PMU_LED_IDE
-       .default_trigger = "ide-disk",
+#ifdef CONFIG_ADB_PMU_LED_DISK
+       .default_trigger = "disk-activity",
 #endif
        .brightness_set = pmu_led_set,
 };