diff mbox

dt/bindings: arm-boards: Remove skeleton.dtsi inclusion from example

Message ID 1477041629-23341-1-git-send-email-geert+renesas@glider.be
State Superseded, archived
Headers show

Commit Message

Geert Uytterhoeven Oct. 21, 2016, 9:20 a.m. UTC
As of commit 9c0da3cc61f1233c ("ARM: dts: explicitly mark skeleton.dtsi
as deprecated"), including skeleton.dtsi is deprecated.
Hence remove it from the example.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 Documentation/devicetree/bindings/arm/arm-boards | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Mark Rutland Oct. 21, 2016, 9:50 a.m. UTC | #1
On Fri, Oct 21, 2016 at 11:20:29AM +0200, Geert Uytterhoeven wrote:
> As of commit 9c0da3cc61f1233c ("ARM: dts: explicitly mark skeleton.dtsi
> as deprecated"), including skeleton.dtsi is deprecated.
> Hence remove it from the example.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
>  Documentation/devicetree/bindings/arm/arm-boards | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/arm/arm-boards b/Documentation/devicetree/bindings/arm/arm-boards
> index ab318a56fca2194f..e667ecbcf226dfe3 100644
> --- a/Documentation/devicetree/bindings/arm/arm-boards
> +++ b/Documentation/devicetree/bindings/arm/arm-boards
> @@ -148,15 +148,14 @@ Example:
>  
>  /dts-v1/;
>  #include <dt-bindings/interrupt-controller/irq.h>
> -#include "skeleton.dtsi"
>  
>  / {
>  	model = "ARM RealView PB1176 with device tree";
>  	compatible = "arm,realview-pb1176";
> +	#address-cells = <0>;
> +	#size-cells = <1>;
>  
>  	soc {
> -		#address-cells = <1>;
> -		#size-cells = <1>;

Strictly speaking, these two are still necessary for the ranges
property. They're *not* inherited per the spec, no matter what Linux
happens to do today.

With those restored:

Acked-by: Mark Rutland <mark.rutland@arm.com>

Thanks,
Mark.

>  		compatible = "arm,realview-pb1176-soc", "simple-bus";
>  		ranges;
>  
> -- 
> 1.9.1
> 
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Geert Uytterhoeven Oct. 21, 2016, 10:16 a.m. UTC | #2
Hi Mark,

On Fri, Oct 21, 2016 at 11:50 AM, Mark Rutland <mark.rutland@arm.com> wrote:
> On Fri, Oct 21, 2016 at 11:20:29AM +0200, Geert Uytterhoeven wrote:
>> As of commit 9c0da3cc61f1233c ("ARM: dts: explicitly mark skeleton.dtsi
>> as deprecated"), including skeleton.dtsi is deprecated.
>> Hence remove it from the example.
>>
>> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
>> ---
>>  Documentation/devicetree/bindings/arm/arm-boards | 5 ++---
>>  1 file changed, 2 insertions(+), 3 deletions(-)
>>
>> diff --git a/Documentation/devicetree/bindings/arm/arm-boards b/Documentation/devicetree/bindings/arm/arm-boards
>> index ab318a56fca2194f..e667ecbcf226dfe3 100644
>> --- a/Documentation/devicetree/bindings/arm/arm-boards
>> +++ b/Documentation/devicetree/bindings/arm/arm-boards
>> @@ -148,15 +148,14 @@ Example:
>>
>>  /dts-v1/;
>>  #include <dt-bindings/interrupt-controller/irq.h>
>> -#include "skeleton.dtsi"
>>
>>  / {
>>       model = "ARM RealView PB1176 with device tree";
>>       compatible = "arm,realview-pb1176";
>> +     #address-cells = <0>;
>> +     #size-cells = <1>;
>>
>>       soc {
>> -             #address-cells = <1>;
>> -             #size-cells = <1>;
>
> Strictly speaking, these two are still necessary for the ranges
> property. They're *not* inherited per the spec, no matter what Linux
> happens to do today.

I wasn't sure about that part of the change. OK, will fix.

> With those restored:
>
> Acked-by: Mark Rutland <mark.rutland@arm.com>

Thanks!

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Geert Uytterhoeven Oct. 21, 2016, 10:26 a.m. UTC | #3
On Fri, Oct 21, 2016 at 12:16 PM, Geert Uytterhoeven
<geert@linux-m68k.org> wrote:
> On Fri, Oct 21, 2016 at 11:50 AM, Mark Rutland <mark.rutland@arm.com> wrote:
>> On Fri, Oct 21, 2016 at 11:20:29AM +0200, Geert Uytterhoeven wrote:
>>> --- a/Documentation/devicetree/bindings/arm/arm-boards
>>> +++ b/Documentation/devicetree/bindings/arm/arm-boards
>>> @@ -148,15 +148,14 @@ Example:
>>>
>>>  /dts-v1/;
>>>  #include <dt-bindings/interrupt-controller/irq.h>
>>> -#include "skeleton.dtsi"
>>>
>>>  / {
>>>       model = "ARM RealView PB1176 with device tree";
>>>       compatible = "arm,realview-pb1176";
>>> +     #address-cells = <0>;

How did I manage to turn the <1> into a <0> by moving and reindenting
two lines?!? Will fix, too.

>>> +     #size-cells = <1>;
>>>
>>>       soc {
>>> -             #address-cells = <1>;
>>> -             #size-cells = <1>;
>>
>> Strictly speaking, these two are still necessary for the ranges
>> property. They're *not* inherited per the spec, no matter what Linux
>> happens to do today.
>
> I wasn't sure about that part of the change. OK, will fix.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/Documentation/devicetree/bindings/arm/arm-boards b/Documentation/devicetree/bindings/arm/arm-boards
index ab318a56fca2194f..e667ecbcf226dfe3 100644
--- a/Documentation/devicetree/bindings/arm/arm-boards
+++ b/Documentation/devicetree/bindings/arm/arm-boards
@@ -148,15 +148,14 @@  Example:
 
 /dts-v1/;
 #include <dt-bindings/interrupt-controller/irq.h>
-#include "skeleton.dtsi"
 
 / {
 	model = "ARM RealView PB1176 with device tree";
 	compatible = "arm,realview-pb1176";
+	#address-cells = <0>;
+	#size-cells = <1>;
 
 	soc {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "arm,realview-pb1176-soc", "simple-bus";
 		ranges;