Skip to content

Commit 04f629f

Browse files
g0hl1ndavem330
authored andcommitted
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 <[email protected]> Reviewed-by: Rob Herring <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent a8038be commit 04f629f

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

Documentation/devicetree/bindings/net/phy.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ Optional Properties:
5555

5656
- reset-gpios: The GPIO phandle and specifier for the PHY reset signal.
5757

58-
- reset-delay-us: Delay after the reset was asserted in microseconds.
58+
- reset-assert-us: Delay after the reset was asserted in microseconds.
5959
If this property is missing the delay will be skipped.
6060

61-
- reset-post-delay-us: Delay after the reset was deasserted in microseconds.
61+
- reset-deassert-us: Delay after the reset was deasserted in microseconds.
6262
If this property is missing the delay will be skipped.
6363

6464
Example:
@@ -70,6 +70,6 @@ ethernet-phy@0 {
7070
reg = <0>;
7171

7272
reset-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
73-
reset-delay-us = <1000>;
74-
reset-post-delay-us = <2000>;
73+
reset-assert-us = <1000>;
74+
reset-deassert-us = <2000>;
7575
};

drivers/net/phy/mdio_device.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ void mdio_device_reset(struct mdio_device *mdiodev, int value)
126126

127127
gpiod_set_value(mdiodev->reset, value);
128128

129-
d = value ? mdiodev->reset_delay : mdiodev->reset_post_delay;
129+
d = value ? mdiodev->reset_assert_delay : mdiodev->reset_deassert_delay;
130130
if (d)
131131
usleep_range(d, d + max_t(unsigned int, d / 10, 100));
132132
}

drivers/of/of_mdio.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,10 @@ static int of_mdiobus_register_phy(struct mii_bus *mdio,
7777
if (of_property_read_bool(child, "broken-turn-around"))
7878
mdio->phy_ignore_ta_mask |= 1 << addr;
7979

80-
of_property_read_u32(child, "reset-delay-us", &phy->mdio.reset_delay);
81-
of_property_read_u32(child, "reset-post-delay-us",
82-
&phy->mdio.reset_post_delay);
80+
of_property_read_u32(child, "reset-assert-us",
81+
&phy->mdio.reset_assert_delay);
82+
of_property_read_u32(child, "reset-deassert-us",
83+
&phy->mdio.reset_deassert_delay);
8384

8485
/* Associate the OF node with the device structure so it
8586
* can be looked up later */

include/linux/mdio.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ struct mdio_device {
4141
int addr;
4242
int flags;
4343
struct gpio_desc *reset;
44-
unsigned int reset_delay;
45-
unsigned int reset_post_delay;
44+
unsigned int reset_assert_delay;
45+
unsigned int reset_deassert_delay;
4646
};
4747
#define to_mdio_device(d) container_of(d, struct mdio_device, dev)
4848

0 commit comments

Comments
 (0)