[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20100105193750.GL4274@sortiz.org>
Date: Tue, 5 Jan 2010 20:37:51 +0100
From: Samuel Ortiz <sameo@...ux.intel.com>
To: Mark Brown <broonie@...nsource.wolfsonmicro.com>
Cc: linux-kernel@...r.kernel.org, stable@...nel.org
Subject: Re: [PATCH 2.6.33] mfd: Correct WM835x ISINK ramp time defines
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@...nsource.wolfsonmicro.com>
> Cc: stable@...nel.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/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists