Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752005AbaBZO0f (ORCPT ); Wed, 26 Feb 2014 09:26:35 -0500 Received: from comal.ext.ti.com ([198.47.26.152]:51103 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751019AbaBZO0d (ORCPT ); Wed, 26 Feb 2014 09:26:33 -0500 Message-ID: <530DF992.1090106@ti.com> Date: Wed, 26 Feb 2014 09:26:26 -0500 From: Santosh Shilimkar User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 To: "Khoronzhuk, Ivan" , Stephen Rothwell , Mike Turquette CC: "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "Karicheri, Muralidharan" , "Strashko, Grygorii" Subject: Re: linux-next: manual merge of the clk tree with the keystone tree References: <20140226181521.e8cecdff21d892ea1f037bff@canb.auug.org.au> <530DD2CD.7000302@ti.com> In-Reply-To: <530DD2CD.7000302@ti.com> Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wednesday 26 February 2014 06:41 AM, Khoronzhuk, Ivan wrote: > > On 02/26/2014 09:15 AM, Stephen Rothwell wrote: >> Hi Mike, >> >> Today's linux-next merge of the clk tree got a conflict in >> arch/arm/boot/dts/keystone-clocks.dtsi between commit 0cfc9ccec2a8 ("ARM: >> dts: keystone: preparatory patch to support K2L and K2E SOCs") from the >> keystone tree and commit 565bbdcd3b91 ("ARM: keystone: dts: fix clkvcp3 >> control register address") from the clk tree. >> >> I fixed it up (by adding the following merge fix patch) and can carry the >> fix as necessary (no action is required). >> >> From: Stephen Rothwell >> Date: Wed, 26 Feb 2014 18:12:55 +1100 >> Subject: [PATCH] ARM: keystone: dts: fix for code movement >> >> Signed-off-by: Stephen Rothwell >> --- >> arch/arm/boot/dts/k2hk-clocks.dtsi | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/arch/arm/boot/dts/k2hk-clocks.dtsi b/arch/arm/boot/dts/k2hk-clocks.dtsi >> index 4eed84feb761..a71aa2996321 100644 >> --- a/arch/arm/boot/dts/k2hk-clocks.dtsi >> +++ b/arch/arm/boot/dts/k2hk-clocks.dtsi >> @@ -339,7 +339,7 @@ clocks { >> compatible = "ti,keystone,psc-clock"; >> clocks = <&chipclk13>; >> clock-output-names = "vcp-3"; >> - reg = <0x0235000a8 0xb00>, <0x02350060 0x400>; >> + reg = <0x023500a8 0xb00>, <0x02350060 0x400>; >> reg-names = "control", "domain"; >> domain-id = <24>; >> }; > > The patch "ARM: dts: keystone: preparatory patch to support K2L and K2E > SOCs" > is from "[PATCH 0/4] ARM: dts: keystone: Add support for K2H and K2E > SOCs/EVMs" > series (http://www.spinics.net/lists/arm-kernel/msg310946.html). > > As I understand, this series splits keystone clock tree into tree boards. Not boards but SOCs. > As result clock "clkvcp3" (for wich reg is corrected) is moved to the > following two dts: > > k2hk-clocks.dtsi > k2l-clocks.dtsi > > So probably you should apply this change to k2l-clocks.dtsi too. > I will fix my tree. Thanks for spotting it Ivan !! Regards, Santosh -- 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/