Re: linux-next: origin tree build failure
Hi Stephen, On Wed, Dec 16, 2009 at 09:45:41AM +1100, Stephen Rothwell wrote: Hi Tony, On Tue, 15 Dec 2009 09:27:17 -0800 Tony Lindgren t...@atomide.com wrote: * Mark Brown broo...@opensource.wolfsonmicro.com [091215 06:52]: On Tue, Dec 15, 2009 at 04:41:08PM +1100, Stephen Rothwell wrote: I have applied this patch for today (please check): Looks good to me too, fwiw: Acked-by: Mark Brown broo...@opensource.wolfsonmicro.com Good thing we have for-next to catch things like this. Except if the renaming patch had gone through linux-next (even for one day) we would have found the problem *before* it was in Linus' tree ... Mea maxima culpa. I could come up with several reason why I rushed this patch in, but none of them would be good. I apologize here. (/me is a little grumpy :-)) I understand, sorry again. Cheers, Samuel. -- Cheers, Stephen Rothwells...@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ -- Intel Open Source Technology Centre http://oss.intel.com/ -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: linux-next: origin tree build failure
* Stephen Rothwell s...@canb.auug.org.au wrote: Hi all, Today's linux-next build (powerpc allyesconfig) failed like this: drivers/mfd/twl4030-codec.c:29:31: error: linux/i2c/twl4030.h: No such file or directory FYI, x86 allyesconfig fails to build too so this doesnt only affect PowerPC. Ingo -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: linux-next: origin tree build failure
Hello, On Tuesday 15 December 2009 07:41:08 ext Stephen Rothwell wrote: Hi all, Today's linux-next build (powerpc allyesconfig) failed like this: drivers/mfd/twl4030-codec.c:29:31: error: linux/i2c/twl4030.h: No such file or directory (there were more, but I assume that they all stem form this one). Caused by commit 0b83ddebc6e884dc0221358cf68c461520fbdd8e (MFD: twl4030: add twl4030_codec MFD as a new child to the core) from Linus' tree interacting with commit b07682b6056eb6701f8cb86aa5800e6f2ea7919b (mfd: Rename twl4030* driver files to enable re-use) also from Linus' tree. This file seems to have been missed in the renaming. Yes, the twl4030-codec MFD driver went in earlier than the twl4030 rename patch, which does not taken care of the twl4030-codec MFD driver for some reasons. The patch looks good, I might also align the twl4030-codec MFD driver with the renamed twl core soon. I have to check the feasibility of this first, since the renaming was done to facilitate the addition of twl6030 (OMAP4 companion chip), and I don't have yet access to the documentation. Thank you, Péter -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: linux-next: origin tree build failure
On Tue, Dec 15, 2009 at 04:41:08PM +1100, Stephen Rothwell wrote: I have applied this patch for today (please check): Looks good to me too, fwiw: Acked-by: Mark Brown broo...@opensource.wolfsonmicro.com -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: linux-next: origin tree build failure
* Mark Brown broo...@opensource.wolfsonmicro.com [091215 06:52]: On Tue, Dec 15, 2009 at 04:41:08PM +1100, Stephen Rothwell wrote: I have applied this patch for today (please check): Looks good to me too, fwiw: Acked-by: Mark Brown broo...@opensource.wolfsonmicro.com Good thing we have for-next to catch things like this. Acked-by: Tony Lindgren t...@atomide.com -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: linux-next: origin tree build failure
Hi Tony, On Tue, 15 Dec 2009 09:27:17 -0800 Tony Lindgren t...@atomide.com wrote: * Mark Brown broo...@opensource.wolfsonmicro.com [091215 06:52]: On Tue, Dec 15, 2009 at 04:41:08PM +1100, Stephen Rothwell wrote: I have applied this patch for today (please check): Looks good to me too, fwiw: Acked-by: Mark Brown broo...@opensource.wolfsonmicro.com Good thing we have for-next to catch things like this. Except if the renaming patch had gone through linux-next (even for one day) we would have found the problem *before* it was in Linus' tree ... (/me is a little grumpy :-)) -- Cheers, Stephen Rothwells...@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ pgpVgJq3s7cfu.pgp Description: PGP signature
Re: linux-next: origin tree build failure
On Wed, 16 Dec 2009, Stephen Rothwell wrote: Hi Tony, On Tue, 15 Dec 2009 09:27:17 -0800 Tony Lindgren t...@atomide.com wrote: * Mark Brown broo...@opensource.wolfsonmicro.com [091215 06:52]: On Tue, Dec 15, 2009 at 04:41:08PM +1100, Stephen Rothwell wrote: I have applied this patch for today (please check): Looks good to me too, fwiw: Acked-by: Mark Brown broo...@opensource.wolfsonmicro.com Good thing we have for-next to catch things like this. Except if the renaming patch had gone through linux-next (even for one day) we would have found the problem *before* it was in Linus' tree ... I think maybe Tony was being ironic, exactly because of this. Linus -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: linux-next: origin tree build failure
On Tue, 15 Dec 2009 15:02:17 -0800 (PST) Linus Torvalds torva...@linux-foundation.org wrote: I think maybe Tony was being ironic, exactly because of this. Yeah, that occurred to me just after sending the email. Sorry, Tony. (/me is grumpy and tired :-)) -- Cheers, Stephen Rothwells...@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ pgp22mRRNbOKc.pgp Description: PGP signature
linux-next: origin tree build failure
Hi all, Today's linux-next build (powerpc allyesconfig) failed like this: drivers/mfd/twl4030-codec.c:29:31: error: linux/i2c/twl4030.h: No such file or directory (there were more, but I assume that they all stem form this one). Caused by commit 0b83ddebc6e884dc0221358cf68c461520fbdd8e (MFD: twl4030: add twl4030_codec MFD as a new child to the core) from Linus' tree interacting with commit b07682b6056eb6701f8cb86aa5800e6f2ea7919b (mfd: Rename twl4030* driver files to enable re-use) also from Linus' tree. This file seems to have been missed in the renaming. I have applied this patch for today (please check): From: Stephen Rothwell s...@canb.auug.org.au Date: Tue, 15 Dec 2009 16:33:10 +1100 Subject: [PATCH] mfd: fix for twl4030 renaming Signed-off-by: Stephen Rothwell s...@canb.auug.org.au --- drivers/mfd/twl4030-codec.c | 10 +- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/mfd/twl4030-codec.c b/drivers/mfd/twl4030-codec.c index 77b9149..700b149 100644 --- a/drivers/mfd/twl4030-codec.c +++ b/drivers/mfd/twl4030-codec.c @@ -26,7 +26,7 @@ #include linux/kernel.h #include linux/fs.h #include linux/platform_device.h -#include linux/i2c/twl4030.h +#include linux/i2c/twl.h #include linux/mfd/core.h #include linux/mfd/twl4030-codec.h @@ -56,7 +56,7 @@ static int twl4030_codec_set_resource(enum twl4030_codec_res id, int enable) struct twl4030_codec *codec = platform_get_drvdata(twl4030_codec_dev); u8 val; - twl4030_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, val, + twl_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, val, codec-resource[id].reg); if (enable) @@ -64,7 +64,7 @@ static int twl4030_codec_set_resource(enum twl4030_codec_res id, int enable) else val = ~codec-resource[id].mask; - twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, + twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, val, codec-resource[id].reg); return val; @@ -75,7 +75,7 @@ static inline int twl4030_codec_get_resource(enum twl4030_codec_res id) struct twl4030_codec *codec = platform_get_drvdata(twl4030_codec_dev); u8 val; - twl4030_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, val, + twl_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, val, codec-resource[id].reg); return val; @@ -183,7 +183,7 @@ static int __devinit twl4030_codec_probe(struct platform_device *pdev) dev_err(pdev-dev, Invalid audio_mclk\n); return -EINVAL; } - twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, + twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, val, TWL4030_REG_APLL_CTL); codec = kzalloc(sizeof(struct twl4030_codec), GFP_KERNEL); -- 1.6.5.4 -- Cheers, Stephen Rothwells...@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
