Add reset deassertion for Aspeed MDIO
Subsystems (5)
PATCH v5 2/3 net: mdio: add reset control for Aspeed MDIO
In reply to Dylan HungAdd reset assertion/deassertion for Aspeed MDIO. There are 4 MDIO controllers embedded in Aspeed AST2600 SOC and share one reset control register SCU50[3]. To work with old DT blobs which don't have the reset property, devm_reset_control_get_optional_shared is used in this change.
--- drivers/net/mdio/mdio-aspeed.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
drivers/net/mdio/mdio-aspeed.c +14 -1
@@ -3,6 +3,7 @@#include <linux/bitfield.h> #include <linux/delay.h> +#include <linux/reset.h> #include <linux/iopoll.h> #include <linux/mdio.h> #include <linux/module.h>
@@ -37,6 +38,7 @@struct aspeed_mdio {void __iomem *base; +struct reset_control *reset; };static int aspeed_mdio_read (struct mii_bus *bus,int addr,int regnum)
@@ -120,6 +122,12 @@ static int aspeed_mdio_probe(struct platform_device *pdev)if (IS_ERR (ctx->base))return PTR_ERR (ctx->base); + ctx->reset =devm_reset_control_get_optional_shared (&pdev->dev,NULL ); +if (IS_ERR (ctx->reset)) +return PTR_ERR (ctx->reset); + +reset_control_deassert (ctx->reset); + bus->name =DRV_NAME ;snprintf (bus->id,MII_BUS_ID_SIZE ,"%s%d" , pdev->name, pdev->id); bus->parent = &pdev->dev;
@@ -129,6 +137,7 @@ static int aspeed_mdio_probe(struct platform_device *pdev) rc =of_mdiobus_register (bus, pdev->dev.of_node);if (rc) {dev_err (&pdev->dev,"Cannot register MDIO bus!\n" ); +reset_control_assert (ctx->reset);return rc; }
@@ -139,7 +148,11 @@ static int aspeed_mdio_probe(struct platform_device *pdev)static int aspeed_mdio_remove (struct platform_device *pdev) { -mdiobus_unregister (platform_get_drvdata (pdev)); +struct mii_bus *bus = (struct mii_bus *)platform_get_drvdata (pdev); +struct aspeed_mdio *ctx = bus->priv; + +reset_control_assert (ctx->reset); +mdiobus_unregister (bus);return 0 ; }
Signature · 1 line
2.25.1
PATCH v5 3/3 ARM: dts: aspeed: add reset properties into MDIO nodes
In reply to Dylan HungAdd reset control properties into MDIO nodes. The 4 MDIO controllers in AST2600 SOC share one reset control bit SCU50[3].
--- arch/arm/boot/dts/aspeed-g6.dtsi | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm/boot/dts/aspeed-g6.dtsi +4 -0
@@ -181,6 +181,7 @@ mdio0: mdio@1e650000 { status = "disabled"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_mdio1_default>; + resets = <&syscon ASPEED_RESET_MII>; }; mdio1: mdio@1e650008 {
@@ -191,6 +192,7 @@ mdio1: mdio@1e650008 { status = "disabled"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_mdio2_default>; + resets = <&syscon ASPEED_RESET_MII>; }; mdio2: mdio@1e650010 {
@@ -201,6 +203,7 @@ mdio2: mdio@1e650010 { status = "disabled"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_mdio3_default>; + resets = <&syscon ASPEED_RESET_MII>; }; mdio3: mdio@1e650018 {
@@ -211,6 +214,7 @@ mdio3: mdio@1e650018 { status = "disabled"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_mdio4_default>; + resets = <&syscon ASPEED_RESET_MII>; }; mac0: ftgmac@1e660000 {
Signature · 1 line
2.25.1
v5 cover Add reset deassertion for Aspeed MDIO
Add missing reset deassertion for Aspeed MDIO bus controller. The reset is asserted by the hardware when power-on so the driver only needs to deassert it. To be able to work with the old DT blobs, the reset is optional since it may be deasserted by the bootloader or the previous kernel.
V5:
- fix error of dt_binding_check
V4:
- use ASPEED_RESET_MII instead of hardcoding in dt-binding example
V3:
- remove reset property from the required list of the device tree bindings
- remove "Cc: [email protected]" from the commit messages
- add more description in the commit message of the dt-binding
V2:
- add reset property in the device tree bindings
- add reset assertion in the error path and driver remove
Dylan Hung (3):
dt-bindings: net: add reset property for aspeed, ast2600-mdio binding
net: mdio: add reset control for Aspeed MDIO
ARM: dts: aspeed: add reset properties into MDIO nodes
.../bindings/net/aspeed,ast2600-mdio.yaml | 6 ++++++ arch/arm/boot/dts/aspeed-g6.dtsi | 4 ++++ drivers/net/mdio/mdio-aspeed.c | 15 ++++++++++++++- 3 files changed, 24 insertions(+), 1 deletion(-)
Signature · 1 line
2.25.1
PATCH v5 1/3 dt-bindings: net: add reset property for aspeed, ast2600-mdio binding
The AST2600 MDIO bus controller has a reset control bit and must be deasserted before manipulating the MDIO controller. By default, the hardware asserts the reset so the driver only need to deassert it.
Regarding to the old DT blobs which don't have reset property in them, the reset deassertion is usually done by the bootloader so the reset property is optional to work with them.
--- .../devicetree/bindings/net/aspeed,ast2600-mdio.yaml | 6 ++++++ 1 file changed, 6 insertions(+)
Documentation/devicetree/bindings/net/aspeed,ast2600-mdio.yaml +6 -0
@@ -20,10 +20,14 @@ allOf: properties: compatible: const: aspeed,ast2600-mdio + reg: maxItems: 1 description: The register range of the MDIO controller instance + resets: + maxItems: 1 + required: - compatible - reg
@@ -34,11 +38,13 @@ unevaluatedProperties: false examples: - | + #include <dt-bindings/clock/ast2600-clock.h> mdio0: mdio@1e650000 { compatible = "aspeed,ast2600-mdio"; reg = <0x1e650000 0x8>; #address-cells = <1>; #size-cells = <0>; + resets = <&syscon ASPEED_RESET_MII>; ethphy0: ethernet-phy@0 { compatible = "ethernet-phy-ieee802.3-c22";
Signature · 1 line
2.25.1
Jakub Kicinski
maintainerQuoted 5 lines · On Wed, 13 Apr 2022 20:10:34 +0800 Dylan Hung wrote:
Add missing reset deassertion for Aspeed MDIO bus controller. The reset is asserted by the hardware when power-on so the driver only needs to deassert it. To be able to work with the old DT blobs, the reset is optional since it may be deasserted by the bootloader or the previous kernel.
I presume you want this applied to net-next, but it appears there is a conflict or something. Could you resend the patches based on net-next/master?