Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-elphel
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
linux-elphel
Commits
a1f63e66
Commit
a1f63e66
authored
Nov 23, 2017
by
Oleg Dzhimiev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updated
parent
41c53043
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
7 deletions
+10
-7
xilinx_emacps.c.patch
src/patches/xilinx_emacps.c.patch
+10
-7
No files found.
src/patches/xilinx_emacps.c.patch
View file @
a1f63e66
diff -Naur a/drivers/net/ethernet/xilinx/xilinx_emacps.c b/drivers/net/ethernet/xilinx/xilinx_emacps.c
diff --git a/drivers/net/ethernet/xilinx/xilinx_emacps.c b/drivers/net/ethernet/xilinx/xilinx_emacps.c
--- a/drivers/net/ethernet/xilinx/xilinx_emacps.c 2016-01-25 18:34:24.065782741 -0700
index a4289f9..c28e6da 100644
+++ b/drivers/net/ethernet/xilinx/xilinx_emacps.c 2016-01-25 19:03:50.781815909 -0700
--- a/drivers/net/ethernet/xilinx/xilinx_emacps.c
@@ -479,6 +479,10 @@
+++ b/drivers/net/ethernet/xilinx/xilinx_emacps.c
@@ -480,6 +480,10 @@ MDC_DIV_64, MDC_DIV_96, MDC_DIV_128, MDC_DIV_224 };
#define XEMACPS_PTP_CC_MULT (1 << 31)
#define XEMACPS_PTP_CC_MULT (1 << 31)
#endif
#endif
...
@@ -12,7 +13,7 @@ diff -Naur a/drivers/net/ethernet/xilinx/xilinx_emacps.c b/drivers/net/ethernet/
...
@@ -12,7 +13,7 @@ diff -Naur a/drivers/net/ethernet/xilinx/xilinx_emacps.c b/drivers/net/ethernet/
#define xemacps_read(base, reg) \
#define xemacps_read(base, reg) \
readl_relaxed(((void __iomem *)(base)) + (reg))
readl_relaxed(((void __iomem *)(base)) + (reg))
#define xemacps_write(base, reg, val) \
#define xemacps_write(base, reg, val) \
@@ -87
1,6 +875,49 @@
@@ -87
2,6 +876,51 @@ static int xemacps_mii_probe(struct net_device *ndev)
return 0;
return 0;
}
}
...
@@ -20,7 +21,9 @@ diff -Naur a/drivers/net/ethernet/xilinx/xilinx_emacps.c b/drivers/net/ethernet/
...
@@ -20,7 +21,9 @@ diff -Naur a/drivers/net/ethernet/xilinx/xilinx_emacps.c b/drivers/net/ethernet/
+static int ar8035_phy_fixup(struct phy_device *dev)
+static int ar8035_phy_fixup(struct phy_device *dev)
+{
+{
+ u16 val;
+ u16 val;
+ struct net_local *lp = dev->bus->priv;
+ // Elphel: phy_device has changed
+ //struct net_local *lp = dev->bus->priv;
+ struct net_local *lp = dev->mdio->bus->priv;
+ dev_dbg(&lp->pdev->dev,"fixup start");
+ dev_dbg(&lp->pdev->dev,"fixup start");
+
+
+ /* Ar803x phy SmartEEE feature cause link status generates glitch,
+ /* Ar803x phy SmartEEE feature cause link status generates glitch,
...
@@ -62,7 +65,7 @@ diff -Naur a/drivers/net/ethernet/xilinx/xilinx_emacps.c b/drivers/net/ethernet/
...
@@ -62,7 +65,7 @@ diff -Naur a/drivers/net/ethernet/xilinx/xilinx_emacps.c b/drivers/net/ethernet/
/**
/**
* xemacps_mii_init - Initialize and register mii bus to network device
* xemacps_mii_init - Initialize and register mii bus to network device
* @lp: local device instance pointer
* @lp: local device instance pointer
@@ -88
3,6 +930,8 @@
@@ -88
4,6 +933,8 @@ static int xemacps_mii_init(struct net_local *lp)
struct device_node *np = of_get_parent(lp->phy_node);
struct device_node *np = of_get_parent(lp->phy_node);
struct device_node *npp;
struct device_node *npp;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment