[PATCH v2 1/2] ARM: dts: Remove use of skeleton.dtsi from bcm283x.dtsi

[Mark Rutland]

On Wed, Aug 03, 2016 at 03:12:44PM +0100, Ian Campbell wrote:
> This file is included from DTS files under arch/arm64 too (via
> broadcom/bcm2837-rpi-3-b.dts and broadcom/bcm2837.dtsi). There is a desire
> not to have skeleton.dtsi for ARM64. See commit 3ebee5a2e141 ("arm64: dts:
> kill skeleton.dtsi") for rationale for its removal.
> 
> As well as the addition of #*-cells also requires adding the device_type to
> the rpi memory node explicitly.
> 
> Note that this change results in the removal of an empty /aliases node from
> bcm2835-rpi-a.dtb and bcm2835-rpi-a-plus.dtb. I have no hardware to check
> if this is a problem or not.
> 
> It also results in some reordering of the nodes in the DTBs (the /aliases
> and /memory nodes come later). This isn't supposed to matter but, again,
> I've no hardware to check if it is true in this particular case.
> 
> Signed-off-by: Ian Campbell <ijc at hellion.org.uk>

I also don't have the relevant hardware to test with, but this looks
generally like the right thing. So FWIW:

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

Mark.

> diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi
> index caf2707..e9b47b2 100644
> --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
> +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
> @@ -2,6 +2,7 @@
>  
>  / {
>  	memory {
> +		device_type = "memory";
>  		reg = <0 0x10000000>;
>  	};
>  
> diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
> index b982522..445624a 100644
> --- a/arch/arm/boot/dts/bcm283x.dtsi
> +++ b/arch/arm/boot/dts/bcm283x.dtsi
> @@ -2,7 +2,6 @@
>  #include <dt-bindings/clock/bcm2835.h>
>  #include <dt-bindings/clock/bcm2835-aux.h>
>  #include <dt-bindings/gpio/gpio.h>
> -#include "skeleton.dtsi"
>  
>  /* This include file covers the common peripherals and configuration between
>   * bcm2835 and bcm2836 implementations, leaving the CPU configuration to
> @@ -13,6 +12,8 @@
>  	compatible = "brcm,bcm2835";
>  	model = "BCM2835";
>  	interrupt-parent = <&intc>;
> +	#address-cells = <1>;
> +	#size-cells = <1>;
>  
>  	chosen {
>  		bootargs = "earlyprintk console=ttyAMA0";
> -- 
> 2.8.1
>