From: Sergio Paracuellos <[email protected]> Gpio driver is using mtk and there is already 'mediatek' binding defined for this maker. Update driver to use it instead the custom one 'mtk'.
Signed-off-by: Sergio Paracuellos <[email protected]> Reviewed-by: NeilBrown <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> --- target/linux/ramips/dts/mt7621.dtsi | 8 ++++---- target/linux/ramips/dts/mt7628an.dtsi | 8 ++++---- target/linux/ramips/files-4.14/drivers/gpio/gpio-mt7621.c | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/target/linux/ramips/dts/mt7621.dtsi b/target/linux/ramips/dts/mt7621.dtsi index f35e6a74fd..15a85fd4d1 100644 --- a/target/linux/ramips/dts/mt7621.dtsi +++ b/target/linux/ramips/dts/mt7621.dtsi @@ -73,26 +73,26 @@ #address-cells = <1>; #size-cells = <0>; - compatible = "mtk,mt7621-gpio"; + compatible = "mediatek,mt7621-gpio"; reg = <0x600 0x100>; gpio0: bank@0 { reg = <0>; - compatible = "mtk,mt7621-gpio-bank"; + compatible = "mediatek,mt7621-gpio-bank"; gpio-controller; #gpio-cells = <2>; }; gpio1: bank@1 { reg = <1>; - compatible = "mtk,mt7621-gpio-bank"; + compatible = "mediatek,mt7621-gpio-bank"; gpio-controller; #gpio-cells = <2>; }; gpio2: bank@2 { reg = <2>; - compatible = "mtk,mt7621-gpio-bank"; + compatible = "mediatek,mt7621-gpio-bank"; gpio-controller; #gpio-cells = <2>; }; diff --git a/target/linux/ramips/dts/mt7628an.dtsi b/target/linux/ramips/dts/mt7628an.dtsi index df2ed37c9a..d02250d01c 100644 --- a/target/linux/ramips/dts/mt7628an.dtsi +++ b/target/linux/ramips/dts/mt7628an.dtsi @@ -81,7 +81,7 @@ #address-cells = <1>; #size-cells = <0>; - compatible = "mtk,mt7628-gpio", "mtk,mt7621-gpio"; + compatible = "mtk,mt7628-gpio", "mediatek,mt7621-gpio"; reg = <0x600 0x100>; interrupt-parent = <&intc>; @@ -89,21 +89,21 @@ gpio0: bank@0 { reg = <0>; - compatible = "mtk,mt7621-gpio-bank"; + compatible = "mediatek,mt7621-gpio-bank"; gpio-controller; #gpio-cells = <2>; }; gpio1: bank@1 { reg = <1>; - compatible = "mtk,mt7621-gpio-bank"; + compatible = "mediatek,mt7621-gpio-bank"; gpio-controller; #gpio-cells = <2>; }; gpio2: bank@2 { reg = <2>; - compatible = "mtk,mt7621-gpio-bank"; + compatible = "mediatek,mt7621-gpio-bank"; gpio-controller; #gpio-cells = <2>; }; diff --git a/target/linux/ramips/files-4.14/drivers/gpio/gpio-mt7621.c b/target/linux/ramips/files-4.14/drivers/gpio/gpio-mt7621.c index a57738125b..7d179492d8 100644 --- a/target/linux/ramips/files-4.14/drivers/gpio/gpio-mt7621.c +++ b/target/linux/ramips/files-4.14/drivers/gpio/gpio-mt7621.c @@ -323,7 +323,7 @@ mediatek_gpio_probe(struct platform_device *pdev) } for_each_child_of_node(np, bank) - if (of_device_is_compatible(bank, "mtk,mt7621-gpio-bank")) + if (of_device_is_compatible(bank, "mediatek,mt7621-gpio-bank")) mediatek_gpio_bank_probe(pdev, bank); if (mediatek_gpio_irq_domain) @@ -334,7 +334,7 @@ mediatek_gpio_probe(struct platform_device *pdev) } static const struct of_device_id mediatek_gpio_match[] = { - { .compatible = "mtk,mt7621-gpio" }, + { .compatible = "mediatek,mt7621-gpio" }, {}, }; MODULE_DEVICE_TABLE(of, mediatek_gpio_match); -- 2.17.0 _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/listinfo/openwrt-devel
