UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Richard Leitner 2017-12-22 11:08:09 +01:00 committed by David S. Miller
parent a8038befce
commit 04f629f730
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/devicetree/bindings/net/phy.txt
View File

@ -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>;
};

2
drivers/net/phy/mdio_device.c
View File

@ -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));
}

7
drivers/of/of_mdio.c
View File

@ -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 */

4
include/linux/mdio.h
View File

@ -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)