From: nicolas.ferre@atmel•com (Nicolas Ferre)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v2 2/2] ARM: at91: sama5/dt: update rstc to correct compatible string
Date: Thu, 30 Jul 2015 18:45:42 +0200 [thread overview]
Message-ID: <55BA54B6.2080802@atmel.com> (raw)
In-Reply-To: <55ACEB9B.70901@atmel.com>
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 at vger.kernel.org
>> Signed-off-by: Josh Wu <josh.wu@atmel•com>
>
> Acked-by: Nicolas Ferre <nicolas.ferre@atmel•com>
>
> 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 at 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 at fc068600 {
>> - compatible = "atmel,at91sam9g45-rstc";
>> + compatible = "atmel,sama5d3-rstc";
>> reg = <0xfc068600 0x10>;
>> };
>>
>>
>
>
--
Nicolas Ferre
next prev parent reply other threads:[~2015-07-30 16:45 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-20 9:32 [PATCH v2 1/2] power: reset: at91: add sama5d3 reset function Josh Wu
2015-07-20 9:32 ` [PATCH v2 2/2] ARM: at91: sama5/dt: update rstc to correct compatible string Josh Wu
2015-07-20 9:34 ` Alexandre Belloni
2015-07-20 12:37 ` Nicolas Ferre
2015-07-30 16:45 ` Nicolas Ferre [this message]
2015-07-20 9:33 ` [PATCH v2 1/2] power: reset: at91: add sama5d3 reset function Alexandre Belloni
2015-07-20 13:12 ` Guenter Roeck
2015-07-20 16:42 ` Sebastian Reichel
2015-07-28 7:27 ` Nicolas Ferre
2015-08-05 18:04 ` Sebastian Reichel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=55BA54B6.2080802@atmel.com \
--to=nicolas.ferre@atmel$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox