From 139188ef1778960cdd30004f55d37b9c9e0807e2 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 1 Mar 2020 23:34:49 +0100 Subject: [PATCH] ath79: Fix deviuce treei --- target/linux/ath79/dts/ar7100.dtsi | 12 ++++++++---- target/linux/ath79/dts/ar7240.dtsi | 12 ++++++++---- target/linux/ath79/dts/ar7241.dtsi | 12 ++++++++---- target/linux/ath79/dts/ar7242.dtsi | 12 ++++++++---- target/linux/ath79/dts/ar9132.dtsi | 8 ++++---- target/linux/ath79/dts/ar9330.dtsi | 12 ++++++++---- target/linux/ath79/dts/qca953x.dtsi | 12 ++++++++---- target/linux/ath79/dts/qca9557.dtsi | 4 ++++ target/linux/ath79/dts/qca956x.dtsi | 12 ++++++++---- 9 files changed, 64 insertions(+), 32 deletions(-) diff --git a/target/linux/ath79/dts/ar7100.dtsi b/target/linux/ath79/dts/ar7100.dtsi index e3f0edccff..8bf118a04c 100644 --- a/target/linux/ath79/dts/ar7100.dtsi +++ b/target/linux/ath79/dts/ar7100.dtsi @@ -191,8 +191,10 @@ pll-handle = <&pll>; phy-mode = "rgmii"; - resets = <&rst 9>; - reset-names = "mac"; + resets = <&rst 9>, <&rst 22>; + reset-names = "mac", "mdio"; + clocks = <&pll ATH79_CLK_AHB>, <&pll ATH79_CLK_AHB>; + clock-names = "eth", "mdio"; qca,mac-idx = <0>; }; @@ -211,7 +213,9 @@ phy-mode = "rgmii"; - resets = <&rst 13>; - reset-names = "mac"; + resets = <&rst 13>, <&rst 23>; + reset-names = "mac", "mdio"; + clocks = <&pll ATH79_CLK_AHB>, <&pll ATH79_CLK_AHB>; + clock-names = "eth", "mdio"; qca,mac-idx = <1>; }; diff --git a/target/linux/ath79/dts/ar7240.dtsi b/target/linux/ath79/dts/ar7240.dtsi index 5382a710f9..98b101279a 100644 --- a/target/linux/ath79/dts/ar7240.dtsi +++ b/target/linux/ath79/dts/ar7240.dtsi @@ -63,8 +63,10 @@ pll-data = <0x00110000 0x00001099 0x00991099>; - resets = <&rst 9>; - reset-names = "mac"; + resets = <&rst 9>, <&rst 22>; + reset-names = "mac", "mdio"; + clocks = <&pll ATH79_CLK_AHB>, <&pll ATH79_CLK_AHB>; + clock-names = "eth", "mdio"; phy-handle = <&swphy4>; }; @@ -73,8 +75,10 @@ pll-data = <0x00110000 0x00001099 0x00991099>; - resets = <&rst 13>; - reset-names = "mac"; + resets = <&rst 13>, <&rst 23>; + reset-names = "mac", "mdio"; + clocks = <&pll ATH79_CLK_AHB>, <&pll ATH79_CLK_AHB>; + clock-names = "eth", "mdio"; phy-mode = "gmii"; diff --git a/target/linux/ath79/dts/ar7241.dtsi b/target/linux/ath79/dts/ar7241.dtsi index 59fcd05f5e..51da46dcf8 100644 --- a/target/linux/ath79/dts/ar7241.dtsi +++ b/target/linux/ath79/dts/ar7241.dtsi @@ -44,8 +44,10 @@ pll-data = <0x00110000 0x00001099 0x00991099>; - resets = <&rst 9>; - reset-names = "mac"; + resets = <&rst 9>, <&rst 22>; + reset-names = "mac", "mdio"; + clocks = <&pll ATH79_CLK_AHB>, <&pll ATH79_CLK_AHB>; + clock-names = "eth", "mdio"; phy-handle = <&swphy4>; }; @@ -81,8 +83,10 @@ pll-data = <0x00110000 0x00001099 0x00991099>; - resets = <&rst 13>; - reset-names = "mac"; + resets = <&rst 13>, <&rst 23>; + reset-names = "mac", "mdio"; + clocks = <&pll ATH79_CLK_AHB>, <&pll ATH79_CLK_AHB>; + clock-names = "eth", "mdio"; phy-mode = "gmii"; diff --git a/target/linux/ath79/dts/ar7242.dtsi b/target/linux/ath79/dts/ar7242.dtsi index be28ae7838..0d1e3883ca 100644 --- a/target/linux/ath79/dts/ar7242.dtsi +++ b/target/linux/ath79/dts/ar7242.dtsi @@ -51,8 +51,10 @@ pll-reg = <0x4 0x2c 17>; pll-handle = <&pll>; - resets = <&rst 9>; - reset-names = "mac"; + resets = <&rst 9>, <&rst 22>; + reset-names = "mac", "mdio"; + clocks = <&pll ATH79_CLK_AHB>, <&pll ATH79_CLK_AHB>; + clock-names = "eth", "mdio"; }; &mdio1 { @@ -74,8 +76,10 @@ ð1 { compatible = "qca,ar7242-eth", "syscon"; - resets = <&rst 13>; - reset-names = "mac"; + resets = <&rst 13>, <&rst 23>; + reset-names = "mac", "mdio"; + clocks = <&pll ATH79_CLK_AHB>, <&pll ATH79_CLK_AHB>; + clock-names = "eth", "mdio"; phy-mode = "gmii"; diff --git a/target/linux/ath79/dts/ar9132.dtsi b/target/linux/ath79/dts/ar9132.dtsi index ec60aff867..a8865ae31b 100644 --- a/target/linux/ath79/dts/ar9132.dtsi +++ b/target/linux/ath79/dts/ar9132.dtsi @@ -193,9 +193,9 @@ pll-data = <0x1a000000 0x13000a44 0x00441099>; pll-reg = <0x4 0x14 20>; pll-handle = <&pll>; - resets = <&rst 9>; - reset-names = "mac"; - clocks = <&pll ATH79_CLK_AHB> - clock-names = "eth"; + resets = <&rst 9>, <&rst 22>; + reset-names = "mac", "mdio"; + clocks = <&pll ATH79_CLK_AHB>, <&pll ATH79_CLK_AHB>; + clock-names = "eth", "mdio"; qca,mac-idx = <0>; }; diff --git a/target/linux/ath79/dts/ar9330.dtsi b/target/linux/ath79/dts/ar9330.dtsi index 8e52ae8fdb..c3d6635336 100644 --- a/target/linux/ath79/dts/ar9330.dtsi +++ b/target/linux/ath79/dts/ar9330.dtsi @@ -167,8 +167,10 @@ pll-data = <0x00110000 0x00001099 0x00991099>; - resets = <&rst 9>; - reset-names = "mac"; + resets = <&rst 9>, <&rst 22>; + reset-names = "mac", "mdio"; + clocks = <&pll ATH79_CLK_AHB>, <&pll ATH79_CLK_AHB>; + clock-names = "eth", "mdio"; phy-handle = <&swphy4>; }; @@ -205,8 +207,10 @@ pll-data = <0x00110000 0x00001099 0x00991099>; phy-mode = "gmii"; - resets = <&rst 13>; - reset-names = "mac"; + resets = <&rst 13>, <&rst 23>; + reset-names = "mac", "mdio"; + clocks = <&pll ATH79_CLK_AHB>, <&pll ATH79_CLK_AHB>; + clock-names = "eth", "mdio"; fixed-link { speed = <1000>; diff --git a/target/linux/ath79/dts/qca953x.dtsi b/target/linux/ath79/dts/qca953x.dtsi index e359badd2b..f255a6f54b 100644 --- a/target/linux/ath79/dts/qca953x.dtsi +++ b/target/linux/ath79/dts/qca953x.dtsi @@ -228,8 +228,10 @@ pll-reg = <0x4 0x2c 17>; pll-handle = <&pll>; - reset-names = "mac"; - resets = <&rst 9>; + resets = <&rst 9>, <&rst 22>; + reset-names = "mac", "mdio"; + clocks = <&pll ATH79_CLK_AHB>, <&pll ATH79_CLK_AHB>; + clock-names = "eth", "mdio"; }; &mdio1 { @@ -269,8 +271,10 @@ status = "okay"; compatible = "qca,qca9530-eth", "syscon"; - resets = <&rst 13>; - reset-names = "mac"; + resets = <&rst 13>, <&rst 23>; + reset-names = "mac", "mdio"; + clocks = <&pll ATH79_CLK_AHB>, <&pll ATH79_CLK_AHB>; + clock-names = "eth", "mdio"; phy-mode = "gmii"; diff --git a/target/linux/ath79/dts/qca9557.dtsi b/target/linux/ath79/dts/qca9557.dtsi index 69ea639804..90d86f5c9f 100644 --- a/target/linux/ath79/dts/qca9557.dtsi +++ b/target/linux/ath79/dts/qca9557.dtsi @@ -320,6 +320,8 @@ resets = <&rst 9>, <&rst 22>; reset-names = "mac", "mdio"; + clocks = <&pll ATH79_CLK_AHB>, <&pll ATH79_CLK_AHB>; + clock-names = "eth", "mdio"; }; &mdio1 { @@ -337,4 +339,6 @@ resets = <&rst 13>, <&rst 23>; reset-names = "mac", "mdio"; + clocks = <&pll ATH79_CLK_AHB>, <&pll ATH79_CLK_AHB>; + clock-names = "eth", "mdio"; }; diff --git a/target/linux/ath79/dts/qca956x.dtsi b/target/linux/ath79/dts/qca956x.dtsi index d0ce952ef4..942ce9a3ba 100644 --- a/target/linux/ath79/dts/qca956x.dtsi +++ b/target/linux/ath79/dts/qca956x.dtsi @@ -262,8 +262,10 @@ pll-reg = <0 0x48 0>; pll-handle = <&pll>; - resets = <&rst 9>; - reset-names = "mac"; + resets = <&rst 9>, <&rst 22>; + reset-names = "mac", "mdio"; + clocks = <&pll ATH79_CLK_AHB>, <&pll ATH79_CLK_AHB>; + clock-names = "eth", "mdio"; }; &mdio1 { @@ -303,8 +305,10 @@ phy-mode = "gmii"; - resets = <&rst 13>; - reset-names = "mac"; + resets = <&rst 13>, <&rst 23>; + reset-names = "mac", "mdio"; + clocks = <&pll ATH79_CLK_AHB>, <&pll ATH79_CLK_AHB>; + clock-names = "eth", "mdio"; fixed-link { speed = <1000>; -- 2.30.2