net: sh_eth: change the condition of initialization
authorYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Wed, 15 Feb 2012 17:54:56 +0000 (17:54 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 16 Feb 2012 22:08:09 +0000 (17:08 -0500)
The SH7757 has 2 Fast Ethernet and 2 Gigabit Ethernet, and the first
Gigabit channel needs the initialization. So, this patch adds the
parameter of "needs_init", and if the sh_eth_plat_data is set it
to 1, the driver will initialize the channel.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/renesas/sh_eth.c
include/linux/sh_eth.h

index 8f53b5a..5a5afbc 100644 (file)
@@ -1859,8 +1859,8 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
        /* read and set MAC address */
        read_mac_address(ndev, pd->mac_addr);
 
-       /* First device only init */
-       if (!devno) {
+       /* initialize first or needed device */
+       if (!devno || pd->needs_init) {
                if (mdp->cd->tsu) {
                        struct resource *rtsu;
                        rtsu = platform_get_resource(pdev, IORESOURCE_MEM, 1);
index 2076acf..b17d765 100644 (file)
@@ -20,6 +20,7 @@ struct sh_eth_plat_data {
        unsigned char mac_addr[6];
        unsigned no_ether_link:1;
        unsigned ether_link_active_low:1;
+       unsigned needs_init:1;
 };
 
 #endif