On Thu, May 21, 2015 at 10:32:40PM +0800, Daniel Kurtz wrote: > On Wed, May 20, 2015 at 10:19 PM, Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> wrote: > > This adds the SCPSYS device node to the MT8173 dtsi file. > > > > Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> > > --- > > arch/arm64/boot/dts/mediatek/mt8173.dtsi | 10 ++++++++++ > > 1 file changed, 10 insertions(+) > > > > diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts/mediatek/mt8173.dtsi > > index 924fdb6..12430f0 100644 > > --- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi > > +++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi > > @@ -125,6 +125,16 @@ > > <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>; > > }; > > > > + scpsys: scpsys@10006000 { > > + compatible = "mediatek,mt8173-scpsys"; > > + #power-domain-cells = <1>; > > + reg = <0 0x10006000 0 0x1000>; > > + clocks = <&clk26m>, > > Why is mfg using <&clk26m> and not <&topckgen CLK_TOP_MFG_SEL>? Because James Liao said to me that it is derived from clk26m and not from mfg_sel. > I saw another patch set on the list today from James Liao that adds more clocks. > Perhaps we can move the SCPSYS set on top of that one and include more clocks? > > > + <&topckgen CLK_TOP_MM_SEL>; > > FYI: the devicetree changes in this set depend on your other patch set > starting with: > > https://patchwork.kernel.org/patch/6446341/ > "arm64: dts: mt8173: Add clock controller device nodes" > > This patch isn't based on top of the other set, though, so it may lead > to a small merge conflict when folding in the .dtsi device nodes (ie, > placing scpsys@10006000 after pwrap@1000d000). > > I'm not sure how people usually resolve this or manage the ordering of > co-dependent patch sets upstream. This merge conflict should be easy to solve. However, I can rebase this on Matthias' dts branch if desired. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html