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

Commit 66f75ccb authored by Florian Fainelli's avatar Florian Fainelli Committed by Ralf Baechle
Browse files

MIPS: Alchemy: Add au1000-eth platform device 



This patch makes the board code register the au1000-eth platform device. The
au1000-eth platform data can be overriden with the au1xxx_override_eth_cfg
function like it has to be done for the Bosporus board which uses a
different MAC/PHY setup.

Signed-off-by: default avatarFlorian Fainelli <florian@openwrt.org>
Cc: David Miller <davem@davemloft.net>
Cc: linux-mips@linux-mips.org
Cc: netdev@vger.kernel.org
Patchwork: http://patchwork.linux-mips.org/patch/618/


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

arch/mips/alchemy/common/platform.c

+90 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <asm/mach-au1x00/au1xxx.h>

#include <asm/mach-au1x00/au1xxx_dbdma.h>

#include <asm/mach-au1x00/au1100_mmc.h>

#include <asm/mach-au1x00/au1xxx_eth.h>



#define PORT(_base, _irq)					\

	{							\
@@ -326,6 +327,88 @@ static struct platform_device pbdb_smbus_device = { 
};

#endif



/* Macro to help defining the Ethernet MAC resources */

#define MAC_RES(_base, _enable, _irq)			\

	{						\

		.start	= CPHYSADDR(_base),		\

		.end	= CPHYSADDR(_base + 0xffff),	\

		.flags	= IORESOURCE_MEM,		\

	},						\

	{						\

		.start	= CPHYSADDR(_enable),		\

		.end	= CPHYSADDR(_enable + 0x3),	\

		.flags	= IORESOURCE_MEM,		\

	},						\

	{						\

		.start	= _irq,				\

		.end	= _irq,				\

		.flags	= IORESOURCE_IRQ		\

	}



static struct resource au1xxx_eth0_resources[] = {

#if defined(CONFIG_SOC_AU1000)

	MAC_RES(AU1000_ETH0_BASE, AU1000_MAC0_ENABLE, AU1000_MAC0_DMA_INT),

#elif defined(CONFIG_SOC_AU1100)

	MAC_RES(AU1100_ETH0_BASE, AU1100_MAC0_ENABLE, AU1100_MAC0_DMA_INT),

#elif defined(CONFIG_SOC_AU1550)

	MAC_RES(AU1550_ETH0_BASE, AU1550_MAC0_ENABLE, AU1550_MAC0_DMA_INT),

#elif defined(CONFIG_SOC_AU1500)

	MAC_RES(AU1500_ETH0_BASE, AU1500_MAC0_ENABLE, AU1500_MAC0_DMA_INT),

#endif

};



static struct resource au1xxx_eth1_resources[] = {

#if defined(CONFIG_SOC_AU1000)

	MAC_RES(AU1000_ETH1_BASE, AU1000_MAC1_ENABLE, AU1000_MAC1_DMA_INT),

#elif defined(CONFIG_SOC_AU1550)

	MAC_RES(AU1550_ETH1_BASE, AU1550_MAC1_ENABLE, AU1550_MAC1_DMA_INT),

#elif defined(CONFIG_SOC_AU1500)

	MAC_RES(AU1500_ETH1_BASE, AU1500_MAC1_ENABLE, AU1500_MAC1_DMA_INT),

#endif

};



static struct au1000_eth_platform_data au1xxx_eth0_platform_data = {

	.phy1_search_mac0 = 1,

};



static struct platform_device au1xxx_eth0_device = {

	.name		= "au1000-eth",

	.id		= 0,

	.num_resources	= ARRAY_SIZE(au1xxx_eth0_resources),

	.resource	= au1xxx_eth0_resources,

	.dev.platform_data = &au1xxx_eth0_platform_data,

};



#ifndef CONFIG_SOC_AU1100

static struct au1000_eth_platform_data au1xxx_eth1_platform_data = {

	.phy1_search_mac0 = 1,

};



static struct platform_device au1xxx_eth1_device = {

	.name		= "au1000-eth",

	.id		= 1,

	.num_resources	= ARRAY_SIZE(au1xxx_eth1_resources),

	.resource	= au1xxx_eth1_resources,

	.dev.platform_data = &au1xxx_eth1_platform_data,

};

#endif



void __init au1xxx_override_eth_cfg(unsigned int port,

			struct au1000_eth_platform_data *eth_data)

{

	if (!eth_data || port > 1)

		return;



	if (port == 0)

		memcpy(&au1xxx_eth0_platform_data, eth_data,

			sizeof(struct au1000_eth_platform_data));

#ifndef CONFIG_SOC_AU1100

	else

		memcpy(&au1xxx_eth1_platform_data, eth_data,

			sizeof(struct au1000_eth_platform_data));

#endif

}



static struct platform_device *au1xxx_platform_devices[] __initdata = {

	&au1xx0_uart_device,

	&au1xxx_usb_ohci_device,
@@ -345,6 +428,7 @@ static struct platform_device *au1xxx_platform_devices[] __initdata = { 
#ifdef SMBUS_PSC_BASE

	&pbdb_smbus_device,

#endif

	&au1xxx_eth0_device,

};



static int __init au1xxx_platform_init(void)
@@ -356,6 +440,12 @@ static int __init au1xxx_platform_init(void) 
	for (i = 0; au1x00_uart_data[i].flags; i++)

		au1x00_uart_data[i].uartclk = uartclk;



#ifndef CONFIG_SOC_AU1100

	/* Register second MAC if enabled in pinfunc */

	if (!(au_readl(SYS_PINFUNC) & (u32)SYS_PF_NI2))

		platform_device_register(&au1xxx_eth1_device);

#endif



	return platform_add_devices(au1xxx_platform_devices,

				    ARRAY_SIZE(au1xxx_platform_devices));

}

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

+17 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <linux/interrupt.h>



#include <asm/mach-au1x00/au1000.h>

#include <asm/mach-au1x00/au1xxx_eth.h>

#include <asm/mach-db1x00/db1x00.h>

#include <asm/mach-db1x00/bcsr.h>
@@ -44,12 +45,26 @@ char irq_tab_alchemy[][5] __initdata = { 
};

#endif



/*

 * Micrel/Kendin 5 port switch attached to MAC0,

 * MAC0 is associated with PHY address 5 (== WAN port)

 * MAC1 is not associated with any PHY, since it's connected directly

 * to the switch.

 * no interrupts are used

 */

static struct au1000_eth_platform_data eth0_pdata = {

	.phy_static_config	= 1,

	.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 */

};





#endif



#ifdef CONFIG_MIPS_MIRAGE
@@ -103,6 +118,8 @@ void __init board_setup(void) 
	printk(KERN_INFO "AMD Alchemy Au1100/Db1100 Board\n");

#endif

#ifdef CONFIG_MIPS_BOSPORUS

	au1xxx_override_eth_cfg(0, &eth0_pdata);



	printk(KERN_INFO "AMD Alchemy Bosporus Board\n");

#endif

#ifdef CONFIG_MIPS_MIRAGE

arch/mips/include/asm/mach-au1x00/au1xxx_eth.h

0 → 100644
+17 −0
Original line number Diff line number Diff line 
#ifndef __AU1X00_ETH_DATA_H

#define __AU1X00_ETH_DATA_H



/* Platform specific PHY configuration passed to the MAC driver */

struct au1000_eth_platform_data {

	int phy_static_config;

	int phy_search_highest_addr;

	int phy1_search_mac0;

	int phy_addr;

	int phy_busid;

	int phy_irq;

};



void __init au1xxx_override_eth_cfg(unsigned port,

			struct au1000_eth_platform_data *eth_data);



#endif /* __AU1X00_ETH_DATA_H */