lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MIPS: Alchemy: only build mmc support helpers if au1xmmc is enabled

Browse Source 
[ Upstream commit ef8f8f04a0b25e8f294b24350e8463a8d6a9ba0b ]

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>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Tested-by: Randy Dunlap <rdunlap@infradead.org> # build-tested
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Christoph Hellwig 2023-09-05 09:06:56 +02:00 committed by Greg Kroah-Hartman
parent 5b0d13e2d9
commit 6938a6cbe6
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/mips/alchemy/devboards/db1000.c
View File

@ -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) static irqreturn_t db1100_mmc_cd(int irq, void *ptr)
{ {
mmc_detect_change(ptr, msecs_to_jiffies(500)); 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), .num_resources = ARRAY_SIZE(au1100_mmc1_res),
.resource = au1100_mmc1_res, .resource = au1100_mmc1_res,
}; };
#endif /* CONFIG_MMC_AU1X */
/******************************************************************************/ /******************************************************************************/
@ -432,8 +434,10 @@ static struct platform_device *db1x00_devs[] = {
static struct platform_device *db1100_devs[] = { static struct platform_device *db1100_devs[] = {
&au1100_lcd_device, &au1100_lcd_device,
#ifdef CONFIG_MMC_AU1X
&db1100_mmc0_dev, &db1100_mmc0_dev,
&db1100_mmc1_dev, &db1100_mmc1_dev,
#endif
}; };
int __init db1000_dev_setup(void) int __init db1000_dev_setup(void)

6
arch/mips/alchemy/devboards/db1200.c
View File

@ -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 /* SD carddetects: they're supposed to be edge-triggered, but ack
* doesn't seem to work (CPLD Rev 2). Instead, the screaming one * doesn't seem to work (CPLD Rev 2). Instead, the screaming one
* is disabled and its counterpart enabled. The 200ms timeout is * 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), .num_resources = ARRAY_SIZE(au1200_mmc1_res),
.resource = 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 = { static struct platform_device *db1200_devs[] __initdata = {
NULL, /* PSC0, selected by S6.8 */ NULL, /* PSC0, selected by S6.8 */
&db1200_ide_dev, &db1200_ide_dev,
#ifdef CONFIG_MMC_AU1X
&db1200_mmc0_dev, &db1200_mmc0_dev,
#endif
&au1200_lcd_dev, &au1200_lcd_dev,
&db1200_eth_dev, &db1200_eth_dev,
&db1200_nand_dev, &db1200_nand_dev,
@ -762,7 +766,9 @@ static struct platform_device *db1200_devs[] __initdata = {
}; };
static struct platform_device *pb1200_devs[] __initdata = { static struct platform_device *pb1200_devs[] __initdata = {
#ifdef CONFIG_MMC_AU1X
&pb1200_mmc1_dev, &pb1200_mmc1_dev,
#endif
}; };
/* Some peripheral base addresses differ on the PB1200 */ /* Some peripheral base addresses differ on the PB1200 */

4
arch/mips/alchemy/devboards/db1300.c
View File

@ -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) static irqreturn_t db1300_mmc_cd(int irq, void *ptr)
{ {
disable_irq_nosync(irq); disable_irq_nosync(irq);
@ -632,6 +633,7 @@ static struct platform_device db1300_sd0_dev = {
.resource = au1300_sd0_res, .resource = au1300_sd0_res,
.num_resources = ARRAY_SIZE(au1300_sd0_res), .num_resources = ARRAY_SIZE(au1300_sd0_res),
}; };
#endif /* CONFIG_MMC_AU1X */
/**********************************************************************/ /**********************************************************************/
@ -769,8 +771,10 @@ static struct platform_device *db1300_dev[] __initdata = {
&db1300_5waysw_dev, &db1300_5waysw_dev,
&db1300_nand_dev, &db1300_nand_dev,
&db1300_ide_dev, &db1300_ide_dev,
#ifdef CONFIG_MMC_AU1X
&db1300_sd0_dev, &db1300_sd0_dev,
&db1300_sd1_dev, &db1300_sd1_dev,
#endif
&db1300_lcd_dev, &db1300_lcd_dev,
&db1300_ac97_dev, &db1300_ac97_dev,
&db1300_i2s_dev, &db1300_i2s_dev,