From: Peter Geis <pgwipeout@gmail.com> To: "Heiko Stübner" <heiko@sntech.de> Cc: Linus Walleij <linus.walleij@linaro.org>, Bartosz Golaszewski <bgolaszewski@baylibre.com>, Rob Herring <robh+dt@kernel.org>, "open list:GPIO SUBSYSTEM" <linux-gpio@vger.kernel.org>, devicetree@vger.kernel.org, arm-mail-list <linux-arm-kernel@lists.infradead.org>, "open list:ARM/Rockchip SoC..." <linux-rockchip@lists.infradead.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org> Subject: Re: [PATCH 4/9] arm64: dts: rockchip: add rk356x gmac1 node Date: Wed, 28 Jul 2021 10:32:32 -0400 [thread overview] Message-ID: <CAMdYzYrFBS_v00YC35rbDMfVW_zwMb01OYFKY4v8+zETGYR98g@mail.gmail.com> (raw) In-Reply-To: <21568327.EfDdHjke4D@diego> On Wed, Jul 28, 2021 at 10:21 AM Heiko Stübner <heiko@sntech.de> wrote: > > Hi Peter, > > Am Mittwoch, 28. Juli 2021, 15:55:29 CEST schrieb Peter Geis: > > Add the gmac1 controller to the rk356x device tree. > > This is the controller common to both the rk3568 and rk3566. > > > > Signed-off-by: Peter Geis <pgwipeout@gmail.com> > > --- > > arch/arm64/boot/dts/rockchip/rk356x.dtsi | 48 ++++++++++++++++++++++++ > > 1 file changed, 48 insertions(+) > > > > diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi > > index c2aa7aeec58d..77c679304916 100644 > > --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi > > +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi > > @@ -18,6 +18,7 @@ / { > > #size-cells = <2>; > > > > aliases { > > + ethernet1 = &gmac1; > > gpio0 = &gpio0; > > gpio1 = &gpio1; > > gpio2 = &gpio2; > > Looking back at the discussion about mmc aliases in board-dts vs. soc-dtsi > I get the feeling the ethernet alias would be same case, as not all boards > will expose ethernet. > > In the very least the ethernet alias should be part of the rk3566/rk3568 dtsi > files, doing ethernet0 = &gmac1 for rk3566 and ethernet1 = &gmac1 for rk3568. > > But I do think the board-dts would be the more appropriate place. Okay, that makes sense, I'll move this to the board. In regards to the 0 vs 1, this was to avoid issues with downstream u-boot/rkbin which treats the rk3566 as a rk3568. Currently it doesn't seem to affect anything in the way the kernel probes it, as it still shows up as eth0. > > > Heiko > > > @@ -344,6 +345,53 @@ sdmmc2: mmc@fe000000 { > > status = "disabled"; > > }; > > > > + gmac1: ethernet@fe010000 { > > + compatible = "rockchip,rk3568-gmac", "snps,dwmac-4.20a"; > > + reg = <0x0 0xfe010000 0x0 0x10000>; > > + interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>, > > + <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>; > > + interrupt-names = "macirq", "eth_wake_irq"; > > + clocks = <&cru SCLK_GMAC1>, <&cru SCLK_GMAC1_RX_TX>, > > + <&cru SCLK_GMAC1_RX_TX>, <&cru CLK_MAC1_REFOUT>, > > + <&cru ACLK_GMAC1>, <&cru PCLK_GMAC1>, > > + <&cru SCLK_GMAC1_RX_TX>, <&cru CLK_GMAC1_PTP_REF>; > > + clock-names = "stmmaceth", "mac_clk_rx", > > + "mac_clk_tx", "clk_mac_refout", > > + "aclk_mac", "pclk_mac", > > + "clk_mac_speed", "ptp_ref"; > > + resets = <&cru SRST_A_GMAC1>; > > + reset-names = "stmmaceth"; > > + rockchip,grf = <&grf>; > > + snps,mixed-burst; > > + snps,tso; > > + snps,axi-config = <&gmac1_stmmac_axi_setup>; > > + snps,mtl-rx-config = <&gmac1_mtl_rx_setup>; > > + snps,mtl-tx-config = <&gmac1_mtl_tx_setup>; > > + status = "disabled"; > > + > > + mdio1: mdio { > > + compatible = "snps,dwmac-mdio"; > > + #address-cells = <0x1>; > > + #size-cells = <0x0>; > > + }; > > + > > + gmac1_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>; > > + }; > > + > > + gmac1_mtl_rx_setup: rx-queues-config { > > + snps,rx-queues-to-use = <1>; > > + queue0 {}; > > + }; > > + > > + gmac1_mtl_tx_setup: tx-queues-config { > > + snps,tx-queues-to-use = <1>; > > + queue0 {}; > > + }; > > + }; > > + > > qos_gpu: qos@fe128000 { > > compatible = "rockchip,rk3568-qos", "syscon"; > > reg = <0x0 0xfe128000 0x0 0x20>; > > > > > >
next prev parent reply other threads:[~2021-07-28 14:32 UTC|newest] Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-28 13:55 [PATCH 0/9] fixes and enablement for rk356x Peter Geis 2021-07-28 13:55 ` [PATCH 1/9] dt-bindings: gpio: rockchip,gpio-bank: increase max clocks Peter Geis 2021-07-28 14:10 ` Heiko Stübner 2021-07-28 15:24 ` Peter Geis 2021-07-28 15:51 ` Rob Herring 2021-07-28 13:55 ` [PATCH 2/9] arm64: dts: rockchip: fix rk3568 mbi-alias Peter Geis 2021-07-28 13:55 ` [PATCH 3/9] arm64: dts: rockchip: add rk356x gpio debounce clocks Peter Geis 2021-07-28 13:55 ` [PATCH 4/9] arm64: dts: rockchip: add rk356x gmac1 node Peter Geis 2021-07-28 14:21 ` Heiko Stübner 2021-07-28 14:32 ` Peter Geis [this message] 2021-07-28 13:55 ` [PATCH 5/9] arm64: dts: rockchip: add rk3568 tsadc nodes Peter Geis 2021-07-28 14:46 ` Heiko Stübner 2021-07-28 15:14 ` Peter Geis 2021-07-28 15:31 ` Heiko Stübner 2021-07-28 15:33 ` Johan Jonker 2022-01-17 8:43 ` Piotr Oniszczuk 2022-01-17 13:49 ` Peter Geis 2022-01-17 14:13 ` Piotr Oniszczuk 2022-01-17 14:38 ` Peter Geis 2022-01-17 14:53 ` Piotr Oniszczuk 2021-07-28 13:55 ` [PATCH 6/9] arm64: dts: rockchip: add missing rk3568 cru phandles Peter Geis 2021-07-28 14:06 ` Heiko Stübner 2021-07-28 14:18 ` Peter Geis 2021-07-28 14:41 ` Heiko Stübner 2021-07-28 15:16 ` Peter Geis 2021-07-28 16:49 ` Peter Geis 2021-07-28 17:28 ` Heiko Stübner 2021-07-28 13:55 ` [PATCH 7/9] arm64: dts: rockchip: adjust rk3568 pll clocks Peter Geis 2021-07-28 14:08 ` Heiko Stübner 2021-07-28 14:24 ` Peter Geis 2021-07-28 13:55 ` [PATCH 8/9] arm64: dts: rockchip: enable gmac node on quartz64-a Peter Geis 2021-07-28 13:55 ` [PATCH 9/9] arm64: dts: rockchip: add thermal support to Quartz64 Model A Peter Geis
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=CAMdYzYrFBS_v00YC35rbDMfVW_zwMb01OYFKY4v8+zETGYR98g@mail.gmail.com \ --to=pgwipeout@gmail.com \ --cc=bgolaszewski@baylibre.com \ --cc=devicetree@vger.kernel.org \ --cc=heiko@sntech.de \ --cc=linus.walleij@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-gpio@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-rockchip@lists.infradead.org \ --cc=robh+dt@kernel.org \ --subject='Re: [PATCH 4/9] arm64: dts: rockchip: add rk356x gmac1 node' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
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).