[v2,4/4] arm64: dts: fsd: Add Ethernet support for PERIC Block of FSD SoC
Commit Message
The FSD SoC contains two instances of Synopsys DWC QoS Ethernet IP, one in
FSYS0 block and other in PERIC block.
Adds device tree node for Ethernet in PERIC Block and enables the same for
FSD platform.
Signed-off-by: Pankaj Dubey <pankaj.dubey@samsung.com>
Signed-off-by: Jayati Sahu <jayati.sahu@samsung.com>
Signed-off-by: Sriranjani P <sriranjani.p@samsung.com>
---
arch/arm64/boot/dts/tesla/fsd-evb.dts | 9 ++++
arch/arm64/boot/dts/tesla/fsd-pinctrl.dtsi | 56 ++++++++++++++++++++++
arch/arm64/boot/dts/tesla/fsd.dtsi | 29 +++++++++++
3 files changed, 94 insertions(+)
Comments
On 11/01/2023 08:54, Sriranjani P wrote:
> The FSD SoC contains two instances of Synopsys DWC QoS Ethernet IP, one in
> FSYS0 block and other in PERIC block.
>
> Adds device tree node for Ethernet in PERIC Block and enables the same for
> FSD platform.
>
> Signed-off-by: Pankaj Dubey <pankaj.dubey@samsung.com>
> Signed-off-by: Jayati Sahu <jayati.sahu@samsung.com>
> Signed-off-by: Sriranjani P <sriranjani.p@samsung.com>
> ---
> arch/arm64/boot/dts/tesla/fsd-evb.dts | 9 ++++
> arch/arm64/boot/dts/tesla/fsd-pinctrl.dtsi | 56 ++++++++++++++++++++++
> arch/arm64/boot/dts/tesla/fsd.dtsi | 29 +++++++++++
> 3 files changed, 94 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/tesla/fsd-evb.dts b/arch/arm64/boot/dts/tesla/fsd-evb.dts
> index ca0c1a28d562..2c0cbe775e04 100644
> --- a/arch/arm64/boot/dts/tesla/fsd-evb.dts
> +++ b/arch/arm64/boot/dts/tesla/fsd-evb.dts
> @@ -39,6 +39,15 @@
> };
> };
>
> +ðernet_1 {
> + status = "okay";
> +
> + fixed-link {
> + speed = <1000>;
> + full-duplex;
> + };
> +};
> +
> &fin_pll {
> clock-frequency = <24000000>;
> };
> diff --git a/arch/arm64/boot/dts/tesla/fsd-pinctrl.dtsi b/arch/arm64/boot/dts/tesla/fsd-pinctrl.dtsi
> index 7ccc0738a149..c955bf159786 100644
> --- a/arch/arm64/boot/dts/tesla/fsd-pinctrl.dtsi
> +++ b/arch/arm64/boot/dts/tesla/fsd-pinctrl.dtsi
> @@ -395,6 +395,62 @@
> samsung,pin-pud = <FSD_PIN_PULL_UP>;
> samsung,pin-drv = <FSD_PIN_DRV_LV1>;
> };
> +
> + eth1_tx_clk: eth1-tx-clk-pins {
> + samsung,pins = "gpf2-0";
> + samsung,pin-function = <FSD_PIN_FUNC_2>;
> + samsung,pin-pud = <FSD_PIN_PULL_DOWN>;
> + samsung,pin-drv = <FSD_PIN_DRV_LV6>;
> + };
> +
> + eth1_tx_data: eth1-tx-data-pins {
> + samsung,pins = "gpf2-1", "gpf2-2", "gpf2-3", "gpf2-4";
> + samsung,pin-function = <FSD_PIN_FUNC_2>;
> + samsung,pin-pud = <FSD_PIN_PULL_UP>;
> + samsung,pin-drv = <FSD_PIN_DRV_LV6>;
> + };
> +
> + eth1_tx_ctrl: eth1-tx-ctrl-pins {
> + samsung,pins = "gpf2-5";
> + samsung,pin-function = <FSD_PIN_FUNC_2>;
> + samsung,pin-pud = <FSD_PIN_PULL_UP>;
> + samsung,pin-drv = <FSD_PIN_DRV_LV6>;
> + };
> +
> + eth1_phy_intr: eth1-phy-intr-pins {
> + samsung,pins = "gpf2-6";
> + samsung,pin-function = <FSD_PIN_FUNC_2>;
> + samsung,pin-pud = <FSD_PIN_PULL_UP>;
> + samsung,pin-drv = <FSD_PIN_DRV_LV4>;
> + };
> +
> + eth1_rx_clk: eth1-rx-clk-pins {
> + samsung,pins = "gpf3-0";
> + samsung,pin-function = <FSD_PIN_FUNC_2>;
> + samsung,pin-pud = <FSD_PIN_PULL_UP>;
> + samsung,pin-drv = <FSD_PIN_DRV_LV6>;
> + };
> +
> + eth1_rx_data: eth1-rx-data-pins {
> + samsung,pins = "gpf3-1", "gpf3-2", "gpf3-3", "gpf3-4";
> + samsung,pin-function = <FSD_PIN_FUNC_2>;
> + samsung,pin-pud = <FSD_PIN_PULL_UP>;
> + samsung,pin-drv = <FSD_PIN_DRV_LV6>;
> + };
> +
> + eth1_rx_ctrl: eth1-rx-ctrl-pins {
> + samsung,pins = "gpf3-5";
> + samsung,pin-function = <FSD_PIN_FUNC_2>;
> + samsung,pin-pud = <FSD_PIN_PULL_UP>;
> + samsung,pin-drv = <FSD_PIN_DRV_LV6>;
> + };
> +
> + eth1_mdio: eth1-mdio-pins {
> + samsung,pins = "gpf3-6", "gpf3-7";
> + samsung,pin-function = <FSD_PIN_FUNC_2>;
> + samsung,pin-pud = <FSD_PIN_PULL_UP>;
> + samsung,pin-drv = <FSD_PIN_DRV_LV4>;
> + };
> };
>
> &pinctrl_pmu {
> diff --git a/arch/arm64/boot/dts/tesla/fsd.dtsi b/arch/arm64/boot/dts/tesla/fsd.dtsi
> index ade707cc646b..8807055807dd 100644
> --- a/arch/arm64/boot/dts/tesla/fsd.dtsi
> +++ b/arch/arm64/boot/dts/tesla/fsd.dtsi
> @@ -33,6 +33,7 @@
> spi1 = &spi_1;
> spi2 = &spi_2;
> eth0 = ðernet_0;
> + eth1 = ðernet_1;
Nope for the reasons I explained last time.
> };
>
> cpus {
> @@ -882,6 +883,34 @@
> phy-mode = "rgmii";
> status = "disabled";
> };
> +
> + ethernet_1: ethernet@14300000 {
Do not add nodes to the end.
Best regards,
Krzysztof
> -----Original Message-----
> From: Krzysztof Kozlowski [mailto:krzysztof.kozlowski@linaro.org]
> Sent: 12 January 2023 15:07
> To: Sriranjani P <sriranjani.p@samsung.com>; davem@davemloft.net;
> edumazet@google.com; kuba@kernel.org; pabeni@redhat.com;
> robh+dt@kernel.org; krzysztof.kozlowski+dt@linaro.org;
> alexandre.torgue@foss.st.com; peppe.cavallaro@st.com;
> joabreu@synopsys.com; mcoquelin.stm32@gmail.com
> Cc: netdev@vger.kernel.org; devicetree@vger.kernel.org; linux-
> kernel@vger.kernel.org; pankaj.dubey@samsung.com;
> alim.akhtar@samsung.com; ravi.patel@samsung.com; Jayati Sahu
> <jayati.sahu@samsung.com>
> Subject: Re: [PATCH v2 4/4] arm64: dts: fsd: Add Ethernet support for PERIC
> Block of FSD SoC
>
> On 11/01/2023 08:54, Sriranjani P wrote:
> > The FSD SoC contains two instances of Synopsys DWC QoS Ethernet IP,
> > one in
> > FSYS0 block and other in PERIC block.
> >
> > Adds device tree node for Ethernet in PERIC Block and enables the same
> > for FSD platform.
> >
> > Signed-off-by: Pankaj Dubey <pankaj.dubey@samsung.com>
> > Signed-off-by: Jayati Sahu <jayati.sahu@samsung.com>
> > Signed-off-by: Sriranjani P <sriranjani.p@samsung.com>
> > ---
> > arch/arm64/boot/dts/tesla/fsd-evb.dts | 9 ++++
> > arch/arm64/boot/dts/tesla/fsd-pinctrl.dtsi | 56
> ++++++++++++++++++++++
> > arch/arm64/boot/dts/tesla/fsd.dtsi | 29 +++++++++++
> > 3 files changed, 94 insertions(+)
> >
> > diff --git a/arch/arm64/boot/dts/tesla/fsd-evb.dts
> > b/arch/arm64/boot/dts/tesla/fsd-evb.dts
> > index ca0c1a28d562..2c0cbe775e04 100644
> > --- a/arch/arm64/boot/dts/tesla/fsd-evb.dts
> > +++ b/arch/arm64/boot/dts/tesla/fsd-evb.dts
> > @@ -39,6 +39,15 @@
> > };
> > };
> >
> > +ðernet_1 {
> > + status = "okay";
> > +
> > + fixed-link {
> > + speed = <1000>;
> > + full-duplex;
> > + };
> > +};
> > +
> > &fin_pll {
> > clock-frequency = <24000000>;
> > };
> > diff --git a/arch/arm64/boot/dts/tesla/fsd-pinctrl.dtsi
> > b/arch/arm64/boot/dts/tesla/fsd-pinctrl.dtsi
> > index 7ccc0738a149..c955bf159786 100644
> > --- a/arch/arm64/boot/dts/tesla/fsd-pinctrl.dtsi
> > +++ b/arch/arm64/boot/dts/tesla/fsd-pinctrl.dtsi
> > @@ -395,6 +395,62 @@
> > samsung,pin-pud = <FSD_PIN_PULL_UP>;
> > samsung,pin-drv = <FSD_PIN_DRV_LV1>;
> > };
> > +
> > + eth1_tx_clk: eth1-tx-clk-pins {
> > + samsung,pins = "gpf2-0";
> > + samsung,pin-function = <FSD_PIN_FUNC_2>;
> > + samsung,pin-pud = <FSD_PIN_PULL_DOWN>;
> > + samsung,pin-drv = <FSD_PIN_DRV_LV6>;
> > + };
> > +
> > + eth1_tx_data: eth1-tx-data-pins {
> > + samsung,pins = "gpf2-1", "gpf2-2", "gpf2-3", "gpf2-4";
> > + samsung,pin-function = <FSD_PIN_FUNC_2>;
> > + samsung,pin-pud = <FSD_PIN_PULL_UP>;
> > + samsung,pin-drv = <FSD_PIN_DRV_LV6>;
> > + };
> > +
> > + eth1_tx_ctrl: eth1-tx-ctrl-pins {
> > + samsung,pins = "gpf2-5";
> > + samsung,pin-function = <FSD_PIN_FUNC_2>;
> > + samsung,pin-pud = <FSD_PIN_PULL_UP>;
> > + samsung,pin-drv = <FSD_PIN_DRV_LV6>;
> > + };
> > +
> > + eth1_phy_intr: eth1-phy-intr-pins {
> > + samsung,pins = "gpf2-6";
> > + samsung,pin-function = <FSD_PIN_FUNC_2>;
> > + samsung,pin-pud = <FSD_PIN_PULL_UP>;
> > + samsung,pin-drv = <FSD_PIN_DRV_LV4>;
> > + };
> > +
> > + eth1_rx_clk: eth1-rx-clk-pins {
> > + samsung,pins = "gpf3-0";
> > + samsung,pin-function = <FSD_PIN_FUNC_2>;
> > + samsung,pin-pud = <FSD_PIN_PULL_UP>;
> > + samsung,pin-drv = <FSD_PIN_DRV_LV6>;
> > + };
> > +
> > + eth1_rx_data: eth1-rx-data-pins {
> > + samsung,pins = "gpf3-1", "gpf3-2", "gpf3-3", "gpf3-4";
> > + samsung,pin-function = <FSD_PIN_FUNC_2>;
> > + samsung,pin-pud = <FSD_PIN_PULL_UP>;
> > + samsung,pin-drv = <FSD_PIN_DRV_LV6>;
> > + };
> > +
> > + eth1_rx_ctrl: eth1-rx-ctrl-pins {
> > + samsung,pins = "gpf3-5";
> > + samsung,pin-function = <FSD_PIN_FUNC_2>;
> > + samsung,pin-pud = <FSD_PIN_PULL_UP>;
> > + samsung,pin-drv = <FSD_PIN_DRV_LV6>;
> > + };
> > +
> > + eth1_mdio: eth1-mdio-pins {
> > + samsung,pins = "gpf3-6", "gpf3-7";
> > + samsung,pin-function = <FSD_PIN_FUNC_2>;
> > + samsung,pin-pud = <FSD_PIN_PULL_UP>;
> > + samsung,pin-drv = <FSD_PIN_DRV_LV4>;
> > + };
> > };
> >
> > &pinctrl_pmu {
> > diff --git a/arch/arm64/boot/dts/tesla/fsd.dtsi
> > b/arch/arm64/boot/dts/tesla/fsd.dtsi
> > index ade707cc646b..8807055807dd 100644
> > --- a/arch/arm64/boot/dts/tesla/fsd.dtsi
> > +++ b/arch/arm64/boot/dts/tesla/fsd.dtsi
> > @@ -33,6 +33,7 @@
> > spi1 = &spi_1;
> > spi2 = &spi_2;
> > eth0 = ðernet_0;
> > + eth1 = ðernet_1;
>
> Nope for the reasons I explained last time.
Sorry somehow I'm not able to find my previous mail chain.
I had replied to your comment in the previous version of the mail.
In this case alias id is used to differentiate between Ethernet instance 0 and 1 in the driver code.
>
> > };
> >
> > cpus {
> > @@ -882,6 +883,34 @@
> > phy-mode = "rgmii";
> > status = "disabled";
> > };
> > +
> > + ethernet_1: ethernet@14300000 {
>
> Do not add nodes to the end.
If you mean to say that the nodes are supposed to be in the increasing order of physical address,
I can see that the existing file is not arranged in that format. If that is required I can first fix the
existing file and post the revised patch for the same.
>
> Best regards,
> Krzysztof
@@ -39,6 +39,15 @@
};
};
+ðernet_1 {
+ status = "okay";
+
+ fixed-link {
+ speed = <1000>;
+ full-duplex;
+ };
+};
+
&fin_pll {
clock-frequency = <24000000>;
};
@@ -395,6 +395,62 @@
samsung,pin-pud = <FSD_PIN_PULL_UP>;
samsung,pin-drv = <FSD_PIN_DRV_LV1>;
};
+
+ eth1_tx_clk: eth1-tx-clk-pins {
+ samsung,pins = "gpf2-0";
+ samsung,pin-function = <FSD_PIN_FUNC_2>;
+ samsung,pin-pud = <FSD_PIN_PULL_DOWN>;
+ samsung,pin-drv = <FSD_PIN_DRV_LV6>;
+ };
+
+ eth1_tx_data: eth1-tx-data-pins {
+ samsung,pins = "gpf2-1", "gpf2-2", "gpf2-3", "gpf2-4";
+ samsung,pin-function = <FSD_PIN_FUNC_2>;
+ samsung,pin-pud = <FSD_PIN_PULL_UP>;
+ samsung,pin-drv = <FSD_PIN_DRV_LV6>;
+ };
+
+ eth1_tx_ctrl: eth1-tx-ctrl-pins {
+ samsung,pins = "gpf2-5";
+ samsung,pin-function = <FSD_PIN_FUNC_2>;
+ samsung,pin-pud = <FSD_PIN_PULL_UP>;
+ samsung,pin-drv = <FSD_PIN_DRV_LV6>;
+ };
+
+ eth1_phy_intr: eth1-phy-intr-pins {
+ samsung,pins = "gpf2-6";
+ samsung,pin-function = <FSD_PIN_FUNC_2>;
+ samsung,pin-pud = <FSD_PIN_PULL_UP>;
+ samsung,pin-drv = <FSD_PIN_DRV_LV4>;
+ };
+
+ eth1_rx_clk: eth1-rx-clk-pins {
+ samsung,pins = "gpf3-0";
+ samsung,pin-function = <FSD_PIN_FUNC_2>;
+ samsung,pin-pud = <FSD_PIN_PULL_UP>;
+ samsung,pin-drv = <FSD_PIN_DRV_LV6>;
+ };
+
+ eth1_rx_data: eth1-rx-data-pins {
+ samsung,pins = "gpf3-1", "gpf3-2", "gpf3-3", "gpf3-4";
+ samsung,pin-function = <FSD_PIN_FUNC_2>;
+ samsung,pin-pud = <FSD_PIN_PULL_UP>;
+ samsung,pin-drv = <FSD_PIN_DRV_LV6>;
+ };
+
+ eth1_rx_ctrl: eth1-rx-ctrl-pins {
+ samsung,pins = "gpf3-5";
+ samsung,pin-function = <FSD_PIN_FUNC_2>;
+ samsung,pin-pud = <FSD_PIN_PULL_UP>;
+ samsung,pin-drv = <FSD_PIN_DRV_LV6>;
+ };
+
+ eth1_mdio: eth1-mdio-pins {
+ samsung,pins = "gpf3-6", "gpf3-7";
+ samsung,pin-function = <FSD_PIN_FUNC_2>;
+ samsung,pin-pud = <FSD_PIN_PULL_UP>;
+ samsung,pin-drv = <FSD_PIN_DRV_LV4>;
+ };
};
&pinctrl_pmu {
@@ -33,6 +33,7 @@
spi1 = &spi_1;
spi2 = &spi_2;
eth0 = ðernet_0;
+ eth1 = ðernet_1;
};
cpus {
@@ -882,6 +883,34 @@
phy-mode = "rgmii";
status = "disabled";
};
+
+ ethernet_1: ethernet@14300000 {
+ compatible = "tesla,dwc-qos-ethernet-4.21";
+ reg = <0x0 0x14300000 0x0 0x10000>;
+ interrupts = <GIC_SPI 176 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&clock_peric PERIC_EQOS_TOP_IPCLKPORT_CLK_PTP_REF_I>,
+ <&clock_peric PERIC_EQOS_TOP_IPCLKPORT_ACLK_I>,
+ <&clock_peric PERIC_EQOS_TOP_IPCLKPORT_HCLK_I>,
+ <&clock_peric PERIC_EQOS_TOP_IPCLKPORT_RGMII_CLK_I>,
+ <&clock_peric PERIC_EQOS_TOP_IPCLKPORT_CLK_RX_I>,
+ <&clock_peric PERIC_BUS_D_PERIC_IPCLKPORT_EQOSCLK>,
+ <&clock_peric PERIC_BUS_P_PERIC_IPCLKPORT_EQOSCLK>,
+ <&clock_peric PERIC_EQOS_PHYRXCLK_MUX>,
+ <&clock_peric PERIC_EQOS_PHYRXCLK>,
+ <&clock_peric PERIC_DOUT_RGMII_CLK>;
+ clock-names = "ptp_ref", "master_bus", "slave_bus", "tx", "rx",
+ "master2_bus", "slave2_bus", "eqos_rxclk_mux",
+ "eqos_phyrxclk", "dout_peric_rgmii_clk";
+ pinctrl-names = "default";
+ pinctrl-0 = <ð1_tx_clk>, <ð1_tx_data>, <ð1_tx_ctrl>,
+ <ð1_phy_intr>, <ð1_rx_clk>, <ð1_rx_data>,
+ <ð1_rx_ctrl>, <ð1_mdio>;
+ local-mac-address = [00 00 00 00 00 00];
+ rx-clock-skew = <&sysreg_peric 0x10>;
+ iommus = <&smmu_peric 0x0 0x1>;
+ phy-mode = "rgmii";
+ status = "disabled";
+ };
};
};