[PATCH 1/2] ARM: S3C64XX: Add module identification for Balblair Cragganmore module

[PATCH 1/2] ARM: S3C64XX: Add module identification for Balblair Cragganmore module

[Mark Brown]

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
 arch/arm/mach-s3c64xx/mach-crag6410-module.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/mach-s3c64xx/mach-crag6410-module.c b/arch/arm/mach-s3c64xx/mach-crag6410-module.c
index dbd5771..985e255 100644
--- a/arch/arm/mach-s3c64xx/mach-crag6410-module.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410-module.c
@@ -219,6 +219,7 @@ static __devinitdata const struct {
 	  .spi_devs = wm1253_devs, .num_spi_devs = ARRAY_SIZE(wm1253_devs) },
 	{ .id = 0x32, .name = "XXXX-EV1 Caol Illa" },
 	{ .id = 0x33, .name = "XXXX-EV1 Oban" },
+	{ .id = 0x34, .name = "WM0010-6320-CS42 Balblair" },
 	{ .id = 0x39, .name = "1254-EV1 Dallas Dhu",
 	  .i2c_devs = wm1254_devs, .num_i2c_devs = ARRAY_SIZE(wm1254_devs) },
 	{ .id = 0x3a, .name = "1259-EV1 Tobermory",
-- 
1.7.10

[PATCH 2/2] ARM: S3C64XX: Add WM5102 EVM to Cragganmore modules

[Mark Brown]

No platform data yet as driver is not yet merged.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
 arch/arm/mach-s3c64xx/mach-crag6410-module.c |    7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arch/arm/mach-s3c64xx/mach-crag6410-module.c b/arch/arm/mach-s3c64xx/mach-crag6410-module.c
index 985e255..f80761c 100644
--- a/arch/arm/mach-s3c64xx/mach-crag6410-module.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410-module.c
@@ -192,6 +192,11 @@ static const struct i2c_board_info wm1277_devs[] = {
 	},
 };
 
+static const struct i2c_board_info wm5102_devs[] = {
+	{ I2C_BOARD_INFO("wm5102", 0x1a),
+	  .irq = GLENFARCLAS_PMIC_IRQ_BASE + WM831X_IRQ_GPIO_2, },
+};
+
 static const struct i2c_board_info wm6230_i2c_devs[] = {
 	{ I2C_BOARD_INFO("wm9081", 0x6c),
 	  .platform_data = &wm9081_pdata, },
@@ -229,6 +234,8 @@ static __devinitdata const struct {
 	{ .id = 0x3c, .name = "1273-EV1 Longmorn" },
 	{ .id = 0x3d, .name = "1277-EV1 Littlemill",
 	  .i2c_devs = wm1277_devs, .num_i2c_devs = ARRAY_SIZE(wm1277_devs) },
+	{ .id = 0x3e, .name = "WM5102-6271-EV1-CS127",
+	  .i2c_devs = wm5102_devs, .num_i2c_devs = ARRAY_SIZE(wm5102_devs) },
 };
 
 static __devinit int wlf_gf_module_probe(struct i2c_client *i2c,
-- 
1.7.10

[PATCH 1/2] ARM: S3C64XX: Add module identification for Balblair Cragganmore module

[Kukjin Kim]

Mark Brown wrote:
> 
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> ---
>  arch/arm/mach-s3c64xx/mach-crag6410-module.c |    1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/arch/arm/mach-s3c64xx/mach-crag6410-module.c b/arch/arm/mach-
> s3c64xx/mach-crag6410-module.c
> index dbd5771..985e255 100644
> --- a/arch/arm/mach-s3c64xx/mach-crag6410-module.c
> +++ b/arch/arm/mach-s3c64xx/mach-crag6410-module.c
> @@ -219,6 +219,7 @@ static __devinitdata const struct {
>  	  .spi_devs = wm1253_devs, .num_spi_devs =
> ARRAY_SIZE(wm1253_devs) },
>  	{ .id = 0x32, .name = "XXXX-EV1 Caol Illa" },
>  	{ .id = 0x33, .name = "XXXX-EV1 Oban" },
> +	{ .id = 0x34, .name = "WM0010-6320-CS42 Balblair" },
>  	{ .id = 0x39, .name = "1254-EV1 Dallas Dhu",
>  	  .i2c_devs = wm1254_devs, .num_i2c_devs =
> ARRAY_SIZE(wm1254_devs) },
>  	{ .id = 0x3a, .name = "1259-EV1 Tobermory",
> --
> 1.7.10

OK, will apply.
Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

[PATCH 2/2] ARM: S3C64XX: Add WM5102 EVM to Cragganmore modules

[Kukjin Kim]

Mark Brown wrote:
> 
> No platform data yet as driver is not yet merged.
> 
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> ---
>  arch/arm/mach-s3c64xx/mach-crag6410-module.c |    7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/arch/arm/mach-s3c64xx/mach-crag6410-module.c b/arch/arm/mach-
> s3c64xx/mach-crag6410-module.c
> index 985e255..f80761c 100644
> --- a/arch/arm/mach-s3c64xx/mach-crag6410-module.c
> +++ b/arch/arm/mach-s3c64xx/mach-crag6410-module.c
> @@ -192,6 +192,11 @@ static const struct i2c_board_info wm1277_devs[] = {
>  	},
>  };
> 
> +static const struct i2c_board_info wm5102_devs[] = {
> +	{ I2C_BOARD_INFO("wm5102", 0x1a),
> +	  .irq = GLENFARCLAS_PMIC_IRQ_BASE + WM831X_IRQ_GPIO_2, },
> +};
> +
>  static const struct i2c_board_info wm6230_i2c_devs[] = {
>  	{ I2C_BOARD_INFO("wm9081", 0x6c),
>  	  .platform_data = &wm9081_pdata, },
> @@ -229,6 +234,8 @@ static __devinitdata const struct {
>  	{ .id = 0x3c, .name = "1273-EV1 Longmorn" },
>  	{ .id = 0x3d, .name = "1277-EV1 Littlemill",
>  	  .i2c_devs = wm1277_devs, .num_i2c_devs =
> ARRAY_SIZE(wm1277_devs) },
> +	{ .id = 0x3e, .name = "WM5102-6271-EV1-CS127",
> +	  .i2c_devs = wm5102_devs, .num_i2c_devs =
> ARRAY_SIZE(wm5102_devs) },
>  };
> 
>  static __devinit int wlf_gf_module_probe(struct i2c_client *i2c,
> --
> 1.7.10

OK, will apply.
Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.