diff options
| -rw-r--r-- | arch/mips/dts/ar9331-dptechnics-dpt-module.dts | 6 | ||||
| -rw-r--r-- | arch/mips/dts/ar9331.dtsi | 15 | ||||
| -rw-r--r-- | arch/mips/dts/tplink-mr3020.dts | 2 | ||||
| -rw-r--r-- | drivers/net/ag71xx.c | 2 |
4 files changed, 9 insertions, 16 deletions
diff --git a/arch/mips/dts/ar9331-dptechnics-dpt-module.dts b/arch/mips/dts/ar9331-dptechnics-dpt-module.dts index 315589aab9..cbaf5ab39e 100644 --- a/arch/mips/dts/ar9331-dptechnics-dpt-module.dts +++ b/arch/mips/dts/ar9331-dptechnics-dpt-module.dts @@ -15,7 +15,7 @@ art@0 { compatible = "qca,art-ar9331", "qca,art"; device-path = &spiflash_art; - barebox,provide-mac-address = <&mac0>; + barebox,provide-mac-address = <ð0>; }; }; @@ -48,7 +48,3 @@ reg = <0x7f0000 0x10000>; }; }; - -&mac0 { - status = "okay"; -}; diff --git a/arch/mips/dts/ar9331.dtsi b/arch/mips/dts/ar9331.dtsi index 42baae1e89..72f029754e 100644 --- a/arch/mips/dts/ar9331.dtsi +++ b/arch/mips/dts/ar9331.dtsi @@ -5,14 +5,11 @@ reg = <0x18060008 0x8>; clocks = <&pll ATH79_CLK_CPU>; }; - - mac0: mac@19000000 { - compatible = "qca,ar9331-ge0"; - reg = <0x18070000 0x00000100>, - <0x19000000 0x01000000>; - reg-names = "gmac", "ge0"; - phy-mode = "mii"; - status = "disabled"; - }; }; }; + +ð0 { + reg = <0x19000000 0x200>, + <0x18070000 0x00000100>; + reg-names = "ge0", "gmac"; +}; diff --git a/arch/mips/dts/tplink-mr3020.dts b/arch/mips/dts/tplink-mr3020.dts index e30eae1578..c6ae154f4f 100644 --- a/arch/mips/dts/tplink-mr3020.dts +++ b/arch/mips/dts/tplink-mr3020.dts @@ -28,6 +28,6 @@ }; }; -&mac0 { +ð0 { status = "okay"; }; diff --git a/drivers/net/ag71xx.c b/drivers/net/ag71xx.c index 0565c90490..70aaa60f1a 100644 --- a/drivers/net/ag71xx.c +++ b/drivers/net/ag71xx.c @@ -667,7 +667,7 @@ static void ag71xx_remove(struct device_d *dev) } static __maybe_unused struct of_device_id ag71xx_dt_ids[] = { - { .compatible = "qca,ar9331-ge0", .data = &ag71xx_cfg_ar9331_ge0, }, + { .compatible = "qca,ar9330-eth", .data = &ag71xx_cfg_ar9331_ge0, }, { .compatible = "qca,ar9344-gmac0", .data = &ag71xx_cfg_ar9344_gmac0, }, { /* sentinel */ } }; |