Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 570cb456 authored by Manuel Lauss's avatar Manuel Lauss Committed by Ralf Baechle
Browse files

MIPS: Alchemy: Repair db1500/bosporus builds 



A few hunks somehow ended up outside their #ifdef/endif blocks,
leading to -Werror-induces build failures.

Signed-off-by: default avatarManuel Lauss <manuel.lauss@gmail.com>
To: Linux-MIPS <linux-mips@linux-mips.org>
Patchwork: http://patchwork.linux-mips.org/patch/1003/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent d891a539

arch/mips/alchemy/devboards/db1x00/board_setup.c

+28 −24
Original line number Diff line number Diff line
@@ -46,19 +46,25 @@ char irq_tab_alchemy[][5] __initdata = { 
	[13] = { -1, AU1500_PCI_INTA, AU1500_PCI_INTB, AU1500_PCI_INTC, AU1500_PCI_INTD }, /* IDSEL 13 - PCI slot */

};



static void bosporus_power_off(void)

{

	printk(KERN_INFO "It's now safe to turn off power\n");

	while (1)

		asm volatile (".set mips3 ; wait ; .set mips0");

}

#endif



const char *get_system_type(void)

{

	return "Alchemy Bosporus Gateway Reference";

}



#ifdef CONFIG_MIPS_DB1550

char irq_tab_alchemy[][5] __initdata = {

	[11] = { -1, AU1550_PCI_INTC, 0xff, 0xff, 0xff }, /* IDSEL 11 - on-board HPT371 */

	[12] = { -1, AU1550_PCI_INTB, AU1550_PCI_INTC, AU1550_PCI_INTD, AU1550_PCI_INTA }, /* IDSEL 12 - PCI slot 2 (left) */

	[13] = { -1, AU1550_PCI_INTA, AU1550_PCI_INTB, AU1550_PCI_INTC, AU1550_PCI_INTD }, /* IDSEL 13 - PCI slot 1 (right) */

};

#endif





#ifdef CONFIG_MIPS_BOSPORUS

char irq_tab_alchemy[][5] __initdata = {

	[11] = { -1, AU1500_PCI_INTA, AU1500_PCI_INTB, 0xff, 0xff }, /* IDSEL 11 - miniPCI  */

	[12] = { -1, AU1500_PCI_INTA, 0xff, 0xff, 0xff }, /* IDSEL 12 - SN1741   */

	[13] = { -1, AU1500_PCI_INTA, AU1500_PCI_INTB, AU1500_PCI_INTC, AU1500_PCI_INTD }, /* IDSEL 13 - PCI slot */

};



/*

 * Micrel/Kendin 5 port switch attached to MAC0,

 * MAC0 is associated with PHY address 5 (== WAN port)
@@ -71,16 +77,20 @@ static struct au1000_eth_platform_data eth0_pdata = { 
	.phy_addr		= 5,

};



#ifdef CONFIG_MIPS_BOSPORUS

char irq_tab_alchemy[][5] __initdata = {

	[11] = { -1, AU1500_PCI_INTA, AU1500_PCI_INTB, 0xff, 0xff }, /* IDSEL 11 - miniPCI  */

	[12] = { -1, AU1500_PCI_INTA, 0xff, 0xff, 0xff }, /* IDSEL 12 - SN1741   */

	[13] = { -1, AU1500_PCI_INTA, AU1500_PCI_INTB, AU1500_PCI_INTC, AU1500_PCI_INTD }, /* IDSEL 13 - PCI slot */

};



static void bosporus_power_off(void)

{

	printk(KERN_INFO "It's now safe to turn off power\n");

	while (1)

		asm volatile (".set mips3 ; wait ; .set mips0");

}



const char *get_system_type(void)

{

	return "Alchemy Bosporus Gateway Reference";

}

#endif





#ifdef CONFIG_MIPS_MIRAGE

char irq_tab_alchemy[][5] __initdata = {

	[11] = { -1, AU1500_PCI_INTD, 0xff, 0xff, 0xff }, /* IDSEL 11 - SMI VGX */
@@ -99,13 +109,6 @@ const char *get_system_type(void) 
}

#endif



#ifdef CONFIG_MIPS_DB1550

char irq_tab_alchemy[][5] __initdata = {

	[11] = { -1, AU1550_PCI_INTC, 0xff, 0xff, 0xff }, /* IDSEL 11 - on-board HPT371 */

	[12] = { -1, AU1550_PCI_INTB, AU1550_PCI_INTC, AU1550_PCI_INTD, AU1550_PCI_INTA }, /* IDSEL 12 - PCI slot 2 (left) */

	[13] = { -1, AU1550_PCI_INTA, AU1550_PCI_INTB, AU1550_PCI_INTC, AU1550_PCI_INTD }, /* IDSEL 13 - PCI slot 1 (right) */

};

#endif



#if defined(CONFIG_MIPS_BOSPORUS) || defined(CONFIG_MIPS_MIRAGE)

static void mips_softreset(void)
@@ -121,6 +124,7 @@ const char *get_system_type(void) 
}

#endif





void __init board_setup(void)

{

	unsigned long bcsr1, bcsr2;