From mboxrd@z Thu Jan 1 00:00:00 1970 From: Florian Fainelli Subject: Re: [PATCH 1/2] alchemy: add au1000-eth platform device Date: Tue, 18 Aug 2009 18:01:40 +0200 Message-ID: <200908181801.41602.florian@openwrt.org> References: <200908170105.38154.florian@openwrt.org> <4A8AC125.3020602@ru.mvista.com> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Ralf Baechle , linux-mips@linux-mips.org, Manuel Lauss , David Miller , netdev@vger.kernel.org To: Sergei Shtylyov Return-path: In-Reply-To: <4A8AC125.3020602@ru.mvista.com> Content-Disposition: inline Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org List-Id: netdev.vger.kernel.org Le Tuesday 18 August 2009 16:56:37 Sergei Shtylyov, vous avez =E9crit=A0= : > Hello. > > Florian Fainelli wrote: > > This patch adds the board code to register a per-board au1000-eth > > platform device to be used wit the au1000-eth platform driver in a > > subsequent patch. Note that the au1000-eth driver knows about the > > default driver settings such that we do not need to pass any > > platform_data informations in most cases except db1x00. > > Sigh, NAK... > Please don't register the SoC device per board, do it in > alchemy/common/platfrom.c and find a way to pass the board specific > platform data from the board file there instead -- something like > arch/arm/mach-davinci/usb.c does. Ok, like I promised, this was the per-board device registration. Do you= prefer something like this: -- =46rom fd75b7c7fa3c05c21122c43e43260d2785475a79 Mon Sep 17 00:00:00 200= 1 =46rom: Florian Fainelli Date: Tue, 18 Aug 2009 17:53:21 +0200 Subject: [PATCH] alchemy: add au1000-eth platform device (v2) This patch makes the board code register the au1000-eth platform device. The au1000-eth platform data can be overriden with the au1xxx_override_eth0_cfg function like it has to be done for the Bosporus board. Changes from v1: - remove per-board platform.c file - add an override function to pass custom eth0 platform_data PHY settin= gs Signed-off-by: Florian Fainelli --- diff --git a/arch/mips/alchemy/common/platform.c b/arch/mips/alchemy/co= mmon/platform.c index 117f99f..559294a 100644 --- a/arch/mips/alchemy/common/platform.c +++ b/arch/mips/alchemy/common/platform.c @@ -19,6 +19,7 @@ #include #include #include +#include =20 #define PORT(_base, _irq) \ { \ @@ -331,6 +332,76 @@ static struct platform_device pbdb_smbus_device =3D= { }; #endif =20 +/* Macro to help defining the Ethernet MAC resources */ +#define MAC_RES(_base, _enable, _irq) \ + { \ + .start =3D CPHYSADDR(_base), \ + .end =3D CPHYSADDR(_base + 0xffff), \ + .flags =3D IORESOURCE_MEM, \ + }, \ + { \ + .start =3D CPHYSADDR(_enable), \ + .end =3D CPHYSADDR(_enable + 0x3), \ + .flags =3D IORESOURCE_MEM, \ + }, \ + { \ + .start =3D _irq, \ + .end =3D _irq, \ + .flags =3D IORESOURCE_IRQ \ + } + +static struct resource au1xxx_eth0_resources[] =3D { +#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[] =3D { +#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 =3D { + .phy1_search_mac0 =3D 1, +}; + +static struct platform_device au1xxx_eth0_device =3D { + .name =3D "au1000-eth", + .id =3D 0, + .num_resources =3D ARRAY_SIZE(au1xxx_eth0_resources), + .resource =3D au1xxx_eth0_resources, + .dev.platform_data =3D &au1xxx_eth0_platform_data, +}; + +#ifndef CONFIG_SOC_AU1100 +static struct platform_device au1xxx_eth1_device =3D { + .name =3D "au1000-eth", + .id =3D 1, + .num_resources =3D ARRAY_SIZE(au1xxx_eth1_resources), + .resource =3D au1xxx_eth1_resources, +}; +#endif + +void __init au1xxx_override_eth0_cfg(struct au1000_eth_platform_data *= eth_data) +{ + if (!eth_data) + return; + + memcpy(&au1xxx_eth0_platform_data, eth_data, + sizeof(struct au1000_eth_platform_data)); +} + static struct platform_device *au1xxx_platform_devices[] __initdata =3D= { &au1xx0_uart_device, &au1xxx_usb_ohci_device, @@ -351,17 +422,25 @@ static struct platform_device *au1xxx_platform_de= vices[] __initdata =3D { #ifdef SMBUS_PSC_BASE &pbdb_smbus_device, #endif + &au1xxx_eth0_device, }; =20 static int __init au1xxx_platform_init(void) { unsigned int uartclk =3D get_au1x00_uart_baud_base() * 16; - int i; + int i, ni; =20 /* Fill up uartclk. */ for (i =3D 0; au1x00_uart_data[i].flags; i++) au1x00_uart_data[i].uartclk =3D uartclk; =20 + /* Register second MAC if enabled in pinfunc */ +#ifndef CONFIG_SOC_AU1100 + ni =3D (int)((au_readl(SYS_PINFUNC) & (u32)(SYS_PF_NI2)) >> 4); + if (!(ni + 1)) + platform_device_register(&au1xxx_eth1_device); +#endif + return platform_add_devices(au1xxx_platform_devices, ARRAY_SIZE(au1xxx_platform_devices)); } diff --git a/arch/mips/alchemy/devboards/db1x00/board_setup.c b/arch/mi= ps/alchemy/devboards/db1x00/board_setup.c index de30d8e..4d2d32c 100644 --- a/arch/mips/alchemy/devboards/db1x00/board_setup.c +++ b/arch/mips/alchemy/devboards/db1x00/board_setup.c @@ -32,6 +32,7 @@ =20 #include #include +#include =20 #include =20 @@ -134,6 +135,22 @@ void __init board_setup(void) printk(KERN_INFO "AMD Alchemy Au1100/Db1100 Board\n"); #endif #ifdef CONFIG_MIPS_BOSPORUS + struct au1000_eth_platform_data eth0_pdata; + + /* + * Micrel/Kendin 5 port switch attached to MAC0, + * MAC0 is associated with PHY address 5 (=3D=3D WAN port) + * MAC1 is not associated with any PHY, since it's connected directly + * to the switch. + * no interrupts are used + */ + eth0_pdata.phy1_search_mac0 =3D 0; + eth0_pdata.phy_static_config =3D 1; + eth0_pdata.phy_addr =3D 5; + eth0_pdata.phy_busid =3D 0; + + au1xxx_override_eth0_cfg(ð0_pdata); + printk(KERN_INFO "AMD Alchemy Bosporus Board\n"); #endif #ifdef CONFIG_MIPS_MIRAGE diff --git a/arch/mips/include/asm/mach-au1x00/au1xxx_eth.h b/arch/mips= /include/asm/mach-au1x00/au1xxx_eth.h new file mode 100644 index 0000000..876187e --- /dev/null +++ b/arch/mips/include/asm/mach-au1x00/au1xxx_eth.h @@ -0,0 +1,17 @@ +#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_eth0_cfg(struct au1000_eth_platform_data *= eth_data); + +#endif /* __AU1X00_ETH_DATA_H */ + --=20 1.6.3.rc3