* linux-next: voltage tree build failure
@ 2009-08-24 4:40 Stephen Rothwell
2009-08-24 9:51 ` Liam Girdwood
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2009-08-24 4:40 UTC (permalink / raw)
To: Liam Girdwood; +Cc: linux-next, linux-kernel, Anuj Aggarwal
[-- Attachment #1: Type: text/plain, Size: 730 bytes --]
Hi Liam,
Today's linux-next build (x86_64 allmodconfig) failed like this:
drivers/regulator/tps65023-regulator: struct i2c_device_id is 32 bytes. The last of 1 is:
0x74 0x70 0x73 0x36 0x35 0x30 0x32 0x33 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00
FATAL: drivers/regulator/tps65023-regulator: struct i2c_device_id is not terminated with a NULL entry!
Caused by commit 9cfd343f14bf4bd95f8bfc6a1d411d2002bf94d8 ("Regulator:
Add TPS65023 regulator driver").
I have used the version of the voltage tree from next-20090821 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: voltage tree build failure
2009-08-24 4:40 linux-next: voltage tree build failure Stephen Rothwell
@ 2009-08-24 9:51 ` Liam Girdwood
0 siblings, 0 replies; 6+ messages in thread
From: Liam Girdwood @ 2009-08-24 9:51 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Anuj Aggarwal
Hi Stephen,
On Mon, 2009-08-24 at 14:40 +1000, Stephen Rothwell wrote:
> Hi Liam,
>
> Today's linux-next build (x86_64 allmodconfig) failed like this:
>
> drivers/regulator/tps65023-regulator: struct i2c_device_id is 32 bytes. The last of 1 is:
> 0x74 0x70 0x73 0x36 0x35 0x30 0x32 0x33 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00
> FATAL: drivers/regulator/tps65023-regulator: struct i2c_device_id is not terminated with a NULL entry!
>
> Caused by commit 9cfd343f14bf4bd95f8bfc6a1d411d2002bf94d8 ("Regulator:
> Add TPS65023 regulator driver").
>
> I have used the version of the voltage tree from next-20090821 for today.
Sorry about this, looks like I failed to select both tps drivers in my
test build.
Fixed with this patch :-
regulator: tps650xx - build fixes for x86_64
Fixes the following errors on both tps650xx regulator drivers :-
drivers/regulator/tps65023-regulator: struct i2c_device_id is 32 bytes. The last of 1 is:
0x74 0x70 0x73 0x36 0x35 0x30 0x32 0x33 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00
FATAL: drivers/regulator/tps65023-regulator: struct i2c_device_id is not terminated with a NULL entry!
This patch also fixes the GPL v2 licence string for both drivers.
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
diff --git a/drivers/regulator/tps65023-regulator.c b/drivers/regulator/tps65023-regulator.c
index 1e54f46..07fda0a 100644
--- a/drivers/regulator/tps65023-regulator.c
+++ b/drivers/regulator/tps65023-regulator.c
@@ -587,9 +587,10 @@ static const struct tps_info tps65023_regs[] = {
},
};
-static const struct i2c_device_id tps_65023_id = {
- .name = "tps65023",
- .driver_data = (unsigned long) &tps65023_regs[0],
+static const struct i2c_device_id tps_65023_id[] = {
+ {.name = "tps65023",
+ .driver_data = (unsigned long) tps65023_regs,},
+ { },
};
MODULE_DEVICE_TABLE(i2c, tps_65023_id);
@@ -601,7 +602,7 @@ static struct i2c_driver tps_65023_i2c_driver = {
},
.probe = tps_65023_probe,
.remove = __devexit_p(tps_65023_remove),
- .id_table = &tps_65023_id,
+ .id_table = tps_65023_id,
};
/**
@@ -628,4 +629,4 @@ module_exit(tps_65023_cleanup);
MODULE_AUTHOR("Texas Instruments");
MODULE_DESCRIPTION("TPS65023 voltage regulator driver");
-MODULE_LICENSE("GPLv2");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/regulator/tps6507x-regulator.c b/drivers/regulator/tps6507x-regulator.c
index 1aa3636..f8a6dfb 100644
--- a/drivers/regulator/tps6507x-regulator.c
+++ b/drivers/regulator/tps6507x-regulator.c
@@ -670,9 +670,10 @@ static const struct tps_info tps6507x_regs[] = {
},
};
-static const struct i2c_device_id tps_6507x_id = {
- .name = "tps6507x",
- .driver_data = (unsigned long) &tps6507x_regs[0],
+static const struct i2c_device_id tps_6507x_id[] = {
+ {.name = "tps6507x",
+ .driver_data = (unsigned long) tps6507x_regs,},
+ { },
};
MODULE_DEVICE_TABLE(i2c, tps_6507x_id);
@@ -683,7 +684,7 @@ static struct i2c_driver tps_6507x_i2c_driver = {
},
.probe = tps_6507x_probe,
.remove = __devexit_p(tps_6507x_remove),
- .id_table = &tps_6507x_id,
+ .id_table = tps_6507x_id,
};
/**
@@ -710,4 +711,4 @@ module_exit(tps_6507x_cleanup);
MODULE_AUTHOR("Texas Instruments");
MODULE_DESCRIPTION("TPS6507x voltage regulator driver");
-MODULE_LICENSE("GPLv2");
+MODULE_LICENSE("GPL v2");
^ permalink raw reply related [flat|nested] 6+ messages in thread
* linux-next: voltage tree build failure
@ 2009-10-12 2:26 Stephen Rothwell
2009-10-12 2:50 ` Haojian Zhuang
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2009-10-12 2:26 UTC (permalink / raw)
To: Liam Girdwood; +Cc: linux-next, linux-kernel, Haojian Zhuang, Samuel Ortiz
[-- Attachment #1: Type: text/plain, Size: 1290 bytes --]
Hi Liam,
Today's linux-next build (x86_64 allmodconfig) failed like this:
drivers/built-in.o: In function `pm8607_write_device':
88pm8607.c:(.text+0xd1359): undefined reference to `i2c_master_send'
drivers/built-in.o: In function `pm8607_read_device':
88pm8607.c:(.text+0xd13ab): undefined reference to `i2c_master_send'
88pm8607.c:(.text+0xd13cc): undefined reference to `i2c_master_recv'
drivers/built-in.o: In function `pm8607_init':
88pm8607.c:(.init.text+0xaa22): undefined reference to `i2c_register_driver'
drivers/built-in.o: In function `pm8607_probe':
88pm8607.c:(.devinit.text+0x50fb): undefined reference to `mfd_add_devices'
drivers/built-in.o: In function `pm8607_exit':
88pm8607.c:(.exit.text+0x5de): undefined reference to `i2c_del_driver'
drivers/built-in.o: In function `pm8607_remove':
88pm8607.c:(.devexit.text+0x1cc): undefined reference to `mfd_remove_devices'
Caused by commit 258e3427f83a573d738344c2f5499da5e026e1df ("regulator:
add 88PM8607 PMIC driver"). This is the same driver that has caused the
mfd tree to fail in the same way since next-20091006. I have used the
version of the voltage tree from next-20091009 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: voltage tree build failure
2009-10-12 2:26 Stephen Rothwell
@ 2009-10-12 2:50 ` Haojian Zhuang
2009-10-12 12:57 ` Mark Brown
0 siblings, 1 reply; 6+ messages in thread
From: Haojian Zhuang @ 2009-10-12 2:50 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Liam Girdwood, linux-next, linux-kernel, Samuel Ortiz
On Sun, Oct 11, 2009 at 10:26 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Liam,
>
> Today's linux-next build (x86_64 allmodconfig) failed like this:
>
> drivers/built-in.o: In function `pm8607_write_device':
> 88pm8607.c:(.text+0xd1359): undefined reference to `i2c_master_send'
> drivers/built-in.o: In function `pm8607_read_device':
> 88pm8607.c:(.text+0xd13ab): undefined reference to `i2c_master_send'
> 88pm8607.c:(.text+0xd13cc): undefined reference to `i2c_master_recv'
> drivers/built-in.o: In function `pm8607_init':
> 88pm8607.c:(.init.text+0xaa22): undefined reference to `i2c_register_driver'
> drivers/built-in.o: In function `pm8607_probe':
> 88pm8607.c:(.devinit.text+0x50fb): undefined reference to `mfd_add_devices'
> drivers/built-in.o: In function `pm8607_exit':
> 88pm8607.c:(.exit.text+0x5de): undefined reference to `i2c_del_driver'
> drivers/built-in.o: In function `pm8607_remove':
> 88pm8607.c:(.devexit.text+0x1cc): undefined reference to `mfd_remove_devices'
>
> Caused by commit 258e3427f83a573d738344c2f5499da5e026e1df ("regulator:
> add 88PM8607 PMIC driver"). This is the same driver that has caused the
> mfd tree to fail in the same way since next-20091006. I have used the
> version of the voltage tree from next-20091009 for today.
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
>
Hi Samuel & Liam,
Please help review and merge this fix patch. I'm sorry for inconvience.
Stephen,
Thanks for your check.
>From b7d3707263598c4c6671ac592eaaf13535a7b96a Mon Sep 17 00:00:00 2001
From: Haojian Zhuang <haojian.zhuang@marvell.com>
Date: Tue, 6 Oct 2009 08:08:37 -0400
Subject: [PATCH] mfd: fix the dependancy issue on 88PM8607
88PM8607 depends on I2C and MFD_CORE. Since 88PM8607 is built-in
kernel, it also requires that I2C and MFD_CORE are built-in
kernel also.
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
---
drivers/mfd/Kconfig | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index fbe684b..00064e2 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -307,7 +307,7 @@ config EZX_PCAP
config MFD_88PM8607
bool "Support Marvell 88PM8607"
- depends on I2C
+ depends on I2C=y
select MFD_CORE
help
This supports for Marvell 88PM8607 Power Management IC. This includes
--
1.5.6.5
Best Regards
Haojian
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: linux-next: voltage tree build failure
2009-10-12 2:50 ` Haojian Zhuang
@ 2009-10-12 12:57 ` Mark Brown
2009-10-12 13:35 ` Samuel Ortiz
0 siblings, 1 reply; 6+ messages in thread
From: Mark Brown @ 2009-10-12 12:57 UTC (permalink / raw)
To: Haojian Zhuang
Cc: Stephen Rothwell, Liam Girdwood, linux-next, linux-kernel,
Samuel Ortiz
On Sun, Oct 11, 2009 at 10:50:54PM -0400, Haojian Zhuang wrote:
> Hi Samuel & Liam,
> Please help review and merge this fix patch. I'm sorry for inconvience.
This is waiting for Samuel - it should go via the MFD tree. I've CCed
in Samuel's current e-mail address on the off-chance that that helps.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: voltage tree build failure
2009-10-12 12:57 ` Mark Brown
@ 2009-10-12 13:35 ` Samuel Ortiz
0 siblings, 0 replies; 6+ messages in thread
From: Samuel Ortiz @ 2009-10-12 13:35 UTC (permalink / raw)
To: Mark Brown
Cc: Haojian Zhuang, Stephen Rothwell, Liam Girdwood, linux-next,
linux-kernel
On Mon, Oct 12, 2009 at 01:57:07PM +0100, Mark Brown wrote:
> On Sun, Oct 11, 2009 at 10:50:54PM -0400, Haojian Zhuang wrote:
>
> > Hi Samuel & Liam,
>
> > Please help review and merge this fix patch. I'm sorry for inconvience.
>
> This is waiting for Samuel - it should go via the MFD tree. I've CCed
> in Samuel's current e-mail address on the off-chance that that helps.
Patch applied and pushed. Sorry for the delay, I wasnt cc'ed at first.
Cheers,
Samuel.
--
Intel Open Source Technology Centre
http://oss.intel.com/
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-10-12 13:34 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-08-24 4:40 linux-next: voltage tree build failure Stephen Rothwell
2009-08-24 9:51 ` Liam Girdwood
-- strict thread matches above, loose matches on Subject: below --
2009-10-12 2:26 Stephen Rothwell
2009-10-12 2:50 ` Haojian Zhuang
2009-10-12 12:57 ` Mark Brown
2009-10-12 13:35 ` Samuel Ortiz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox