From: Andre Przywara <andre.przywara@arm.com> To: Maxime Ripard <mripard@kernel.org>, Chen-Yu Tsai <wens@csie.org>, Jernej Skrabec <jernej.skrabec@siol.net> Cc: "Icenowy Zheng" <icenowy@aosc.xyz>, "Linus Walleij" <linus.walleij@linaro.org>, "Rob Herring" <robh@kernel.org>, "Clément Péron" <peron.clem@gmail.com>, "Shuosheng Huang" <huangshuosheng@allwinnertech.com>, "Yangtao Li" <tiny.windzz@gmail.com>, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com, "Giuseppe Cavallaro" <peppe.cavallaro@st.com>, "Alexandre Torgue" <alexandre.torgue@st.com>, "Jose Abreu" <joabreu@synopsys.com>, "David S . Miller" <davem@davemloft.net>, "Jakub Kicinski" <kuba@kernel.org>, netdev@vger.kernel.org Subject: [PATCH v2 13/21] net: stmmac: dwmac-sun8i: Prepare for second EMAC clock register Date: Fri, 11 Dec 2020 01:19:26 +0000 [thread overview] Message-ID: <20201211011934.6171-14-andre.przywara@arm.com> (raw) In-Reply-To: <20201211011934.6171-1-andre.przywara@arm.com> The Allwinner H616 SoC has two EMAC controllers, with the second one being tied to the internal PHY, but also using a separate EMAC clock register. To tell the driver about which clock register to use, we add a parameter to our syscon phandle. The driver will use this value as an index into the regmap, so that we can address more than the first register, if needed. Signed-off-by: Andre Przywara <andre.przywara@arm.com> --- drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c index 58e0511badba..00c10ec7b693 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c @@ -1129,6 +1129,8 @@ static int sun8i_dwmac_probe(struct platform_device *pdev) struct stmmac_priv *priv; struct net_device *ndev; struct regmap *regmap; + struct reg_field syscon_field; + u32 syscon_idx = 0; ret = stmmac_get_platform_resources(pdev, &stmmac_res); if (ret) @@ -1190,8 +1192,12 @@ static int sun8i_dwmac_probe(struct platform_device *pdev) return ret; } - gmac->regmap_field = devm_regmap_field_alloc(dev, regmap, - *gmac->variant->syscon_field); + syscon_field = *gmac->variant->syscon_field; + ret = of_property_read_u32_index(pdev->dev.of_node, "syscon", 1, + &syscon_idx); + if (!ret) + syscon_field.reg += syscon_idx * sizeof(u32); + gmac->regmap_field = devm_regmap_field_alloc(dev, regmap, syscon_field); if (IS_ERR(gmac->regmap_field)) { ret = PTR_ERR(gmac->regmap_field); dev_err(dev, "Unable to map syscon register: %d\n", ret); @@ -1263,6 +1269,8 @@ static const struct of_device_id sun8i_dwmac_match[] = { .data = &emac_variant_a64 }, { .compatible = "allwinner,sun50i-h6-emac", .data = &emac_variant_h6 }, + { .compatible = "allwinner,sun50i-h616-emac", + .data = &emac_variant_h6 }, { } }; MODULE_DEVICE_TABLE(of, sun8i_dwmac_match); -- 2.17.5
WARNING: multiple messages have this Message-ID (diff)
From: Andre Przywara <andre.przywara@arm.com> To: Maxime Ripard <mripard@kernel.org>, Chen-Yu Tsai <wens@csie.org>, Jernej Skrabec <jernej.skrabec@siol.net> Cc: "Rob Herring" <robh@kernel.org>, "Alexandre Torgue" <alexandre.torgue@st.com>, "Yangtao Li" <tiny.windzz@gmail.com>, netdev@vger.kernel.org, "Linus Walleij" <linus.walleij@linaro.org>, linux-kernel@vger.kernel.org, "Jakub Kicinski" <kuba@kernel.org>, linux-sunxi@googlegroups.com, "Jose Abreu" <joabreu@synopsys.com>, "Clément Péron" <peron.clem@gmail.com>, "Icenowy Zheng" <icenowy@aosc.xyz>, "Giuseppe Cavallaro" <peppe.cavallaro@st.com>, "Shuosheng Huang" <huangshuosheng@allwinnertech.com>, "David S . Miller" <davem@davemloft.net>, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 13/21] net: stmmac: dwmac-sun8i: Prepare for second EMAC clock register Date: Fri, 11 Dec 2020 01:19:26 +0000 [thread overview] Message-ID: <20201211011934.6171-14-andre.przywara@arm.com> (raw) In-Reply-To: <20201211011934.6171-1-andre.przywara@arm.com> The Allwinner H616 SoC has two EMAC controllers, with the second one being tied to the internal PHY, but also using a separate EMAC clock register. To tell the driver about which clock register to use, we add a parameter to our syscon phandle. The driver will use this value as an index into the regmap, so that we can address more than the first register, if needed. Signed-off-by: Andre Przywara <andre.przywara@arm.com> --- drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c index 58e0511badba..00c10ec7b693 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c @@ -1129,6 +1129,8 @@ static int sun8i_dwmac_probe(struct platform_device *pdev) struct stmmac_priv *priv; struct net_device *ndev; struct regmap *regmap; + struct reg_field syscon_field; + u32 syscon_idx = 0; ret = stmmac_get_platform_resources(pdev, &stmmac_res); if (ret) @@ -1190,8 +1192,12 @@ static int sun8i_dwmac_probe(struct platform_device *pdev) return ret; } - gmac->regmap_field = devm_regmap_field_alloc(dev, regmap, - *gmac->variant->syscon_field); + syscon_field = *gmac->variant->syscon_field; + ret = of_property_read_u32_index(pdev->dev.of_node, "syscon", 1, + &syscon_idx); + if (!ret) + syscon_field.reg += syscon_idx * sizeof(u32); + gmac->regmap_field = devm_regmap_field_alloc(dev, regmap, syscon_field); if (IS_ERR(gmac->regmap_field)) { ret = PTR_ERR(gmac->regmap_field); dev_err(dev, "Unable to map syscon register: %d\n", ret); @@ -1263,6 +1269,8 @@ static const struct of_device_id sun8i_dwmac_match[] = { .data = &emac_variant_a64 }, { .compatible = "allwinner,sun50i-h6-emac", .data = &emac_variant_h6 }, + { .compatible = "allwinner,sun50i-h616-emac", + .data = &emac_variant_h6 }, { } }; MODULE_DEVICE_TABLE(of, sun8i_dwmac_match); -- 2.17.5 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-12-11 1:26 UTC|newest] Thread overview: 98+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-12-11 1:19 [PATCH v2 00/21] arm64: sunxi: Initial Allwinner H616 SoC support Andre Przywara 2020-12-11 1:19 ` Andre Przywara 2020-12-11 1:19 ` [PATCH v2 01/21] clk: sunxi-ng: h6: Fix clock divider range on some clocks Andre Przywara 2020-12-11 1:19 ` Andre Przywara 2020-12-11 1:19 ` [PATCH v2 02/21] dt-bindings: pinctrl: Add Allwinner H616 compatible strings Andre Przywara 2020-12-11 1:19 ` Andre Przywara 2020-12-14 9:37 ` Maxime Ripard 2020-12-14 9:37 ` Maxime Ripard 2021-01-14 0:45 ` Andre Przywara 2021-01-14 0:45 ` Andre Przywara 2021-01-14 11:57 ` Maxime Ripard 2021-01-14 11:57 ` Maxime Ripard 2020-12-11 1:19 ` [PATCH v2 03/21] pinctrl: sunxi: Add support for the Allwinner H616 pin controller Andre Przywara 2020-12-11 1:19 ` Andre Przywara 2020-12-14 9:44 ` Maxime Ripard 2020-12-14 9:44 ` Maxime Ripard 2020-12-11 1:19 ` [PATCH v2 04/21] pinctrl: sunxi: Add support for the Allwinner H616-R " Andre Przywara 2020-12-11 1:19 ` Andre Przywara 2020-12-11 1:19 ` [PATCH v2 05/21] dt-bindings: clk: sunxi-ccu: Add compatible string for Allwinner H616 Andre Przywara 2020-12-11 1:19 ` Andre Przywara 2020-12-14 22:53 ` Rob Herring 2020-12-14 22:53 ` Rob Herring 2020-12-11 1:19 ` [PATCH v2 06/21] clk: sunxi-ng: Add support for the Allwinner H616 R-CCU Andre Przywara 2020-12-11 1:19 ` Andre Przywara 2020-12-11 1:19 ` [PATCH v2 07/21] clk: sunxi-ng: Add support for the Allwinner H616 CCU Andre Przywara 2020-12-11 1:19 ` Andre Przywara 2020-12-11 1:19 ` [PATCH v2 08/21] dt-bindings: mmc: sunxi: Add Allwinner A100 and H616 compatibles Andre Przywara 2020-12-11 1:19 ` Andre Przywara 2020-12-14 22:54 ` Rob Herring 2020-12-14 22:54 ` Rob Herring 2021-01-11 18:06 ` Ulf Hansson 2021-01-11 18:06 ` Ulf Hansson 2020-12-11 1:19 ` [PATCH v2 09/21] mmc: sunxi: add support for A100 mmc controller Andre Przywara 2020-12-11 1:19 ` Andre Przywara 2021-01-11 18:06 ` Ulf Hansson 2021-01-11 18:06 ` Ulf Hansson 2020-12-11 1:19 ` [PATCH v2 10/21] mfd: axp20x: Allow AXP chips without interrupt lines Andre Przywara 2020-12-11 1:19 ` Andre Przywara 2020-12-11 1:19 ` [PATCH v2 11/21] dt-bindings: sram: sunxi-sram: Add H616 compatible string Andre Przywara 2020-12-11 1:19 ` Andre Przywara 2020-12-14 22:54 ` Rob Herring 2020-12-14 22:54 ` Rob Herring 2020-12-11 1:19 ` [PATCH v2 12/21] soc: sunxi: sram: Add support for more than one EMAC clock Andre Przywara 2020-12-11 1:19 ` Andre Przywara 2020-12-11 1:19 ` Andre Przywara [this message] 2020-12-11 1:19 ` [PATCH v2 13/21] net: stmmac: dwmac-sun8i: Prepare for second EMAC clock register Andre Przywara 2020-12-11 1:19 ` [PATCH v2 14/21] phy: sun4i-usb: Rework "pmu_unk1" handling Andre Przywara 2020-12-11 1:19 ` Andre Przywara 2020-12-13 18:24 ` Icenowy Zheng 2020-12-13 18:24 ` Icenowy Zheng 2020-12-14 1:35 ` André Przywara 2020-12-14 1:35 ` André Przywara 2020-12-14 4:45 ` Icenowy Zheng 2020-12-14 4:45 ` Icenowy Zheng 2020-12-11 1:19 ` [PATCH v2 15/21] phy: sun4i-usb: Add support for the H616 USB PHY Andre Przywara 2020-12-11 1:19 ` Andre Przywara 2020-12-14 9:52 ` Maxime Ripard 2020-12-14 9:52 ` Maxime Ripard 2020-12-11 1:19 ` [PATCH v2 16/21] dt-bindings: watchdog: sun4i: Add A100 compatible Andre Przywara 2020-12-11 1:19 ` Andre Przywara 2020-12-13 16:12 ` Guenter Roeck 2020-12-13 16:12 ` Guenter Roeck 2020-12-11 1:19 ` [PATCH v2 17/21] dt-bindings: watchdog: sun4i: Add H616 compatible string Andre Przywara 2020-12-11 1:19 ` Andre Przywara 2020-12-14 22:55 ` Rob Herring 2020-12-14 22:55 ` Rob Herring 2021-01-23 17:29 ` Guenter Roeck 2021-01-23 17:29 ` Guenter Roeck 2020-12-11 1:19 ` [PATCH v2 18/21] dt-bindings: allwinner: Add H616 compatible strings Andre Przywara 2020-12-11 1:19 ` Andre Przywara 2020-12-14 22:56 ` Rob Herring 2020-12-14 22:56 ` Rob Herring 2021-01-05 16:29 ` Wolfram Sang 2021-01-05 16:29 ` Wolfram Sang 2020-12-11 1:19 ` [PATCH v2 19/21] arm64: dts: allwinner: Add Allwinner H616 .dtsi file Andre Przywara 2020-12-11 1:19 ` Andre Przywara 2020-12-14 9:58 ` Maxime Ripard 2020-12-14 9:58 ` Maxime Ripard 2020-12-14 12:53 ` Andre Przywara 2020-12-14 12:53 ` Andre Przywara 2020-12-14 13:28 ` [linux-sunxi] " Chen-Yu Tsai 2020-12-14 13:28 ` Chen-Yu Tsai 2020-12-14 14:14 ` Maxime Ripard 2020-12-14 14:14 ` Maxime Ripard 2020-12-14 14:12 ` Maxime Ripard 2020-12-14 14:12 ` Maxime Ripard 2020-12-11 1:19 ` [PATCH v2 20/21] dt-bindings: arm: sunxi: Add OrangePi Zero 2 binding Andre Przywara 2020-12-11 1:19 ` Andre Przywara 2020-12-14 22:56 ` Rob Herring 2020-12-14 22:56 ` Rob Herring 2020-12-11 1:19 ` [PATCH v2 21/21] arm64: dts: allwinner: Add OrangePi Zero 2 .dts Andre Przywara 2020-12-11 1:19 ` Andre Przywara 2020-12-14 9:59 ` Maxime Ripard 2020-12-14 9:59 ` Maxime Ripard 2020-12-13 17:47 ` [PATCH v2 00/21] arm64: sunxi: Initial Allwinner H616 SoC support Icenowy Zheng 2020-12-13 17:47 ` Icenowy Zheng 2020-12-14 1:18 ` André Przywara 2020-12-14 1:18 ` André Przywara
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=20201211011934.6171-14-andre.przywara@arm.com \ --to=andre.przywara@arm.com \ --cc=alexandre.torgue@st.com \ --cc=davem@davemloft.net \ --cc=huangshuosheng@allwinnertech.com \ --cc=icenowy@aosc.xyz \ --cc=jernej.skrabec@siol.net \ --cc=joabreu@synopsys.com \ --cc=kuba@kernel.org \ --cc=linus.walleij@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-sunxi@googlegroups.com \ --cc=mripard@kernel.org \ --cc=netdev@vger.kernel.org \ --cc=peppe.cavallaro@st.com \ --cc=peron.clem@gmail.com \ --cc=robh@kernel.org \ --cc=tiny.windzz@gmail.com \ --cc=wens@csie.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.