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: [email protected]
>> Signed-off-by: Josh Wu <[email protected]>
>
> Acked-by: Nicolas Ferre <[email protected]>
>
> 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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
