aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorHaavard Skinnemoen <hskinnemoen@atmel.com>2006-12-04 08:08:39 -0500
committerHaavard Skinnemoen <hskinnemoen@atmel.com>2006-12-08 07:06:19 -0500
commitc164b90135d05ac52f70e6652910a4f585f7b999 (patch)
treeea1dc910c9ff5c68b0fd22e112eaeead5f483cf0 /arch
parenta6f92f3dc8e53185bae50d44b5042b9cddf7f475 (diff)
[AVR32] Remove mii_phy_addr and eth_addr from eth_platform_data
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/avr32/boards/atstk1000/atstk1002.c65
1 files changed, 57 insertions, 8 deletions
diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c
index f65865cd9c3b..32b361f31c2c 100644
--- a/arch/avr32/boards/atstk1000/atstk1002.c
+++ b/arch/avr32/boards/atstk1000/atstk1002.c
@@ -7,33 +7,83 @@
7 * it under the terms of the GNU General Public License version 2 as 7 * it under the terms of the GNU General Public License version 2 as
8 * published by the Free Software Foundation. 8 * published by the Free Software Foundation.
9 */ 9 */
10#include <linux/clk.h>
11#include <linux/etherdevice.h>
10#include <linux/init.h> 12#include <linux/init.h>
11#include <linux/kernel.h> 13#include <linux/kernel.h>
14#include <linux/platform_device.h>
12#include <linux/string.h> 15#include <linux/string.h>
13#include <linux/types.h> 16#include <linux/types.h>
14 17
18#include <asm/io.h>
15#include <asm/setup.h> 19#include <asm/setup.h>
16#include <asm/arch/board.h> 20#include <asm/arch/board.h>
17#include <asm/arch/init.h> 21#include <asm/arch/init.h>
18 22
23struct eth_addr {
24 u8 addr[6];
25};
26
27static struct eth_addr __initdata hw_addr[2];
28
19static struct eth_platform_data __initdata eth_data[2]; 29static struct eth_platform_data __initdata eth_data[2];
20extern struct lcdc_platform_data atstk1000_fb0_data; 30extern struct lcdc_platform_data atstk1000_fb0_data;
21 31
32/*
33 * The next two functions should go away as the boot loader is
34 * supposed to initialize the macb address registers with a valid
35 * ethernet address. But we need to keep it around for a while until
36 * we can be reasonably sure the boot loader does this.
37 *
38 * The phy_id is ignored as the driver will probe for it.
39 */
22static int __init parse_tag_ethernet(struct tag *tag) 40static int __init parse_tag_ethernet(struct tag *tag)
23{ 41{
24 int i; 42 int i;
25 43
26 i = tag->u.ethernet.mac_index; 44 i = tag->u.ethernet.mac_index;
27 if (i < ARRAY_SIZE(eth_data)) { 45 if (i < ARRAY_SIZE(hw_addr))
28 eth_data[i].mii_phy_addr = tag->u.ethernet.mii_phy_addr; 46 memcpy(hw_addr[i].addr, tag->u.ethernet.hw_address,
29 memcpy(&eth_data[i].hw_addr, tag->u.ethernet.hw_address, 47 sizeof(hw_addr[i].addr));
30 sizeof(eth_data[i].hw_addr)); 48
31 eth_data[i].valid = 1;
32 }
33 return 0; 49 return 0;
34} 50}
35__tagtable(ATAG_ETHERNET, parse_tag_ethernet); 51__tagtable(ATAG_ETHERNET, parse_tag_ethernet);
36 52
53static void __init set_hw_addr(struct platform_device *pdev)
54{
55 struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
56 const u8 *addr;
57 void __iomem *regs;
58 struct clk *pclk;
59
60 if (!res)
61 return;
62 if (pdev->id >= ARRAY_SIZE(hw_addr))
63 return;
64
65 addr = hw_addr[pdev->id].addr;
66 if (!is_valid_ether_addr(addr))
67 return;
68
69 /*
70 * Since this is board-specific code, we'll cheat and use the
71 * physical address directly as we happen to know that it's
72 * the same as the virtual address.
73 */
74 regs = (void __iomem __force *)res->start;
75 pclk = clk_get(&pdev->dev, "pclk");
76 if (!pclk)
77 return;
78
79 clk_enable(pclk);
80 __raw_writel((addr[3] << 24) | (addr[2] << 16)
81 | (addr[1] << 8) | addr[0], regs + 0x98);
82 __raw_writel((addr[5] << 8) | addr[4], regs + 0x9c);
83 clk_disable(pclk);
84 clk_put(pclk);
85}
86
37void __init setup_board(void) 87void __init setup_board(void)
38{ 88{
39 at32_map_usart(1, 0); /* /dev/ttyS0 */ 89 at32_map_usart(1, 0); /* /dev/ttyS0 */
@@ -51,8 +101,7 @@ static int __init atstk1002_init(void)
51 at32_add_device_usart(1); 101 at32_add_device_usart(1);
52 at32_add_device_usart(2); 102 at32_add_device_usart(2);
53 103
54 if (eth_data[0].valid) 104 set_hw_addr(at32_add_device_eth(0, &eth_data[0]));
55 at32_add_device_eth(0, &eth_data[0]);
56 105
57 at32_add_device_spi(0); 106 at32_add_device_spi(0);
58 at32_add_device_lcdc(0, &atstk1000_fb0_data); 107 at32_add_device_lcdc(0, &atstk1000_fb0_data);