From ffaaa6788a983a5eae0117d138a297df3f131869 Mon Sep 17 00:00:00 2001 From: Stanislav Galabov Date: Tue, 10 May 2016 16:23:54 +0300 Subject: [PATCH] ramips: DTS modifications This commit makes the following modifications to ramips dts files: 1. Add clkctrl node to all dtsi files (although not used for now) 2. Add clocks and clock-names properties to some nodes (usbphy, pci) 3. Add usbphy node for rt3050 (although not used for now) 4. Add clock-frequency to uart nodes in mt7621.dtsi and mt7628an.dtsi These modifications, although not fully used at the moment, will make it easier for FreeBSD to adopt and use LEDE ramips dts files with minimal changes for easier maintenance. Signed-off-by: Stanislav Galabov --- target/linux/ramips/dts/mt7620a.dtsi | 11 +++++++++++ target/linux/ramips/dts/mt7620n.dtsi | 8 ++++++++ target/linux/ramips/dts/mt7621.dtsi | 11 +++++++++++ target/linux/ramips/dts/mt7628an.dtsi | 21 ++++++++++++++++++--- target/linux/ramips/dts/rt2880.dtsi | 5 +++++ target/linux/ramips/dts/rt3050.dtsi | 13 +++++++++++++ target/linux/ramips/dts/rt3352.dtsi | 7 +++++++ target/linux/ramips/dts/rt3883.dtsi | 7 +++++++ target/linux/ramips/dts/rt5350.dtsi | 7 +++++++ 9 files changed, 87 insertions(+), 3 deletions(-) diff --git a/target/linux/ramips/dts/mt7620a.dtsi b/target/linux/ramips/dts/mt7620a.dtsi index 352b2d1188c..2450f7d0081 100644 --- a/target/linux/ramips/dts/mt7620a.dtsi +++ b/target/linux/ramips/dts/mt7620a.dtsi @@ -396,12 +396,20 @@ #reset-cells = <1>; }; + clkctrl: clkctrl { + compatible = "ralink,rt2880-clock"; + #clock-cells = <1>; + }; + usbphy: usbphy { compatible = "mediatek,mt7620-usbphy"; #phy-cells = <1>; resets = <&rstctrl 22 &rstctrl 25>; reset-names = "host", "device"; + + clocks = <&clkctrl 22 &clkctrl 25>; + clock-names = "host", "device"; }; ethernet: ethernet@10100000 { @@ -499,6 +507,9 @@ resets = <&rstctrl 26>; reset-names = "pcie0"; + clocks = <&clkctrl 26>; + clock-names = "pcie0"; + interrupt-parent = <&cpuintc>; interrupts = <4>; diff --git a/target/linux/ramips/dts/mt7620n.dtsi b/target/linux/ramips/dts/mt7620n.dtsi index d1cf36f29ab..1df9544ae74 100644 --- a/target/linux/ramips/dts/mt7620n.dtsi +++ b/target/linux/ramips/dts/mt7620n.dtsi @@ -255,12 +255,20 @@ #reset-cells = <1>; }; + clkctrl: clkctrl { + compatible = "ralink,rt2880-clock"; + #clock-cells = <1>; + }; + usbphy: usbphy { compatible = "mediatek,mt7620-usbphy"; #phy-cells = <1>; resets = <&rstctrl 22 &rstctrl 25>; reset-names = "host", "device"; + + clocks = <&clkctrl 22 &clkctrl 25>; + clock-names = "host", "device"; }; ethernet: ethernet@10100000 { diff --git a/target/linux/ramips/dts/mt7621.dtsi b/target/linux/ramips/dts/mt7621.dtsi index bc30597fdd2..2ce07d78af8 100644 --- a/target/linux/ramips/dts/mt7621.dtsi +++ b/target/linux/ramips/dts/mt7621.dtsi @@ -109,6 +109,7 @@ reg = <0xc00 0x100>; clocks = <&sysclock>; + clock-frequency = <50000000>; interrupt-parent = <&gic>; interrupts = ; @@ -241,6 +242,11 @@ #reset-cells = <1>; }; + clkctrl: clkctrl { + compatible = "ralink,rt2880-clock"; + #clock-cells = <1>; + }; + sdhci: sdhci@1E130000 { compatible = "ralink,mt7620-sdhci"; reg = <0x1E130000 0x4000>; @@ -349,6 +355,11 @@ status = "okay"; + resets = <&rstctrl 24 &rstctrl 25 &rstctrl 26>; + reset-names = "pcie0", "pcie1", "pcie2"; + clocks = <&clkctrl 24 &clkctrl 25 &clkctrl 26>; + clock-names = "pcie0", "pcie1", "pcie2"; + pcie0 { reg = <0x0000 0 0 0 0>; diff --git a/target/linux/ramips/dts/mt7628an.dtsi b/target/linux/ramips/dts/mt7628an.dtsi index b242e48d21a..6b8b1b73d08 100644 --- a/target/linux/ramips/dts/mt7628an.dtsi +++ b/target/linux/ramips/dts/mt7628an.dtsi @@ -166,6 +166,8 @@ reg-io-width = <4>; no-loopback-test; + clock-frequency = <40000000>; + resets = <&rstctrl 12>; reset-names = "uartl"; @@ -184,6 +186,8 @@ reg-io-width = <4>; no-loopback-test; + clock-frequency = <40000000>; + resets = <&rstctrl 19>; reset-names = "uart1"; @@ -204,6 +208,8 @@ reg-io-width = <4>; no-loopback-test; + clock-frequency = <40000000>; + resets = <&rstctrl 20>; reset-names = "uart2"; @@ -344,6 +350,11 @@ #reset-cells = <1>; }; + clkctrl: clkctrl { + compatible = "ralink,rt2880-clock"; + #clock-cells = <1>; + }; + usbphy: usbphy@10120000 { compatible = "ralink,mt7628an-usbphy", "mediatek,mt7620-usbphy"; reg = <0x10120000 0x4000>; @@ -351,6 +362,8 @@ resets = <&rstctrl 22 &rstctrl 25>; reset-names = "host", "device"; + clocks = <&clkctrl 22 &clkctrl 25>; + clock-names = "host", "device"; }; sdhci: sdhci@10130000 { @@ -420,12 +433,14 @@ #address-cells = <3>; #size-cells = <2>; - resets = <&rstctrl 26>; - reset-names = "pcie0"; - interrupt-parent = <&cpuintc>; interrupts = <4>; + resets = <&rstctrl 26 &rstctrl 27>; + reset-names = "pcie0", "pcie1"; + clocks = <&clkctrl 26 &clkctrl 27>; + clock-names = "pcie0", "pcie1"; + status = "disabled"; device_type = "pci"; diff --git a/target/linux/ramips/dts/rt2880.dtsi b/target/linux/ramips/dts/rt2880.dtsi index e96b800a331..ad882547f79 100644 --- a/target/linux/ramips/dts/rt2880.dtsi +++ b/target/linux/ramips/dts/rt2880.dtsi @@ -158,6 +158,11 @@ #reset-cells = <1>; }; + clkctrl: clkctrl { + compatible = "ralink,rt2880-clock"; + #clock-cells = <1>; + }; + ethernet: ethernet@400000 { compatible = "ralink,rt2880-eth"; reg = <0x00400000 0x10000>; diff --git a/target/linux/ramips/dts/rt3050.dtsi b/target/linux/ramips/dts/rt3050.dtsi index 1ddc1515b34..caf448bd160 100644 --- a/target/linux/ramips/dts/rt3050.dtsi +++ b/target/linux/ramips/dts/rt3050.dtsi @@ -215,6 +215,19 @@ #reset-cells = <1>; }; + clkctrl: clkctrl { + compatible = "ralink,rt2880-clock"; + #clock-cells = <1>; + }; + + usbphy: usbphy { + compatible = "ralink,rt3050-usbphy"; + resets = <&rstctrl 22>; + reset-names = "host"; + clocks = <&clkctrl 18>; + clock-names = "host"; + }; + ethernet: ethernet@10100000 { compatible = "ralink,rt3050-eth"; reg = <0x10100000 0x10000>; diff --git a/target/linux/ramips/dts/rt3352.dtsi b/target/linux/ramips/dts/rt3352.dtsi index 386ac51ffb7..a818a18d222 100644 --- a/target/linux/ramips/dts/rt3352.dtsi +++ b/target/linux/ramips/dts/rt3352.dtsi @@ -229,6 +229,11 @@ #reset-cells = <1>; }; + clkctrl: clkctrl { + compatible = "ralink,rt2880-clock"; + #clock-cells = <1>; + }; + ethernet: ethernet@10100000 { compatible = "ralink,rt3352-eth", "ralink,rt3050-eth"; reg = <0x10100000 0x10000>; @@ -259,6 +264,8 @@ resets = <&rstctrl 22 &rstctrl 25>; reset-names = "host", "device"; + clocks = <&clkctrl 18 &clkctrl 20>; + clock-names = "host", "device"; }; wmac: wmac@10180000 { diff --git a/target/linux/ramips/dts/rt3883.dtsi b/target/linux/ramips/dts/rt3883.dtsi index ba1f9a9c8aa..d92cb65b7ad 100644 --- a/target/linux/ramips/dts/rt3883.dtsi +++ b/target/linux/ramips/dts/rt3883.dtsi @@ -272,6 +272,11 @@ #reset-cells = <1>; }; + clkctrl: clkctrl { + compatible = "ralink,rt2880-clock"; + #clock-cells = <1>; + }; + pci: pci@10140000 { compatible = "ralink,rt3883-pci"; reg = <0x10140000 0x20000>; @@ -364,6 +369,8 @@ resets = <&rstctrl 22 &rstctrl 25>; reset-names = "host", "device"; + clocks = <&clkctrl 22 &clkctrl 25>; + clock-names = "host", "device"; }; wmac: wmac@10180000 { diff --git a/target/linux/ramips/dts/rt5350.dtsi b/target/linux/ramips/dts/rt5350.dtsi index 6f30f2df597..8733d4f550e 100644 --- a/target/linux/ramips/dts/rt5350.dtsi +++ b/target/linux/ramips/dts/rt5350.dtsi @@ -267,12 +267,19 @@ #reset-cells = <1>; }; + clkctrl: clkctrl { + compatible = "ralink,rt2880-clock"; + #clock-cells = <1>; + }; + usbphy: usbphy { compatible = "ralink,rt3352-usbphy"; #phy-cells = <1>; resets = <&rstctrl 22 &rstctrl 25>; reset-names = "host", "device"; + clocks = <&clkctrl 18>; + clock-names = "host"; }; ethernet: ethernet@10100000 { -- 2.30.2