Skip to content

Commit 52a6d9b

Browse files
committed
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
2 parents 633b47c + ef8f8f0 commit 52a6d9b

File tree

3 files changed

+14
-0
lines changed

3 files changed

+14
-0
lines changed

arch/mips/alchemy/devboards/db1000.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ static struct platform_device db1x00_audio_dev = {
164164

165165
/******************************************************************************/
166166

167+
#ifdef CONFIG_MMC_AU1X
167168
static irqreturn_t db1100_mmc_cd(int irq, void *ptr)
168169
{
169170
mmc_detect_change(ptr, msecs_to_jiffies(500));
@@ -369,6 +370,7 @@ static struct platform_device db1100_mmc1_dev = {
369370
.num_resources = ARRAY_SIZE(au1100_mmc1_res),
370371
.resource = au1100_mmc1_res,
371372
};
373+
#endif /* CONFIG_MMC_AU1X */
372374

373375
/******************************************************************************/
374376

@@ -440,8 +442,10 @@ static struct platform_device *db1x00_devs[] = {
440442

441443
static struct platform_device *db1100_devs[] = {
442444
&au1100_lcd_device,
445+
#ifdef CONFIG_MMC_AU1X
443446
&db1100_mmc0_dev,
444447
&db1100_mmc1_dev,
448+
#endif
445449
};
446450

447451
int __init db1000_dev_setup(void)

arch/mips/alchemy/devboards/db1200.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,7 @@ static struct platform_device db1200_ide_dev = {
326326

327327
/**********************************************************************/
328328

329+
#ifdef CONFIG_MMC_AU1X
329330
/* SD carddetects: they're supposed to be edge-triggered, but ack
330331
* doesn't seem to work (CPLD Rev 2). Instead, the screaming one
331332
* is disabled and its counterpart enabled. The 200ms timeout is
@@ -584,6 +585,7 @@ static struct platform_device pb1200_mmc1_dev = {
584585
.num_resources = ARRAY_SIZE(au1200_mmc1_res),
585586
.resource = au1200_mmc1_res,
586587
};
588+
#endif /* CONFIG_MMC_AU1X */
587589

588590
/**********************************************************************/
589591

@@ -751,7 +753,9 @@ static struct platform_device db1200_audiodma_dev = {
751753
static struct platform_device *db1200_devs[] __initdata = {
752754
NULL, /* PSC0, selected by S6.8 */
753755
&db1200_ide_dev,
756+
#ifdef CONFIG_MMC_AU1X
754757
&db1200_mmc0_dev,
758+
#endif
755759
&au1200_lcd_dev,
756760
&db1200_eth_dev,
757761
&db1200_nand_dev,
@@ -762,7 +766,9 @@ static struct platform_device *db1200_devs[] __initdata = {
762766
};
763767

764768
static struct platform_device *pb1200_devs[] __initdata = {
769+
#ifdef CONFIG_MMC_AU1X
765770
&pb1200_mmc1_dev,
771+
#endif
766772
};
767773

768774
/* Some peripheral base addresses differ on the PB1200 */

arch/mips/alchemy/devboards/db1300.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -450,6 +450,7 @@ static struct platform_device db1300_ide_dev = {
450450

451451
/**********************************************************************/
452452

453+
#ifdef CONFIG_MMC_AU1X
453454
static irqreturn_t db1300_mmc_cd(int irq, void *ptr)
454455
{
455456
disable_irq_nosync(irq);
@@ -632,6 +633,7 @@ static struct platform_device db1300_sd0_dev = {
632633
.resource = au1300_sd0_res,
633634
.num_resources = ARRAY_SIZE(au1300_sd0_res),
634635
};
636+
#endif /* CONFIG_MMC_AU1X */
635637

636638
/**********************************************************************/
637639

@@ -767,8 +769,10 @@ static struct platform_device *db1300_dev[] __initdata = {
767769
&db1300_5waysw_dev,
768770
&db1300_nand_dev,
769771
&db1300_ide_dev,
772+
#ifdef CONFIG_MMC_AU1X
770773
&db1300_sd0_dev,
771774
&db1300_sd1_dev,
775+
#endif
772776
&db1300_lcd_dev,
773777
&db1300_ac97_dev,
774778
&db1300_i2s_dev,

0 commit comments

Comments
 (0)