Message ID | 1471332629-15722-9-git-send-email-erin.lo@mediatek.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 08/16, Erin Lo wrote: > From: James Liao <jamesjj.liao@mediatek.com> > > Add clock controller nodes for MT2701, include topckgen, infracfg, > pericfg, apmixedsys, mmsys, imgsys, vdecsys, hifsys, ethsys and > bdpsys. This patch also add two oscillators that provide clocks for > MT2701. > > Signed-off-by: James Liao <jamesjj.liao@mediatek.com> > Signed-off-by: Erin Lo <erin.lo@mediatek.com> > --- This should go through arm-soc tree, so do you need a stable branch in clk tree to pull through arm-soc, or are we going to wait a release cycle on the dts patches?
On Thu, 2016-08-18 at 17:18 -0700, Stephen Boyd wrote: > On 08/16, Erin Lo wrote: > > From: James Liao <jamesjj.liao@mediatek.com> > > > > Add clock controller nodes for MT2701, include topckgen, infracfg, > > pericfg, apmixedsys, mmsys, imgsys, vdecsys, hifsys, ethsys and > > bdpsys. This patch also add two oscillators that provide clocks for > > MT2701. > > > > Signed-off-by: James Liao <jamesjj.liao@mediatek.com> > > Signed-off-by: Erin Lo <erin.lo@mediatek.com> > > --- > > This should go through arm-soc tree, so do you need a stable > branch in clk tree to pull through arm-soc, or are we going to > wait a release cycle on the dts patches? Hi Stephen, I prefer to wait a release cycle. We may merge clk driver first, then merge dts patches in next kernel release. Best regards, James
diff --git a/arch/arm/boot/dts/mt2701.dtsi b/arch/arm/boot/dts/mt2701.dtsi index 18596a2..c9a8dbf 100644 --- a/arch/arm/boot/dts/mt2701.dtsi +++ b/arch/arm/boot/dts/mt2701.dtsi @@ -12,8 +12,10 @@ * GNU General Public License for more details. */ +#include <dt-bindings/clock/mt2701-clk.h> #include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/arm-gic.h> +#include <dt-bindings/reset/mt2701-resets.h> #include "skeleton64.dtsi" #include "mt2701-pinfunc.h" @@ -77,6 +79,20 @@ #clock-cells = <0>; }; + clk26m: oscillator@0 { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <26000000>; + clock-output-names = "clk26m"; + }; + + rtc32k: oscillator@1 { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <32000>; + clock-output-names = "rtc32k"; + }; + timer { compatible = "arm,armv7-timer"; interrupt-parent = <&gic>; @@ -104,6 +120,26 @@ reg = <0 0x10005000 0 0x1000>; }; + topckgen: syscon@10000000 { + compatible = "mediatek,mt2701-topckgen", "syscon"; + reg = <0 0x10000000 0 0x1000>; + #clock-cells = <1>; + }; + + infracfg: syscon@10001000 { + compatible = "mediatek,mt2701-infracfg", "syscon"; + reg = <0 0x10001000 0 0x1000>; + #clock-cells = <1>; + #reset-cells = <1>; + }; + + pericfg: syscon@10003000 { + compatible = "mediatek,mt2701-pericfg", "syscon"; + reg = <0 0x10003000 0 0x1000>; + #clock-cells = <1>; + #reset-cells = <1>; + }; + watchdog: watchdog@10007000 { compatible = "mediatek,mt2701-wdt", "mediatek,mt6589-wdt"; @@ -128,6 +164,12 @@ reg = <0 0x10200100 0 0x1c>; }; + apmixedsys: syscon@10209000 { + compatible = "mediatek,mt2701-apmixedsys", "syscon"; + reg = <0 0x10209000 0 0x1000>; + #clock-cells = <1>; + }; + gic: interrupt-controller@10211000 { compatible = "arm,cortex-a7-gic"; interrupt-controller;