From 65e86c06e095336b9204820832911e6891f7cb3f Mon Sep 17 00:00:00 2001 From: Joakim Zhang Date: Thu, 27 May 2021 19:21:37 +0800 Subject: [PATCH] LF-3715-1 net: phy: realtek: change "rtl821x,clkout_en" to "rtl821x,clkout-disable" For PHY RTL8211FDI-CG, CLKOUT clock default is enabled by hardware, use "rtl821x,clkout-disable" property to disable CLKOUT if user required. If use "rtl821x,clkout_en" property to enable CLKOUT clock, it will block existing cases which need this CLKOUT for MAC but doesn't add this property. It's safe to change "rtl821x,clkout_en" to "rtl821x,clkout-disable", as to be removed property("rtl821x,clkout_en") never been used in the kernel tree. Camelia Groza validated on LS1043ARDB. Tested-by: Camelia Groza Reviewed-by: Camelia Groza Reviewed-by: Jun Li Signed-off-by: Joakim Zhang Acked-by: Jason Liu --- Documentation/devicetree/bindings/net/realtek.txt | 2 +- drivers/net/phy/realtek.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/net/realtek.txt b/Documentation/devicetree/bindings/net/realtek.txt index c3e43f18d5e3..8cd83b0be333 100644 --- a/Documentation/devicetree/bindings/net/realtek.txt +++ b/Documentation/devicetree/bindings/net/realtek.txt @@ -3,5 +3,5 @@ Realtek PHY properties. These properties cover the base properties Realtek PHYs. Optional properties: - - rtl821x,clkout_en : enable clkout to supply clocks for MAC. + - rtl821x,clkout-disable: disable CLKOUT clock. - rtl821x,aldps-disable : disable ALDPS mode. diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c index 2276e1b9391f..746cdfd06578 100644 --- a/drivers/net/phy/realtek.c +++ b/drivers/net/phy/realtek.c @@ -93,7 +93,7 @@ static int rtl821x_probe(struct phy_device *phydev) if (!priv) return -ENOMEM; - if (of_property_read_bool(dev->of_node, "rtl821x,clkout_en")) + if (!of_property_read_bool(dev->of_node, "rtl821x,clkout-disable")) priv->quirks |= RTL821X_CLKOUT_EN_FEATURE; if (of_property_read_bool(dev->of_node, "rtl821x,aldps-disable")) -- 2.17.1