* [PATCH 1/2] ARM: S3C64XX: Initial hookup for Bells module on Cragganmore
@ 2012-05-14 17:20 ` Mark Brown
0 siblings, 0 replies; 12+ messages in thread
From: Mark Brown @ 2012-05-14 17:20 UTC (permalink / raw)
To: Kukjin Kim; +Cc: linux-arm-kernel, linux-samsung-soc, patches, Mark Brown
The Bells module now has a number assigned to it. Also hook up the WM9081
which is soldered down onto the board.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
arch/arm/mach-s3c64xx/mach-crag6410-module.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410-module.c b/arch/arm/mach-s3c64xx/mach-crag6410-module.c
index 0c9b0cb..dbd5771 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 wm6230_i2c_devs[] = {
+ { I2C_BOARD_INFO("wm9081", 0x6c),
+ .platform_data = &wm9081_pdata, },
+};
+
static __devinitdata const struct {
u8 id;
const char *name;
@@ -205,7 +210,9 @@ static __devinitdata const struct {
{ .id = 0x03, .name = "1252-EV1 Glenlivet" },
{ .id = 0x11, .name = "6249-EV2 Glenfarclas", },
{ .id = 0x14, .name = "6271-EV1 Lochnagar" },
- { .id = 0x15, .name = "XXXX-EV1 Bells" },
+ { .id = 0x15, .name = "6320-EV1 Bells",
+ .i2c_devs = wm6230_i2c_devs,
+ .num_i2c_devs = ARRAY_SIZE(wm6230_i2c_devs) },
{ .id = 0x21, .name = "1275-EV1 Mortlach" },
{ .id = 0x25, .name = "1274-EV1 Glencadam" },
{ .id = 0x31, .name = "1253-EV1 Tomatin",
--
1.7.10
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 1/2] ARM: S3C64XX: Initial hookup for Bells module on Cragganmore
@ 2012-05-14 17:20 ` Mark Brown
0 siblings, 0 replies; 12+ messages in thread
From: Mark Brown @ 2012-05-14 17:20 UTC (permalink / raw)
To: linux-arm-kernel
The Bells module now has a number assigned to it. Also hook up the WM9081
which is soldered down onto the board.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
arch/arm/mach-s3c64xx/mach-crag6410-module.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410-module.c b/arch/arm/mach-s3c64xx/mach-crag6410-module.c
index 0c9b0cb..dbd5771 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 wm6230_i2c_devs[] = {
+ { I2C_BOARD_INFO("wm9081", 0x6c),
+ .platform_data = &wm9081_pdata, },
+};
+
static __devinitdata const struct {
u8 id;
const char *name;
@@ -205,7 +210,9 @@ static __devinitdata const struct {
{ .id = 0x03, .name = "1252-EV1 Glenlivet" },
{ .id = 0x11, .name = "6249-EV2 Glenfarclas", },
{ .id = 0x14, .name = "6271-EV1 Lochnagar" },
- { .id = 0x15, .name = "XXXX-EV1 Bells" },
+ { .id = 0x15, .name = "6320-EV1 Bells",
+ .i2c_devs = wm6230_i2c_devs,
+ .num_i2c_devs = ARRAY_SIZE(wm6230_i2c_devs) },
{ .id = 0x21, .name = "1275-EV1 Mortlach" },
{ .id = 0x25, .name = "1274-EV1 Glencadam" },
{ .id = 0x31, .name = "1253-EV1 Tomatin",
--
1.7.10
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 2/2] ARM: S3C64XX: Hook up carrier class modules on Cragganmore
2012-05-14 17:20 ` Mark Brown
@ 2012-05-14 17:20 ` Mark Brown
-1 siblings, 0 replies; 12+ messages in thread
From: Mark Brown @ 2012-05-14 17:20 UTC (permalink / raw)
To: Kukjin Kim; +Cc: linux-arm-kernel, linux-samsung-soc, patches, Mark Brown
We now have an additional classs of modules which are enumerated at I2C
address 0x22. Add hookup for these modules.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
arch/arm/mach-s3c64xx/mach-crag6410.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c
index 0787b91..48eb76f 100644
--- a/arch/arm/mach-s3c64xx/mach-crag6410.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
@@ -674,6 +674,7 @@ static struct i2c_board_info i2c_devs1[] __initdata = {
.platform_data = &glenfarclas_pmic_pdata },
{ I2C_BOARD_INFO("wlf-gf-module", 0x20) },
+ { I2C_BOARD_INFO("wlf-gf-module", 0x22) },
{ I2C_BOARD_INFO("wlf-gf-module", 0x24) },
{ I2C_BOARD_INFO("wlf-gf-module", 0x25) },
{ I2C_BOARD_INFO("wlf-gf-module", 0x26) },
--
1.7.10
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 2/2] ARM: S3C64XX: Hook up carrier class modules on Cragganmore
@ 2012-05-14 17:20 ` Mark Brown
0 siblings, 0 replies; 12+ messages in thread
From: Mark Brown @ 2012-05-14 17:20 UTC (permalink / raw)
To: linux-arm-kernel
We now have an additional classs of modules which are enumerated at I2C
address 0x22. Add hookup for these modules.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
arch/arm/mach-s3c64xx/mach-crag6410.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c
index 0787b91..48eb76f 100644
--- a/arch/arm/mach-s3c64xx/mach-crag6410.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
@@ -674,6 +674,7 @@ static struct i2c_board_info i2c_devs1[] __initdata = {
.platform_data = &glenfarclas_pmic_pdata },
{ I2C_BOARD_INFO("wlf-gf-module", 0x20) },
+ { I2C_BOARD_INFO("wlf-gf-module", 0x22) },
{ I2C_BOARD_INFO("wlf-gf-module", 0x24) },
{ I2C_BOARD_INFO("wlf-gf-module", 0x25) },
{ I2C_BOARD_INFO("wlf-gf-module", 0x26) },
--
1.7.10
^ permalink raw reply related [flat|nested] 12+ messages in thread* RE: [PATCH 2/2] ARM: S3C64XX: Hook up carrier class modules on Cragganmore
2012-05-14 17:20 ` Mark Brown
@ 2012-05-15 8:58 ` Kukjin Kim
-1 siblings, 0 replies; 12+ messages in thread
From: Kukjin Kim @ 2012-05-15 8:58 UTC (permalink / raw)
To: 'Mark Brown'; +Cc: linux-samsung-soc, patches, linux-arm-kernel
Mark Brown wrote:
>
> We now have an additional classs of modules which are enumerated at I2C
> address 0x22. Add hookup for these modules.
>
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> ---
> arch/arm/mach-s3c64xx/mach-crag6410.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c
> index 0787b91..48eb76f 100644
> --- a/arch/arm/mach-s3c64xx/mach-crag6410.c
> +++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
> @@ -674,6 +674,7 @@ static struct i2c_board_info i2c_devs1[] __initdata = {
> .platform_data = &glenfarclas_pmic_pdata },
>
> { I2C_BOARD_INFO("wlf-gf-module", 0x20) },
> + { I2C_BOARD_INFO("wlf-gf-module", 0x22) },
> { I2C_BOARD_INFO("wlf-gf-module", 0x24) },
> { I2C_BOARD_INFO("wlf-gf-module", 0x25) },
> { I2C_BOARD_INFO("wlf-gf-module", 0x26) },
> --
> 1.7.10
Looks good to me, but there is no '{ I2C_BOARD_INFO("wlf-gf-module", 0x20) },' in my tree.
Just adding address 0x22 stuff is enough now?
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH 2/2] ARM: S3C64XX: Hook up carrier class modules on Cragganmore
@ 2012-05-15 8:58 ` Kukjin Kim
0 siblings, 0 replies; 12+ messages in thread
From: Kukjin Kim @ 2012-05-15 8:58 UTC (permalink / raw)
To: linux-arm-kernel
Mark Brown wrote:
>
> We now have an additional classs of modules which are enumerated at I2C
> address 0x22. Add hookup for these modules.
>
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> ---
> arch/arm/mach-s3c64xx/mach-crag6410.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c
> index 0787b91..48eb76f 100644
> --- a/arch/arm/mach-s3c64xx/mach-crag6410.c
> +++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
> @@ -674,6 +674,7 @@ static struct i2c_board_info i2c_devs1[] __initdata = {
> .platform_data = &glenfarclas_pmic_pdata },
>
> { I2C_BOARD_INFO("wlf-gf-module", 0x20) },
> + { I2C_BOARD_INFO("wlf-gf-module", 0x22) },
> { I2C_BOARD_INFO("wlf-gf-module", 0x24) },
> { I2C_BOARD_INFO("wlf-gf-module", 0x25) },
> { I2C_BOARD_INFO("wlf-gf-module", 0x26) },
> --
> 1.7.10
Looks good to me, but there is no '{ I2C_BOARD_INFO("wlf-gf-module", 0x20) },' in my tree.
Just adding address 0x22 stuff is enough now?
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 2/2] ARM: S3C64XX: Hook up carrier class modules on Cragganmore
2012-05-15 8:58 ` Kukjin Kim
@ 2012-05-15 17:37 ` Mark Brown
-1 siblings, 0 replies; 12+ messages in thread
From: Mark Brown @ 2012-05-15 17:37 UTC (permalink / raw)
To: Kukjin Kim; +Cc: linux-arm-kernel, linux-samsung-soc, patches
[-- Attachment #1: Type: text/plain, Size: 258 bytes --]
On Tue, May 15, 2012 at 05:58:12PM +0900, Kukjin Kim wrote:
> Looks good to me, but there is no '{ I2C_BOARD_INFO("wlf-gf-module", 0x20) },' in my tree.
> Just adding address 0x22 stuff is enough now?
Yes, it is - sorry, context diff for another project.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH 2/2] ARM: S3C64XX: Hook up carrier class modules on Cragganmore
@ 2012-05-15 17:37 ` Mark Brown
0 siblings, 0 replies; 12+ messages in thread
From: Mark Brown @ 2012-05-15 17:37 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, May 15, 2012 at 05:58:12PM +0900, Kukjin Kim wrote:
> Looks good to me, but there is no '{ I2C_BOARD_INFO("wlf-gf-module", 0x20) },' in my tree.
> Just adding address 0x22 stuff is enough now?
Yes, it is - sorry, context diff for another project.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120515/56b88648/attachment-0001.sig>
^ permalink raw reply [flat|nested] 12+ messages in thread* RE: [PATCH 2/2] ARM: S3C64XX: Hook up carrier class modules on Cragganmore
2012-05-15 17:37 ` Mark Brown
@ 2012-05-16 6:21 ` Kukjin Kim
-1 siblings, 0 replies; 12+ messages in thread
From: Kukjin Kim @ 2012-05-16 6:21 UTC (permalink / raw)
To: 'Mark Brown'; +Cc: linux-arm-kernel, linux-samsung-soc, patches
Mark Brown wrote:
>
> On Tue, May 15, 2012 at 05:58:12PM +0900, Kukjin Kim wrote:
>
> > Looks good to me, but there is no '{ I2C_BOARD_INFO("wlf-gf-module",
> 0x20) },' in my tree.
>
> > Just adding address 0x22 stuff is enough now?
>
> Yes, it is - sorry, context diff for another project.
OK, no problem.
Applied and thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH 2/2] ARM: S3C64XX: Hook up carrier class modules on Cragganmore
@ 2012-05-16 6:21 ` Kukjin Kim
0 siblings, 0 replies; 12+ messages in thread
From: Kukjin Kim @ 2012-05-16 6:21 UTC (permalink / raw)
To: linux-arm-kernel
Mark Brown wrote:
>
> On Tue, May 15, 2012 at 05:58:12PM +0900, Kukjin Kim wrote:
>
> > Looks good to me, but there is no '{ I2C_BOARD_INFO("wlf-gf-module",
> 0x20) },' in my tree.
>
> > Just adding address 0x22 stuff is enough now?
>
> Yes, it is - sorry, context diff for another project.
OK, no problem.
Applied and thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply [flat|nested] 12+ messages in thread
* RE: [PATCH 1/2] ARM: S3C64XX: Initial hookup for Bells module on Cragganmore
2012-05-14 17:20 ` Mark Brown
@ 2012-05-15 8:58 ` Kukjin Kim
-1 siblings, 0 replies; 12+ messages in thread
From: Kukjin Kim @ 2012-05-15 8:58 UTC (permalink / raw)
To: 'Mark Brown'; +Cc: linux-arm-kernel, linux-samsung-soc, patches
Mark Brown wrote:
>
> The Bells module now has a number assigned to it. Also hook up the WM9081
> which is soldered down onto the board.
>
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> ---
> arch/arm/mach-s3c64xx/mach-crag6410-module.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-s3c64xx/mach-crag6410-module.c b/arch/arm/mach-s3c64xx/mach-crag6410-
> module.c
> index 0c9b0cb..dbd5771 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 wm6230_i2c_devs[] = {
> + { I2C_BOARD_INFO("wm9081", 0x6c),
> + .platform_data = &wm9081_pdata, },
> +};
> +
> static __devinitdata const struct {
> u8 id;
> const char *name;
> @@ -205,7 +210,9 @@ static __devinitdata const struct {
> { .id = 0x03, .name = "1252-EV1 Glenlivet" },
> { .id = 0x11, .name = "6249-EV2 Glenfarclas", },
> { .id = 0x14, .name = "6271-EV1 Lochnagar" },
> - { .id = 0x15, .name = "XXXX-EV1 Bells" },
> + { .id = 0x15, .name = "6320-EV1 Bells",
> + .i2c_devs = wm6230_i2c_devs,
> + .num_i2c_devs = ARRAY_SIZE(wm6230_i2c_devs) },
> { .id = 0x21, .name = "1275-EV1 Mortlach" },
> { .id = 0x25, .name = "1274-EV1 Glencadam" },
> { .id = 0x31, .name = "1253-EV1 Tomatin",
> --
> 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.
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH 1/2] ARM: S3C64XX: Initial hookup for Bells module on Cragganmore
@ 2012-05-15 8:58 ` Kukjin Kim
0 siblings, 0 replies; 12+ messages in thread
From: Kukjin Kim @ 2012-05-15 8:58 UTC (permalink / raw)
To: linux-arm-kernel
Mark Brown wrote:
>
> The Bells module now has a number assigned to it. Also hook up the WM9081
> which is soldered down onto the board.
>
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> ---
> arch/arm/mach-s3c64xx/mach-crag6410-module.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-s3c64xx/mach-crag6410-module.c b/arch/arm/mach-s3c64xx/mach-crag6410-
> module.c
> index 0c9b0cb..dbd5771 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 wm6230_i2c_devs[] = {
> + { I2C_BOARD_INFO("wm9081", 0x6c),
> + .platform_data = &wm9081_pdata, },
> +};
> +
> static __devinitdata const struct {
> u8 id;
> const char *name;
> @@ -205,7 +210,9 @@ static __devinitdata const struct {
> { .id = 0x03, .name = "1252-EV1 Glenlivet" },
> { .id = 0x11, .name = "6249-EV2 Glenfarclas", },
> { .id = 0x14, .name = "6271-EV1 Lochnagar" },
> - { .id = 0x15, .name = "XXXX-EV1 Bells" },
> + { .id = 0x15, .name = "6320-EV1 Bells",
> + .i2c_devs = wm6230_i2c_devs,
> + .num_i2c_devs = ARRAY_SIZE(wm6230_i2c_devs) },
> { .id = 0x21, .name = "1275-EV1 Mortlach" },
> { .id = 0x25, .name = "1274-EV1 Glencadam" },
> { .id = 0x31, .name = "1253-EV1 Tomatin",
> --
> 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.
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2012-05-16 6:21 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-05-14 17:20 [PATCH 1/2] ARM: S3C64XX: Initial hookup for Bells module on Cragganmore Mark Brown
2012-05-14 17:20 ` Mark Brown
2012-05-14 17:20 ` [PATCH 2/2] ARM: S3C64XX: Hook up carrier class modules " Mark Brown
2012-05-14 17:20 ` Mark Brown
2012-05-15 8:58 ` Kukjin Kim
2012-05-15 8:58 ` Kukjin Kim
2012-05-15 17:37 ` Mark Brown
2012-05-15 17:37 ` Mark Brown
2012-05-16 6:21 ` Kukjin Kim
2012-05-16 6:21 ` Kukjin Kim
2012-05-15 8:58 ` [PATCH 1/2] ARM: S3C64XX: Initial hookup for Bells module " Kukjin Kim
2012-05-15 8:58 ` Kukjin Kim
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.