[AVR32] Remove mii_phy_addr and eth_addr from eth_platform_data
authorHaavard Skinnemoen <hskinnemoen@atmel.com>
Mon, 4 Dec 2006 13:08:39 +0000 (14:08 +0100)
committerHaavard Skinnemoen <hskinnemoen@atmel.com>
Fri, 8 Dec 2006 12:06:19 +0000 (13:06 +0100)
The macb driver will probe for the PHY chip and read the mac address
from the MACB registers, so we don't need them in eth_platform_data
anymore.

Since u-boot doesn't currently initialize the MACB registers with the
mac addresses, the tag parsing code is kept but instead of sticking
the information into eth_platform_data, it uses it to initialize
the MACB registers (in case the boot loader didn't do it.) This code
should be unnecessary at some point in the future.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
arch/avr32/boards/atstk1000/atstk1002.c
include/asm-avr32/arch-at32ap/board.h

index f65865cd9c3bd0effddd69ab1e3b2b4cc429bb85..32b361f31c2ce443a9c8760bd80ce6eeaade8d44 100644 (file)
@@ -7,33 +7,83 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
+#include <linux/clk.h>
+#include <linux/etherdevice.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
+#include <linux/platform_device.h>
 #include <linux/string.h>
 #include <linux/types.h>
 
+#include <asm/io.h>
 #include <asm/setup.h>
 #include <asm/arch/board.h>
 #include <asm/arch/init.h>
 
+struct eth_addr {
+       u8 addr[6];
+};
+
+static struct eth_addr __initdata hw_addr[2];
+
 static struct eth_platform_data __initdata eth_data[2];
 extern struct lcdc_platform_data atstk1000_fb0_data;
 
+/*
+ * The next two functions should go away as the boot loader is
+ * supposed to initialize the macb address registers with a valid
+ * ethernet address. But we need to keep it around for a while until
+ * we can be reasonably sure the boot loader does this.
+ *
+ * The phy_id is ignored as the driver will probe for it.
+ */
 static int __init parse_tag_ethernet(struct tag *tag)
 {
        int i;
 
        i = tag->u.ethernet.mac_index;
-       if (i < ARRAY_SIZE(eth_data)) {
-               eth_data[i].mii_phy_addr = tag->u.ethernet.mii_phy_addr;
-               memcpy(&eth_data[i].hw_addr, tag->u.ethernet.hw_address,
-                      sizeof(eth_data[i].hw_addr));
-               eth_data[i].valid = 1;
-       }
+       if (i < ARRAY_SIZE(hw_addr))
+               memcpy(hw_addr[i].addr, tag->u.ethernet.hw_address,
+                      sizeof(hw_addr[i].addr));
+
        return 0;
 }
 __tagtable(ATAG_ETHERNET, parse_tag_ethernet);
 
+static void __init set_hw_addr(struct platform_device *pdev)
+{
+       struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       const u8 *addr;
+       void __iomem *regs;
+       struct clk *pclk;
+
+       if (!res)
+               return;
+       if (pdev->id >= ARRAY_SIZE(hw_addr))
+               return;
+
+       addr = hw_addr[pdev->id].addr;
+       if (!is_valid_ether_addr(addr))
+               return;
+
+       /*
+        * Since this is board-specific code, we'll cheat and use the
+        * physical address directly as we happen to know that it's
+        * the same as the virtual address.
+        */
+       regs = (void __iomem __force *)res->start;
+       pclk = clk_get(&pdev->dev, "pclk");
+       if (!pclk)
+               return;
+
+       clk_enable(pclk);
+       __raw_writel((addr[3] << 24) | (addr[2] << 16)
+                    | (addr[1] << 8) | addr[0], regs + 0x98);
+       __raw_writel((addr[5] << 8) | addr[4], regs + 0x9c);
+       clk_disable(pclk);
+       clk_put(pclk);
+}
+
 void __init setup_board(void)
 {
        at32_map_usart(1, 0);   /* /dev/ttyS0 */
@@ -51,8 +101,7 @@ static int __init atstk1002_init(void)
        at32_add_device_usart(1);
        at32_add_device_usart(2);
 
-       if (eth_data[0].valid)
-               at32_add_device_eth(0, &eth_data[0]);
+       set_hw_addr(at32_add_device_eth(0, &eth_data[0]));
 
        at32_add_device_spi(0);
        at32_add_device_lcdc(0, &atstk1000_fb0_data);
index a39b3e999f18dca54774979c4f500b17fe785b3d..b120ee030c867b97a46d1d314fe376d0f5fbd2e7 100644 (file)
@@ -21,10 +21,7 @@ void at32_map_usart(unsigned int hw_id, unsigned int line);
 struct platform_device *at32_add_device_usart(unsigned int id);
 
 struct eth_platform_data {
-       u8      valid;
-       u8      mii_phy_addr;
        u8      is_rmii;
-       u8      hw_addr[6];
 };
 struct platform_device *
 at32_add_device_eth(unsigned int id, struct eth_platform_data *data);