Message ID | 20180721200049.7553-1-anders.roxell@linaro.org |
---|---|
State | Accepted |
Commit | 16909c81c6298c2db5587340106523e0a6c2bfe2 |
Headers | show |
Series | drivers/memory/Kconfig: Add CONFIG_OF dependency | expand |
On 07/21/2018 01:00 PM, Anders Roxell wrote: > JZ4780_NEMC doesn't depend on OF, and if OF isn't enabled we get this > error: > drivers/memory/jz4780-nemc.c: In function ‘jz4780_nemc_num_banks’: > drivers/memory/jz4780-nemc.c:72:10: error: implicit declaration of > function ‘of_read_number’; did you mean ‘down_read_nested’? > [-Werror=implicit-function-declaration] > bank = of_read_number(prop, 1); > ^~~~~~~~~~~~~~ > down_read_nested > > Make JZ4780_NEMC depend on OF. > > Fixes: ab99e11062c1 ("memory: jz4780-nemc: Allow selection of this driver when COMPILE_TEST=y") > Reported-by: Randy Dunlap <rdunlap@infradead.org> > Signed-off-by: Anders Roxell <anders.roxell@linaro.org> Acked-by: Randy Dunlap <rdunlap@infradead.org> Thanks. > --- > drivers/memory/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/memory/Kconfig b/drivers/memory/Kconfig > index a642552dfdc9..63389f075f1d 100644 > --- a/drivers/memory/Kconfig > +++ b/drivers/memory/Kconfig > @@ -123,7 +123,7 @@ config JZ4780_NEMC > bool "Ingenic JZ4780 SoC NEMC driver" > default y > depends on MACH_JZ4780 || COMPILE_TEST > - depends on HAS_IOMEM > + depends on HAS_IOMEM && OF > help > This driver is for the NAND/External Memory Controller (NEMC) in > the Ingenic JZ4780. This controller is used to handle external > -- ~Randy
On Mon, Jul 23, 2018 at 11:41 AM, Boris Brezillon <boris.brezillon@bootlin.com> wrote: > On Mon, 23 Jul 2018 11:34:43 +0200 > Arnd Bergmann <arnd@arndb.de> wrote: > >> On Sun, Jul 22, 2018 at 8:29 AM, Boris Brezillon >> <boris.brezillon@bootlin.com> wrote: >> > +Arnd, Rob and the DT ML. >> > >> > On Sat, 21 Jul 2018 14:53:47 -0700 >> > Randy Dunlap <rdunlap@infradead.org> wrote: >> > >> >> On 07/21/2018 01:00 PM, Anders Roxell wrote: >> >> > JZ4780_NEMC doesn't depend on OF, and if OF isn't enabled we get this >> >> > error: >> >> > drivers/memory/jz4780-nemc.c: In function ‘jz4780_nemc_num_banks’: >> >> > drivers/memory/jz4780-nemc.c:72:10: error: implicit declaration of >> >> > function ‘of_read_number’; did you mean ‘down_read_nested’? >> >> > [-Werror=implicit-function-declaration] >> >> > bank = of_read_number(prop, 1); >> >> > ^~~~~~~~~~~~~~ >> >> > down_read_nested >> > >> > Looks like of.h defines stubs so that people can compile-test without >> > CONFIG_OF selected. Maybe we should move of_read_number() and >> > of_read_ulong() out of the #ifdef CONFIG_OF section. >> >> That seems fine, though the added dependency seems appropriate >> here as well. of_read_number() is rarely used, and for the most part in >> powerpc specific code that is guaranteed to have CONFIG_OF enabled, >> so it's not that likely to cause many more problems. > > Ok, then I'll let Miquel apply Anders' patch to the NAND tree. > > Thanks for your feedback. My randconfig build bot just ran into a second problem with this driver with CONFIG_GPIOLIB disabled: drivers/mtd/nand/raw/jz4740_nand.c: In function 'jz_nand_dev_ready': drivers/mtd/nand/raw/jz4740_nand.c:133:9: error: implicit declaration of function 'gpiod_get_value_cansleep'; did you mean 'gpio_get_value_cansleep'? [-Werror=implicit-function-declaration] return gpiod_get_value_cansleep(nand->busy_gpio); ^~~~~~~~~~~~~~~~~~~~~~~~ gpio_get_value_cansleep drivers/mtd/nand/raw/jz4740_nand.c: In function 'jz_nand_probe': drivers/mtd/nand/raw/jz4740_nand.c:388:20: error: implicit declaration of function 'devm_gpiod_get_optional'; did you mean 'devm_gpio_request_one'? [-Werror=implicit-function-declaration] nand->busy_gpio = devm_gpiod_get_optional(&pdev->dev, "busy", GPIOD_IN); ^~~~~~~~~~~~~~~~~~~~~~~ devm_gpio_request_one drivers/mtd/nand/raw/jz4740_nand.c:388:64: error: 'GPIOD_IN' undeclared (first use in this function); did you mean 'GPIOF_IN'? nand->busy_gpio = devm_gpiod_get_optional(&pdev->dev, "busy", GPIOD_IN); ^~~~~~~~ GPIOF_IN We could add another dependency here or (my preference) include linux/gpio/consumer.h to fix that. Do you want a separate patch for it, or should Anders send a combined patch? Arnd
On Mon, Jul 23, 2018 at 6:14 PM, Boris Brezillon <boris.brezillon@bootlin.com> wrote: > On Mon, 23 Jul 2018 18:04:52 +0200 > Arnd Bergmann <arnd@arndb.de> wrote: > >> On Mon, Jul 23, 2018 at 5:40 PM, Arnd Bergmann <arnd@arndb.de> wrote: >> > On Mon, Jul 23, 2018 at 11:41 AM, Boris Brezillon >> > <boris.brezillon@bootlin.com> wrote: >> >> On Mon, 23 Jul 2018 11:34:43 +0200 >> >> Arnd Bergmann <arnd@arndb.de> wrote: >> >> >> >>> On Sun, Jul 22, 2018 at 8:29 AM, Boris Brezillon >> >>> <boris.brezillon@bootlin.com> wrote: >> >>> > +Arnd, Rob and the DT ML. > Yep, somehow io.h was indirectly included by gpio.h. I fixed that in my > patch when replacing gpio.h by gpio/consumer.h by including linux/io.h. Ok, looks good. With the patch from you plus the one from Anders, I don't see any more randconfig failures in this driver. Arnd
diff --git a/drivers/memory/Kconfig b/drivers/memory/Kconfig index a642552dfdc9..63389f075f1d 100644 --- a/drivers/memory/Kconfig +++ b/drivers/memory/Kconfig @@ -123,7 +123,7 @@ config JZ4780_NEMC bool "Ingenic JZ4780 SoC NEMC driver" default y depends on MACH_JZ4780 || COMPILE_TEST - depends on HAS_IOMEM + depends on HAS_IOMEM && OF help This driver is for the NAND/External Memory Controller (NEMC) in the Ingenic JZ4780. This controller is used to handle external
JZ4780_NEMC doesn't depend on OF, and if OF isn't enabled we get this error: drivers/memory/jz4780-nemc.c: In function ‘jz4780_nemc_num_banks’: drivers/memory/jz4780-nemc.c:72:10: error: implicit declaration of function ‘of_read_number’; did you mean ‘down_read_nested’? [-Werror=implicit-function-declaration] bank = of_read_number(prop, 1); ^~~~~~~~~~~~~~ down_read_nested Make JZ4780_NEMC depend on OF. Fixes: ab99e11062c1 ("memory: jz4780-nemc: Allow selection of this driver when COMPILE_TEST=y") Reported-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Anders Roxell <anders.roxell@linaro.org> --- drivers/memory/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.18.0