| Message ID | 20230905070656.196274-1-hch@lst.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ef8f8f04a0b25e8f294b24350e8463a8d6a9ba0b |
| Headers | show |
| Series | MIPS: Alchemy: only build mmc support helpers if au1xmmc is enabled | expand |
On 9/5/23 00:06, Christoph Hellwig wrote: > While commit d4a5c59a955b ("mmc: au1xmmc: force non-modular build and > remove symbol_get usage") to be built in, it can still build a kernel > without MMC support and thuse no mmc_detect_change symbol at all. > > Add ifdefs to build the mmc support code in the alchemy arch code > conditional on mmc support. > > Fixes: d4a5c59a955b ("mmc: au1xmmc: force non-modular build and remove symbol_get usage") > Reported-by: kernel test robot <lkp@intel.com> > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > arch/mips/alchemy/devboards/db1000.c | 4 ++++ > arch/mips/alchemy/devboards/db1200.c | 6 ++++++ > arch/mips/alchemy/devboards/db1300.c | 4 ++++ > 3 files changed, 14 insertions(+) > Acked-by: Randy Dunlap <rdunlap@infradead.org> Tested-by: Randy Dunlap <rdunlap@infradead.org> # build-tested Thanks.
On Tue, Sep 05, 2023 at 06:04:18PM -0700, Randy Dunlap wrote: > Acked-by: Randy Dunlap <rdunlap@infradead.org> > Tested-by: Randy Dunlap <rdunlap@infradead.org> # build-tested Thomas, given that this is mips arch code, it's probably best if you pick it up.
On Fri, Sep 08, 2023 at 10:16:34AM +0200, Christoph Hellwig wrote: > On Tue, Sep 05, 2023 at 06:04:18PM -0700, Randy Dunlap wrote: > > Acked-by: Randy Dunlap <rdunlap@infradead.org> > > Tested-by: Randy Dunlap <rdunlap@infradead.org> # build-tested > > Thomas, given that this is mips arch code, it's probably best if you > pick it up. sure, will apply it soon. Thomas.
On Tue, Sep 05, 2023 at 09:06:56AM +0200, Christoph Hellwig wrote: > While commit d4a5c59a955b ("mmc: au1xmmc: force non-modular build and > remove symbol_get usage") to be built in, it can still build a kernel > without MMC support and thuse no mmc_detect_change symbol at all. > > Add ifdefs to build the mmc support code in the alchemy arch code > conditional on mmc support. > > Fixes: d4a5c59a955b ("mmc: au1xmmc: force non-modular build and remove symbol_get usage") > Reported-by: kernel test robot <lkp@intel.com> > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > arch/mips/alchemy/devboards/db1000.c | 4 ++++ > arch/mips/alchemy/devboards/db1200.c | 6 ++++++ > arch/mips/alchemy/devboards/db1300.c | 4 ++++ > 3 files changed, 14 insertions(+) applied to mips-fixes. Thomas.
diff --git a/arch/mips/alchemy/devboards/db1000.c b/arch/mips/alchemy/devboards/db1000.c index 012da042d0a4f7..7b9f91db227f2d 100644 --- a/arch/mips/alchemy/devboards/db1000.c +++ b/arch/mips/alchemy/devboards/db1000.c @@ -164,6 +164,7 @@ static struct platform_device db1x00_audio_dev = { /******************************************************************************/ +#ifdef CONFIG_MMC_AU1X static irqreturn_t db1100_mmc_cd(int irq, void *ptr) { mmc_detect_change(ptr, msecs_to_jiffies(500)); @@ -369,6 +370,7 @@ static struct platform_device db1100_mmc1_dev = { .num_resources = ARRAY_SIZE(au1100_mmc1_res), .resource = au1100_mmc1_res, }; +#endif /* CONFIG_MMC_AU1X */ /******************************************************************************/ @@ -440,8 +442,10 @@ static struct platform_device *db1x00_devs[] = { static struct platform_device *db1100_devs[] = { &au1100_lcd_device, +#ifdef CONFIG_MMC_AU1X &db1100_mmc0_dev, &db1100_mmc1_dev, +#endif }; int __init db1000_dev_setup(void) diff --git a/arch/mips/alchemy/devboards/db1200.c b/arch/mips/alchemy/devboards/db1200.c index 76080c71a2a7b6..f521874ebb07b2 100644 --- a/arch/mips/alchemy/devboards/db1200.c +++ b/arch/mips/alchemy/devboards/db1200.c @@ -326,6 +326,7 @@ static struct platform_device db1200_ide_dev = { /**********************************************************************/ +#ifdef CONFIG_MMC_AU1X /* SD carddetects: they're supposed to be edge-triggered, but ack * doesn't seem to work (CPLD Rev 2). Instead, the screaming one * is disabled and its counterpart enabled. The 200ms timeout is @@ -584,6 +585,7 @@ static struct platform_device pb1200_mmc1_dev = { .num_resources = ARRAY_SIZE(au1200_mmc1_res), .resource = au1200_mmc1_res, }; +#endif /* CONFIG_MMC_AU1X */ /**********************************************************************/ @@ -751,7 +753,9 @@ static struct platform_device db1200_audiodma_dev = { static struct platform_device *db1200_devs[] __initdata = { NULL, /* PSC0, selected by S6.8 */ &db1200_ide_dev, +#ifdef CONFIG_MMC_AU1X &db1200_mmc0_dev, +#endif &au1200_lcd_dev, &db1200_eth_dev, &db1200_nand_dev, @@ -762,7 +766,9 @@ static struct platform_device *db1200_devs[] __initdata = { }; static struct platform_device *pb1200_devs[] __initdata = { +#ifdef CONFIG_MMC_AU1X &pb1200_mmc1_dev, +#endif }; /* Some peripheral base addresses differ on the PB1200 */ diff --git a/arch/mips/alchemy/devboards/db1300.c b/arch/mips/alchemy/devboards/db1300.c index ff61901329c626..d377e043b49f86 100644 --- a/arch/mips/alchemy/devboards/db1300.c +++ b/arch/mips/alchemy/devboards/db1300.c @@ -450,6 +450,7 @@ static struct platform_device db1300_ide_dev = { /**********************************************************************/ +#ifdef CONFIG_MMC_AU1X static irqreturn_t db1300_mmc_cd(int irq, void *ptr) { disable_irq_nosync(irq); @@ -632,6 +633,7 @@ static struct platform_device db1300_sd0_dev = { .resource = au1300_sd0_res, .num_resources = ARRAY_SIZE(au1300_sd0_res), }; +#endif /* CONFIG_MMC_AU1X */ /**********************************************************************/ @@ -767,8 +769,10 @@ static struct platform_device *db1300_dev[] __initdata = { &db1300_5waysw_dev, &db1300_nand_dev, &db1300_ide_dev, +#ifdef CONFIG_MMC_AU1X &db1300_sd0_dev, &db1300_sd1_dev, +#endif &db1300_lcd_dev, &db1300_ac97_dev, &db1300_i2s_dev,
While commit d4a5c59a955b ("mmc: au1xmmc: force non-modular build and remove symbol_get usage") to be built in, it can still build a kernel without MMC support and thuse no mmc_detect_change symbol at all. Add ifdefs to build the mmc support code in the alchemy arch code conditional on mmc support. Fixes: d4a5c59a955b ("mmc: au1xmmc: force non-modular build and remove symbol_get usage") Reported-by: kernel test robot <lkp@intel.com> Signed-off-by: Christoph Hellwig <hch@lst.de> --- arch/mips/alchemy/devboards/db1000.c | 4 ++++ arch/mips/alchemy/devboards/db1200.c | 6 ++++++ arch/mips/alchemy/devboards/db1300.c | 4 ++++ 3 files changed, 14 insertions(+)