him411/openwrt-redmi-ax3000
1
0
Fork 0
mirror of https://github.com/hzyitc/openwrt-redmi-ax3000.git synced 2025-12-16 16:31:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

mediatek: rtl8367s: modernize gpio API

Browse Source 
Upstream is strongly considering removing of_gpio.h. As of this commit,
3 upstream drivers remain with actual usage.

Get ahead of upstream and use the GPIOD API before the OF one goes away.

Rework to remove mediatek,reset-pin in favor of the standard
reset-gpios.

Fix wrong high GPIO.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/20088
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Rosen Penev 2025-09-18 16:15:02 -07:00 committed by Hauke Mehrtens
parent 23a070dfb1
commit f614322d28
4 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/mediatek/dts/mt7622-buffalo-wsr-2533dhp2.dts
View File

@ -22,7 +22,7 @@
compatible = "mediatek,rtk-gsw";
mediatek,ethsys = <&ethsys>;
mediatek,mdio = <&mdio>;
mediatek,reset-pin = <&pio 54 GPIO_ACTIVE_HIGH>;
reset-gpios = <&pio 54 GPIO_ACTIVE_LOW>;
};
};

2
target/linux/mediatek/dts/mt7622-elecom-wrc-2533gent.dts
View File

@ -161,7 +161,7 @@
compatible = "mediatek,rtk-gsw";
mediatek,ethsys = <&ethsys>;
mediatek,mdio = <&mdio>;
mediatek,reset-pin = <&pio 54 0>;
reset-gpios = <&pio 54 GPIO_ACTIVE_LOW>;
status = "okay";
};
};

2
target/linux/mediatek/dts/mt7622-totolink-a8000ru.dts
View File

@ -95,7 +95,7 @@
compatible = "mediatek,rtk-gsw";
mediatek,ethsys = <&ethsys>;
mediatek,mdio = <&mdio>;
mediatek,reset-pin = <&pio 54 0>;
reset-gpios = <&pio 54 GPIO_ACTIVE_LOW>;
status = "okay";
};
};

20
target/linux/mediatek/files/drivers/net/phy/rtk/rtl8367s_mdio.c
View File

@ -16,9 +16,9 @@
#include <linux/init.h>
#include <linux/device.h>
#include <linux/delay.h>
#include <linux/gpio/consumer.h>
#include <linux/of_mdio.h>
#include <linux/of_platform.h>
#include <linux/of_gpio.h>
#include <linux/platform_device.h>
@ -31,7 +31,7 @@
struct rtk_gsw {
struct device *dev;
struct mii_bus *bus;
int reset_pin;
struct gpio_desc *reset_gpiod;
};
static struct rtk_gsw *_gsw;
@ -67,14 +67,14 @@ static int rtl8367s_hw_reset(void)
{
struct rtk_gsw *gsw = _gsw;
if (gsw->reset_pin < 0)
if (!gsw->reset_gpiod)
return 0;
gpio_direction_output(gsw->reset_pin, 0);
gpiod_set_value_cansleep(gsw->reset_gpiod, 1);
usleep_range(1000, 1100);
gpio_set_value(gsw->reset_pin, 1);
gpiod_set_value_cansleep(gsw->reset_gpiod, 0);
mdelay(500);
@ -221,7 +221,6 @@ static int rtk_gsw_probe(struct platform_device *pdev)
struct mii_bus *mdio_bus;
struct rtk_gsw *gsw;
const char *pm;
int ret;
mdio = of_parse_phandle(np, "mediatek,mdio", 0);
@ -242,12 +241,9 @@ static int rtk_gsw_probe(struct platform_device *pdev)
gsw->bus = mdio_bus;
gsw->reset_pin = of_get_named_gpio(np, "mediatek,reset-pin", 0);
if (gsw->reset_pin >= 0) {
ret = devm_gpio_request(gsw->dev, gsw->reset_pin, "mediatek,reset-pin");
if (ret)
printk("fail to devm_gpio_request\n");
}
gsw->reset_gpiod = devm_gpiod_get_optional(&pdev->dev, "reset", GPIOD_OUT_HIGH);
if (IS_ERR(gsw->reset_gpiod))
return dev_err_probe(&pdev->dev, PTR_ERR(gsw->reset_gpiod), "Failed to reset gpio");
_gsw = gsw;