* [PATCHv4 linux-next 1/4] dt-bindings: net: rockchip-dwmac: fix rv1126 compatible warning
@ 2023-01-11 6:48 Anand Moon
2023-01-11 6:48 ` [PATCHv4 linux-next 3/4] Rockchip RV1126 has GMAC 10/100/1000M ethernet controller Anand Moon
0 siblings, 1 reply; 6+ messages in thread
From: Anand Moon @ 2023-01-11 6:48 UTC (permalink / raw)
To: David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Rob Herring, Krzysztof Kozlowski, Heiko Stuebner, David Wu,
Anand Moon, Jagan Teki
Cc: Johan Jonker, Rob Herring, Krzysztof Kozlowski, netdev,
devicetree, linux-arm-kernel, linux-rockchip, linux-kernel
Fix compatible string for RV1126 gmac, and constrain it to
be compatible with Synopsys dwmac 4.20a.
fix below warning
$ make CHECK_DTBS=y rv1126-edgeble-neu2-io.dtb
arch/arm/boot/dts/rv1126-edgeble-neu2-io.dtb: ethernet@ffc40000:
compatible: 'oneOf' conditional failed, one must be fixed:
['rockchip,rv1126-gmac', 'snps,dwmac-4.20a'] is too long
'rockchip,rv1126-gmac' is not one of ['rockchip,rk3568-gmac', 'rockchip,rk3588-gmac']
Fixes: b36fe2f43662 ("dt-bindings: net: rockchip-dwmac: add rv1126 compatible")
Reviewed-by: Jagan Teki <jagan@edgeble.ai>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Anand Moon <anand@edgeble.ai>
---
v4: none
v3: added Ack and Rev from Rob and Jagan.
v2: drop SoB of Jagan Teki
added Fix tags and update the commit message of the warning.
---
Documentation/devicetree/bindings/net/rockchip-dwmac.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/net/rockchip-dwmac.yaml b/Documentation/devicetree/bindings/net/rockchip-dwmac.yaml
index 42fb72b6909d..04936632fcbb 100644
--- a/Documentation/devicetree/bindings/net/rockchip-dwmac.yaml
+++ b/Documentation/devicetree/bindings/net/rockchip-dwmac.yaml
@@ -49,11 +49,11 @@ properties:
- rockchip,rk3368-gmac
- rockchip,rk3399-gmac
- rockchip,rv1108-gmac
- - rockchip,rv1126-gmac
- items:
- enum:
- rockchip,rk3568-gmac
- rockchip,rk3588-gmac
+ - rockchip,rv1126-gmac
- const: snps,dwmac-4.20a
clocks:
--
2.39.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCHv4 linux-next 3/4] Rockchip RV1126 has GMAC 10/100/1000M ethernet controller
2023-01-11 6:48 [PATCHv4 linux-next 1/4] dt-bindings: net: rockchip-dwmac: fix rv1126 compatible warning Anand Moon
@ 2023-01-11 6:48 ` Anand Moon
2023-01-11 10:11 ` Heiko Stübner
0 siblings, 1 reply; 6+ messages in thread
From: Anand Moon @ 2023-01-11 6:48 UTC (permalink / raw)
To: Heiko Stuebner, Rob Herring, Krzysztof Kozlowski, Richard Cochran
Cc: Johan Jonker, Anand Moon, Jagan Teki, linux-arm-kernel,
linux-rockchip, devicetree, linux-kernel, netdev
Add Ethernet GMAC node for RV1126 SoC.
Signed-off-by: Anand Moon <anand@edgeble.ai>
Signed-off-by: Jagan Teki <jagan@edgeble.ai>
---
v4: sort the node as reg adds. update the commit message.
v3: drop the gmac_clkin_m0 & gmac_clkin_m1 fix clock node which are not
used, Add SoB of Jagan Teki.
v2: drop SoB of Jagan Teki.
---
arch/arm/boot/dts/rv1126.dtsi | 49 +++++++++++++++++++++++++++++++++++
1 file changed, 49 insertions(+)
diff --git a/arch/arm/boot/dts/rv1126.dtsi b/arch/arm/boot/dts/rv1126.dtsi
index 1cb43147e90b..1f07d0a4fa73 100644
--- a/arch/arm/boot/dts/rv1126.dtsi
+++ b/arch/arm/boot/dts/rv1126.dtsi
@@ -332,6 +332,55 @@ timer0: timer@ff660000 {
clock-names = "pclk", "timer";
};
+ gmac: ethernet@ffc40000 {
+ compatible = "rockchip,rv1126-gmac", "snps,dwmac-4.20a";
+ reg = <0xffc40000 0x4000>;
+ interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "macirq", "eth_wake_irq";
+ rockchip,grf = <&grf>;
+ clocks = <&cru CLK_GMAC_SRC>, <&cru CLK_GMAC_TX_RX>,
+ <&cru CLK_GMAC_TX_RX>, <&cru CLK_GMAC_REF>,
+ <&cru ACLK_GMAC>, <&cru PCLK_GMAC>,
+ <&cru CLK_GMAC_TX_RX>, <&cru CLK_GMAC_PTPREF>;
+ clock-names = "stmmaceth", "mac_clk_rx",
+ "mac_clk_tx", "clk_mac_ref",
+ "aclk_mac", "pclk_mac",
+ "clk_mac_speed", "ptp_ref";
+ resets = <&cru SRST_GMAC_A>;
+ reset-names = "stmmaceth";
+
+ snps,mixed-burst;
+ snps,tso;
+
+ snps,axi-config = <&stmmac_axi_setup>;
+ snps,mtl-rx-config = <&mtl_rx_setup>;
+ snps,mtl-tx-config = <&mtl_tx_setup>;
+ status = "disabled";
+
+ mdio: mdio {
+ compatible = "snps,dwmac-mdio";
+ #address-cells = <0x1>;
+ #size-cells = <0x0>;
+ };
+
+ stmmac_axi_setup: stmmac-axi-config {
+ snps,wr_osr_lmt = <4>;
+ snps,rd_osr_lmt = <8>;
+ snps,blen = <0 0 0 0 16 8 4>;
+ };
+
+ mtl_rx_setup: rx-queues-config {
+ snps,rx-queues-to-use = <1>;
+ queue0 {};
+ };
+
+ mtl_tx_setup: tx-queues-config {
+ snps,tx-queues-to-use = <1>;
+ queue0 {};
+ };
+ };
+
emmc: mmc@ffc50000 {
compatible = "rockchip,rv1126-dw-mshc", "rockchip,rk3288-dw-mshc";
reg = <0xffc50000 0x4000>;
--
2.39.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCHv4 linux-next 3/4] Rockchip RV1126 has GMAC 10/100/1000M ethernet controller
2023-01-11 6:48 ` [PATCHv4 linux-next 3/4] Rockchip RV1126 has GMAC 10/100/1000M ethernet controller Anand Moon
@ 2023-01-11 10:11 ` Heiko Stübner
2023-01-11 10:31 ` Anand Moon
0 siblings, 1 reply; 6+ messages in thread
From: Heiko Stübner @ 2023-01-11 10:11 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Richard Cochran, Anand Moon
Cc: Johan Jonker, Anand Moon, Jagan Teki, linux-arm-kernel,
linux-rockchip, devicetree, linux-kernel, netdev
Hi,
Am Mittwoch, 11. Januar 2023, 07:48:38 CET schrieb Anand Moon:
> Add Ethernet GMAC node for RV1126 SoC.
>
> Signed-off-by: Anand Moon <anand@edgeble.ai>
> Signed-off-by: Jagan Teki <jagan@edgeble.ai>
patches 2-4 have this Signed-off-by from Jagan again where he is not
not the author but also not the sender.
Also this patch here, needs a fixed subject with the correct prefixes.
Heiko
> ---
> v4: sort the node as reg adds. update the commit message.
> v3: drop the gmac_clkin_m0 & gmac_clkin_m1 fix clock node which are not
> used, Add SoB of Jagan Teki.
> v2: drop SoB of Jagan Teki.
> ---
> arch/arm/boot/dts/rv1126.dtsi | 49 +++++++++++++++++++++++++++++++++++
> 1 file changed, 49 insertions(+)
>
> diff --git a/arch/arm/boot/dts/rv1126.dtsi b/arch/arm/boot/dts/rv1126.dtsi
> index 1cb43147e90b..1f07d0a4fa73 100644
> --- a/arch/arm/boot/dts/rv1126.dtsi
> +++ b/arch/arm/boot/dts/rv1126.dtsi
> @@ -332,6 +332,55 @@ timer0: timer@ff660000 {
> clock-names = "pclk", "timer";
> };
>
> + gmac: ethernet@ffc40000 {
> + compatible = "rockchip,rv1126-gmac", "snps,dwmac-4.20a";
> + reg = <0xffc40000 0x4000>;
> + interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
> + interrupt-names = "macirq", "eth_wake_irq";
> + rockchip,grf = <&grf>;
> + clocks = <&cru CLK_GMAC_SRC>, <&cru CLK_GMAC_TX_RX>,
> + <&cru CLK_GMAC_TX_RX>, <&cru CLK_GMAC_REF>,
> + <&cru ACLK_GMAC>, <&cru PCLK_GMAC>,
> + <&cru CLK_GMAC_TX_RX>, <&cru CLK_GMAC_PTPREF>;
> + clock-names = "stmmaceth", "mac_clk_rx",
> + "mac_clk_tx", "clk_mac_ref",
> + "aclk_mac", "pclk_mac",
> + "clk_mac_speed", "ptp_ref";
> + resets = <&cru SRST_GMAC_A>;
> + reset-names = "stmmaceth";
> +
> + snps,mixed-burst;
> + snps,tso;
> +
> + snps,axi-config = <&stmmac_axi_setup>;
> + snps,mtl-rx-config = <&mtl_rx_setup>;
> + snps,mtl-tx-config = <&mtl_tx_setup>;
> + status = "disabled";
> +
> + mdio: mdio {
> + compatible = "snps,dwmac-mdio";
> + #address-cells = <0x1>;
> + #size-cells = <0x0>;
> + };
> +
> + stmmac_axi_setup: stmmac-axi-config {
> + snps,wr_osr_lmt = <4>;
> + snps,rd_osr_lmt = <8>;
> + snps,blen = <0 0 0 0 16 8 4>;
> + };
> +
> + mtl_rx_setup: rx-queues-config {
> + snps,rx-queues-to-use = <1>;
> + queue0 {};
> + };
> +
> + mtl_tx_setup: tx-queues-config {
> + snps,tx-queues-to-use = <1>;
> + queue0 {};
> + };
> + };
> +
> emmc: mmc@ffc50000 {
> compatible = "rockchip,rv1126-dw-mshc", "rockchip,rk3288-dw-mshc";
> reg = <0xffc50000 0x4000>;
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCHv4 linux-next 3/4] Rockchip RV1126 has GMAC 10/100/1000M ethernet controller
2023-01-11 10:11 ` Heiko Stübner
@ 2023-01-11 10:31 ` Anand Moon
2023-01-11 10:43 ` Heiko Stübner
0 siblings, 1 reply; 6+ messages in thread
From: Anand Moon @ 2023-01-11 10:31 UTC (permalink / raw)
To: Heiko Stübner
Cc: Rob Herring, Krzysztof Kozlowski, Richard Cochran, Johan Jonker,
Jagan Teki, linux-arm-kernel, linux-rockchip, devicetree,
linux-kernel, netdev
Hi Heiko,
Thanks for your review comments.
On Wed, 11 Jan 2023 at 15:41, Heiko Stübner <heiko@sntech.de> wrote:
>
> Hi,
>
> Am Mittwoch, 11. Januar 2023, 07:48:38 CET schrieb Anand Moon:
> > Add Ethernet GMAC node for RV1126 SoC.
> >
> > Signed-off-by: Anand Moon <anand@edgeble.ai>
> > Signed-off-by: Jagan Teki <jagan@edgeble.ai>
>
> patches 2-4 have this Signed-off-by from Jagan again where he is not
> not the author but also not the sender.
We both work to fix this patch hence Jagan's SoB was added.
>
> Also this patch here, needs a fixed subject with the correct prefixes.
>
Ok, will fix this in the next version.
>
> Heiko
>
> > ---
> > v4: sort the node as reg adds. update the commit message.
> > v3: drop the gmac_clkin_m0 & gmac_clkin_m1 fix clock node which are not
> > used, Add SoB of Jagan Teki.
> > v2: drop SoB of Jagan Teki.
Thanks
-Anand
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCHv4 linux-next 3/4] Rockchip RV1126 has GMAC 10/100/1000M ethernet controller
2023-01-11 10:31 ` Anand Moon
@ 2023-01-11 10:43 ` Heiko Stübner
2023-01-11 10:47 ` Anand Moon
0 siblings, 1 reply; 6+ messages in thread
From: Heiko Stübner @ 2023-01-11 10:43 UTC (permalink / raw)
To: Anand Moon
Cc: Rob Herring, Krzysztof Kozlowski, Richard Cochran, Johan Jonker,
Jagan Teki, linux-arm-kernel, linux-rockchip, devicetree,
linux-kernel, netdev
Am Mittwoch, 11. Januar 2023, 11:31:40 CET schrieb Anand Moon:
> Hi Heiko,
>
> Thanks for your review comments.
>
> On Wed, 11 Jan 2023 at 15:41, Heiko Stübner <heiko@sntech.de> wrote:
> >
> > Hi,
> >
> > Am Mittwoch, 11. Januar 2023, 07:48:38 CET schrieb Anand Moon:
> > > Add Ethernet GMAC node for RV1126 SoC.
> > >
> > > Signed-off-by: Anand Moon <anand@edgeble.ai>
> > > Signed-off-by: Jagan Teki <jagan@edgeble.ai>
> >
> > patches 2-4 have this Signed-off-by from Jagan again where he is not
> > not the author but also not the sender.
>
> We both work to fix this patch hence Jagan's SoB was added.
ok, then I think the correct way to express that would be:
Co-Developed-by: Jagan Teki <jagan@edgeble.ai>
Signed-off-by: Jagan Teki <jagan@edgeble.ai>
Signed-off-by: Anand Moon <anand@edgeble.ai>
> >
> > Also this patch here, needs a fixed subject with the correct prefixes.
> >
> Ok, will fix this in the next version.
> >
> > Heiko
> >
> > > ---
> > > v4: sort the node as reg adds. update the commit message.
> > > v3: drop the gmac_clkin_m0 & gmac_clkin_m1 fix clock node which are not
> > > used, Add SoB of Jagan Teki.
> > > v2: drop SoB of Jagan Teki.
>
> Thanks
> -Anand
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCHv4 linux-next 3/4] Rockchip RV1126 has GMAC 10/100/1000M ethernet controller
2023-01-11 10:43 ` Heiko Stübner
@ 2023-01-11 10:47 ` Anand Moon
0 siblings, 0 replies; 6+ messages in thread
From: Anand Moon @ 2023-01-11 10:47 UTC (permalink / raw)
To: Heiko Stübner
Cc: Rob Herring, Krzysztof Kozlowski, Richard Cochran, Johan Jonker,
Jagan Teki, linux-arm-kernel, linux-rockchip, devicetree,
linux-kernel, netdev
Hi Heiko
On Wed, 11 Jan 2023 at 16:13, Heiko Stübner <heiko@sntech.de> wrote:
>
> Am Mittwoch, 11. Januar 2023, 11:31:40 CET schrieb Anand Moon:
> > Hi Heiko,
> >
> > Thanks for your review comments.
> >
> > On Wed, 11 Jan 2023 at 15:41, Heiko Stübner <heiko@sntech.de> wrote:
> > >
> > > Hi,
> > >
> > > Am Mittwoch, 11. Januar 2023, 07:48:38 CET schrieb Anand Moon:
> > > > Add Ethernet GMAC node for RV1126 SoC.
> > > >
> > > > Signed-off-by: Anand Moon <anand@edgeble.ai>
> > > > Signed-off-by: Jagan Teki <jagan@edgeble.ai>
> > >
> > > patches 2-4 have this Signed-off-by from Jagan again where he is not
> > > not the author but also not the sender.
> >
> > We both work to fix this patch hence Jagan's SoB was added.
>
> ok, then I think the correct way to express that would be:
>
> Co-Developed-by: Jagan Teki <jagan@edgeble.ai>
> Signed-off-by: Jagan Teki <jagan@edgeble.ai>
> Signed-off-by: Anand Moon <anand@edgeble.ai>
>
Yes, you are right.
Thanks
-Anand
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-01-11 10:47 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-11 6:48 [PATCHv4 linux-next 1/4] dt-bindings: net: rockchip-dwmac: fix rv1126 compatible warning Anand Moon
2023-01-11 6:48 ` [PATCHv4 linux-next 3/4] Rockchip RV1126 has GMAC 10/100/1000M ethernet controller Anand Moon
2023-01-11 10:11 ` Heiko Stübner
2023-01-11 10:31 ` Anand Moon
2023-01-11 10:43 ` Heiko Stübner
2023-01-11 10:47 ` Anand Moon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).