Commit 0d5977d6 authored Jul 17, 2010 by Wolfgang Grandegger Committed by Ralf Baechle Jul 26, 2010

MIPS: Alchemy: Define eth platform devices in the correct order



Currently, the eth devices are probed in the inverse order, first
au1xxx_eth1_device and then au1xxx_eth0_device. On the GPR board,
this makes trouble:

  # ifconfig|grep HWaddr
  eth0      Link encap:Ethernet  HWaddr 00:50:C2:0C:30:01
  eth1      Link encap:Ethernet  HWaddr 66:22:01:80:38:10

A bogous ethernet hwaddr is assigned to the first device and
au1xxx_eth0_device is mapped to eth1, which even does not work
properly. With this patch, the problems are gone:

  # ifconfig|grep HWaddr
  eth0      Link encap:Ethernet  HWaddr 66:22:11:32:38:10
  eth1      Link encap:Ethernet  HWaddr 66:22:11:32:38:11

Signed-off-by: Wolfgang Grandegger <wg@denx.de>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/1473/


Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

parent 7f13f65e

arch/mips/alchemy/common/platform.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -435,20 +435,21 @@ static struct platform_device *au1xxx_platform_devices[] __initdata = {
		static int __init au1xxx_platform_init(void)
		{
		unsigned int uartclk = get_au1x00_uart_baud_base() * 16;
		int i;
		int err, i;

		/* Fill up uartclk. */
		for (i = 0; au1x00_uart_data[i].flags; i++)
		au1x00_uart_data[i].uartclk = uartclk;

		err = platform_add_devices(au1xxx_platform_devices,
		ARRAY_SIZE(au1xxx_platform_devices));
		#ifndef CONFIG_SOC_AU1100
		/* Register second MAC if enabled in pinfunc */
		if (!(au_readl(SYS_PINFUNC) & (u32)SYS_PF_NI2))
		if (!err && !(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));
		return err;
		}

		arch_initcall(au1xxx_platform_init);