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>steinar/wifi_calib_4_9_kernel
parent
86ab168614
commit
83e2c70e84
|
@ -472,7 +472,7 @@
|
||||||
|
|
||||||
hdd {
|
hdd {
|
||||||
gpios = <&mcu_pio 1 0>;
|
gpios = <&mcu_pio 1 0>;
|
||||||
linux,default-trigger = "ide-disk";
|
linux,default-trigger = "disk-activity";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -496,7 +496,7 @@
|
||||||
|
|
||||||
hdd {
|
hdd {
|
||||||
gpios = <&mcu_pio 1 0>;
|
gpios = <&mcu_pio 1 0>;
|
||||||
linux,default-trigger = "ide-disk";
|
linux,default-trigger = "disk-activity";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -480,7 +480,7 @@
|
||||||
|
|
||||||
hdd {
|
hdd {
|
||||||
gpios = <&mcu_pio 1 0>;
|
gpios = <&mcu_pio 1 0>;
|
||||||
linux,default-trigger = "ide-disk";
|
linux,default-trigger = "disk-activity";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -446,7 +446,7 @@
|
||||||
|
|
||||||
hdd {
|
hdd {
|
||||||
gpios = <&mcu_pio 1 0>;
|
gpios = <&mcu_pio 1 0>;
|
||||||
linux,default-trigger = "ide-disk";
|
linux,default-trigger = "disk-activity";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -158,7 +158,7 @@ CONFIG_ADB=y
|
||||||
CONFIG_ADB_CUDA=y
|
CONFIG_ADB_CUDA=y
|
||||||
CONFIG_ADB_PMU=y
|
CONFIG_ADB_PMU=y
|
||||||
CONFIG_ADB_PMU_LED=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_APM_EMU=m
|
||||||
CONFIG_PMAC_MEDIABAY=y
|
CONFIG_PMAC_MEDIABAY=y
|
||||||
CONFIG_PMAC_BACKLIGHT=y
|
CONFIG_PMAC_BACKLIGHT=y
|
||||||
|
|
|
@ -442,7 +442,7 @@ CONFIG_ADB=y
|
||||||
CONFIG_ADB_CUDA=y
|
CONFIG_ADB_CUDA=y
|
||||||
CONFIG_ADB_PMU=y
|
CONFIG_ADB_PMU=y
|
||||||
CONFIG_ADB_PMU_LED=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_APM_EMU=y
|
||||||
CONFIG_PMAC_MEDIABAY=y
|
CONFIG_PMAC_MEDIABAY=y
|
||||||
CONFIG_PMAC_BACKLIGHT=y
|
CONFIG_PMAC_BACKLIGHT=y
|
||||||
|
|
|
@ -96,19 +96,18 @@ config ADB_PMU_LED
|
||||||
Support the front LED on Power/iBooks as a generic LED that can
|
Support the front LED on Power/iBooks as a generic LED that can
|
||||||
be triggered by any of the supported triggers. To get the
|
be triggered by any of the supported triggers. To get the
|
||||||
behaviour of the old CONFIG_BLK_DEV_IDE_PMAC_BLINK, select this
|
behaviour of the old CONFIG_BLK_DEV_IDE_PMAC_BLINK, select this
|
||||||
and the ide-disk LED trigger and configure appropriately through
|
and the disk LED trigger and configure appropriately through sysfs.
|
||||||
sysfs.
|
|
||||||
|
|
||||||
config ADB_PMU_LED_IDE
|
config ADB_PMU_LED_DISK
|
||||||
bool "Use front LED as IDE LED by default"
|
bool "Use front LED as DISK LED by default"
|
||||||
depends on ADB_PMU_LED
|
depends on ADB_PMU_LED
|
||||||
depends on LEDS_CLASS
|
depends on LEDS_CLASS
|
||||||
depends on IDE_GD_ATA
|
depends on IDE_GD_ATA
|
||||||
select LEDS_TRIGGERS
|
select LEDS_TRIGGERS
|
||||||
select LEDS_TRIGGER_IDE_DISK
|
select LEDS_TRIGGER_DISK
|
||||||
help
|
help
|
||||||
This option makes the front LED default to the IDE trigger
|
This option makes the front LED default to the disk trigger
|
||||||
so that it blinks on IDE activity.
|
so that it blinks on disk activity.
|
||||||
|
|
||||||
config PMAC_SMU
|
config PMAC_SMU
|
||||||
bool "Support for SMU based PowerMacs"
|
bool "Support for SMU based PowerMacs"
|
||||||
|
|
|
@ -73,8 +73,8 @@ static void pmu_led_set(struct led_classdev *led_cdev,
|
||||||
|
|
||||||
static struct led_classdev pmu_led = {
|
static struct led_classdev pmu_led = {
|
||||||
.name = "pmu-led::front",
|
.name = "pmu-led::front",
|
||||||
#ifdef CONFIG_ADB_PMU_LED_IDE
|
#ifdef CONFIG_ADB_PMU_LED_DISK
|
||||||
.default_trigger = "ide-disk",
|
.default_trigger = "disk-activity",
|
||||||
#endif
|
#endif
|
||||||
.brightness_set = pmu_led_set,
|
.brightness_set = pmu_led_set,
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue