Commit 52a6d9b5 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'mips-fixes_6.6_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

Pull MIPS fix from Thomas Bogendoerfer:

 - fix Alchemy build with MMC support disabled

* tag 'mips-fixes_6.6_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MIPS: Alchemy: only build mmc support helpers if au1xmmc is enabled
parents 633b47cb ef8f8f04
...@@ -164,6 +164,7 @@ static struct platform_device db1x00_audio_dev = { ...@@ -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 = { ...@@ -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 */
/******************************************************************************/ /******************************************************************************/
...@@ -440,8 +442,10 @@ static struct platform_device *db1x00_devs[] = { ...@@ -440,8 +442,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)
......
...@@ -326,6 +326,7 @@ static struct platform_device db1200_ide_dev = { ...@@ -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 = { ...@@ -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 = { ...@@ -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 = { ...@@ -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 */
......
...@@ -450,6 +450,7 @@ static struct platform_device db1300_ide_dev = { ...@@ -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 = { ...@@ -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 */
/**********************************************************************/ /**********************************************************************/
...@@ -767,8 +769,10 @@ static struct platform_device *db1300_dev[] __initdata = { ...@@ -767,8 +769,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,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment