2013-03-25 13:30:54

by Maxime Ripard

[permalink] [raw]
Subject: [PATCH 08/10] ARM: sunxi: dt: Update interrupt controller compatible string

Signed-off-by: Maxime Ripard <[email protected]>
---
arch/arm/boot/dts/sun4i-a10.dtsi | 2 +-
arch/arm/boot/dts/sun5i-a13.dtsi | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
index be71782..805d704 100644
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
@@ -121,7 +121,7 @@
ranges;

intc: interrupt-controller@01c20400 {
- compatible = "allwinner,sunxi-ic";
+ compatible = "allwinner,sun4i-ic";
reg = <0x01c20400 0x400>;
interrupt-controller;
#interrupt-cells = <1>;
diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi
index 7a81aaf..760222c 100644
--- a/arch/arm/boot/dts/sun5i-a13.dtsi
+++ b/arch/arm/boot/dts/sun5i-a13.dtsi
@@ -122,7 +122,7 @@
ranges;

intc: interrupt-controller@01c20400 {
- compatible = "allwinner,sunxi-ic";
+ compatible = "allwinner,sun4i-ic";
reg = <0x01c20400 0x400>;
interrupt-controller;
#interrupt-cells = <1>;
--
1.7.10.4


2013-03-25 13:59:08

by Rob Herring

[permalink] [raw]
Subject: Re: [PATCH 08/10] ARM: sunxi: dt: Update interrupt controller compatible string

On 03/25/2013 08:30 AM, Maxime Ripard wrote:
> Signed-off-by: Maxime Ripard <[email protected]>
> ---
> arch/arm/boot/dts/sun4i-a10.dtsi | 2 +-
> arch/arm/boot/dts/sun5i-a13.dtsi | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
> index be71782..805d704 100644
> --- a/arch/arm/boot/dts/sun4i-a10.dtsi
> +++ b/arch/arm/boot/dts/sun4i-a10.dtsi
> @@ -121,7 +121,7 @@
> ranges;
>
> intc: interrupt-controller@01c20400 {
> - compatible = "allwinner,sunxi-ic";
> + compatible = "allwinner,sun4i-ic";

Generally speaking, this is a bad thing to do. This breaks compatibility
between dtb and kernel versions. If that breakage is not yet a concern
for sunxi, then it is okay.

Also, I don't see any documentation updates for any of these changes.

Rob

> reg = <0x01c20400 0x400>;
> interrupt-controller;
> #interrupt-cells = <1>;
> diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi
> index 7a81aaf..760222c 100644
> --- a/arch/arm/boot/dts/sun5i-a13.dtsi
> +++ b/arch/arm/boot/dts/sun5i-a13.dtsi
> @@ -122,7 +122,7 @@
> ranges;
>
> intc: interrupt-controller@01c20400 {
> - compatible = "allwinner,sunxi-ic";
> + compatible = "allwinner,sun4i-ic";
> reg = <0x01c20400 0x400>;
> interrupt-controller;
> #interrupt-cells = <1>;
>

2013-03-25 16:27:55

by Maxime Ripard

[permalink] [raw]
Subject: Re: [PATCH 08/10] ARM: sunxi: dt: Update interrupt controller compatible string

Hi Rob,

Le 25/03/2013 14:59, Rob Herring a ?crit :
> On 03/25/2013 08:30 AM, Maxime Ripard wrote:
>> Signed-off-by: Maxime Ripard <[email protected]>
>> ---
>> arch/arm/boot/dts/sun4i-a10.dtsi | 2 +-
>> arch/arm/boot/dts/sun5i-a13.dtsi | 2 +-
>> 2 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
>> index be71782..805d704 100644
>> --- a/arch/arm/boot/dts/sun4i-a10.dtsi
>> +++ b/arch/arm/boot/dts/sun4i-a10.dtsi
>> @@ -121,7 +121,7 @@
>> ranges;
>>
>> intc: interrupt-controller@01c20400 {
>> - compatible = "allwinner,sunxi-ic";
>> + compatible = "allwinner,sun4i-ic";
>
> Generally speaking, this is a bad thing to do. This breaks compatibility
> between dtb and kernel versions. If that breakage is not yet a concern
> for sunxi, then it is okay.

Yes, I know, but I thought it was okay since sunxi has never been in an
usable state, and it seemed odd to me to begin to maintain an history
for a platform that has never actually been booted by a user.

On the other end, if someone speaks up, I'd be happy to keep the old
compatible around as well.

> Also, I don't see any documentation updates for any of these changes.

Ah, yes, my bad.

Thanks,
Maxime

--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com