firmware-utils/mksercommfw: fix musl build

[openwrt/openwrt.git] / target / linux / ar7 / patches-3.18 / 950-cpmac_titan.patch

diff --git a/target/linux/ar7/patches-3.18/950-cpmac_titan.patch b/target/linux/ar7/patches-3.18/950-cpmac_titan.patch
index f1d432cc4c8352c6b70f6c15747099b49f74d196..3cabae067a5952f7f9ee47883749c873cd44c4ff 100644 (file)
--- a/target/linux/ar7/patches-3.18/950-cpmac_titan.patch
+++ b/target/linux/ar7/patches-3.18/950-cpmac_titan.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/ethernet/ti/cpmac.c
 +++ b/drivers/net/ethernet/ti/cpmac.c
 --- a/drivers/net/ethernet/ti/cpmac.c
 +++ b/drivers/net/ethernet/ti/cpmac.c

-@@ -1146,6 +1146,8 @@ static int cpmac_probe(struct platform_d
+@@ -1147,6 +1147,8 @@ static int cpmac_probe(struct platform_d

                goto out;
        }
  
                goto out;
        }
  


@@ -9,7 +9,7 @@
        dev->irq = platform_get_irq_byname(pdev, "irq");
  
        dev->netdev_ops = &cpmac_netdev_ops;
        dev->irq = platform_get_irq_byname(pdev, "irq");
  
        dev->netdev_ops = &cpmac_netdev_ops;

-@@ -1227,7 +1229,7 @@ int cpmac_init(void)
+@@ -1228,7 +1230,7 @@ int cpmac_init(void)

        cpmac_mii->reset = cpmac_mdio_reset;
        cpmac_mii->irq = mii_irqs;
  
        cpmac_mii->reset = cpmac_mdio_reset;
        cpmac_mii->irq = mii_irqs;
  


@@ -18,8 +18,8 @@
  
        if (!cpmac_mii->priv) {
                pr_err("Can't ioremap mdio registers\n");
  
        if (!cpmac_mii->priv) {
                pr_err("Can't ioremap mdio registers\n");

-@@ -1238,10 +1240,16 @@ int cpmac_init(void)
- #warning FIXME: unhardcode gpio&reset bits
+@@ -1239,10 +1241,16 @@ int cpmac_init(void)
+       /* FIXME: unhardcode gpio&reset bits */

        ar7_gpio_disable(26);
        ar7_gpio_disable(27);
 -      ar7_device_reset(AR7_RESET_BIT_CPMAC_LO);
        ar7_gpio_disable(26);
        ar7_gpio_disable(27);
 -      ar7_device_reset(AR7_RESET_BIT_CPMAC_LO);


@@ -37,7 +37,7 @@
        cpmac_mii->reset(cpmac_mii);
  
        for (i = 0; i < 300; i++) {
        cpmac_mii->reset(cpmac_mii);
  
        for (i = 0; i < 300; i++) {

-@@ -1258,7 +1266,11 @@ int cpmac_init(void)
+@@ -1259,7 +1267,11 @@ int cpmac_init(void)

                mask = 0;
        }
  
                mask = 0;
        }