Re: linux-next: build failure after merge of the mfd tree
On Thu, 05 Nov 2020, Michał Mirosław wrote: > On Thu, Nov 05, 2020 at 12:50:27PM +1100, Stephen Rothwell wrote: > > Hi all, > > > > After merging the mfd tree, today's linux-next build (arm > > multi_v7_defconfig) failed like this: > > > > drivers/gpio/gpio-tps65910.c: In function 'tps65910_gpio_get': > > drivers/gpio/gpio-tps65910.c:31:2: error: implicit declaration of function > > 'tps65910_reg_read' [-Werror=implicit-function-declaration] > >31 | tps65910_reg_read(tps65910, TPS65910_GPIO0 + offset, &val); > > | ^ > > drivers/gpio/gpio-tps65910.c: In function 'tps65910_gpio_set': > > drivers/gpio/gpio-tps65910.c:46:3: error: implicit declaration of function > > 'tps65910_reg_set_bits' [-Werror=implicit-function-declaration] > >46 | tps65910_reg_set_bits(tps65910, TPS65910_GPIO0 + offset, > > | ^ > > drivers/gpio/gpio-tps65910.c:49:3: error: implicit declaration of function > > 'tps65910_reg_clear_bits' [-Werror=implicit-function-declaration] > >49 | tps65910_reg_clear_bits(tps65910, TPS65910_GPIO0 + offset, > > | ^~~ > > > > Caused by commit > > > > 23feb2c3367c ("mfd: tps65910: Clean up after switching to regmap") > > > > I have used the version of the mfd tree from next-20201104 for today. > > Hi, > > It's missing a patch for gpio part [1]. > > [1] https://lkml.org/lkml/2020/9/26/398 I'm aware of it. Just waiting for Linus' reply. -- Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog
Re: linux-next: build failure after merge of the mfd tree
On Thu, Nov 05, 2020 at 12:50:27PM +1100, Stephen Rothwell wrote: > Hi all, > > After merging the mfd tree, today's linux-next build (arm > multi_v7_defconfig) failed like this: > > drivers/gpio/gpio-tps65910.c: In function 'tps65910_gpio_get': > drivers/gpio/gpio-tps65910.c:31:2: error: implicit declaration of function > 'tps65910_reg_read' [-Werror=implicit-function-declaration] >31 | tps65910_reg_read(tps65910, TPS65910_GPIO0 + offset, &val); > | ^ > drivers/gpio/gpio-tps65910.c: In function 'tps65910_gpio_set': > drivers/gpio/gpio-tps65910.c:46:3: error: implicit declaration of function > 'tps65910_reg_set_bits' [-Werror=implicit-function-declaration] >46 | tps65910_reg_set_bits(tps65910, TPS65910_GPIO0 + offset, > | ^ > drivers/gpio/gpio-tps65910.c:49:3: error: implicit declaration of function > 'tps65910_reg_clear_bits' [-Werror=implicit-function-declaration] >49 | tps65910_reg_clear_bits(tps65910, TPS65910_GPIO0 + offset, > | ^~~ > > Caused by commit > > 23feb2c3367c ("mfd: tps65910: Clean up after switching to regmap") > > I have used the version of the mfd tree from next-20201104 for today. Hi, It's missing a patch for gpio part [1]. [1] https://lkml.org/lkml/2020/9/26/398 Best Regards Michał Mirosław
linux-next: build failure after merge of the mfd tree
Hi all, After merging the mfd tree, today's linux-next build (arm multi_v7_defconfig) failed like this: drivers/gpio/gpio-tps65910.c: In function 'tps65910_gpio_get': drivers/gpio/gpio-tps65910.c:31:2: error: implicit declaration of function 'tps65910_reg_read' [-Werror=implicit-function-declaration] 31 | tps65910_reg_read(tps65910, TPS65910_GPIO0 + offset, &val); | ^ drivers/gpio/gpio-tps65910.c: In function 'tps65910_gpio_set': drivers/gpio/gpio-tps65910.c:46:3: error: implicit declaration of function 'tps65910_reg_set_bits' [-Werror=implicit-function-declaration] 46 | tps65910_reg_set_bits(tps65910, TPS65910_GPIO0 + offset, | ^ drivers/gpio/gpio-tps65910.c:49:3: error: implicit declaration of function 'tps65910_reg_clear_bits' [-Werror=implicit-function-declaration] 49 | tps65910_reg_clear_bits(tps65910, TPS65910_GPIO0 + offset, | ^~~ Caused by commit 23feb2c3367c ("mfd: tps65910: Clean up after switching to regmap") I have used the version of the mfd tree from next-20201104 for today. -- Cheers, Stephen Rothwell pgpS9zaQkK2js.pgp Description: OpenPGP digital signature
Re: linux-next: build failure after merge of the mfd tree
On Fri, 17 Jul 2020, Stephen Rothwell wrote: > Hi Lee, > > On Fri, 17 Jul 2020 07:56:36 +0100 Lee Jones wrote: > > > > > +static const char *kempld_devs[] = { > > > > Do you mind if I change this to 'kempld_dev_names' and still keep your > > SoB? > > No worries, I just did a quick hack, so if you neaten it up that would > be good. Great. Thanks again. Applied, thanks. -- Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog
Re: linux-next: build failure after merge of the mfd tree
Hi Lee, On Fri, 17 Jul 2020 07:56:36 +0100 Lee Jones wrote: > > > +static const char *kempld_devs[] = { > > Do you mind if I change this to 'kempld_dev_names' and still keep your > SoB? No worries, I just did a quick hack, so if you neaten it up that would be good. -- Cheers, Stephen Rothwell pgpl6qjCLPEZ9.pgp Description: OpenPGP digital signature
Re: linux-next: build failure after merge of the mfd tree
On Fri, 17 Jul 2020, Stephen Rothwell wrote: > Hi all, > > After merging the mfd tree, today's linux-next build (x86_64 allmodconfig) > failed like this: > > drivers/mfd/kempld-core.c: In function 'kempld_register_cells_generic': > drivers/mfd/kempld-core.c:105:13: error: assignment of read-only location > 'devs[i++]' > 105 | devs[i++] = kempld_devs[KEMPLD_I2C]; > | ^ > drivers/mfd/kempld-core.c:108:13: error: assignment of read-only location > 'devs[i++]' > 108 | devs[i++] = kempld_devs[KEMPLD_WDT]; > | ^ > drivers/mfd/kempld-core.c:111:13: error: assignment of read-only location > 'devs[i++]' > 111 | devs[i++] = kempld_devs[KEMPLD_GPIO]; > | ^ > drivers/mfd/kempld-core.c:114:13: error: assignment of read-only location > 'devs[i++]' > 114 | devs[i++] = kempld_devs[KEMPLD_UART]; > | ^ > > Caused by commit > > 70d48975c152 ("mfd: core: Make a best effort attempt to match devices with > the correct of_nodes") > > I have added the following fix patch for today (I assume that there is > a better solution): > > From: Stephen Rothwell > Date: Fri, 17 Jul 2020 13:36:22 +1000 > Subject: [PATCH] fix up for struct mfd_cell change > > Fixes: 70d48975c152 ("mfd: core: Make a best effort attempt to match devices > with the correct of_nodes") Thanks for fixing this Stephen. I need to investigate why this didn't show up during my own testing. > Signed-off-by: Stephen Rothwell > --- > drivers/mfd/kempld-core.c | 28 ++-- > 1 file changed, 10 insertions(+), 18 deletions(-) > > diff --git a/drivers/mfd/kempld-core.c b/drivers/mfd/kempld-core.c > index f48e21d8b97c..ad68ee699cb5 100644 > --- a/drivers/mfd/kempld-core.c > +++ b/drivers/mfd/kempld-core.c > @@ -79,39 +79,31 @@ enum kempld_cells { > KEMPLD_UART, > }; > > -static const struct mfd_cell kempld_devs[] = { > - [KEMPLD_I2C] = { > - .name = "kempld-i2c", > - }, > - [KEMPLD_WDT] = { > - .name = "kempld-wdt", > - }, > - [KEMPLD_GPIO] = { > - .name = "kempld-gpio", > - }, > - [KEMPLD_UART] = { > - .name = "kempld-uart", > - }, > +static const char *kempld_devs[] = { Do you mind if I change this to 'kempld_dev_names' and still keep your SoB? > + [KEMPLD_I2C] = "kempld-i2c", > + [KEMPLD_WDT] = "kempld-wdt", > + [KEMPLD_GPIO] = "kempld-gpio", > + [KEMPLD_UART] = "kempld-uart", > }; > > #define KEMPLD_MAX_DEVS ARRAY_SIZE(kempld_devs) > > static int kempld_register_cells_generic(struct kempld_device_data *pld) > { > - struct mfd_cell devs[KEMPLD_MAX_DEVS]; > + struct mfd_cell devs[KEMPLD_MAX_DEVS] = {}; > int i = 0; > > if (pld->feature_mask & KEMPLD_FEATURE_BIT_I2C) > - devs[i++] = kempld_devs[KEMPLD_I2C]; > + devs[i++].name = kempld_devs[KEMPLD_I2C]; > > if (pld->feature_mask & KEMPLD_FEATURE_BIT_WATCHDOG) > - devs[i++] = kempld_devs[KEMPLD_WDT]; > + devs[i++].name = kempld_devs[KEMPLD_WDT]; > > if (pld->feature_mask & KEMPLD_FEATURE_BIT_GPIO) > - devs[i++] = kempld_devs[KEMPLD_GPIO]; > + devs[i++].name = kempld_devs[KEMPLD_GPIO]; > > if (pld->feature_mask & KEMPLD_FEATURE_MASK_UART) > - devs[i++] = kempld_devs[KEMPLD_UART]; > + devs[i++].name = kempld_devs[KEMPLD_UART]; > > return mfd_add_devices(pld->dev, -1, devs, i, NULL, 0, NULL); > } -- Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog
linux-next: build failure after merge of the mfd tree
Hi all, After merging the mfd tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/mfd/kempld-core.c: In function 'kempld_register_cells_generic': drivers/mfd/kempld-core.c:105:13: error: assignment of read-only location 'devs[i++]' 105 | devs[i++] = kempld_devs[KEMPLD_I2C]; | ^ drivers/mfd/kempld-core.c:108:13: error: assignment of read-only location 'devs[i++]' 108 | devs[i++] = kempld_devs[KEMPLD_WDT]; | ^ drivers/mfd/kempld-core.c:111:13: error: assignment of read-only location 'devs[i++]' 111 | devs[i++] = kempld_devs[KEMPLD_GPIO]; | ^ drivers/mfd/kempld-core.c:114:13: error: assignment of read-only location 'devs[i++]' 114 | devs[i++] = kempld_devs[KEMPLD_UART]; | ^ Caused by commit 70d48975c152 ("mfd: core: Make a best effort attempt to match devices with the correct of_nodes") I have added the following fix patch for today (I assume that there is a better solution): From: Stephen Rothwell Date: Fri, 17 Jul 2020 13:36:22 +1000 Subject: [PATCH] fix up for struct mfd_cell change Fixes: 70d48975c152 ("mfd: core: Make a best effort attempt to match devices with the correct of_nodes") Signed-off-by: Stephen Rothwell --- drivers/mfd/kempld-core.c | 28 ++-- 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/drivers/mfd/kempld-core.c b/drivers/mfd/kempld-core.c index f48e21d8b97c..ad68ee699cb5 100644 --- a/drivers/mfd/kempld-core.c +++ b/drivers/mfd/kempld-core.c @@ -79,39 +79,31 @@ enum kempld_cells { KEMPLD_UART, }; -static const struct mfd_cell kempld_devs[] = { - [KEMPLD_I2C] = { - .name = "kempld-i2c", - }, - [KEMPLD_WDT] = { - .name = "kempld-wdt", - }, - [KEMPLD_GPIO] = { - .name = "kempld-gpio", - }, - [KEMPLD_UART] = { - .name = "kempld-uart", - }, +static const char *kempld_devs[] = { + [KEMPLD_I2C] = "kempld-i2c", + [KEMPLD_WDT] = "kempld-wdt", + [KEMPLD_GPIO] = "kempld-gpio", + [KEMPLD_UART] = "kempld-uart", }; #define KEMPLD_MAX_DEVSARRAY_SIZE(kempld_devs) static int kempld_register_cells_generic(struct kempld_device_data *pld) { - struct mfd_cell devs[KEMPLD_MAX_DEVS]; + struct mfd_cell devs[KEMPLD_MAX_DEVS] = {}; int i = 0; if (pld->feature_mask & KEMPLD_FEATURE_BIT_I2C) - devs[i++] = kempld_devs[KEMPLD_I2C]; + devs[i++].name = kempld_devs[KEMPLD_I2C]; if (pld->feature_mask & KEMPLD_FEATURE_BIT_WATCHDOG) - devs[i++] = kempld_devs[KEMPLD_WDT]; + devs[i++].name = kempld_devs[KEMPLD_WDT]; if (pld->feature_mask & KEMPLD_FEATURE_BIT_GPIO) - devs[i++] = kempld_devs[KEMPLD_GPIO]; + devs[i++].name = kempld_devs[KEMPLD_GPIO]; if (pld->feature_mask & KEMPLD_FEATURE_MASK_UART) - devs[i++] = kempld_devs[KEMPLD_UART]; + devs[i++].name = kempld_devs[KEMPLD_UART]; return mfd_add_devices(pld->dev, -1, devs, i, NULL, 0, NULL); } -- 2.27.0 -- Cheers, Stephen Rothwell pgpOpqrsz0SzX.pgp Description: OpenPGP digital signature
linux-next: build failure after merge of the mfd tree
Hi Lee, After merging the mfd tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/mfd/cros_ec_dev.c: In function 'ec_device_probe': drivers/mfd/cros_ec_dev.c:422:33: error: 'EC_FEATURE_FINGERPRINT' undeclared (first use in this function); did you mean 'EC_FEATURE_HANG_DETECT'? if (cros_ec_check_features(ec, EC_FEATURE_FINGERPRINT)) { ^~ EC_FEATURE_HANG_DETECT drivers/mfd/cros_ec_dev.c:422:33: note: each undeclared identifier is reported only once for each function it appears in drivers/mfd/cros_ec_dev.c:445:33: error: 'EC_FEATURE_TOUCHPAD' undeclared (first use in this function); did you mean 'EC_FEATURE_USB_PD'? if (cros_ec_check_features(ec, EC_FEATURE_TOUCHPAD)) { ^~~ EC_FEATURE_USB_PD Caused by commits 4483a6f22432 ("mfd: cros_ec: Instantiate properly CrOS FP MCU device") a03871b9e9ea ("mfd: cros_ec: Instantiate properly CrOS Touchpad MCU device") I have used the mfd tree from next-20190402 for today. -- Cheers, Stephen Rothwell pgpu6bBwrF5Xw.pgp Description: OpenPGP digital signature
linux-next: build failure after merge of the mfd tree
Hi all, After merging the mfd tree, today's linux-next build (arm multi_v7_defconfig) failed like this: drivers/mfd/tps65218.c: In function 'tps65218_probe': drivers/mfd/tps65218.c:247:3: error: label 'err_irq' used but not defined goto err_irq; ^~~~ Caused by commit 05ba643fa2ce ("mfd: tps65218: Use devm_regmap_add_irq_chip and clean up error path in probe()") I have used the mfd tree from next-20181214 for today. -- Cheers, Stephen Rothwell pgpBydFGXBP_F.pgp Description: OpenPGP digital signature
Re: linux-next: build failure after merge of the mfd tree
Hi Lee, On Tue, 12 Dec 2017 08:13:10 + Lee Jones wrote: > > Yes, it's in: > > next-20171212 as 51bd7125f740 > > Also, the pull request for it went out over a week ago: > > https://lkml.org/lkml/2017/12/4/142 > > What's missing? Do you still see an issue with the build? Sorry about that, my scripts have been applying the patch, but it automerges and doesn't fail even though it ends up applying nothing :-( And I didn't notice :-( :-( Thanks. All good. -- Cheers, Stephen Rothwell
Re: linux-next: build failure after merge of the mfd tree
On Tue, 12 Dec 2017, Stephen Rothwell wrote: > Hi Lee, > > On Wed, 6 Dec 2017 08:58:03 + Lee Jones wrote: > > > > On Wed, 06 Dec 2017, Stephen Rothwell wrote: > > > > > On Mon, 4 Dec 2017 09:39:53 + Lee Jones wrote: > > > > > > > > > > > > I added the following fix patch: > > > > > > > > > > From: Stephen Rothwell > > > > > Date: Mon, 4 Dec 2017 14:10:34 +1100 > > > > > Subject: [PATCH] misc: rtsx: fix symbol clashes > > > > > > > > > > Signed-off-by: Stephen Rothwell > > > > > > > > Although I'm not sure how to apply this manually without scissors. > > > > > > Just take everything from the From: line above to the end and give it > > > to "git am". Yes, this may involve saving the email and editting it, > > > sorry about that. > > > > If you use the scissors, I can ask Git to deal with all that for me. > > > > We like #lazymaintenance. :D > > So is this going to be applied to the mfd tree? Que? Yes, it's in: next-20171212 as 51bd7125f740 Also, the pull request for it went out over a week ago: https://lkml.org/lkml/2017/12/4/142 What's missing? Do you still see an issue with the build? -- Lee Jones Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
Re: linux-next: build failure after merge of the mfd tree
Hi Lee, On Wed, 6 Dec 2017 08:58:03 + Lee Jones wrote: > > On Wed, 06 Dec 2017, Stephen Rothwell wrote: > > > On Mon, 4 Dec 2017 09:39:53 + Lee Jones wrote: > > > > > > > I added the following fix patch: > > > > > > > > From: Stephen Rothwell > > > > Date: Mon, 4 Dec 2017 14:10:34 +1100 > > > > Subject: [PATCH] misc: rtsx: fix symbol clashes > > > > > > > > Signed-off-by: Stephen Rothwell > > > > > > Although I'm not sure how to apply this manually without scissors. > > > > Just take everything from the From: line above to the end and give it > > to "git am". Yes, this may involve saving the email and editting it, > > sorry about that. > > If you use the scissors, I can ask Git to deal with all that for me. > > We like #lazymaintenance. :D So is this going to be applied to the mfd tree? -- Cheers, Stephen Rothwell
Re: linux-next: build failure after merge of the mfd tree
On Wed, 06 Dec 2017, Stephen Rothwell wrote: > Hi Lee, > > On Mon, 4 Dec 2017 09:39:53 + Lee Jones wrote: > > > > > I added the following fix patch: > > > > > > From: Stephen Rothwell > > > Date: Mon, 4 Dec 2017 14:10:34 +1100 > > > Subject: [PATCH] misc: rtsx: fix symbol clashes > > > > > > Signed-off-by: Stephen Rothwell > > > > Although I'm not sure how to apply this manually without scissors. > > Just take everything from the From: line above to the end and give it > to "git am". Yes, this may involve saving the email and editting it, > sorry about that. If you use the scissors, I can ask Git to deal with all that for me. We like #lazymaintenance. :D -- Lee Jones Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
Re: linux-next: build failure after merge of the mfd tree
Hi Lee, On Mon, 4 Dec 2017 09:39:53 + Lee Jones wrote: > > > I added the following fix patch: > > > > From: Stephen Rothwell > > Date: Mon, 4 Dec 2017 14:10:34 +1100 > > Subject: [PATCH] misc: rtsx: fix symbol clashes > > > > Signed-off-by: Stephen Rothwell > > Although I'm not sure how to apply this manually without scissors. Just take everything from the From: line above to the end and give it to "git am". Yes, this may involve saving the email and editting it, sorry about that. -- Cheers, Stephen Rothwell
Re: linux-next: build failure after merge of the mfd tree
On Mon, 04 Dec 2017, Stephen Rothwell wrote: > Hi Lee, > > After merging the mfd tree, today's linux-next build (powerpc > allyesconfig) failed like this: > > drivers/staging/rts5208/sd.o: In function `.sd_power_off_card3v3': > (.text+0x5760): multiple definition of `.sd_power_off_card3v3' > drivers/misc/cardreader/rtsx_pcr.o:(.text+0x4630): first defined here > drivers/staging/rts5208/sd.o:(.opd+0x378): multiple definition of > `sd_power_off_card3v3' > drivers/misc/cardreader/rtsx_pcr.o:(.opd+0x4f8): first defined here > drivers/staging/rts5208/ms.o: In function `.ms_power_off_card3v3': > (.text+0x5e70): multiple definition of `.ms_power_off_card3v3' > drivers/misc/cardreader/rtsx_pcr.o:(.text+0x46e0): first defined here > drivers/staging/rts5208/ms.o:(.opd+0x360): multiple definition of > `ms_power_off_card3v3' > drivers/misc/cardreader/rtsx_pcr.o:(.opd+0x510): first defined here > > > Caused by commit > > 5da4e04ae480 ("misc: rtsx: Add support for RTS5260") > > I added the following fix patch: > > From: Stephen Rothwell > Date: Mon, 4 Dec 2017 14:10:34 +1100 > Subject: [PATCH] misc: rtsx: fix symbol clashes > > Signed-off-by: Stephen Rothwell Thanks Stephen. Although I'm not sure how to apply this manually without scissors. Might have to do so manually. > --- > drivers/misc/cardreader/rts5260.c | 4 ++-- > drivers/misc/cardreader/rtsx_pcr.c | 4 ++-- > drivers/misc/cardreader/rtsx_pcr.h | 4 ++-- > 3 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/misc/cardreader/rts5260.c > b/drivers/misc/cardreader/rts5260.c > index 3b308640282d..07cb93abf685 100644 > --- a/drivers/misc/cardreader/rts5260.c > +++ b/drivers/misc/cardreader/rts5260.c > @@ -426,9 +426,9 @@ void rts5260_process_ocp(struct rtsx_pcr *pcr) > rtsx_pci_get_ocpstat(pcr, &pcr->ocp_stat); > rts5260_get_ocpstat2(pcr, &pcr->ocp_stat2); > if (pcr->card_exist & SD_EXIST) > - sd_power_off_card3v3(pcr); > + rtsx_sd_power_off_card3v3(pcr); > else if (pcr->card_exist & MS_EXIST) > - ms_power_off_card3v3(pcr); > + rtsx_ms_power_off_card3v3(pcr); > > if (!(pcr->card_exist & MS_EXIST) && !(pcr->card_exist & SD_EXIST)) { > if ((pcr->ocp_stat & (SD_OC_NOW | SD_OC_EVER | > diff --git a/drivers/misc/cardreader/rtsx_pcr.c > b/drivers/misc/cardreader/rtsx_pcr.c > index 99adc67bbf73..5345170fc57b 100644 > --- a/drivers/misc/cardreader/rtsx_pcr.c > +++ b/drivers/misc/cardreader/rtsx_pcr.c > @@ -1208,7 +1208,7 @@ void rtsx_pci_clear_ocpstat(struct rtsx_pcr *pcr) > } > } > > -int sd_power_off_card3v3(struct rtsx_pcr *pcr) > +int rtsx_sd_power_off_card3v3(struct rtsx_pcr *pcr) > { > rtsx_pci_write_register(pcr, CARD_CLK_EN, SD_CLK_EN | > MS_CLK_EN | SD40_CLK_EN, 0); > @@ -1223,7 +1223,7 @@ int sd_power_off_card3v3(struct rtsx_pcr *pcr) > return 0; > } > > -int ms_power_off_card3v3(struct rtsx_pcr *pcr) > +int rtsx_ms_power_off_card3v3(struct rtsx_pcr *pcr) > { > rtsx_pci_write_register(pcr, CARD_CLK_EN, SD_CLK_EN | > MS_CLK_EN | SD40_CLK_EN, 0); > diff --git a/drivers/misc/cardreader/rtsx_pcr.h > b/drivers/misc/cardreader/rtsx_pcr.h > index c544e35d0154..6ea1655db0bb 100644 > --- a/drivers/misc/cardreader/rtsx_pcr.h > +++ b/drivers/misc/cardreader/rtsx_pcr.h > @@ -107,7 +107,7 @@ void rtsx_pci_disable_ocp(struct rtsx_pcr *pcr); > void rtsx_pci_enable_ocp(struct rtsx_pcr *pcr); > int rtsx_pci_get_ocpstat(struct rtsx_pcr *pcr, u8 *val); > void rtsx_pci_clear_ocpstat(struct rtsx_pcr *pcr); > -int sd_power_off_card3v3(struct rtsx_pcr *pcr); > -int ms_power_off_card3v3(struct rtsx_pcr *pcr); > +int rtsx_sd_power_off_card3v3(struct rtsx_pcr *pcr); > +int rtsx_ms_power_off_card3v3(struct rtsx_pcr *pcr); > > #endif -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
Re: linux-next: build failure after merge of the mfd tree
On Mon, Dec 04, 2017 at 02:19:56PM +1100, Stephen Rothwell wrote: > Hi Lee, > > After merging the mfd tree, today's linux-next build (powerpc > allyesconfig) failed like this: > > drivers/staging/rts5208/sd.o: In function `.sd_power_off_card3v3': > (.text+0x5760): multiple definition of `.sd_power_off_card3v3' > drivers/misc/cardreader/rtsx_pcr.o:(.text+0x4630): first defined here > drivers/staging/rts5208/sd.o:(.opd+0x378): multiple definition of > `sd_power_off_card3v3' > drivers/misc/cardreader/rtsx_pcr.o:(.opd+0x4f8): first defined here > drivers/staging/rts5208/ms.o: In function `.ms_power_off_card3v3': > (.text+0x5e70): multiple definition of `.ms_power_off_card3v3' > drivers/misc/cardreader/rtsx_pcr.o:(.text+0x46e0): first defined here > drivers/staging/rts5208/ms.o:(.opd+0x360): multiple definition of > `ms_power_off_card3v3' > drivers/misc/cardreader/rtsx_pcr.o:(.opd+0x510): first defined here > > > Caused by commit > > 5da4e04ae480 ("misc: rtsx: Add support for RTS5260") > > I added the following fix patch: > > From: Stephen Rothwell > Date: Mon, 4 Dec 2017 14:10:34 +1100 > Subject: [PATCH] misc: rtsx: fix symbol clashes > > Signed-off-by: Stephen Rothwell > --- > drivers/misc/cardreader/rts5260.c | 4 ++-- > drivers/misc/cardreader/rtsx_pcr.c | 4 ++-- > drivers/misc/cardreader/rtsx_pcr.h | 4 ++-- > 3 files changed, 6 insertions(+), 6 deletions(-) Acked-by: Greg Kroah-Hartman
linux-next: build failure after merge of the mfd tree
Hi Lee, After merging the mfd tree, today's linux-next build (powerpc allyesconfig) failed like this: drivers/staging/rts5208/sd.o: In function `.sd_power_off_card3v3': (.text+0x5760): multiple definition of `.sd_power_off_card3v3' drivers/misc/cardreader/rtsx_pcr.o:(.text+0x4630): first defined here drivers/staging/rts5208/sd.o:(.opd+0x378): multiple definition of `sd_power_off_card3v3' drivers/misc/cardreader/rtsx_pcr.o:(.opd+0x4f8): first defined here drivers/staging/rts5208/ms.o: In function `.ms_power_off_card3v3': (.text+0x5e70): multiple definition of `.ms_power_off_card3v3' drivers/misc/cardreader/rtsx_pcr.o:(.text+0x46e0): first defined here drivers/staging/rts5208/ms.o:(.opd+0x360): multiple definition of `ms_power_off_card3v3' drivers/misc/cardreader/rtsx_pcr.o:(.opd+0x510): first defined here Caused by commit 5da4e04ae480 ("misc: rtsx: Add support for RTS5260") I added the following fix patch: From: Stephen Rothwell Date: Mon, 4 Dec 2017 14:10:34 +1100 Subject: [PATCH] misc: rtsx: fix symbol clashes Signed-off-by: Stephen Rothwell --- drivers/misc/cardreader/rts5260.c | 4 ++-- drivers/misc/cardreader/rtsx_pcr.c | 4 ++-- drivers/misc/cardreader/rtsx_pcr.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/misc/cardreader/rts5260.c b/drivers/misc/cardreader/rts5260.c index 3b308640282d..07cb93abf685 100644 --- a/drivers/misc/cardreader/rts5260.c +++ b/drivers/misc/cardreader/rts5260.c @@ -426,9 +426,9 @@ void rts5260_process_ocp(struct rtsx_pcr *pcr) rtsx_pci_get_ocpstat(pcr, &pcr->ocp_stat); rts5260_get_ocpstat2(pcr, &pcr->ocp_stat2); if (pcr->card_exist & SD_EXIST) - sd_power_off_card3v3(pcr); + rtsx_sd_power_off_card3v3(pcr); else if (pcr->card_exist & MS_EXIST) - ms_power_off_card3v3(pcr); + rtsx_ms_power_off_card3v3(pcr); if (!(pcr->card_exist & MS_EXIST) && !(pcr->card_exist & SD_EXIST)) { if ((pcr->ocp_stat & (SD_OC_NOW | SD_OC_EVER | diff --git a/drivers/misc/cardreader/rtsx_pcr.c b/drivers/misc/cardreader/rtsx_pcr.c index 99adc67bbf73..5345170fc57b 100644 --- a/drivers/misc/cardreader/rtsx_pcr.c +++ b/drivers/misc/cardreader/rtsx_pcr.c @@ -1208,7 +1208,7 @@ void rtsx_pci_clear_ocpstat(struct rtsx_pcr *pcr) } } -int sd_power_off_card3v3(struct rtsx_pcr *pcr) +int rtsx_sd_power_off_card3v3(struct rtsx_pcr *pcr) { rtsx_pci_write_register(pcr, CARD_CLK_EN, SD_CLK_EN | MS_CLK_EN | SD40_CLK_EN, 0); @@ -1223,7 +1223,7 @@ int sd_power_off_card3v3(struct rtsx_pcr *pcr) return 0; } -int ms_power_off_card3v3(struct rtsx_pcr *pcr) +int rtsx_ms_power_off_card3v3(struct rtsx_pcr *pcr) { rtsx_pci_write_register(pcr, CARD_CLK_EN, SD_CLK_EN | MS_CLK_EN | SD40_CLK_EN, 0); diff --git a/drivers/misc/cardreader/rtsx_pcr.h b/drivers/misc/cardreader/rtsx_pcr.h index c544e35d0154..6ea1655db0bb 100644 --- a/drivers/misc/cardreader/rtsx_pcr.h +++ b/drivers/misc/cardreader/rtsx_pcr.h @@ -107,7 +107,7 @@ void rtsx_pci_disable_ocp(struct rtsx_pcr *pcr); void rtsx_pci_enable_ocp(struct rtsx_pcr *pcr); int rtsx_pci_get_ocpstat(struct rtsx_pcr *pcr, u8 *val); void rtsx_pci_clear_ocpstat(struct rtsx_pcr *pcr); -int sd_power_off_card3v3(struct rtsx_pcr *pcr); -int ms_power_off_card3v3(struct rtsx_pcr *pcr); +int rtsx_sd_power_off_card3v3(struct rtsx_pcr *pcr); +int rtsx_ms_power_off_card3v3(struct rtsx_pcr *pcr); #endif -- 2.15.0 -- Cheers, Stephen Rothwell
Re: linux-next: build failure after merge of the mfd tree
Hi Lee, On Wed, 31 May 2017 12:23:32 +1000 Stephen Rothwell wrote: > > After merging the mfd tree, today's linux-next build (x86_64 allmodconfig) > failed like this: > > drivers/usb/typec/typec_wcove.c: In function 'wcove_typec_pr > obe': > drivers/usb/typec/typec_wcove.c:306:32: error: 'struct intel_soc_pmic' has no > member named 'irq_chip_data_level2' > ret = regmap_irq_get_virq(pmic->irq_chip_data_level2, > ^ > > Caused by commit > > aa32452e6ef9 ("mfd: intel_soc_pmic_bxtwc: Use chained irqs for second level > irq chips") > > interacting with commit > > d2061f9cc32d ("usb: typec: add driver for Intel Whiskey Cove PMIC USB > Type-C PHY") > > from Linus' tree (v4.12-rc1). grep is your friend. :-) > > I have used the mfd tree from next-20170530 for today. I am still getting this failure. -- Cheers, Stephen Rothwell
Re: linux-next: build failure after merge of the mfd tree
Hi Darren, On Wed, 31 May 2017 12:23:32 +1000 Stephen Rothwell wrote: > > After merging the mfd tree, today's linux-next build (x86_64 allmodconfig) > failed like this: > > drivers/usb/typec/typec_wcove.c: In function 'wcove_typec_pr > obe': > drivers/usb/typec/typec_wcove.c:306:32: error: 'struct intel_soc_pmic' has no > member named 'irq_chip_data_level2' > ret = regmap_irq_get_virq(pmic->irq_chip_data_level2, > ^ > > Caused by commit > > aa32452e6ef9 ("mfd: intel_soc_pmic_bxtwc: Use chained irqs for second level > irq chips") > > interacting with commit > > d2061f9cc32d ("usb: typec: add driver for Intel Whiskey Cove PMIC USB > Type-C PHY") > > from Linus' tree (v4.12-rc1). grep is your friend. :-) > > I have used the mfd tree from next-20170530 for today. This also affected the drivers-x86 tree, so I have use the version of that from next-20170530 as well. -- Cheers, Stephen Rothwell
linux-next: build failure after merge of the mfd tree
Hi Lee, After merging the mfd tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/usb/typec/typec_wcove.c: In function 'wcove_typec_pr obe': drivers/usb/typec/typec_wcove.c:306:32: error: 'struct intel_soc_pmic' has no member named 'irq_chip_data_level2' ret = regmap_irq_get_virq(pmic->irq_chip_data_level2, ^ Caused by commit aa32452e6ef9 ("mfd: intel_soc_pmic_bxtwc: Use chained irqs for second level irq chips") interacting with commit d2061f9cc32d ("usb: typec: add driver for Intel Whiskey Cove PMIC USB Type-C PHY") from Linus' tree (v4.12-rc1). grep is your friend. :-) I have used the mfd tree from next-20170530 for today. -- Cheers, Stephen Rothwell
Re: linux-next: build failure after merge of the mfd tree
Hi Lee, On Mon, 10 Apr 2017 07:55:52 +0100 Lee Jones wrote: > > I guess this is still causing an issue in -next? Yeah. > The patch has now been removed from mfd-next and the result pushed. Thanks. -- Cheers, Stephen Rothwell
Re: linux-next: build failure after merge of the mfd tree
On Mon, 10 Apr 2017, Stephen Rothwell wrote: > Hi all, > > On Tue, 04 Apr 2017 15:31:15 +0300 Andy Shevchenko > wrote: > > > > On Tue, 2017-04-04 at 09:21 +0100, Lee Jones wrote: > > > On Tue, 04 Apr 2017, Lee Jones wrote: > > > > > > > On Tue, 04 Apr 2017, Stephen Rothwell wrote: > > > > > > > > > After merging the mfd tree, today's linux-next build (powerpc > > > > > allyesconfig) failed like this: > > > > > > > > > > /home/sfr/next/next/drivers/mfd/intel_soc_pmic_bxtwc.c:25:31: > > > > > fatal error: asm/intel_pmc_ipc.h: No such file or directory > > > > > > > > > > Caused by commit > > > > > > > > > > eb2a445f7d8f ("mfd: intel_soc_pmic: Fix a mess with compilation > > > > > units") > > > > > > > > > > I have reverted that commit for today. > > > > > > > > Andy, > > > > > > > > I'm pulling this commit. Despite you thinking the error is unrelated > > > > to your patch, something is clearly wrong and I don't have time to > > > > investigate. > > > > > > > > Ball is in your court. > > > > > > Okay, I've had a *very* quick looks. > > > > > Seems as if you should be depending on INTEL_PMC_IPC. > > > > As a quick fix, yes. As a proper fix the PMC/SCU mess should be fixed in > > a way to provide a header in include/platform_data/x86. > > > > I will prepare v4. > > Thanks. > > Ping? I guess this is still causing an issue in -next? The patch has now been removed from mfd-next and the result pushed. -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
Re: linux-next: build failure after merge of the mfd tree
Hi all, On Tue, 04 Apr 2017 15:31:15 +0300 Andy Shevchenko wrote: > > On Tue, 2017-04-04 at 09:21 +0100, Lee Jones wrote: > > On Tue, 04 Apr 2017, Lee Jones wrote: > > > > > On Tue, 04 Apr 2017, Stephen Rothwell wrote: > > > > > > > After merging the mfd tree, today's linux-next build (powerpc > > > > allyesconfig) failed like this: > > > > > > > > /home/sfr/next/next/drivers/mfd/intel_soc_pmic_bxtwc.c:25:31: > > > > fatal error: asm/intel_pmc_ipc.h: No such file or directory > > > > > > > > Caused by commit > > > > > > > > eb2a445f7d8f ("mfd: intel_soc_pmic: Fix a mess with compilation > > > > units") > > > > > > > > I have reverted that commit for today. > > > > > > Andy, > > > > > > I'm pulling this commit. Despite you thinking the error is unrelated > > > to your patch, something is clearly wrong and I don't have time to > > > investigate. > > > > > > Ball is in your court. > > > > Okay, I've had a *very* quick looks. > > > Seems as if you should be depending on INTEL_PMC_IPC. > > As a quick fix, yes. As a proper fix the PMC/SCU mess should be fixed in > a way to provide a header in include/platform_data/x86. > > I will prepare v4. > Thanks. Ping? -- Cheers, Stephen Rothwell
Re: linux-next: build failure after merge of the mfd tree
On Tue, 2017-04-04 at 09:21 +0100, Lee Jones wrote: > On Tue, 04 Apr 2017, Lee Jones wrote: > > > On Tue, 04 Apr 2017, Stephen Rothwell wrote: > > > > > Hi Lee, > > > > > > After merging the mfd tree, today's linux-next build (powerpc > > > allyesconfig) failed like this: > > > > > > /home/sfr/next/next/drivers/mfd/intel_soc_pmic_bxtwc.c:25:31: > > > fatal error: asm/intel_pmc_ipc.h: No such file or directory > > > > > > Caused by commit > > > > > > eb2a445f7d8f ("mfd: intel_soc_pmic: Fix a mess with compilation > > > units") > > > > > > I have reverted that commit for today. > > > > Andy, > > > > I'm pulling this commit. Despite you thinking the error is > > unrelated > > to your patch, something is clearly wrong and I don't have time to > > investigate. > > > > Ball is in your court. > > Okay, I've had a *very* quick looks. > Seems as if you should be depending on INTEL_PMC_IPC. As a quick fix, yes. As a proper fix the PMC/SCU mess should be fixed in a way to provide a header in include/platform_data/x86. I will prepare v4. Thanks. -- Andy Shevchenko Intel Finland Oy
Re: linux-next: build failure after merge of the mfd tree
On Tue, 04 Apr 2017, Lee Jones wrote: > On Tue, 04 Apr 2017, Stephen Rothwell wrote: > > > Hi Lee, > > > > After merging the mfd tree, today's linux-next build (powerpc > > allyesconfig) failed like this: > > > > /home/sfr/next/next/drivers/mfd/intel_soc_pmic_bxtwc.c:25:31: fatal error: > > asm/intel_pmc_ipc.h: No such file or directory > > > > Caused by commit > > > > eb2a445f7d8f ("mfd: intel_soc_pmic: Fix a mess with compilation units") > > > > I have reverted that commit for today. > > Andy, > > I'm pulling this commit. Despite you thinking the error is unrelated > to your patch, something is clearly wrong and I don't have time to > investigate. > > Ball is in your court. Okay, I've had a *very* quick looks. Seems as if you should be depending on INTEL_PMC_IPC. -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
Re: linux-next: build failure after merge of the mfd tree
On Tue, 04 Apr 2017, Stephen Rothwell wrote: > Hi Lee, > > After merging the mfd tree, today's linux-next build (powerpc > allyesconfig) failed like this: > > /home/sfr/next/next/drivers/mfd/intel_soc_pmic_bxtwc.c:25:31: fatal error: > asm/intel_pmc_ipc.h: No such file or directory > > Caused by commit > > eb2a445f7d8f ("mfd: intel_soc_pmic: Fix a mess with compilation units") > > I have reverted that commit for today. Andy, I'm pulling this commit. Despite you thinking the error is unrelated to your patch, something is clearly wrong and I don't have time to investigate. Ball is in your court. -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
linux-next: build failure after merge of the mfd tree
Hi Lee, After merging the mfd tree, today's linux-next build (powerpc allyesconfig) failed like this: /home/sfr/next/next/drivers/mfd/intel_soc_pmic_bxtwc.c:25:31: fatal error: asm/intel_pmc_ipc.h: No such file or directory Caused by commit eb2a445f7d8f ("mfd: intel_soc_pmic: Fix a mess with compilation units") I have reverted that commit for today. -- Cheers, Stephen Rothwell
Re: linux-next: build failure after merge of the mfd tree
On Tue, Mar 01, 2016 at 01:35:58AM +, Kuninori Morimoto wrote: > I noticed that you reborned regmap_write_bits() on your latest tree. > I think using/adding regmap_force_update_bits() is good idea IMO. > Can I create such patch ? It might make more sense to rename _force_update_bits() to _write_bits(). signature.asc Description: PGP signature
Re: linux-next: build failure after merge of the mfd tree
Hi Mark I noticed that you reborned regmap_write_bits() on your latest tree. I think using/adding regmap_force_update_bits() is good idea IMO. Can I create such patch ? > Oops, it is my fault. Can you check/test this patch ? > > > From: Kuninori Morimoto > Date: Tue, 1 Mar 2016 10:12:20 +0900 > Subject: [PATCH] regmap: add regmap_force_update_bits() > > commit 23b92e4c ("regmap: remove regmap_write_bits()") > removed regmap_write_bits(), we can use regmap_force_update_bits() > instead of it. > > Signed-off-by: Kuninori Morimoto > --- > drivers/regulator/tps65086-regulator.c | 2 +- > include/linux/regmap.h | 2 ++ > 2 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/regulator/tps65086-regulator.c > b/drivers/regulator/tps65086-regulator.c > index 33f389d..e78b688 100644 > --- a/drivers/regulator/tps65086-regulator.c > +++ b/drivers/regulator/tps65086-regulator.c > @@ -191,7 +191,7 @@ static int tps65086_of_parse_cb(struct device_node *dev, > > /* Check for decay mode */ > if (desc->id <= BUCK6 && of_property_read_bool(config->of_node, > "ti,regulator-decay")) { > - ret = regmap_write_bits(config->regmap, > + ret = regmap_force_update_bits(config->regmap, > regulators[desc->id].decay_reg, > regulators[desc->id].decay_mask, > regulators[desc->id].decay_mask); > diff --git a/include/linux/regmap.h b/include/linux/regmap.h > index 7449792..d6cde49 100644 > --- a/include/linux/regmap.h > +++ b/include/linux/regmap.h > @@ -67,6 +67,8 @@ struct reg_sequence { > > #define regmap_update_bits(map, reg, mask, val) \ > regmap_update_bits_base(map, reg, mask, val, NULL, false, false) > +#define regmap_force_update_bits(map, reg, mask, val) \ > + regmap_update_bits_base(map, reg, mask, val, NULL, false, true) > #define regmap_update_bits_async(map, reg, mask, val)\ > regmap_update_bits_base(map, reg, mask, val, NULL, true, false) > #define regmap_update_bits_check(map, reg, mask, val, change)\ > -- > > > > Best regards > --- > Kuninori Morimoto
Re: linux-next: build failure after merge of the mfd tree
Hi Stephen, Lee > After merging the mfd tree, today's linux-next build (x86_64 allmodconfig) > failed like this: > > drivers/regulator/tps65086-regulator.c:194:9: error: implicit declaration of > function 'regmap_write_bits' [-Werror=implicit-function-declaration] >ret = regmap_write_bits(config->regmap, > ^ > > Caused by commit > > 23b92e4cf5fd ("regmap: remove regmap_write_bits()") > > from the sound-asoc & regmap trees. > > I am not sure why this is suddenly exposed by the mfd tree, but grep > would have been useful when the regmap tree patch was applied. > > I have reverted that regmap commit for today. Oops, it is my fault. Can you check/test this patch ? From: Kuninori Morimoto Date: Tue, 1 Mar 2016 10:12:20 +0900 Subject: [PATCH] regmap: add regmap_force_update_bits() commit 23b92e4c ("regmap: remove regmap_write_bits()") removed regmap_write_bits(), we can use regmap_force_update_bits() instead of it. Signed-off-by: Kuninori Morimoto --- drivers/regulator/tps65086-regulator.c | 2 +- include/linux/regmap.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/regulator/tps65086-regulator.c b/drivers/regulator/tps65086-regulator.c index 33f389d..e78b688 100644 --- a/drivers/regulator/tps65086-regulator.c +++ b/drivers/regulator/tps65086-regulator.c @@ -191,7 +191,7 @@ static int tps65086_of_parse_cb(struct device_node *dev, /* Check for decay mode */ if (desc->id <= BUCK6 && of_property_read_bool(config->of_node, "ti,regulator-decay")) { - ret = regmap_write_bits(config->regmap, + ret = regmap_force_update_bits(config->regmap, regulators[desc->id].decay_reg, regulators[desc->id].decay_mask, regulators[desc->id].decay_mask); diff --git a/include/linux/regmap.h b/include/linux/regmap.h index 7449792..d6cde49 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h @@ -67,6 +67,8 @@ struct reg_sequence { #defineregmap_update_bits(map, reg, mask, val) \ regmap_update_bits_base(map, reg, mask, val, NULL, false, false) +#defineregmap_force_update_bits(map, reg, mask, val) \ + regmap_update_bits_base(map, reg, mask, val, NULL, false, true) #defineregmap_update_bits_async(map, reg, mask, val)\ regmap_update_bits_base(map, reg, mask, val, NULL, true, false) #defineregmap_update_bits_check(map, reg, mask, val, change)\ -- Best regards --- Kuninori Morimoto
linux-next: build failure after merge of the mfd tree
Hi Lee, After merging the mfd tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/regulator/tps65086-regulator.c:194:9: error: implicit declaration of function 'regmap_write_bits' [-Werror=implicit-function-declaration] ret = regmap_write_bits(config->regmap, ^ Caused by commit 23b92e4cf5fd ("regmap: remove regmap_write_bits()") from the sound-asoc & regmap trees. I am not sure why this is suddenly exposed by the mfd tree, but grep would have been useful when the regmap tree patch was applied. I have reverted that regmap commit for today. -- Cheers, Stephen Rothwell
Re: linux-next: build failure after merge of the mfd tree
On Friday 16 October 2015 12:27:04 Stephen Rothwell wrote: > Hi Arnd, > > On Thu, 15 Oct 2015 14:28:20 +0200 Arnd Bergmann wrote: > > > > diff --git a/include/asm-generic/io-64-nonatomic-hi-lo.h > > b/include/asm-generic/io-64-nonatomic-hi-lo.h > > new file mode 100644 > > index ..32b73abce1b0 > > --- /dev/null > > +++ b/include/asm-generic/io-64-nonatomic-hi-lo.h > > @@ -0,0 +1,2 @@ > > +/* XXX: delete asm-generic/io-64-nonatomic-hi-lo.h after converting new > > users */ > > +#include > > Turns out you need the same for io-64-nonatomic-lo-hi.h as well ... > > D'oh! fixed now, thanks for your patience. Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the mfd tree
Hi Arnd, On Thu, 15 Oct 2015 14:28:20 +0200 Arnd Bergmann wrote: > > diff --git a/include/asm-generic/io-64-nonatomic-hi-lo.h > b/include/asm-generic/io-64-nonatomic-hi-lo.h > new file mode 100644 > index ..32b73abce1b0 > --- /dev/null > +++ b/include/asm-generic/io-64-nonatomic-hi-lo.h > @@ -0,0 +1,2 @@ > +/* XXX: delete asm-generic/io-64-nonatomic-hi-lo.h after converting new > users */ > +#include Turns out you need the same for io-64-nonatomic-lo-hi.h as well ... -- Cheers, Stephen Rothwells...@canb.auug.org.au -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the mfd tree
On Thursday 15 October 2015 14:04:07 Christoph Hellwig wrote: > On Thu, Oct 15, 2015 at 10:59:32AM +0200, Arnd Bergmann wrote: > > The patch looks good, should we do something to prevent that from > > becoming a problem when Linus pulls our branches? > > > > This commit is at the bottom of my asm-generic git tree, so Lee could merge > > that one commit into his tree and fix up the merge correctly. > > > > However, I also now see that > > drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c > > has the same problem, so maybe it's better to add a temporary file > > with the old name containing "#include ", > > which I will remove in the following merge window or as a follow-up. > > I guess we really need that. Do you want to do a quick fixup or should I send > a patch? I've applied this one now. Arnd >From b3d8d0ee6c9781d54d4180c5f1d36a12f0437c86 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Thu, 15 Oct 2015 14:24:45 +0200 Subject: [PATCH] asm-generic: temporarily add back asm-generic/io-64-nonatomic-hi-lo.h New users of this file still start showing up in linux-next, so it's better to have a migration strategy. All existing users as of 4.3-rc4 are converted to use linux/io-64-nonatomic-hi-lo.h, and after 4.4-rc1 we can change all the new ones that have come in since, and then remove this file again. Signed-off-by: Arnd Bergmann Reported-by: LKP project diff --git a/include/asm-generic/io-64-nonatomic-hi-lo.h b/include/asm-generic/io-64-nonatomic-hi-lo.h new file mode 100644 index ..32b73abce1b0 --- /dev/null +++ b/include/asm-generic/io-64-nonatomic-hi-lo.h @@ -0,0 +1,2 @@ +/* XXX: delete asm-generic/io-64-nonatomic-hi-lo.h after converting new users */ +#include -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the mfd tree
On Thu, Oct 15, 2015 at 10:59:32AM +0200, Arnd Bergmann wrote: > The patch looks good, should we do something to prevent that from > becoming a problem when Linus pulls our branches? > > This commit is at the bottom of my asm-generic git tree, so Lee could merge > that one commit into his tree and fix up the merge correctly. > > However, I also now see that > drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c > has the same problem, so maybe it's better to add a temporary file > with the old name containing "#include ", > which I will remove in the following merge window or as a follow-up. I guess we really need that. Do you want to do a quick fixup or should I send a patch? -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the mfd tree
On Thu, 2015-10-15 at 10:59 +0200, Arnd Bergmann wrote: > > > On Thursday 15 October 2015 13:26:02 Stephen Rothwell wrote: > However, I also now see that > drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c > has the same problem, so maybe it's better to add a temporary file > with the old name containing "#include -hi.h>", > which I will remove in the following merge window or as a follow-up. > > Yet another way would be for me to wait until Linus has pulled both > mfd and netdev been merged, and I'll let him know of the conflict > in my pull request. There are at least couple of drivers where I introduced a use of lo_hi_* helpers (idma64.c and xhci header if the latter made Greg's tree). Though didn't check if it's should be fixed. For me looks like temporary (for one cycle) file might be a better work around. -- Andy Shevchenko Intel Finland Oy -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the mfd tree
On Thu, 15 Oct 2015, Arnd Bergmann wrote: > On Thursday 15 October 2015 13:26:02 Stephen Rothwell wrote: > > After merging the mfd tree, today's linux-next build (x86_64 allmodconfig) > > failed like this: > > > > drivers/mfd/intel-lpss.c:29:47: fatal error: > > asm-generic/io-64-nonatomic-lo-hi.h: No such file or directory > > #include > >^ > > > > Caused by commit > > > > 6a1d82fbc8e8 ("mfd: intel-lpss: Use writeq() helper") > > > > interacting with commit > > > > f626fe17485b ("move io-64-nonatomic*.h out of asm-generic") > > > > from the asm-generic tree. > > > > I have added the following merge fix patch and can carry it as necessary. > > > > From: Stephen Rothwell > > Date: Thu, 15 Oct 2015 13:23:20 +1100 > > Subject: [PATCH] mfd: fix for "move io-64-nonatomic*.h out of asm-generic" > > > > Signed-off-by: Stephen Rothwell > > The patch looks good, should we do something to prevent that from > becoming a problem when Linus pulls our branches? > > This commit is at the bottom of my asm-generic git tree, so Lee could merge > that one commit into his tree and fix up the merge correctly. > > However, I also now see that > drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c > has the same problem, so maybe it's better to add a temporary file > with the old name containing "#include ", > which I will remove in the following merge window or as a follow-up. > > Yet another way would be for me to wait until Linus has pulled both > mfd and netdev been merged, and I'll let him know of the conflict > in my pull request. I'll remain flexible. Whatever you think is the best solution we'll go with and I'll facilitate. -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the mfd tree
On Thursday 15 October 2015 13:26:02 Stephen Rothwell wrote: > After merging the mfd tree, today's linux-next build (x86_64 allmodconfig) > failed like this: > > drivers/mfd/intel-lpss.c:29:47: fatal error: > asm-generic/io-64-nonatomic-lo-hi.h: No such file or directory > #include >^ > > Caused by commit > > 6a1d82fbc8e8 ("mfd: intel-lpss: Use writeq() helper") > > interacting with commit > > f626fe17485b ("move io-64-nonatomic*.h out of asm-generic") > > from the asm-generic tree. > > I have added the following merge fix patch and can carry it as necessary. > > From: Stephen Rothwell > Date: Thu, 15 Oct 2015 13:23:20 +1100 > Subject: [PATCH] mfd: fix for "move io-64-nonatomic*.h out of asm-generic" > > Signed-off-by: Stephen Rothwell The patch looks good, should we do something to prevent that from becoming a problem when Linus pulls our branches? This commit is at the bottom of my asm-generic git tree, so Lee could merge that one commit into his tree and fix up the merge correctly. However, I also now see that drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c has the same problem, so maybe it's better to add a temporary file with the old name containing "#include ", which I will remove in the following merge window or as a follow-up. Yet another way would be for me to wait until Linus has pulled both mfd and netdev been merged, and I'll let him know of the conflict in my pull request. Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the mfd tree
Hi Stephen, [auto build test ERROR on next-20151013 -- if it's inappropriate base, please suggest rules for selecting the more suitable base] url: https://github.com/0day-ci/linux/commits/Stephen-Rothwell/linux-next-build-failure-after-merge-of-the-mfd-tree/20151015-102814 config: i386-allmodconfig (attached as .config) reproduce: # save the attached .config to linux build tree make ARCH=i386 All errors (new ones prefixed by >>): >> drivers/mfd/intel-lpss.c:28:41: fatal error: linux/io-64-nonatomic-lo-hi.h: >> No such file or directory compilation terminated. vim +28 drivers/mfd/intel-lpss.c 22 #include 23 #include 24 #include 25 #include 26 #include 27 #include > 28 #include 29 30 #include "intel-lpss.h" 31 --- 0-DAY kernel test infrastructureOpen Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation .config.gz Description: Binary data
linux-next: build failure after merge of the mfd tree
Hi Lee, After merging the mfd tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/mfd/intel-lpss.c:29:47: fatal error: asm-generic/io-64-nonatomic-lo-hi.h: No such file or directory #include ^ Caused by commit 6a1d82fbc8e8 ("mfd: intel-lpss: Use writeq() helper") interacting with commit f626fe17485b ("move io-64-nonatomic*.h out of asm-generic") from the asm-generic tree. I have added the following merge fix patch and can carry it as necessary. From: Stephen Rothwell Date: Thu, 15 Oct 2015 13:23:20 +1100 Subject: [PATCH] mfd: fix for "move io-64-nonatomic*.h out of asm-generic" Signed-off-by: Stephen Rothwell --- drivers/mfd/intel-lpss.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/mfd/intel-lpss.c b/drivers/mfd/intel-lpss.c index 001a7d7708ce..6255513f54c7 100644 --- a/drivers/mfd/intel-lpss.c +++ b/drivers/mfd/intel-lpss.c @@ -25,8 +25,7 @@ #include #include #include - -#include +#include #include "intel-lpss.h" -- 2.5.1 -- Cheers, Stephen Rothwells...@canb.auug.org.au -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the mfd tree
Hi Stephen, On Wed, Mar 04, 2015 at 11:34:29AM +1100, Stephen Rothwell wrote: > Hi Lee, > > After merging the mfd tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > drivers/mfd/mt6397-core.c: In function 'mt6397_irq_domain_map': > drivers/mfd/mt6397-core.c:124:2: error: implicit declaration of function > 'set_irq_flags' [-Werror=implicit-function-declaration] > set_irq_flags(irq, IRQF_VALID); > ^ > drivers/mfd/mt6397-core.c:124:21: error: 'IRQF_VALID' undeclared (first use > in this function) > set_irq_flags(irq, IRQF_VALID); > ^ > drivers/mfd/mt6397-core.c:124:21: note: each undeclared identifier is > reported only once for each function it appears in > > Caused by commit 06d1bcedc888 ("mfd: Add support for the MediaTek > MT6397 PMIC"). > > I have used the mfd tree from next-20150303 for today. Thanks for noting. I have just sent a patch fixing this. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the mfd tree
Hi all, On Wed, 4 Mar 2015 11:34:29 +1100 Stephen Rothwell wrote: > > After merging the mfd tree, today's linux-next build (x86_64 > allmodconfig) failed like this: My email to Flora Fu bounced: : host mailgw02.mediatek.com[210.61.82.184] said: 550 Relaying mail to flora...@mediatek.com is not allowed (in reply to RCPT TO command) So someone might like to let Flora Fu know. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpmlvF2wPhOp.pgp Description: OpenPGP digital signature
linux-next: build failure after merge of the mfd tree
Hi Lee, After merging the mfd tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/mfd/mt6397-core.c: In function 'mt6397_irq_domain_map': drivers/mfd/mt6397-core.c:124:2: error: implicit declaration of function 'set_irq_flags' [-Werror=implicit-function-declaration] set_irq_flags(irq, IRQF_VALID); ^ drivers/mfd/mt6397-core.c:124:21: error: 'IRQF_VALID' undeclared (first use in this function) set_irq_flags(irq, IRQF_VALID); ^ drivers/mfd/mt6397-core.c:124:21: note: each undeclared identifier is reported only once for each function it appears in Caused by commit 06d1bcedc888 ("mfd: Add support for the MediaTek MT6397 PMIC"). I have used the mfd tree from next-20150303 for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpbIwuLggXKs.pgp Description: OpenPGP digital signature
linux-next: build failure after merge of the mfd tree
Hi Lee, After merging the mfd tree, today's linux-next build (x86_64 allmodconfig) failed like this: In file included from drivers/mfd/sky81452.c:29:0: include/linux/mfd/sky81452.h:24:52: fatal error: linux/platform_data/sky81452-backlight.h: No such file or directory #include ^ Caused by commit f4eaf386bcf1 ("mfd: Add support for Skyworks SKY81452 driver"). I have used the mfd tree from next-20141110 for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpT0dUElCYq7.pgp Description: OpenPGP digital signature
Re: linux-next: build failure after merge of the mfd tree
On Tue, 04 Nov 2014, Krzysztof Kozlowski wrote: > On wto, 2014-11-04 at 16:40 +1100, Stephen Rothwell wrote: > > > > After merging the mfd tree, today's linux-next build (powerpc allyesconfig) > > failed like this: [Crash, bang, wallop] > > And so on ... > > > > Caused by commit 9d5f4c2c748e ("mfd: max77686/802: Remove support for > > board files") from the mfd tree. > > > > I reverted that commit for today. > > The commit depends on other patches from a set which hadn't been > applied. Please drop it. It is done! -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the mfd tree
On wto, 2014-11-04 at 16:40 +1100, Stephen Rothwell wrote: > Hi all, > > After merging the mfd tree, today's linux-next build (powerpc allyesconfig) > failed like this: > > drivers/regulator/max77686.c:432:13: warning: 'struct max77686_platform_data' > declared inside parameter list > struct max77686_platform_data *pdata) > ^ > drivers/regulator/max77686.c:432:13: warning: its scope is only this > definition or declaration, which is probably not what you want > drivers/regulator/max77686.c: In function 'max77686_pmic_dt_parse_pdata': > drivers/regulator/max77686.c:447:7: error: dereferencing pointer to > incomplete type > pdata->num_regulators = ARRAY_SIZE(regulators); >^ > drivers/regulator/max77686.c:448:42: error: dereferencing pointer to > incomplete type > rdata = devm_kzalloc(&pdev->dev, sizeof(*rdata) * > ^ > drivers/regulator/max77686.c:449:14: error: dereferencing pointer to > incomplete type > pdata->num_regulators, GFP_KERNEL); > ^ > drivers/regulator/max77686.c:455:23: error: dereferencing pointer to > incomplete type > for (i = 0; i < pdata->num_regulators; i++) { >^ > drivers/regulator/max77686.c:460:3: error: invalid use of undefined type > 'struct max77686_regulator_data' >rdata[i].initdata = rmatch.init_data; >^ > drivers/regulator/max77686.c:460:8: error: dereferencing pointer to > incomplete type >rdata[i].initdata = rmatch.init_data; > ^ > drivers/regulator/max77686.c:461:3: error: invalid use of undefined type > 'struct max77686_regulator_data' >rdata[i].of_node = rmatch.of_node; >^ > drivers/regulator/max77686.c:461:8: error: dereferencing pointer to > incomplete type >rdata[i].of_node = rmatch.of_node; > ^ > drivers/regulator/max77686.c:464:7: error: dereferencing pointer to > incomplete type > pdata->regulators = rdata; >^ > > And so on ... > > Caused by commit 9d5f4c2c748e ("mfd: max77686/802: Remove support for > board files") from the mfd tree. > > I reverted that commit for today. The commit depends on other patches from a set which hadn't been applied. Please drop it. Best regards, Krzysztof -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
linux-next: build failure after merge of the mfd tree
Hi all, After merging the mfd tree, today's linux-next build (powerpc allyesconfig) failed like this: drivers/regulator/max77686.c:432:13: warning: 'struct max77686_platform_data' declared inside parameter list struct max77686_platform_data *pdata) ^ drivers/regulator/max77686.c:432:13: warning: its scope is only this definition or declaration, which is probably not what you want drivers/regulator/max77686.c: In function 'max77686_pmic_dt_parse_pdata': drivers/regulator/max77686.c:447:7: error: dereferencing pointer to incomplete type pdata->num_regulators = ARRAY_SIZE(regulators); ^ drivers/regulator/max77686.c:448:42: error: dereferencing pointer to incomplete type rdata = devm_kzalloc(&pdev->dev, sizeof(*rdata) * ^ drivers/regulator/max77686.c:449:14: error: dereferencing pointer to incomplete type pdata->num_regulators, GFP_KERNEL); ^ drivers/regulator/max77686.c:455:23: error: dereferencing pointer to incomplete type for (i = 0; i < pdata->num_regulators; i++) { ^ drivers/regulator/max77686.c:460:3: error: invalid use of undefined type 'struct max77686_regulator_data' rdata[i].initdata = rmatch.init_data; ^ drivers/regulator/max77686.c:460:8: error: dereferencing pointer to incomplete type rdata[i].initdata = rmatch.init_data; ^ drivers/regulator/max77686.c:461:3: error: invalid use of undefined type 'struct max77686_regulator_data' rdata[i].of_node = rmatch.of_node; ^ drivers/regulator/max77686.c:461:8: error: dereferencing pointer to incomplete type rdata[i].of_node = rmatch.of_node; ^ drivers/regulator/max77686.c:464:7: error: dereferencing pointer to incomplete type pdata->regulators = rdata; ^ And so on ... Caused by commit 9d5f4c2c748e ("mfd: max77686/802: Remove support for board files") from the mfd tree. I reverted that commit for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpY9szjVEzM8.pgp Description: OpenPGP digital signature
Re: linux-next: build failure after merge of the mfd tree
On Sat, 23 Aug 2014, Stephen Rothwell wrote: > Hi Lee, > > After merging the mfd tree, today's linux-next build (x86_64 allmodconfig) > failed like this: > > ERROR: "wm8994_base_regmap_config" [drivers/mfd/wm8994-core.ko] undefined! > ERROR: "wm8994_irq_init" [drivers/mfd/wm8994-core.ko] undefined! > ERROR: "wm1811_regmap_config" [drivers/mfd/wm8994-core.ko] undefined! > ERROR: "wm8958_regmap_config" [drivers/mfd/wm8994-core.ko] undefined! > ERROR: "wm8994_regmap_config" [drivers/mfd/wm8994-core.ko] undefined! > > Presumably caused by commit a3ee6a4e2729 ("mfd: wm8994: Allow modular > build"). > > I have used the mfd tree from next-20140822 for today. I fixed this at 10 o'clock this morning? When did you pull? -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
linux-next: build failure after merge of the mfd tree
Hi Lee, After merging the mfd tree, today's linux-next build (x86_64 allmodconfig) failed like this: ERROR: "wm8994_base_regmap_config" [drivers/mfd/wm8994-core.ko] undefined! ERROR: "wm8994_irq_init" [drivers/mfd/wm8994-core.ko] undefined! ERROR: "wm1811_regmap_config" [drivers/mfd/wm8994-core.ko] undefined! ERROR: "wm8958_regmap_config" [drivers/mfd/wm8994-core.ko] undefined! ERROR: "wm8994_regmap_config" [drivers/mfd/wm8994-core.ko] undefined! Presumably caused by commit a3ee6a4e2729 ("mfd: wm8994: Allow modular build"). I have used the mfd tree from next-20140822 for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au signature.asc Description: PGP signature
Re: linux-next: build failure after merge of the mfd tree
Hi Rob, On Tue, Apr 09, 2013 at 11:50:30AM -0500, Rob Herring wrote: > On Tue, Apr 9, 2013 at 11:12 AM, Samuel Ortiz wrote: > > > > On Tue, Apr 09, 2013 at 07:47:40PM +0400, Alexander Shiyan wrote: > >> > On Mon, Apr 08, 2013 at 08:27:49PM +0400, Alexander Shiyan wrote: > > [...] > > >> From 3296415f29818a430bad12c92dc65cd81e4d133f Mon Sep 17 00:00:00 2001 > >> From: Alexander Shiyan > >> Date: Tue, 9 Apr 2013 19:41:27 +0400 > >> Subject: [PATCH] of: add stub of_get_parent for non-OF builds > >> > >> Fixes build error on x86_64 allmodconfig, introduced by commit > >> 5ab3a89a741f ("mfd: syscon: Add non-DT support"). > >> > >> drivers/regulator/anatop-regulator.c: In function 'anatop_regulator_probe': > >> drivers/regulator/anatop-regulator.c:134:2: error: implicit declaration of > >> function 'of_get_parent' [-Werror=implicit-function-declaration] > >> > >> Signed-off-by: Alexander Shiyan > >> --- > >> include/linux/of.h | 5 + > >> 1 file changed, 5 insertions(+) > >> > >> diff --git a/include/linux/of.h b/include/linux/of.h > >> index a0f1292..9f5923f 100644 > >> --- a/include/linux/of.h > >> +++ b/include/linux/of.h > >> @@ -353,6 +353,11 @@ static inline struct device_node > >> *of_find_node_by_name(struct device_node *from, > >> return NULL; > >> } > >> > >> +static inline struct device_node *of_get_parent(const struct device_node > >> *node) > >> +{ > >> + return NULL; > >> +} > >> + > > That looks like a proper fix, but I'd like to get Grant or/and Rob's ACK for > > it before merging it. Please look at MAINTAINERS and cc them on this thread. > > Acked-by: Rob Herring Thanks, I am pushing this patch through the mfd-next tree. Cheers, Samuel. -- Intel Open Source Technology Centre http://oss.intel.com/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the mfd tree
On Tue, Apr 9, 2013 at 11:12 AM, Samuel Ortiz wrote: > Hi Alexander, > > On Tue, Apr 09, 2013 at 07:47:40PM +0400, Alexander Shiyan wrote: >> > On Mon, Apr 08, 2013 at 08:27:49PM +0400, Alexander Shiyan wrote: [...] >> From 3296415f29818a430bad12c92dc65cd81e4d133f Mon Sep 17 00:00:00 2001 >> From: Alexander Shiyan >> Date: Tue, 9 Apr 2013 19:41:27 +0400 >> Subject: [PATCH] of: add stub of_get_parent for non-OF builds >> >> Fixes build error on x86_64 allmodconfig, introduced by commit >> 5ab3a89a741f ("mfd: syscon: Add non-DT support"). >> >> drivers/regulator/anatop-regulator.c: In function 'anatop_regulator_probe': >> drivers/regulator/anatop-regulator.c:134:2: error: implicit declaration of >> function 'of_get_parent' [-Werror=implicit-function-declaration] >> >> Signed-off-by: Alexander Shiyan >> --- >> include/linux/of.h | 5 + >> 1 file changed, 5 insertions(+) >> >> diff --git a/include/linux/of.h b/include/linux/of.h >> index a0f1292..9f5923f 100644 >> --- a/include/linux/of.h >> +++ b/include/linux/of.h >> @@ -353,6 +353,11 @@ static inline struct device_node >> *of_find_node_by_name(struct device_node *from, >> return NULL; >> } >> >> +static inline struct device_node *of_get_parent(const struct device_node >> *node) >> +{ >> + return NULL; >> +} >> + > That looks like a proper fix, but I'd like to get Grant or/and Rob's ACK for > it before merging it. Please look at MAINTAINERS and cc them on this thread. Acked-by: Rob Herring -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the mfd tree
Hi Alexander, On Tue, Apr 09, 2013 at 07:47:40PM +0400, Alexander Shiyan wrote: > > On Mon, Apr 08, 2013 at 08:27:49PM +0400, Alexander Shiyan wrote: > > > > > > After merging the mfd tree, today's linux-next build (x86_64 > > > > > > allmodconfig) > > > > > > failed like this: > > > > > > > > > > > > drivers/regulator/anatop-regulator.c: In function > > > > > > 'anatop_regulator_probe': > > > > > > drivers/regulator/anatop-regulator.c:134:2: error: implicit > > > > > > declaration of function 'of_get_parent' > > > > > > [-Werror=implicit-function-declaration] > > > > > > > > > > > > Caused by commit 5ab3a89a741f ("mfd: syscon: Add non-DT support"). > > > > > > > > > > > > I have used the mfd tree from next-20130405 for today. > > > > > > > > > > This means that we do not have empty declarations for the > > > > > of_xx functions in linux/of.h for !CONFIG_OF. > > > > > OK to declare these functions or any other opinions? > > > > Ok with me, but you'd need to get Grant and Rob's ACK. > ... > > > Subject: [PATCH] regulator: anatop: Make select dependency from > > > HAVE_IMX_ANATOP symbol > > > > > > This patch make selection of anatop-regulator from HAVE_IMX_ANATOP > > > kernel symbol. This fixes build kernel with syscon driver but without > > > oftree support. > ... > > This does look like a band-aid solution to me. Yes, it will fix the crash, > > but > > you're restricting this code to a much smaller architecture set. AFAIK > > linux-next is not tested on that arch, for example. > > OK, the second solution: > > From 3296415f29818a430bad12c92dc65cd81e4d133f Mon Sep 17 00:00:00 2001 > From: Alexander Shiyan > Date: Tue, 9 Apr 2013 19:41:27 +0400 > Subject: [PATCH] of: add stub of_get_parent for non-OF builds > > Fixes build error on x86_64 allmodconfig, introduced by commit > 5ab3a89a741f ("mfd: syscon: Add non-DT support"). > > drivers/regulator/anatop-regulator.c: In function 'anatop_regulator_probe': > drivers/regulator/anatop-regulator.c:134:2: error: implicit declaration of > function 'of_get_parent' [-Werror=implicit-function-declaration] > > Signed-off-by: Alexander Shiyan > --- > include/linux/of.h | 5 + > 1 file changed, 5 insertions(+) > > diff --git a/include/linux/of.h b/include/linux/of.h > index a0f1292..9f5923f 100644 > --- a/include/linux/of.h > +++ b/include/linux/of.h > @@ -353,6 +353,11 @@ static inline struct device_node > *of_find_node_by_name(struct device_node *from, > return NULL; > } > > +static inline struct device_node *of_get_parent(const struct device_node > *node) > +{ > + return NULL; > +} > + That looks like a proper fix, but I'd like to get Grant or/and Rob's ACK for it before merging it. Please look at MAINTAINERS and cc them on this thread. Cheers, Samuel. -- Intel Open Source Technology Centre http://oss.intel.com/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re[2]: linux-next: build failure after merge of the mfd tree
> On Mon, Apr 08, 2013 at 08:27:49PM +0400, Alexander Shiyan wrote: > > > > > After merging the mfd tree, today's linux-next build (x86_64 > > > > > allmodconfig) > > > > > failed like this: > > > > > > > > > > drivers/regulator/anatop-regulator.c: In function > > > > > 'anatop_regulator_probe': > > > > > drivers/regulator/anatop-regulator.c:134:2: error: implicit > > > > > declaration of function 'of_get_parent' > > > > > [-Werror=implicit-function-declaration] > > > > > > > > > > Caused by commit 5ab3a89a741f ("mfd: syscon: Add non-DT support"). > > > > > > > > > > I have used the mfd tree from next-20130405 for today. > > > > > > > > This means that we do not have empty declarations for the > > > > of_xx functions in linux/of.h for !CONFIG_OF. > > > > OK to declare these functions or any other opinions? > > > Ok with me, but you'd need to get Grant and Rob's ACK. ... > > Subject: [PATCH] regulator: anatop: Make select dependency from > > HAVE_IMX_ANATOP symbol > > > > This patch make selection of anatop-regulator from HAVE_IMX_ANATOP > > kernel symbol. This fixes build kernel with syscon driver but without > > oftree support. ... > This does look like a band-aid solution to me. Yes, it will fix the crash, but > you're restricting this code to a much smaller architecture set. AFAIK > linux-next is not tested on that arch, for example. OK, the second solution: From 3296415f29818a430bad12c92dc65cd81e4d133f Mon Sep 17 00:00:00 2001 From: Alexander Shiyan Date: Tue, 9 Apr 2013 19:41:27 +0400 Subject: [PATCH] of: add stub of_get_parent for non-OF builds Fixes build error on x86_64 allmodconfig, introduced by commit 5ab3a89a741f ("mfd: syscon: Add non-DT support"). drivers/regulator/anatop-regulator.c: In function 'anatop_regulator_probe': drivers/regulator/anatop-regulator.c:134:2: error: implicit declaration of function 'of_get_parent' [-Werror=implicit-function-declaration] Signed-off-by: Alexander Shiyan --- include/linux/of.h | 5 + 1 file changed, 5 insertions(+) diff --git a/include/linux/of.h b/include/linux/of.h index a0f1292..9f5923f 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -353,6 +353,11 @@ static inline struct device_node *of_find_node_by_name(struct device_node *from, return NULL; } +static inline struct device_node *of_get_parent(const struct device_node *node) +{ + return NULL; +} + static inline bool of_have_populated_dt(void) { return false; -- 1.8.1.5 --- N�r��yb�X��ǧv�^�){.n�+{zX����ܨ}���Ơz�&j:+v���zZ+��+zf���h���~i���z��w���?�&�)ߢf��^jǫy�m��@A�a��� 0��h���i
Re: linux-next: build failure after merge of the mfd tree
Hi Alexander, On Mon, Apr 08, 2013 at 08:27:49PM +0400, Alexander Shiyan wrote: > > > > After merging the mfd tree, today's linux-next build (x86_64 > > > > allmodconfig) > > > > failed like this: > > > > > > > > drivers/regulator/anatop-regulator.c: In function > > > > 'anatop_regulator_probe': > > > > drivers/regulator/anatop-regulator.c:134:2: error: implicit declaration > > > > of function 'of_get_parent' [-Werror=implicit-function-declaration] > > > > > > > > Caused by commit 5ab3a89a741f ("mfd: syscon: Add non-DT support"). > > > > > > > > I have used the mfd tree from next-20130405 for today. > > > > > > This means that we do not have empty declarations for the > > > of_xx functions in linux/of.h for !CONFIG_OF. > > > OK to declare these functions or any other opinions? > > Ok with me, but you'd need to get Grant and Rob's ACK. > > I've revised my initial opinion and write a quick patch for fix this issue. > > From a884d309d2978cbc44c52b650d669e56fef664e2 Mon Sep 17 00:00:00 2001 > From: Alexander Shiyan > Date: Mon, 8 Apr 2013 19:13:10 +0400 > Subject: [PATCH] regulator: anatop: Make select dependency from > HAVE_IMX_ANATOP symbol > > This patch make selection of anatop-regulator from HAVE_IMX_ANATOP > kernel symbol. This fixes build kernel with syscon driver but without > oftree support. > > Signed-off-by: Alexander Shiyan > --- > drivers/regulator/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig > index a5d97ea..078932d 100644 > --- a/drivers/regulator/Kconfig > +++ b/drivers/regulator/Kconfig > @@ -133,7 +133,7 @@ config REGULATOR_FAN53555 > > config REGULATOR_ANATOP > tristate "Freescale i.MX on-chip ANATOP LDO regulators" > - depends on MFD_SYSCON > + depends on HAVE_IMX_ANATOP This does look like a band-aid solution to me. Yes, it will fix the crash, but you're restricting this code to a much smaller architecture set. AFAIK linux-next is not tested on that arch, for example. Cheers, Samuel. -- Intel Open Source Technology Centre http://oss.intel.com/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re[2]: linux-next: build failure after merge of the mfd tree
> > > After merging the mfd tree, today's linux-next build (x86_64 allmodconfig) > > > failed like this: > > > > > > drivers/regulator/anatop-regulator.c: In function > > > 'anatop_regulator_probe': > > > drivers/regulator/anatop-regulator.c:134:2: error: implicit declaration > > > of function 'of_get_parent' [-Werror=implicit-function-declaration] > > > > > > Caused by commit 5ab3a89a741f ("mfd: syscon: Add non-DT support"). > > > > > > I have used the mfd tree from next-20130405 for today. > > > > This means that we do not have empty declarations for the > > of_xx functions in linux/of.h for !CONFIG_OF. > > OK to declare these functions or any other opinions? > Ok with me, but you'd need to get Grant and Rob's ACK. I've revised my initial opinion and write a quick patch for fix this issue. From a884d309d2978cbc44c52b650d669e56fef664e2 Mon Sep 17 00:00:00 2001 From: Alexander Shiyan Date: Mon, 8 Apr 2013 19:13:10 +0400 Subject: [PATCH] regulator: anatop: Make select dependency from HAVE_IMX_ANATOP symbol This patch make selection of anatop-regulator from HAVE_IMX_ANATOP kernel symbol. This fixes build kernel with syscon driver but without oftree support. Signed-off-by: Alexander Shiyan --- drivers/regulator/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig index a5d97ea..078932d 100644 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig @@ -133,7 +133,7 @@ config REGULATOR_FAN53555 config REGULATOR_ANATOP tristate "Freescale i.MX on-chip ANATOP LDO regulators" - depends on MFD_SYSCON + depends on HAVE_IMX_ANATOP help Say y here to support Freescale i.MX on-chip ANATOP LDOs regulators. It is recommended that this option be -- 1.8.1.5 ---
Re: linux-next: build failure after merge of the mfd tree
Hi Alexander, On Mon, Apr 08, 2013 at 08:45:51AM +0400, Alexander Shiyan wrote: > Hello. > > > After merging the mfd tree, today's linux-next build (x86_64 allmodconfig) > > failed like this: > > > > drivers/regulator/anatop-regulator.c: In function 'anatop_regulator_probe': > > drivers/regulator/anatop-regulator.c:134:2: error: implicit declaration of > > function 'of_get_parent' [-Werror=implicit-function-declaration] > > > > Caused by commit 5ab3a89a741f ("mfd: syscon: Add non-DT support"). > > > > I have used the mfd tree from next-20130405 for today. > > This means that we do not have empty declarations for the > of_xx functions in linux/of.h for !CONFIG_OF. > OK to declare these functions or any other opinions? Ok with me, but you'd need to get Grant and Rob's ACK. Cheers, Samuel. -- Intel Open Source Technology Centre http://oss.intel.com/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the mfd tree
Hello. > After merging the mfd tree, today's linux-next build (x86_64 allmodconfig) > failed like this: > > drivers/regulator/anatop-regulator.c: In function 'anatop_regulator_probe': > drivers/regulator/anatop-regulator.c:134:2: error: implicit declaration of > function 'of_get_parent' [-Werror=implicit-function-declaration] > > Caused by commit 5ab3a89a741f ("mfd: syscon: Add non-DT support"). > > I have used the mfd tree from next-20130405 for today. This means that we do not have empty declarations for the of_xx functions in linux/of.h for !CONFIG_OF. OK to declare these functions or any other opinions? ---
linux-next: build failure after merge of the mfd tree
Hi Samuel, After merging the mfd tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/regulator/anatop-regulator.c: In function 'anatop_regulator_probe': drivers/regulator/anatop-regulator.c:134:2: error: implicit declaration of function 'of_get_parent' [-Werror=implicit-function-declaration] Caused by commit 5ab3a89a741f ("mfd: syscon: Add non-DT support"). I have used the mfd tree from next-20130405 for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp5qbf1Qgtuh.pgp Description: PGP signature
Re: linux-next: build failure after merge of the mfd tree
Hi Stephen, On Tue, Sep 25, 2012 at 01:47:35PM +1000, Stephen Rothwell wrote: > Hi Samuel, > > After merging the mfd tree, today's linux-next build (x86_64 allmodconfig) > failed like this: > > FATAL: modpost: GPL-incompatible module tps65217_bl.ko uses GPL-only symbol > 'platform_driver_unregister' > > Caused by commit dbc14ec43af2 ("backlight: Add TPS65217 WLED driver"). > > I have used the mfd tree from next-20120924 for today. Thanks for the heads up, it's all fixed now. Cheers, Samuel. -- Intel Open Source Technology Centre http://oss.intel.com/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the mfd tree
Hi Stephen, El Tue, Sep 25, 2012 at 01:47:35PM +1000 Stephen Rothwell ha dit: > After merging the mfd tree, today's linux-next build (x86_64 allmodconfig) > failed like this: > > FATAL: modpost: GPL-incompatible module tps65217_bl.ko uses GPL-only symbol > 'platform_driver_unregister' > > Caused by commit dbc14ec43af2 ("backlight: Add TPS65217 WLED driver"). > > I have used the mfd tree from next-20120924 for today. the module license of that driver is "GPLv2", apparently this should be "GPL v2". for testing i used a built-in driver, so i didn't see the problem. i will submit a patch with the corrected license string later this day best regards -- Matthias Kaehlcke Embedded Linux Developer Amsterdam The only power to which man should aspire is that which he exercises over himself (Elie Wiesel) .''`. using free software / Debian GNU/Linux | http://debian.org : :' : `. `'` gpg --keyserver pgp.mit.edu --recv-keys 47D8E5D4 `- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
linux-next: build failure after merge of the mfd tree
Hi Samuel, After merging the mfd tree, today's linux-next build (x86_64 allmodconfig) failed like this: FATAL: modpost: GPL-incompatible module tps65217_bl.ko uses GPL-only symbol 'platform_driver_unregister' Caused by commit dbc14ec43af2 ("backlight: Add TPS65217 WLED driver"). I have used the mfd tree from next-20120924 for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpTlOrMtgejr.pgp Description: PGP signature
Re: linux-next: build failure after merge of the mfd tree
Hi Stephen, On Mon, Jul 09, 2012 at 01:57:19PM +1000, Stephen Rothwell wrote: > Hi Samuel, > > After merging the mfd tree, today's linux-next build (x86_64 allmodconfig) > failed like this: > > ERROR: "arizona_dai_ops" [sound/soc/codecs/snd-soc-wm5102.ko] undefined! > ERROR: "wm5102_aod" [drivers/mfd/arizona-irq.ko] undefined! > ERROR: "wm5102_irq" [drivers/mfd/arizona-irq.ko] undefined! > ERROR: "irq_set_chip_and_handler_name" [drivers/mfd/arizona-irq.ko] undefined! > ERROR: "wm5102_patch" [drivers/mfd/arizona-core.ko] undefined! > ERROR: "arizona_irq_init" [drivers/mfd/arizona-core.ko] undefined! > ERROR: "arizona_irq_exit" [drivers/mfd/arizona-core.ko] undefined! > > I have used the mfd tree from next-20120706 for today. The mfd and sound trees are now fixed and you should no longer get those failures. Cheers, Samuel. -- Intel Open Source Technology Centre http://oss.intel.com/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the mfd tree
Hi Stephen, Mark, On Mon, Jul 09, 2012 at 01:57:19PM +1000, Stephen Rothwell wrote: > Hi Samuel, > > After merging the mfd tree, today's linux-next build (x86_64 allmodconfig) > failed like this: > > ERROR: "arizona_dai_ops" [sound/soc/codecs/snd-soc-wm5102.ko] undefined! > ERROR: "wm5102_aod" [drivers/mfd/arizona-irq.ko] undefined! > ERROR: "wm5102_irq" [drivers/mfd/arizona-irq.ko] undefined! > ERROR: "irq_set_chip_and_handler_name" [drivers/mfd/arizona-irq.ko] undefined! > ERROR: "wm5102_patch" [drivers/mfd/arizona-core.ko] undefined! > ERROR: "arizona_irq_init" [drivers/mfd/arizona-core.ko] undefined! > ERROR: "arizona_irq_exit" [drivers/mfd/arizona-core.ko] undefined! > I pushed a patch that fixes the following build failures: ERROR: "wm5102_aod" [drivers/mfd/arizona-irq.ko] undefined! ERROR: "wm5102_irq" [drivers/mfd/arizona-irq.ko] undefined! ERROR: "irq_set_chip_and_handler_name" [drivers/mfd/arizona-irq.ko] undefined! ERROR: "wm5102_patch" [drivers/mfd/arizona-core.ko] undefined! ERROR: "arizona_irq_init" [drivers/mfd/arizona-core.ko] undefined! ERROR: "arizona_irq_exit" [drivers/mfd/arizona-core.ko] undefined! This one: ERROR: "arizona_dai_ops" [sound/soc/codecs/snd-soc-wm5102.ko] undefined! comes from the fact that arizon_dai_ops is not an exported symbol while snd-soc-wm5102 is built as a module. This is coming from Mark's sound tree. Cheers, Samuel. -- Intel Open Source Technology Centre http://oss.intel.com/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
linux-next: build failure after merge of the mfd tree
Hi Samuel, After merging the mfd tree, today's linux-next build (x86_64 allmodconfig) failed like this: ERROR: "arizona_dai_ops" [sound/soc/codecs/snd-soc-wm5102.ko] undefined! ERROR: "wm5102_aod" [drivers/mfd/arizona-irq.ko] undefined! ERROR: "wm5102_irq" [drivers/mfd/arizona-irq.ko] undefined! ERROR: "irq_set_chip_and_handler_name" [drivers/mfd/arizona-irq.ko] undefined! ERROR: "wm5102_patch" [drivers/mfd/arizona-core.ko] undefined! ERROR: "arizona_irq_init" [drivers/mfd/arizona-core.ko] undefined! ERROR: "arizona_irq_exit" [drivers/mfd/arizona-core.ko] undefined! I have used the mfd tree from next-20120706 for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpjgdTSokVv3.pgp Description: PGP signature