From: Jacek Anaszewski <j.anaszewski@samsung•com>
To: Stephan Linz <linz@li-pro•net>
Cc: linux-leds@vger•kernel.org, linux-ide@vger•kernel.org,
"Joseph Jezak" <josejx@gentoo•org>,
"Jörg Sommer" <joerg@alea•gnuu.de>,
"Rob Herring" <robh+dt@kernel•org>,
"Pawel Moll" <pawel.moll@arm•com>,
"Mark Rutland" <mark.rutland@arm•com>,
"Ian Campbell" <ijc+devicetree@hellion•org.uk>,
"Kumar Gala" <galak@codeaurora•org>,
"Benjamin Herrenschmidt" <benh@kernel•crashing.org>,
"Paul Mackerras" <paulus@samba•org>,
"Michael Ellerman" <mpe@ellerman•id.au>,
devicetree@vger•kernel.org, linuxppc-dev@lists•ozlabs.org,
linux-kernel@vger•kernel.org
Subject: Re: [PATCH v4 3/7] powerpc: use the new LED disk activity trigger
Date: Mon, 13 Jun 2016 09:46:17 +0200 [thread overview]
Message-ID: <575E64C9.6060302@samsung.com> (raw)
In-Reply-To: <20160610060021.12382-3-linz@li-pro.net>
Hi all,
For consistency reasons this patch should be merged through LED tree,
but I need an ack from relevant maintainer. Benjamin, Michael, Paul?
Thanks,
Jacek Anaszewski
On 06/10/2016 07:59 AM, Stephan Linz wrote:
> - 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>
> ---
> arch/powerpc/boot/dts/mpc8315erdb.dts | 2 +-
> arch/powerpc/boot/dts/mpc8377_rdb.dts | 2 +-
> arch/powerpc/boot/dts/mpc8378_rdb.dts | 2 +-
> arch/powerpc/boot/dts/mpc8379_rdb.dts | 2 +-
> arch/powerpc/configs/pmac32_defconfig | 2 +-
> arch/powerpc/configs/ppc6xx_defconfig | 2 +-
> drivers/macintosh/Kconfig | 13 ++++++-------
> drivers/macintosh/via-pmu-led.c | 4 ++--
> 8 files changed, 14 insertions(+), 15 deletions(-)
>
> diff --git a/arch/powerpc/boot/dts/mpc8315erdb.dts b/arch/powerpc/boot/dts/mpc8315erdb.dts
> index 4354684..ca5139e 100644
> --- 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
> --- 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
> --- 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
> --- 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
> --- 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 99ccbeba..1dde0be 100644
> --- 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
> --- 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
> --- 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,
> };
>
--
Best regards,
Jacek Anaszewski
prev parent reply other threads:[~2016-06-13 7:56 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20160610060021.12382-1-linz@li-pro.net>
2016-06-10 5:59 ` [PATCH v4 3/7] powerpc: use the new LED disk activity trigger Stephan Linz
2016-06-13 7:46 ` Jacek Anaszewski [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=575E64C9.6060302@samsung.com \
--to=j.anaszewski@samsung$(echo .)com \
--cc=benh@kernel$(echo .)crashing.org \
--cc=devicetree@vger$(echo .)kernel.org \
--cc=galak@codeaurora$(echo .)org \
--cc=ijc+devicetree@hellion$(echo .)org.uk \
--cc=joerg@alea$(echo .)gnuu.de \
--cc=josejx@gentoo$(echo .)org \
--cc=linux-ide@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-leds@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=linz@li-pro$(echo .)net \
--cc=mark.rutland@arm$(echo .)com \
--cc=mpe@ellerman$(echo .)id.au \
--cc=paulus@samba$(echo .)org \
--cc=pawel.moll@arm$(echo .)com \
--cc=robh+dt@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox