[PATCH 34/133] [Jaunty SRU] ARM.imx51 Freescale:mfd: Add WM8350 revision H support

[Bryan Wu]

Brad Figg wrote:
> From: Mark Brown <broonie at opensource.wolfsonmicro.com>
> 
> No other software changes are required.
> 

This patch is already in upstream mainline
(0c8a601678960fbcc1c1185a283d6d107575810b), so we can mark this patch
cherry-picked for Jaunty 2.6.28 kernel and drop this when porting to Karmic 2.6.31.

-Bryan

> Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
> Signed-off-by: Samuel Ortiz <sameo at openedhand.com>
> Signed-off-by: Brad Figg <brad.figg at canonical.com>
> ---
>  drivers/mfd/wm8350-core.c       |    7 ++++++-
>  include/linux/mfd/wm8350/core.h |    1 +
>  2 files changed, 7 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/mfd/wm8350-core.c b/drivers/mfd/wm8350-core.c
> index 0d47fb9..6cd378d 100644
> --- a/drivers/mfd/wm8350-core.c
> +++ b/drivers/mfd/wm8350-core.c
> @@ -1186,9 +1186,14 @@ int wm8350_device_init(struct wm8350 *wm8350, int irq,
>  			dev_info(wm8350->dev, "Found Rev G device\n");
>  			wm8350->rev = WM8350_REV_G;
>  			break;
> +		case WM8350_REV_H:
> +			dev_info(wm8350->dev, "Found Rev H device\n");
> +			wm8350->rev = WM8350_REV_H;
> +			break;
>  		default:
>  			/* For safety we refuse to run on unknown hardware */
> -			dev_info(wm8350->dev, "Found unknown rev\n");
> +			dev_info(wm8350->dev, "Found unknown rev %x\n",
> +				 (id2 & WM8350_CHIP_REV_MASK) >> 12);
>  			ret = -ENODEV;
>  			goto err;
>  		}
> diff --git a/include/linux/mfd/wm8350/core.h b/include/linux/mfd/wm8350/core.h
> index 6ebf97f..9490ec1 100644
> --- a/include/linux/mfd/wm8350/core.h
> +++ b/include/linux/mfd/wm8350/core.h
> @@ -536,6 +536,7 @@
>  #define WM8350_REV_E				0x4
>  #define WM8350_REV_F				0x5
>  #define WM8350_REV_G				0x6
> +#define WM8350_REV_H				0x7
>  
>  #define WM8350_NUM_IRQ				63
>