| Message ID | 20190503124444.5056-1-joel@jms.id.au |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | [linux,dev-5.0] ARM: dts: npcm: Remove use of skeleton.dtsi | expand |
On Fri, 3 May 2019, at 22:16, Joel Stanley wrote: > This file is not present in 5.1. Clean it up in preparation for moving > to a future kernel base. > > Signed-off-by: Joel Stanley <joel@jms.id.au> Reviewed-by: Andrew Jeffery <andrew@aj.id.au> > --- > arch/arm/boot/dts/nuvoton-common-npcm7xx.dtsi | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/boot/dts/nuvoton-common-npcm7xx.dtsi > b/arch/arm/boot/dts/nuvoton-common-npcm7xx.dtsi > index 04e842f460a9..da02aa70df06 100644 > --- a/arch/arm/boot/dts/nuvoton-common-npcm7xx.dtsi > +++ b/arch/arm/boot/dts/nuvoton-common-npcm7xx.dtsi > @@ -2,7 +2,6 @@ > // Copyright (c) 2018 Nuvoton Technology tomer.maimon@nuvoton.com > // Copyright 2018 Google, Inc. > > -#include "skeleton.dtsi" > #include <dt-bindings/interrupt-controller/arm-gic.h> > #include <dt-bindings/clock/nuvoton,npcm7xx-clock.h> > #include <dt-bindings/gpio/gpio.h> > @@ -12,6 +11,11 @@ > #size-cells = <1>; > interrupt-parent = <&gic>; > > + memory { > + device_type = "memory"; > + reg = <0 0>; > + }; > + > /* external reference clock */ > clk_refclk: clk-refclk { > compatible = "fixed-clock"; > -- > 2.20.1 > >
On Mon, 6 May 2019 at 03:05, Andrew Jeffery <andrew@aj.id.au> wrote: > > > > On Fri, 3 May 2019, at 22:16, Joel Stanley wrote: > > This file is not present in 5.1. Clean it up in preparation for moving > > to a future kernel base. > > > > Signed-off-by: Joel Stanley <joel@jms.id.au> > > Reviewed-by: Andrew Jeffery <andrew@aj.id.au> Thanks. Applied to dev-5.0. Cheers, Joel
diff --git a/arch/arm/boot/dts/nuvoton-common-npcm7xx.dtsi b/arch/arm/boot/dts/nuvoton-common-npcm7xx.dtsi index 04e842f460a9..da02aa70df06 100644 --- a/arch/arm/boot/dts/nuvoton-common-npcm7xx.dtsi +++ b/arch/arm/boot/dts/nuvoton-common-npcm7xx.dtsi @@ -2,7 +2,6 @@ // Copyright (c) 2018 Nuvoton Technology tomer.maimon@nuvoton.com // Copyright 2018 Google, Inc. -#include "skeleton.dtsi" #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/clock/nuvoton,npcm7xx-clock.h> #include <dt-bindings/gpio/gpio.h> @@ -12,6 +11,11 @@ #size-cells = <1>; interrupt-parent = <&gic>; + memory { + device_type = "memory"; + reg = <0 0>; + }; + /* external reference clock */ clk_refclk: clk-refclk { compatible = "fixed-clock";
This file is not present in 5.1. Clean it up in preparation for moving to a future kernel base. Signed-off-by: Joel Stanley <joel@jms.id.au> --- arch/arm/boot/dts/nuvoton-common-npcm7xx.dtsi | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)