Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754142AbbG3Qqx (ORCPT ); Thu, 30 Jul 2015 12:46:53 -0400 Received: from eusmtp01.atmel.com ([212.144.249.243]:9562 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752958AbbG3Qqu (ORCPT ); Thu, 30 Jul 2015 12:46:50 -0400 Message-ID: <55BA54B6.2080802@atmel.com> Date: Thu, 30 Jul 2015 18:45:42 +0200 From: Nicolas Ferre Organization: atmel User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.8.0 MIME-Version: 1.0 To: Josh Wu , , Sebastian Reichel , Alexandre Belloni CC: , Russell King , "Kumar Gala" , Jean-Christophe Plagniol-Villard , , Ian Campbell , Alexandre Belloni , Rob Herring , Pawel Moll , Mark Rutland Subject: Re: [PATCH v2 2/2] ARM: at91: sama5/dt: update rstc to correct compatible string References: <1437384726-24927-1-git-send-email-josh.wu@atmel.com> <1437384726-24927-2-git-send-email-josh.wu@atmel.com> <55ACEB9B.70901@atmel.com> In-Reply-To: <55ACEB9B.70901@atmel.com> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.161.30.18] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2120 Lines: 75 Le 20/07/2015 14:37, Nicolas Ferre a ?crit : > Le 20/07/2015 11:32, Josh Wu a ?crit : >> They'll use "atmel,sama5d3-rstc" for reset function. >> >> Cc: devicetree@vger.kernel.org >> Signed-off-by: Josh Wu > > Acked-by: Nicolas Ferre > > And we'll have to synchronize with the other patches. The best way to > deal with that can be to take both of them with us through arm-soc. > > Sebastian, > > 1/ as you weren't in the CC list of the original patch, do you want me > to re-send the whole series? > > 2/ can we take these driver's changes with use through the arm-soc git > tree so that we can manage the synchronization better? Okay, so to ease synchronization, I take this one with me through arm-soc and add the old compatibility string as a fallback => the newer will be used when merged... Thanks, bye. > Thanks, bye, > >> --- >> >> Changes in v2: None >> >> arch/arm/boot/dts/sama5d3.dtsi | 2 +- >> arch/arm/boot/dts/sama5d4.dtsi | 2 +- >> 2 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi >> index 9e2444b..280255b 100644 >> --- a/arch/arm/boot/dts/sama5d3.dtsi >> +++ b/arch/arm/boot/dts/sama5d3.dtsi >> @@ -1259,7 +1259,7 @@ >> }; >> >> rstc@fffffe00 { >> - compatible = "atmel,at91sam9g45-rstc"; >> + compatible = "atmel,sama5d3-rstc"; >> reg = <0xfffffe00 0x10>; >> }; >> >> diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi >> index 3ee22ee..481196c 100644 >> --- a/arch/arm/boot/dts/sama5d4.dtsi >> +++ b/arch/arm/boot/dts/sama5d4.dtsi >> @@ -1277,7 +1277,7 @@ >> }; >> >> rstc@fc068600 { >> - compatible = "atmel,at91sam9g45-rstc"; >> + compatible = "atmel,sama5d3-rstc"; >> reg = <0xfc068600 0x10>; >> }; >> >> > > -- Nicolas Ferre -- 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/