diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2006-05-14 23:39:47 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-05-19 00:35:26 -0400 |
commit | 07fb3f454cc9e0f656e378a6feb5bdd6cac4bd41 (patch) | |
tree | 5a754125950cb7ccb4029fc61748e1b171a7920a /arch/powerpc | |
parent | d6b89a196dfb03fdfbe3d574ab6773fe14a1d2c6 (diff) |
[PATCH] powerpc: update iseries_veth device-tree information
Make the device-tree information more generic and more
like the pSeries virtual lan device. Also use the MAC
address from the device tree.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/platforms/iseries/setup.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c index befd36af7e32..0a0825781937 100644 --- a/arch/powerpc/platforms/iseries/setup.c +++ b/arch/powerpc/platforms/iseries/setup.c | |||
@@ -946,10 +946,10 @@ void dt_vdevices(struct iseries_flat_dt *dt) | |||
946 | 946 | ||
947 | if ((vlan_map & (0x8000 >> i)) == 0) | 947 | if ((vlan_map & (0x8000 >> i)) == 0) |
948 | continue; | 948 | continue; |
949 | snprintf(buf, 32, "vlan@%08x", reg + i); | 949 | snprintf(buf, 32, "l-lan@%08x", reg + i); |
950 | dt_start_node(dt, buf); | 950 | dt_start_node(dt, buf); |
951 | dt_prop_str(dt, "device_type", "vlan"); | 951 | dt_prop_str(dt, "device_type", "network"); |
952 | dt_prop_str(dt, "compatible", ""); | 952 | dt_prop_str(dt, "compatible", "IBM,iSeries-l-lan"); |
953 | dt_prop_u32(dt, "reg", reg + i); | 953 | dt_prop_u32(dt, "reg", reg + i); |
954 | dt_prop_u32(dt, "linux,unit_address", i); | 954 | dt_prop_u32(dt, "linux,unit_address", i); |
955 | 955 | ||
@@ -961,6 +961,8 @@ void dt_vdevices(struct iseries_flat_dt *dt) | |||
961 | mac_addr[5] = HvLpConfig_getLpIndex_outline(); | 961 | mac_addr[5] = HvLpConfig_getLpIndex_outline(); |
962 | dt_prop(dt, "local-mac-address", (char *)mac_addr, ETH_ALEN); | 962 | dt_prop(dt, "local-mac-address", (char *)mac_addr, ETH_ALEN); |
963 | dt_prop(dt, "mac-address", (char *)mac_addr, ETH_ALEN); | 963 | dt_prop(dt, "mac-address", (char *)mac_addr, ETH_ALEN); |
964 | dt_prop_u32(dt, "max-frame-size", 9000); | ||
965 | dt_prop_u32(dt, "address-bits", 48); | ||
964 | 966 | ||
965 | dt_end_node(dt); | 967 | dt_end_node(dt); |
966 | } | 968 | } |