ar71xx: select AR71XX_DEV_DSA when AR71XX_DEV_AP91_ETH is selected, do not select...

[openwrt.git] / target / linux / ixp4xx / patches-2.6.32 / 180-tw5334_support.patch

diff --git a/target/linux/ixp4xx/patches-2.6.32/180-tw5334_support.patch b/target/linux/ixp4xx/patches-2.6.32/180-tw5334_support.patch
index f59792a..bed2c5d 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.32/180-tw5334_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.32/180-tw5334_support.patch
@@ -35,7 +35,7 @@
  obj-$(CONFIG_IXP4XX_QMGR)     += ixp4xx_qmgr.o
 --- /dev/null
 +++ b/arch/arm/mach-ixp4xx/tw5334-setup.c
-@@ -0,0 +1,162 @@
+@@ -0,0 +1,163 @@
 +/*
 + * arch/arm/mach-ixp4xx/tw5334-setup.c
 + *
@@ -149,7 +149,6 @@
 +
 +static void __init tw5334_init(void)
 +{
-+      DECLARE_MAC_BUF(mac_buf);
 +      uint8_t __iomem *f;
 +      int i;
 +
@@ -170,20 +169,22 @@
 +       */
 +      f = ioremap(IXP4XX_EXP_BUS_BASE(0), 0x1000000);
 +      if (f) {
-+              for (i = 0; i < 6; i++)
++              for (i = 0; i < 6; i++) {
 +#ifdef __ARMEB__
-+              tw5334_plat_eth[0].hwaddr[i] = readb(f + 0xFC0422 + i);
-+              tw5334_plat_eth[1].hwaddr[i] = readb(f + 0xFC043B + i);
++                      tw5334_plat_eth[0].hwaddr[i] = readb(f + 0xFC0422 + i);
++                      tw5334_plat_eth[1].hwaddr[i] = readb(f + 0xFC043B + i);
 +#else
-+              tw5334_plat_eth[0].hwaddr[i] = readb(f + 0xFC0422 + (i^3));
-+              tw5334_plat_eth[1].hwaddr[i] = readb(f + 0xFC043B + (i^3));
++                      tw5334_plat_eth[0].hwaddr[i] = readb(f + 0xFC0422 + (i^3));
++                      tw5334_plat_eth[1].hwaddr[i] = readb(f + 0xFC043B + (i^3));
 +#endif
++              }
 +              iounmap(f);
 +      }
-+      printk(KERN_INFO "TW-533-4: Using MAC address %s for port 0\n",
-+              print_mac(mac_buf, tw5334_plat_eth[0].hwaddr));
-+      printk(KERN_INFO "TW-533-4: Using MAC address %s for port 1\n",
-+              print_mac(mac_buf, tw5334_plat_eth[1].hwaddr));
++
++      printk(KERN_INFO "TW-533-4: Using MAC address %pM for port 0\n",
++              tw5334_plat_eth[0].hwaddr);
++      printk(KERN_INFO "TW-533-4: Using MAC address %pM for port 1\n",
++              tw5334_plat_eth[1].hwaddr);
 +}
 +
 +#ifdef CONFIG_MACH_TW5334