Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756371AbbEURtk (ORCPT ); Thu, 21 May 2015 13:49:40 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:56939 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756243AbbEURtW (ORCPT ); Thu, 21 May 2015 13:49:22 -0400 Date: Thu, 21 May 2015 19:49:16 +0200 From: Sascha Hauer To: Daniel Kurtz Cc: "linux-arm-kernel@lists.infradead.org" , "open list:OPEN FIRMWARE AND..." , Kevin Hilman , "linux-kernel@vger.kernel.org" , linux-mediatek@lists.infradead.org, Sasha Hauer , Matthias Brugger Subject: Re: [PATCH 5/5] ARM64: MediaTek MT8173: Add SCPSYS device node Message-ID: <20150521174916.GQ6325@pengutronix.de> References: <1432131540-2523-1-git-send-email-s.hauer@pengutronix.de> <1432131540-2523-6-git-send-email-s.hauer@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain X-Uptime: 19:44:43 up 66 days, 5:36, 89 users, load average: 0.48, 0.18, 0.15 User-Agent: Mutt/1.5.21 (2010-09-15) X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::c0 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2591 Lines: 61 On Thu, May 21, 2015 at 10:32:40PM +0800, Daniel Kurtz wrote: > On Wed, May 20, 2015 at 10:19 PM, Sascha Hauer wrote: > > This adds the SCPSYS device node to the MT8173 dtsi file. > > > > Signed-off-by: Sascha Hauer > > --- > > 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 @@ > > ; > > }; > > > > + 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 linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/