3 files changed, 11 insertions, 1 deletions

diff --git a/arch/sh/include/asm/sh_eth.h b/arch/sh/include/asm/sh_eth.h
index bb832584f3c1..acf99700deed 100644
--- a/arch/sh/include/asm/sh_eth.h
+++ b/arch/sh/include/asm/sh_eth.h
@@ -6,6 +6,9 @@ enum {EDMAC_LITTLE_ENDIAN, EDMAC_BIG_ENDIAN};
 struct sh_eth_plat_data {
         int phy;
         int edmac_endian;
+
+        unsigned no_ether_link:1;
+        unsigned ether_link_active_low:1;
 };
 
 #endif
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 4c4dcbf19026..f49d0800c1d1 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -772,13 +772,15 @@ static void sh_eth_error(struct net_device *ndev, int intr_status)
                         mdp->stats.tx_carrier_errors++;
                 if (felic_stat & ECSR_LCHNG) {
                         /* Link Changed */
-                        if (mdp->cd->no_psr) {
+                        if (mdp->cd->no_psr || mdp->no_ether_link) {
                                 if (mdp->link == PHY_DOWN)
                                         link_stat = 0;
                                 else
                                         link_stat = PHY_ST_LINK;
                         } else {
                                 link_stat = (ctrl_inl(ioaddr + PSR));
+                                if (mdp->ether_link_active_low)
+                                        link_stat = ~link_stat;
                         }
                         if (!(link_stat & PHY_ST_LINK)) {
                                 /* Link Down : disable tx and rx */
@@ -1410,6 +1412,8 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
         mdp->phy_id = pd->phy;
         /* EDMAC endian */
         mdp->edmac_endian = pd->edmac_endian;
+        mdp->no_ether_link = pd->no_ether_link;
+        mdp->ether_link_active_low = pd->ether_link_active_low;
 
         /* set cpu data */
         mdp->cd = &sh_eth_my_cpu_data;
diff --git a/drivers/net/sh_eth.h b/drivers/net/sh_eth.h
index 9afe5b4c855d..ba151f86ae7b 100644
--- a/drivers/net/sh_eth.h
+++ b/drivers/net/sh_eth.h
@@ -729,6 +729,9 @@ struct sh_eth_private {
         char post_rx;           /* POST receive */
         char post_fw;           /* POST forward */
         struct net_device_stats tsu_stats;      /* TSU forward status */
+
+        unsigned no_ether_link:1;
+        unsigned ether_link_active_low:1;
 };
 
 static inline void sh_eth_soft_swap(char *src, int len)