ned-off-by: David Wu
---
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 5b1c12ff98c0..e8640123db76 100644
--- a/d
Hi Heiner,
Today i apply this patch, I test it on the RK3328 which has the phy,
it looks good, and link state switching between 10M/100M is correct.
在 2019/3/21 上午1:50, David Miller 写道:
From: Heiner Kallweit
Date: Tue, 19 Mar 2019 19:56:51 +0100
Currently the Phy driver's link_change_notify
Hi David
We should probably wait for a Tested-by: from Daniel Mack
and David Wu , or
equivalent.
We should probably add them to the list of recipients if we want
tests from them, which I've done now.
@David: patch in question that changes the Rockchip eth-phy is
https://patchwork.kerne
Hi Shawn,
Thanks for the suggestion, the most is okay.
在 2018年05月16日 14:34, Shawn Lin 写道:
Hi David,
On 2018/5/16 11:38, David Wu wrote:
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
index 13133b3..4b2ab71 100644
--- a/drivers
Add constants and callback functions for the dwmac on px30 soc.
The base structure is the same, but registers and the bits in
them moved slightly, and add the clk_mac_speed for the select
of mac speed.
Signed-off-by: David Wu
---
.../devicetree/bindings/net/rockchip-dwmac.txt | 1
Add constants and callback functions for the dwmac on rk3128 soc.
As can be seen, the base structure is the same, only registers
and the bits in them moved slightly.
Signed-off-by: David Wu
---
.../devicetree/bindings/net/rockchip-dwmac.txt | 1 +
drivers/net/ethernet/stmicro/stmmac/dwmac
This patch solves the following error:
arch/arm/boot/dts/rk3228-evb.dtb: ERROR (phandle_references): Reference to
non-existent node or label "phy0"
Fixess db40f15b53e4 ("ARM: dts: rk3228-evb: Enable the integrated PHY for gmac")
Signed-off-by: David Wu
---
arch/arm/boot/dt
It only supports rmii interface. Add constants and callback functions
for the dwmac on rv1108 socs. As can be seen, the base structure is
the same, only registers and the bits in them moved slightly.
Signed-off-by: David Wu
---
.../devicetree/bindings/net/rockchip-dwmac.txt | 1 +
drivers
Enable the gmac2phy, make the gmac2phy work on
the rk3328-evb board.
Signed-off-by: David Wu
---
arch/arm64/boot/dts/rockchip/rk3328-evb.dts | 17 +
1 file changed, 17 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-evb.dts
b/arch/arm64/boot/dts/rockchip/rk3328
The gmac2phy controller of rk3328 is connected to integrated PHY
directly inside, add the node for the integrated PHY support.
Signed-off-by: David Wu
---
changes in v5:
- Use phy-is-integrated property via PHY node.
- Move the PHY clock, reset control, pinctrl to PHY node.
arch/arm64/boot
This patch enables the integrated PHY for rk3228 evb board
by default.
To use the external 1000M PHY on evb board, need to make
some switch of evb board to be on.
Signed-off-by: David Wu
Reviewed-by: Florian Fainelli
---
changes in v5:
- Use phy-is-integrated property via PHY node.
- Move the
There is only one mac controller in rk3228, which could connect to
external PHY or integrated PHY, use the grf_com_mux bit15 to route
external/integrated PHY.
Signed-off-by: David Wu
---
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 12
1 file changed, 12 insertions(+)
diff
There are two mac controllers in the rk3328, the one connects
to external PHY, and the other one connects to integrated PHY.
Like the mac of external PHY, the integrated PHY's mac also
needs to configure the related mac registers at GRF.
Signed-off-by: David Wu
---
drivers/net/ethernet/st
To make integrated PHY work, need to configure the PHY clock,
PHY cru reset and related registers.
Signed-off-by: David Wu
---
change in v4:
- PHY is internal or not base on the phy-is-internal property via phy node.
changes in v5:
- Use phy-is-integrated property via PHY node.
- Get the PHY
that the external PHY is used.
Signed-off-by: David Wu
---
change in v5:
- Use phy-is-integrated boolean property.
Documentation/devicetree/bindings/net/phy.txt | 5 +
1 file changed, 5 insertions(+)
diff --git a/Documentation/devicetree/bindings/net/phy.txt
b/Documentation/devicetree
Support integrated ethernet PHY currently.
Signed-off-by: David Wu
---
changes in v4:
- Remove SUPPORTED_[Asym_]Pause.
- Some minor fix like defines.
changes in v5:
- Rename internal to integrated.
- Remove PHY_IS_INTERNAL flag.
drivers/net/phy/Kconfig| 5 +
drivers/net/phy/Makefile
Enable the rockchip PHY driver for multi_v7_defconfig builds.
Signed-off-by: David Wu
---
arch/arm/configs/multi_v7_defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/configs/multi_v7_defconfig
b/arch/arm/configs/multi_v7_defconfig
index 4d19c1b..94d7e71 100644
--- a/arch
This is wrong setting for rk3328_set_to_rmii(), so remove it.
Signed-off-by: David Wu
---
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
index
Make the rockchip PHY driver built into the kernel.
Signed-off-by: David Wu
---
arch/arm64/configs/defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 6c7d147..925bd478 100644
--- a/arch/arm64/configs/defconfig
+++ b
The rk3228 and rk3328 support integrated PHY inside, let's enable
it to work. And the integrated PHY need to do some special setting,
so register the rockchip integrated PHY driver.
David Wu (11):
net: phy: Add rockchip PHY driver support
multi_v7_defconfig: Make rockchip PHY built-in
Enable the gmac2phy, make the gmac2phy work on
the rk3328-evb board.
Signed-off-by: David Wu
---
arch/arm64/boot/dts/rockchip/rk3328-evb.dts | 17 +
1 file changed, 17 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-evb.dts
b/arch/arm64/boot/dts/rockchip/rk3328
The gmac2phy controller of rk3328 is connected to internal phy
directly inside, add the node for the internal phy support.
Signed-off-by: David Wu
---
arch/arm64/boot/dts/rockchip/rk3328.dtsi | 37
1 file changed, 37 insertions(+)
diff --git a/arch/arm64/boot
This patch enables the internal phy for rk3228 evb board
by default.
To use the external 1000M phy on evb board, need to make
some switch of evb board to be on.
Signed-off-by: David Wu
---
arch/arm/boot/dts/rk3228-evb.dts | 32
1 file changed, 32 insertions
This patch adds internal mac phy clock and internal mac phy reset
for rk gmac using.
Signed-off-by: David Wu
---
arch/arm/boot/dts/rk322x.dtsi | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi
index f3e4ffd
There are two mac controllers in the rk3328, the one connects
to external phy, and the other one connects to internal phy.
Like the mac of external phy, the internal phy's mac also needs to
configure the related mac registers at GRF.
Signed-off-by: David Wu
---
drivers/net/ethernet/st
There is only one mac controller in rk3228, which could connect to
external phy or internal phy, use the grf_com_mux bit15 to route
external/internal phy.
Signed-off-by: David Wu
---
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 12
1 file changed, 12 insertions(+)
diff --git a
To make internal phy work, need to configure the phy_clock,
phy cru_reset and related registers.
Signed-off-by: David Wu
---
change in v4:
- PHY is internal or not base on the phy-is-internal property via phy node.
.../devicetree/bindings/net/rockchip-dwmac.txt | 4 +-
drivers/net
Add the documentation for internal phy. A boolean property
indicates that a internal phy will be used.
Signed-off-by: David Wu
---
Documentation/devicetree/bindings/net/phy.txt | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Documentation/devicetree/bindings/net/phy.txt
b/Documentation
Support internal ethernet phy currently.
Signed-off-by: David Wu
---
changes in v4:
- Remove SUPPORTED_[Asym_]Pause flag
- Some minor fix like defines
drivers/net/phy/Kconfig| 5 +
drivers/net/phy/Makefile | 1 +
drivers/net/phy/rockchip.c | 233
Enable the rockchip phy for multi_v7_defconfig builds.
Signed-off-by: David Wu
---
arch/arm/configs/multi_v7_defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/configs/multi_v7_defconfig
b/arch/arm/configs/multi_v7_defconfig
index 4d19c1b..94d7e71 100644
--- a/arch/arm
Make the rockchip phy driver built into the kernel.
Signed-off-by: David Wu
---
arch/arm64/configs/defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 6c7d147..925bd478 100644
--- a/arch/arm64/configs/defconfig
+++ b
The rk3228 and rk3328 support internal phy inside, let's enable
it to work. And the internal phy need to do some special setting, so
register the rockchip internal phy driver.
David Wu (12):
net: phy: Add rockchip phy driver support
multi_v7_defconfig: Make rockchip phy built-in
This is wrong setting for rk3328_set_to_rmii(), so remove it.
Signed-off-by: David Wu
---
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
index
Enable the gmac2phy, make the gmac2phy work on
the rk3328-evb board.
Signed-off-by: David Wu
---
arch/arm64/boot/dts/rockchip/rk3328-evb.dts | 17 +
1 file changed, 17 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-evb.dts
b/arch/arm64/boot/dts/rockchip/rk3328
The gmac2phy controller of rk3328 is connected to internal phy
directly inside, add the node for the internal phy support.
Signed-off-by: David Wu
---
arch/arm64/boot/dts/rockchip/rk3328.dtsi | 25 +
1 file changed, 25 insertions(+)
diff --git a/arch/arm64/boot/dts
This patch enables the internal phy for rk3228 evb board
by default.
To use the external 1000M phy on evb board, need to make
some switch of evb board to be on.
Signed-off-by: David Wu
---
arch/arm/boot/dts/rk3228-evb.dts | 20
1 file changed, 20 insertions(+)
diff --git a
This patch adds internal mac phy clock and internal mac phy reset
for rk gmac using.
Signed-off-by: David Wu
---
arch/arm/boot/dts/rk322x.dtsi | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi
index f3e4ffd
There are two mac controllers in the rk3328, the one connects
to external phy, and the other one connects to internal phy.
Like the mac of external phy, the internal phy's mac also needs to
configure the related mac registers at GRF.
Signed-off-by: David Wu
---
drivers/net/ethernet/st
There is only one mac controller in rk3228, which could connect to
external phy or internal phy, use the grf_com_mux bit15 to route
external/internal phy.
Signed-off-by: David Wu
---
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 12
1 file changed, 12 insertions(+)
diff --git a
To make internal phy work, need to configure the phy_clock,
phy cru_reset and related registers.
Signed-off-by: David Wu
---
.../devicetree/bindings/net/rockchip-dwmac.txt | 6 +-
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 81 ++
2 files changed, 86 insertions
The rk3228 and rk3328 support internal phy inside, let's enable
it to work. And the internal phy need to do some special setting, so
register the rockchip internal phy driver.
David Wu (11):
net: phy: Add rockchip phy driver support
multi_v7_defconfig: Make rockchip phy built-in
Support internal ethernet phy currently.
Signed-off-by: David Wu
---
drivers/net/phy/Kconfig| 5 +
drivers/net/phy/Makefile | 1 +
drivers/net/phy/rockchip.c | 229 +
3 files changed, 235 insertions(+)
create mode 100644 drivers/net/phy
Enable the rockchip phy for multi_v7_defconfig builds.
Signed-off-by: David Wu
---
arch/arm/configs/multi_v7_defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/configs/multi_v7_defconfig
b/arch/arm/configs/multi_v7_defconfig
index 4d19c1b..94d7e71 100644
--- a/arch/arm
Make the rockchip phy driver built into the kernel.
Signed-off-by: David Wu
---
arch/arm64/configs/defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 6c7d147..925bd478 100644
--- a/arch/arm64/configs/defconfig
+++ b
This is wrong setting for rk3328_set_to_rmii(), so remove it.
Signed-off-by: David Wu
---
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
index
Enable the gmac2phy, make the gmac2phy work on
the rk3328-evb board.
Signed-off-by: David Wu
---
arch/arm64/boot/dts/rockchip/rk3328-evb.dts | 17 +
1 file changed, 17 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-evb.dts
b/arch/arm64/boot/dts/rockchip/rk3328
The gmac2phy controller of rk3328 is connected to internal phy
directly inside, add the node for the internal phy support.
Signed-off-by: David Wu
---
arch/arm64/boot/dts/rockchip/rk3328.dtsi | 24
1 file changed, 24 insertions(+)
diff --git a/arch/arm64/boot/dts
To make internal phy work, need to configure the phy_clock,
phy cru_reset and related registers.
Signed-off-by: David Wu
---
changes in v2:
- Use the standard "phy-mode" property for internal phy. (Florian)
- Move the internal macphy clock to the optional properties. (Heiko)
.../
There is only one mac controller in rk3228, which could connect to
external phy or internal phy, use the grf_com_mux bit15 to route
external/internal phy.
Signed-off-by: David Wu
---
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 12
1 file changed, 12 insertions(+)
diff --git a
This patch enables the internal phy for rk3228 evb board
by default.
To use the external 1000M phy on evb board, need to make
some switch of evb board to be on.
Signed-off-by: David Wu
---
arch/arm/boot/dts/rk3228-evb.dts | 19 +++
1 file changed, 19 insertions(+)
diff --git a
There are two mac controllers in the rk3328, the one connects
to external phy, and the other one connects to internal phy.
Like the mac of external phy, the internal phy's mac also needs to
configure the related mac registers at GRF.
Signed-off-by: David Wu
---
drivers/net/ethernet/st
This patch adds internal mac phy clock and internal mac phy reset
for rk gmac using.
Signed-off-by: David Wu
---
arch/arm/boot/dts/rk322x.dtsi | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi
index f3e4ffd
Support internal ephy currently.
Signed-off-by: David Wu
---
changes in v2:
- Alphabetic order for Kconfig and Makefile.
- Add analog register init.
- Disable auto-mdix for workround.
- Rename config
drivers/net/phy/Kconfig| 5 ++
drivers/net/phy/Makefile | 1 +
drivers/net/phy
The rk3228 and rk3328 support internal phy inside, let's enable
it to work. And the internal phy need to do some special setting, so
register the rockchip internal phy driver.
David Wu (11):
net: phy: Add rockchip phy driver support
multi_v7_defconfig: Make rockchip phy built-in
Enable the rockchip phy for multi_v7_defconfig builds.
Signed-off-by: David Wu
---
arch/arm/configs/multi_v7_defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/configs/multi_v7_defconfig
b/arch/arm/configs/multi_v7_defconfig
index 4d19c1b..94d7e71 100644
--- a/arch/arm
Make the rockchip phy driver built into the kernel.
Signed-off-by: David Wu
---
arch/arm64/configs/defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 6c7d147..925bd478 100644
--- a/arch/arm64/configs/defconfig
+++ b
This is wrong setting for rk3328_set_to_rmii(), so remove it.
Signed-off-by: David Wu
---
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
index
Let's enable the gmac2phy, make the gmac2phy work on
the rk3328-evb board.
Signed-off-by: David Wu
---
arch/arm64/boot/dts/rockchip/rk3328-evb.dts | 17 +
1 file changed, 17 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-evb.dts
b/arch/arm64/boot/dts/roc
The gmac2phy controller of rk3328 is connected to internal phy
directly inside, add the node for the internal phy support.
Signed-off-by: David Wu
---
arch/arm64/boot/dts/rockchip/rk3328.dtsi | 25 +
1 file changed, 25 insertions(+)
diff --git a/arch/arm64/boot/dts
This patch enables the internal phy for rk3228 evb board
by default.
To use the external 1000M phy on evb board, need to make
some switch of evb board to be on.
Signed-off-by: David Wu
---
arch/arm/boot/dts/rk3228-evb.dts | 20
1 file changed, 20 insertions(+)
diff --git a
This patch adds internal mac phy clock and internal mac phy reset
for rk gmac using.
Signed-off-by: David Wu
---
arch/arm/boot/dts/rk322x.dtsi | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi
index 48a0c1c
There are two mac controllers in the rk3328, the one connects
to external phy, and the other one connects to internal phy.
Like the mac of external phy, the internal phy's mac also needs to
configure the related mac registers at GRF.
Signed-off-by: David Wu
---
drivers/net/ethernet/st
There is only one mac controller in rk3228, which could connect to
external phy or internal phy, use the grf_com_mux bit15 to route
external/internal phy.
Change-Id: I3a366677047b8032eb535abb0c3e56fa7722aa2e
Signed-off-by: David Wu
---
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 12
To make internal phy worked, need to configure the phy_clock,
phy cru_reset and related registers.
Change-Id: I6971c0a769754b824b1b908b56080cbaf7867d13
Signed-off-by: David Wu
---
.../devicetree/bindings/net/rockchip-dwmac.txt | 3 +
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 82
This is wrong setting for rk3328_set_to_rmii(), so remove it.
Change-Id: I9953784ea44335d90710e5473960c95b3d68a5fd
Signed-off-by: David Wu
---
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
b
Make the rockchip mac phy driver built into the kernel.
Signed-off-by: David Wu
---
arch/arm64/configs/defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 97c123e..b4abe7f 100644
--- a/arch/arm64/configs/defconfig
+++ b
The rk3228 and rk3328 support internal mac phy inside, let's enable
it to work. And the internal phy need to do some special setting, so
register the rockchip mac internal phy driver, not use the genphy driver.
David Wu (11):
net: phy: Add rockchip phy driver support
multi_v7_defconfig:
Enable the rockchip mac phy for multi_v7_defconfig builds
Signed-off-by: David Wu
---
arch/arm/configs/multi_v7_defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/configs/multi_v7_defconfig
b/arch/arm/configs/multi_v7_defconfig
index 2685e03..fc1986c 100644
--- a/arch/arm
Support internal ephy currently.
Signed-off-by: David Wu
---
drivers/net/phy/Kconfig| 4 ++
drivers/net/phy/Makefile | 1 +
drivers/net/phy/rockchip.c | 94 ++
3 files changed, 99 insertions(+)
create mode 100644 drivers/net/phy/rockchip.c
From: "david.wu"
Add constants and callback functions for the dwmac on rk3328 socs.
As can be seen, the base structure is the same, only registers and the
bits in them moved slightly.
Signed-off-by: david.wu
---
.../devicetree/bindings/net/rockchip-dwmac.txt | 1 +
drivers/net/ethernet/s
70 matches
Mail list logo
