Mark Brown wrote:
>
> Now that the WM831x driver uses irq_domain we can happily allow it to
> assign its own IRQs.
>
> Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
> ---
> arch/arm/mach-s3c64xx/include/mach/crag6410.h | 3 +--
> arch/arm/mach-s3c64xx/mach-crag6410.c | 1 -
> 2 files changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-s3c64xx/include/mach/crag6410.h
> b/arch/arm/mach-s3c64xx/include/mach/crag6410.h
> index ec97c15..4c3c999 100644
> --- a/arch/arm/mach-s3c64xx/include/mach/crag6410.h
> +++ b/arch/arm/mach-s3c64xx/include/mach/crag6410.h
> @@ -13,8 +13,7 @@
>
> #include <linux/gpio.h>
>
> -#define BANFF_PMIC_IRQ_BASE IRQ_BOARD_START
> -#define GLENFARCLAS_PMIC_IRQ_BASE (IRQ_BOARD_START + 64)
> +#define GLENFARCLAS_PMIC_IRQ_BASE IRQ_BOARD_START
>
> #define PCA935X_GPIO_BASE GPIO_BOARD_START
> #define CODEC_GPIO_BASE (GPIO_BOARD_START + 8)
> diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-
> s3c64xx/mach-crag6410.c
> index d0c352d..161c3b6 100644
> --- a/arch/arm/mach-s3c64xx/mach-crag6410.c
> +++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
> @@ -525,7 +525,6 @@ static struct wm831x_touch_pdata touch_pdata
> __initdata = {
>
> static struct wm831x_pdata crag_pmic_pdata __initdata = {
> .wm831x_num = 1,
> - .irq_base = BANFF_PMIC_IRQ_BASE,
> .gpio_base = BANFF_PMIC_GPIO_BASE,
> .soft_shutdown = true,
>
> --
> 1.7.10
OK, will apply.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@xxxxxxxxxxx>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
