From: Samuel Ortiz <sameo@linux.intel.com>
To: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: linux-kernel@vger.kernel.org, stable@kernel.org
Subject: Re: [PATCH 2.6.33] mfd: Correct WM835x ISINK ramp time defines
Date: Tue, 5 Jan 2010 20:37:51 +0100 [thread overview]
Message-ID: <20100105193750.GL4274@sortiz.org> (raw)
In-Reply-To: <1262628300-18018-1-git-send-email-broonie@opensource.wolfsonmicro.com>
Hi Mark,
On Mon, Jan 04, 2010 at 06:05:00PM +0000, Mark Brown wrote:
> The constants used to specify ISINK ramp times for WM835x had the
> wrong shifts so that the on times applied to the off ramp and vice
> versa. The masks for the bitfields are correct.
Patch applied to my for-linus branch, thanks.
Cheers,
Samuel.
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> Cc: stable@kernel.org
> ---
> include/linux/mfd/wm8350/pmic.h | 28 ++++++++++++++--------------
> 1 files changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/include/linux/mfd/wm8350/pmic.h b/include/linux/mfd/wm8350/pmic.h
> index be3264e..e786fe9 100644
> --- a/include/linux/mfd/wm8350/pmic.h
> +++ b/include/linux/mfd/wm8350/pmic.h
> @@ -666,20 +666,20 @@
> #define WM8350_ISINK_FLASH_DUR_64MS (1 << 8)
> #define WM8350_ISINK_FLASH_DUR_96MS (2 << 8)
> #define WM8350_ISINK_FLASH_DUR_1024MS (3 << 8)
> -#define WM8350_ISINK_FLASH_ON_INSTANT (0 << 4)
> -#define WM8350_ISINK_FLASH_ON_0_25S (1 << 4)
> -#define WM8350_ISINK_FLASH_ON_0_50S (2 << 4)
> -#define WM8350_ISINK_FLASH_ON_1_00S (3 << 4)
> -#define WM8350_ISINK_FLASH_ON_1_95S (1 << 4)
> -#define WM8350_ISINK_FLASH_ON_3_91S (2 << 4)
> -#define WM8350_ISINK_FLASH_ON_7_80S (3 << 4)
> -#define WM8350_ISINK_FLASH_OFF_INSTANT (0 << 0)
> -#define WM8350_ISINK_FLASH_OFF_0_25S (1 << 0)
> -#define WM8350_ISINK_FLASH_OFF_0_50S (2 << 0)
> -#define WM8350_ISINK_FLASH_OFF_1_00S (3 << 0)
> -#define WM8350_ISINK_FLASH_OFF_1_95S (1 << 0)
> -#define WM8350_ISINK_FLASH_OFF_3_91S (2 << 0)
> -#define WM8350_ISINK_FLASH_OFF_7_80S (3 << 0)
> +#define WM8350_ISINK_FLASH_ON_INSTANT (0 << 0)
> +#define WM8350_ISINK_FLASH_ON_0_25S (1 << 0)
> +#define WM8350_ISINK_FLASH_ON_0_50S (2 << 0)
> +#define WM8350_ISINK_FLASH_ON_1_00S (3 << 0)
> +#define WM8350_ISINK_FLASH_ON_1_95S (1 << 0)
> +#define WM8350_ISINK_FLASH_ON_3_91S (2 << 0)
> +#define WM8350_ISINK_FLASH_ON_7_80S (3 << 0)
> +#define WM8350_ISINK_FLASH_OFF_INSTANT (0 << 4)
> +#define WM8350_ISINK_FLASH_OFF_0_25S (1 << 4)
> +#define WM8350_ISINK_FLASH_OFF_0_50S (2 << 4)
> +#define WM8350_ISINK_FLASH_OFF_1_00S (3 << 4)
> +#define WM8350_ISINK_FLASH_OFF_1_95S (1 << 4)
> +#define WM8350_ISINK_FLASH_OFF_3_91S (2 << 4)
> +#define WM8350_ISINK_FLASH_OFF_7_80S (3 << 4)
>
> /*
> * Regulator Interrupts.
> --
> 1.6.5.7
>
--
Intel Open Source Technology Centre
http://oss.intel.com/
prev parent reply other threads:[~2010-01-05 19:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-04 18:05 Mark Brown
2010-01-05 19:37 ` Samuel Ortiz [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=20100105193750.GL4274@sortiz.org \
--to=sameo@linux.intel.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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
Powered by JetHome