kernel: refresh patches

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 43564
This commit is contained in:
Felix Fietkau
2014-12-08 12:04:25 +00:00
parent 3951f9492f
commit 9a495f6bbb
258 changed files with 2062 additions and 4554 deletions

View File

@@ -65,11 +65,10 @@ Signed-off-by: Brian Norris <computersforpeace@gmail.com>
int of_get_nand_bus_width(struct device_node *np);
bool of_get_nand_on_flash_bbt(struct device_node *np);
@@ -22,6 +24,16 @@ static inline int of_get_nand_ecc_mode(s
{
@@ -23,6 +25,16 @@ static inline int of_get_nand_ecc_mode(s
return -ENOSYS;
}
+
+static inline int of_get_nand_ecc_step_size(struct device_node *np)
+{
+ return -ENOSYS;
@@ -79,6 +78,7 @@ Signed-off-by: Brian Norris <computersforpeace@gmail.com>
+{
+ return -ENOSYS;
+}
+
static inline int of_get_nand_bus_width(struct device_node *np)
{
return -ENOSYS;

View File

@@ -32,7 +32,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
u16 regs[MII_REGS_NUM];
struct phy_device *phydev;
struct fixed_phy_status status;
@@ -104,8 +104,8 @@ static int fixed_phy_update_regs(struct
@@ -104,8 +104,8 @@ static int fixed_phy_update_regs(struct
if (fp->status.asym_pause)
lpa |= LPA_PAUSE_ASYM;
@@ -43,7 +43,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
fp->regs[MII_BMSR] = bmsr;
fp->regs[MII_BMCR] = bmcr;
@@ -115,7 +115,7 @@ static int fixed_phy_update_regs(struct
@@ -115,7 +115,7 @@ static int fixed_phy_update_regs(struct
return 0;
}
@@ -88,7 +88,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
struct fixed_phy_status *status)
{
int ret;
@@ -184,9 +184,9 @@ int fixed_phy_add(unsigned int irq, int
@@ -184,9 +184,9 @@ int fixed_phy_add(unsigned int irq, int
memset(fp->regs, 0xFF, sizeof(fp->regs[0]) * MII_REGS_NUM);

View File

@@ -76,7 +76,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
#include <linux/of.h>
#include <linux/of_irq.h>
#include <linux/of_mdio.h>
@@ -280,3 +281,69 @@ struct phy_device *of_phy_attach(struct
@@ -280,3 +281,69 @@ struct phy_device *of_phy_attach(struct
return phy_attach_direct(dev, phy, flags, iface) ? NULL : phy;
}
EXPORT_SYMBOL(of_phy_attach);