* [PATCH V2 1/5] ARM: dts: imx6: add wakeup support via magic packet
2021-01-16 8:44 [PATCH V2 0/5] patches for FEC Joakim Zhang
@ 2021-01-16 8:44 ` Joakim Zhang
2021-01-16 8:44 ` [PATCH V2 2/5] arm64: dts: imx8m: correct assigned clocks for FEC Joakim Zhang
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Joakim Zhang @ 2021-01-16 8:44 UTC (permalink / raw)
To: shawnguo, s.hauer, festevam; +Cc: devicetree, linux-imx
Add wakeup support via magic packet on i.MX platforms.
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
---
arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 1 +
arch/arm/boot/dts/imx6sx-sdb.dtsi | 2 ++
arch/arm/boot/dts/imx6ul.dtsi | 2 ++
3 files changed, 5 insertions(+)
diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
index afe477f32984..5e58740d40c5 100644
--- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
@@ -298,6 +298,7 @@
interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>,
<&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;
fsl,err006687-workaround-present;
+ fsl,magic-packet;
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6sx-sdb.dtsi b/arch/arm/boot/dts/imx6sx-sdb.dtsi
index 1351d7f70a54..c6e85e4a0883 100644
--- a/arch/arm/boot/dts/imx6sx-sdb.dtsi
+++ b/arch/arm/boot/dts/imx6sx-sdb.dtsi
@@ -206,6 +206,7 @@
phy-mode = "rgmii-id";
phy-handle = <ðphy1>;
phy-reset-gpios = <&gpio2 7 GPIO_ACTIVE_LOW>;
+ fsl,magic-packet;
status = "okay";
mdio {
@@ -227,6 +228,7 @@
pinctrl-0 = <&pinctrl_enet2>;
phy-mode = "rgmii-id";
phy-handle = <ðphy2>;
+ fsl,magic-packet;
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index 9d3411cc597b..afeec01f6522 100644
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -538,6 +538,7 @@
fsl,num-tx-queues = <1>;
fsl,num-rx-queues = <1>;
fsl,stop-mode = <&gpr 0x10 4>;
+ fsl,magic-packet;
status = "disabled";
};
@@ -885,6 +886,7 @@
fsl,num-tx-queues = <1>;
fsl,num-rx-queues = <1>;
fsl,stop-mode = <&gpr 0x10 3>;
+ fsl,magic-packet;
status = "disabled";
};
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH V2 2/5] arm64: dts: imx8m: correct assigned clocks for FEC
2021-01-16 8:44 [PATCH V2 0/5] patches for FEC Joakim Zhang
2021-01-16 8:44 ` [PATCH V2 1/5] ARM: dts: imx6: add wakeup support via magic packet Joakim Zhang
@ 2021-01-16 8:44 ` Joakim Zhang
2021-01-16 8:44 ` [PATCH V2 3/5] arm64: dts: imx8mq: assign clock parents " Joakim Zhang
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Joakim Zhang @ 2021-01-16 8:44 UTC (permalink / raw)
To: shawnguo, s.hauer, festevam; +Cc: devicetree, linux-imx
CLK_ENET_TIMER assigned clocks twice, should be a typo, correct to
CLK_ENET_PHY_REF clock.
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
---
arch/arm64/boot/dts/freescale/imx8mm.dtsi | 7 ++++---
arch/arm64/boot/dts/freescale/imx8mn.dtsi | 7 ++++---
arch/arm64/boot/dts/freescale/imx8mp.dtsi | 7 ++++---
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/arch/arm64/boot/dts/freescale/imx8mm.dtsi b/arch/arm64/boot/dts/freescale/imx8mm.dtsi
index 9bee6f1889a4..5af0e63b1db1 100644
--- a/arch/arm64/boot/dts/freescale/imx8mm.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mm.dtsi
@@ -915,11 +915,12 @@
assigned-clocks = <&clk IMX8MM_CLK_ENET_AXI>,
<&clk IMX8MM_CLK_ENET_TIMER>,
<&clk IMX8MM_CLK_ENET_REF>,
- <&clk IMX8MM_CLK_ENET_TIMER>;
+ <&clk IMX8MM_CLK_ENET_PHY_REF>;
assigned-clock-parents = <&clk IMX8MM_SYS_PLL1_266M>,
<&clk IMX8MM_SYS_PLL2_100M>,
- <&clk IMX8MM_SYS_PLL2_125M>;
- assigned-clock-rates = <0>, <0>, <125000000>, <100000000>;
+ <&clk IMX8MM_SYS_PLL2_125M>,
+ <&clk IMX8MM_SYS_PLL2_50M>;
+ assigned-clock-rates = <0>, <100000000>, <125000000>, <0>;
fsl,num-tx-queues = <3>;
fsl,num-rx-queues = <3>;
status = "disabled";
diff --git a/arch/arm64/boot/dts/freescale/imx8mn.dtsi b/arch/arm64/boot/dts/freescale/imx8mn.dtsi
index fcf580816320..9dc52747a142 100644
--- a/arch/arm64/boot/dts/freescale/imx8mn.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mn.dtsi
@@ -913,11 +913,12 @@
assigned-clocks = <&clk IMX8MN_CLK_ENET_AXI>,
<&clk IMX8MN_CLK_ENET_TIMER>,
<&clk IMX8MN_CLK_ENET_REF>,
- <&clk IMX8MN_CLK_ENET_TIMER>;
+ <&clk IMX8MN_CLK_ENET_PHY_REF>;
assigned-clock-parents = <&clk IMX8MN_SYS_PLL1_266M>,
<&clk IMX8MN_SYS_PLL2_100M>,
- <&clk IMX8MN_SYS_PLL2_125M>;
- assigned-clock-rates = <0>, <0>, <125000000>, <100000000>;
+ <&clk IMX8MN_SYS_PLL2_125M>,
+ <&clk IMX8MN_SYS_PLL2_50M>;
+ assigned-clock-rates = <0>, <100000000>, <125000000>, <0>;
fsl,num-tx-queues = <3>;
fsl,num-rx-queues = <3>;
status = "disabled";
diff --git a/arch/arm64/boot/dts/freescale/imx8mp.dtsi b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
index 9401e92f1c84..ba32725ff28c 100644
--- a/arch/arm64/boot/dts/freescale/imx8mp.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
@@ -768,11 +768,12 @@
assigned-clocks = <&clk IMX8MP_CLK_ENET_AXI>,
<&clk IMX8MP_CLK_ENET_TIMER>,
<&clk IMX8MP_CLK_ENET_REF>,
- <&clk IMX8MP_CLK_ENET_TIMER>;
+ <&clk IMX8MP_CLK_ENET_PHY_REF>;
assigned-clock-parents = <&clk IMX8MP_SYS_PLL1_266M>,
<&clk IMX8MP_SYS_PLL2_100M>,
- <&clk IMX8MP_SYS_PLL2_125M>;
- assigned-clock-rates = <0>, <0>, <125000000>, <100000000>;
+ <&clk IMX8MP_SYS_PLL2_125M>,
+ <&clk IMX8MP_SYS_PLL2_50M>;
+ assigned-clock-rates = <0>, <100000000>, <125000000>, <0>;
fsl,num-tx-queues = <3>;
fsl,num-rx-queues = <3>;
status = "disabled";
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH V2 3/5] arm64: dts: imx8mq: assign clock parents for FEC
2021-01-16 8:44 [PATCH V2 0/5] patches for FEC Joakim Zhang
2021-01-16 8:44 ` [PATCH V2 1/5] ARM: dts: imx6: add wakeup support via magic packet Joakim Zhang
2021-01-16 8:44 ` [PATCH V2 2/5] arm64: dts: imx8m: correct assigned clocks for FEC Joakim Zhang
@ 2021-01-16 8:44 ` Joakim Zhang
2021-01-16 8:44 ` [PATCH V2 4/5] arm64: dts: imx8m: add mac address " Joakim Zhang
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Joakim Zhang @ 2021-01-16 8:44 UTC (permalink / raw)
To: shawnguo, s.hauer, festevam; +Cc: devicetree, linux-imx
Assign clock parents for FEC, set "ptp" clock to 100M, "enet_clk_ref" to
125M.
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
---
arch/arm64/boot/dts/freescale/imx8mq.dtsi | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/arch/arm64/boot/dts/freescale/imx8mq.dtsi b/arch/arm64/boot/dts/freescale/imx8mq.dtsi
index 9fcb001b8dde..2f64a868e01e 100644
--- a/arch/arm64/boot/dts/freescale/imx8mq.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mq.dtsi
@@ -1163,6 +1163,15 @@
<&clk IMX8MQ_CLK_ENET_PHY_REF>;
clock-names = "ipg", "ahb", "ptp",
"enet_clk_ref", "enet_out";
+ assigned-clocks = <&clk IMX8MQ_CLK_ENET_AXI>,
+ <&clk IMX8MQ_CLK_ENET_TIMER>,
+ <&clk IMX8MQ_CLK_ENET_REF>,
+ <&clk IMX8MQ_CLK_ENET_PHY_REF>;
+ assigned-clock-parents = <&clk IMX8MQ_SYS1_PLL_266M>,
+ <&clk IMX8MQ_SYS2_PLL_100M>,
+ <&clk IMX8MQ_SYS2_PLL_125M>,
+ <&clk IMX8MQ_SYS2_PLL_50M>;
+ assigned-clock-rates = <0>, <100000000>, <125000000>, <0>;
fsl,num-tx-queues = <3>;
fsl,num-rx-queues = <3>;
status = "disabled";
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH V2 4/5] arm64: dts: imx8m: add mac address for FEC
2021-01-16 8:44 [PATCH V2 0/5] patches for FEC Joakim Zhang
` (2 preceding siblings ...)
2021-01-16 8:44 ` [PATCH V2 3/5] arm64: dts: imx8mq: assign clock parents " Joakim Zhang
@ 2021-01-16 8:44 ` Joakim Zhang
2021-01-16 8:44 ` [PATCH V2 5/5] arm64: dts: imx8m: add fsl,stop-mode property " Joakim Zhang
2021-01-18 9:40 ` [PATCH V2 0/5] patches " Shawn Guo
5 siblings, 0 replies; 7+ messages in thread
From: Joakim Zhang @ 2021-01-16 8:44 UTC (permalink / raw)
To: shawnguo, s.hauer, festevam; +Cc: devicetree, linux-imx
Add mac address in efuse, so that FEC driver can parse it from nvmem
cell.
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
---
arch/arm64/boot/dts/freescale/imx8mm.dtsi | 7 +++++++
arch/arm64/boot/dts/freescale/imx8mn.dtsi | 7 +++++++
arch/arm64/boot/dts/freescale/imx8mp.dtsi | 7 +++++++
arch/arm64/boot/dts/freescale/imx8mq.dtsi | 7 +++++++
4 files changed, 28 insertions(+)
diff --git a/arch/arm64/boot/dts/freescale/imx8mm.dtsi b/arch/arm64/boot/dts/freescale/imx8mm.dtsi
index 5af0e63b1db1..acb8df609e2b 100644
--- a/arch/arm64/boot/dts/freescale/imx8mm.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mm.dtsi
@@ -527,6 +527,10 @@
cpu_speed_grade: speed-grade@10 {
reg = <0x10 4>;
};
+
+ fec_mac_address: mac-address@90 {
+ reg = <0x90 6>;
+ };
};
anatop: anatop@30360000 {
@@ -923,6 +927,9 @@
assigned-clock-rates = <0>, <100000000>, <125000000>, <0>;
fsl,num-tx-queues = <3>;
fsl,num-rx-queues = <3>;
+ nvmem-cells = <&fec_mac_address>;
+ nvmem-cell-names = "mac-address";
+ nvmem_macaddr_swap;
status = "disabled";
};
diff --git a/arch/arm64/boot/dts/freescale/imx8mn.dtsi b/arch/arm64/boot/dts/freescale/imx8mn.dtsi
index 9dc52747a142..30cc51b633cf 100644
--- a/arch/arm64/boot/dts/freescale/imx8mn.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mn.dtsi
@@ -540,6 +540,10 @@
cpu_speed_grade: speed-grade@10 {
reg = <0x10 4>;
};
+
+ fec_mac_address: mac-address@90 {
+ reg = <0x90 6>;
+ };
};
anatop: anatop@30360000 {
@@ -921,6 +925,9 @@
assigned-clock-rates = <0>, <100000000>, <125000000>, <0>;
fsl,num-tx-queues = <3>;
fsl,num-rx-queues = <3>;
+ nvmem-cells = <&fec_mac_address>;
+ nvmem-cell-names = "mac-address";
+ nvmem_macaddr_swap;
status = "disabled";
};
diff --git a/arch/arm64/boot/dts/freescale/imx8mp.dtsi b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
index ba32725ff28c..9dc63eddce16 100644
--- a/arch/arm64/boot/dts/freescale/imx8mp.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
@@ -337,6 +337,10 @@
cpu_speed_grade: speed-grade@10 {
reg = <0x10 4>;
};
+
+ eth_mac1: mac-address@90 {
+ reg = <0x90 6>;
+ };
};
anatop: anatop@30360000 {
@@ -776,6 +780,9 @@
assigned-clock-rates = <0>, <100000000>, <125000000>, <0>;
fsl,num-tx-queues = <3>;
fsl,num-rx-queues = <3>;
+ nvmem-cells = <ð_mac1>;
+ nvmem-cell-names = "mac-address";
+ nvmem_macaddr_swap;
status = "disabled";
};
};
diff --git a/arch/arm64/boot/dts/freescale/imx8mq.dtsi b/arch/arm64/boot/dts/freescale/imx8mq.dtsi
index 2f64a868e01e..48265f5b2728 100644
--- a/arch/arm64/boot/dts/freescale/imx8mq.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mq.dtsi
@@ -564,6 +564,10 @@
cpu_speed_grade: speed-grade@10 {
reg = <0x10 4>;
};
+
+ fec_mac_address: mac-address@90 {
+ reg = <0x90 6>;
+ };
};
anatop: syscon@30360000 {
@@ -1174,6 +1178,9 @@
assigned-clock-rates = <0>, <100000000>, <125000000>, <0>;
fsl,num-tx-queues = <3>;
fsl,num-rx-queues = <3>;
+ nvmem-cells = <&fec_mac_address>;
+ nvmem-cell-names = "mac-address";
+ nvmem_macaddr_swap;
status = "disabled";
};
};
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH V2 5/5] arm64: dts: imx8m: add fsl,stop-mode property for FEC
2021-01-16 8:44 [PATCH V2 0/5] patches for FEC Joakim Zhang
` (3 preceding siblings ...)
2021-01-16 8:44 ` [PATCH V2 4/5] arm64: dts: imx8m: add mac address " Joakim Zhang
@ 2021-01-16 8:44 ` Joakim Zhang
2021-01-18 9:40 ` [PATCH V2 0/5] patches " Shawn Guo
5 siblings, 0 replies; 7+ messages in thread
From: Joakim Zhang @ 2021-01-16 8:44 UTC (permalink / raw)
To: shawnguo, s.hauer, festevam; +Cc: devicetree, linux-imx
Add fsl,stop-mode property for FEC to enable stop mode.
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
---
arch/arm64/boot/dts/freescale/imx8mm.dtsi | 1 +
arch/arm64/boot/dts/freescale/imx8mn.dtsi | 1 +
arch/arm64/boot/dts/freescale/imx8mp.dtsi | 1 +
arch/arm64/boot/dts/freescale/imx8mq.dtsi | 1 +
4 files changed, 4 insertions(+)
diff --git a/arch/arm64/boot/dts/freescale/imx8mm.dtsi b/arch/arm64/boot/dts/freescale/imx8mm.dtsi
index acb8df609e2b..6bf1d15ba16a 100644
--- a/arch/arm64/boot/dts/freescale/imx8mm.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mm.dtsi
@@ -930,6 +930,7 @@
nvmem-cells = <&fec_mac_address>;
nvmem-cell-names = "mac-address";
nvmem_macaddr_swap;
+ fsl,stop-mode = <&gpr 0x10 3>;
status = "disabled";
};
diff --git a/arch/arm64/boot/dts/freescale/imx8mn.dtsi b/arch/arm64/boot/dts/freescale/imx8mn.dtsi
index 30cc51b633cf..3fac73779fdd 100644
--- a/arch/arm64/boot/dts/freescale/imx8mn.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mn.dtsi
@@ -928,6 +928,7 @@
nvmem-cells = <&fec_mac_address>;
nvmem-cell-names = "mac-address";
nvmem_macaddr_swap;
+ fsl,stop-mode = <&gpr 0x10 3>;
status = "disabled";
};
diff --git a/arch/arm64/boot/dts/freescale/imx8mp.dtsi b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
index 9dc63eddce16..47c8fe10a5ba 100644
--- a/arch/arm64/boot/dts/freescale/imx8mp.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
@@ -782,6 +782,7 @@
fsl,num-rx-queues = <3>;
nvmem-cells = <ð_mac1>;
nvmem-cell-names = "mac-address";
+ fsl,stop-mode = <&gpr 0x10 3>;
nvmem_macaddr_swap;
status = "disabled";
};
diff --git a/arch/arm64/boot/dts/freescale/imx8mq.dtsi b/arch/arm64/boot/dts/freescale/imx8mq.dtsi
index 48265f5b2728..61e94f1f918b 100644
--- a/arch/arm64/boot/dts/freescale/imx8mq.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mq.dtsi
@@ -1181,6 +1181,7 @@
nvmem-cells = <&fec_mac_address>;
nvmem-cell-names = "mac-address";
nvmem_macaddr_swap;
+ fsl,stop-mode = <&iomuxc_gpr 0x10 3>;
status = "disabled";
};
};
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH V2 0/5] patches for FEC
2021-01-16 8:44 [PATCH V2 0/5] patches for FEC Joakim Zhang
` (4 preceding siblings ...)
2021-01-16 8:44 ` [PATCH V2 5/5] arm64: dts: imx8m: add fsl,stop-mode property " Joakim Zhang
@ 2021-01-18 9:40 ` Shawn Guo
5 siblings, 0 replies; 7+ messages in thread
From: Shawn Guo @ 2021-01-18 9:40 UTC (permalink / raw)
To: Joakim Zhang; +Cc: s.hauer, festevam, devicetree, linux-imx
On Sat, Jan 16, 2021 at 04:44:26PM +0800, Joakim Zhang wrote:
> Some improve patches for i.MX FEC.
>
> ---
> ChangeLogs:
> V1->V2:
> * standardize patch subject prefix
> * let unit-address match 'reg' property
>
> Joakim Zhang (5):
> ARM: dts: imx6: add wakeup support via magic packet
> arm64: dts: imx8m: correct assigned clocks for FEC
> arm64: dts: imx8mq: assign clock parents for FEC
> arm64: dts: imx8m: add mac address for FEC
> arm64: dts: imx8m: add fsl,stop-mode property for FEC
Applied all, thanks.
^ permalink raw reply [flat|nested] 7+ messages in thread