phylib: rename reset-(post-)delay-us to reset-(de)assert-us

As suggested by Rob Herring [1] rename the previously introduced
reset-{,post-}delay-us bindings to the clearer reset-{,de}assert-us

[1] https://patchwork.kernel.org/patch/10104905/

Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/Documentation/devicetree/bindings/net/phy.txt b/Documentation/devicetree/bindings/net/phy.txt
index 72860ce7f61016b6bd91186d2cb7a77103357b27..d2169a56f5e37d1225114e8e66cb6614474335e8 100644 (file)
--- a/Documentation/devicetree/bindings/net/phy.txt
+++ b/Documentation/devicetree/bindings/net/phy.txt
@@ -55,10 +55,10 @@ Optional Properties:
 
 - reset-gpios: The GPIO phandle and specifier for the PHY reset signal.
 
-- reset-delay-us: Delay after the reset was asserted in microseconds.
+- reset-assert-us: Delay after the reset was asserted in microseconds.
   If this property is missing the delay will be skipped.
 
-- reset-post-delay-us: Delay after the reset was deasserted in microseconds.
+- reset-deassert-us: Delay after the reset was deasserted in microseconds.
   If this property is missing the delay will be skipped.
 
 Example:
@@ -70,6 +70,6 @@ ethernet-phy@0 {
        reg = <0>;
 
        reset-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
-       reset-delay-us = <1000>;
-       reset-post-delay-us = <2000>;
+       reset-assert-us = <1000>;
+       reset-deassert-us = <2000>;
 };

diff --git a/drivers/net/phy/mdio_device.c b/drivers/net/phy/mdio_device.c
index 843c1dde93e4552880841dfb535d676a6ad58ed3..c924700cf37b5f4d5c31f48aa48a1cf185a8078e 100644 (file)
--- a/drivers/net/phy/mdio_device.c
+++ b/drivers/net/phy/mdio_device.c
@@ -126,7 +126,7 @@ void mdio_device_reset(struct mdio_device *mdiodev, int value)
 
        gpiod_set_value(mdiodev->reset, value);
 
-       d = value ? mdiodev->reset_delay : mdiodev->reset_post_delay;
+       d = value ? mdiodev->reset_assert_delay : mdiodev->reset_deassert_delay;
        if (d)
                usleep_range(d, d + max_t(unsigned int, d / 10, 100));
 }

diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c
index f4c73292b304720417524fac4c17361eb0c976e4..1b9ef35cf0d9612b8e7e62bd6d717acc10bdef91 100644 (file)
--- a/drivers/of/of_mdio.c
+++ b/drivers/of/of_mdio.c
@@ -77,9 +77,10 @@ static int of_mdiobus_register_phy(struct mii_bus *mdio,
        if (of_property_read_bool(child, "broken-turn-around"))
                mdio->phy_ignore_ta_mask |= 1 << addr;
 
-       of_property_read_u32(child, "reset-delay-us", &phy->mdio.reset_delay);
-       of_property_read_u32(child, "reset-post-delay-us",
-                            &phy->mdio.reset_post_delay);
+       of_property_read_u32(child, "reset-assert-us",
+                            &phy->mdio.reset_assert_delay);
+       of_property_read_u32(child, "reset-deassert-us",
+                            &phy->mdio.reset_deassert_delay);
 
        /* Associate the OF node with the device structure so it
         * can be looked up later */

diff --git a/include/linux/mdio.h b/include/linux/mdio.h
index e37c21d8eb19da5f375d0e4d41b70e659dc827b6..268aad47ecd36aca76b7803774e718304f7fff01 100644 (file)
--- a/include/linux/mdio.h
+++ b/include/linux/mdio.h
@@ -41,8 +41,8 @@ struct mdio_device {
        int addr;
        int flags;
        struct gpio_desc *reset;
-       unsigned int reset_delay;
-       unsigned int reset_post_delay;
+       unsigned int reset_assert_delay;
+       unsigned int reset_deassert_delay;
 };
 #define to_mdio_device(d) container_of(d, struct mdio_device, dev)