| Message ID | 20191120145536.17884-1-robh@kernel.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 30a3e01d4cbbfedac48d69a415136000a36910c7 |
| Headers | show |
| Series | dt-bindings: arm: Remove leftover axentia.txt | expand |
On 20/11/2019 08:55:36-0600, Rob Herring wrote: > The bindings described in axentia.txt are already covered by > atmel-at91.yaml, so remove the file. > > Cc: Peter Rosin <peda@axentia.se> > Cc: Nicolas Ferre <nicolas.ferre@microchip.com> > Cc: Alexandre Belloni <alexandre.belloni@bootlin.com> > Cc: Ludovic Desroches <ludovic.desroches@microchip.com> > Signed-off-by: Rob Herring <robh@kernel.org> Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com> > --- > .../devicetree/bindings/arm/axentia.txt | 28 ------------------- > MAINTAINERS | 1 - > 2 files changed, 29 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/arm/axentia.txt > > diff --git a/Documentation/devicetree/bindings/arm/axentia.txt b/Documentation/devicetree/bindings/arm/axentia.txt > deleted file mode 100644 > index de58f2463880..000000000000 > --- a/Documentation/devicetree/bindings/arm/axentia.txt > +++ /dev/null > @@ -1,28 +0,0 @@ > -Device tree bindings for Axentia ARM devices > -============================================ > - > -Linea CPU module > ----------------- > - > -Required root node properties: > -compatible = "axentia,linea", > - "atmel,sama5d31", "atmel,sama5d3", "atmel,sama5"; > -and following the rules from atmel-at91.txt for a sama5d31 SoC. > - > - > -Nattis v2 board with Natte v2 power board > ------------------------------------------ > - > -Required root node properties: > -compatible = "axentia,nattis-2", "axentia,natte-2", "axentia,linea", > - "atmel,sama5d31", "atmel,sama5d3", "atmel,sama5"; > -and following the rules from above for the axentia,linea CPU module. > - > - > -TSE-850 v3 board > ----------------- > - > -Required root node properties: > -compatible = "axentia,tse850v3", "axentia,linea", > - "atmel,sama5d31", "atmel,sama5d3", "atmel,sama5"; > -and following the rules from above for the axentia,linea CPU module. > diff --git a/MAINTAINERS b/MAINTAINERS > index 97b28c913813..8d711f764dfb 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -2859,7 +2859,6 @@ AXENTIA ARM DEVICES > M: Peter Rosin <peda@axentia.se> > L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) > S: Maintained > -F: Documentation/devicetree/bindings/arm/axentia.txt > F: arch/arm/boot/dts/at91-linea.dtsi > F: arch/arm/boot/dts/at91-natte.dtsi > F: arch/arm/boot/dts/at91-nattis-2-natte-2.dts > -- > 2.20.1 >
On 2019-12-10 12:04, Alexandre Belloni wrote: > On 20/11/2019 08:55:36-0600, Rob Herring wrote: >> The bindings described in axentia.txt are already covered by >> atmel-at91.yaml, so remove the file. >> >> Cc: Peter Rosin <peda@axentia.se> >> Cc: Nicolas Ferre <nicolas.ferre@microchip.com> >> Cc: Alexandre Belloni <alexandre.belloni@bootlin.com> >> Cc: Ludovic Desroches <ludovic.desroches@microchip.com> >> Signed-off-by: Rob Herring <robh@kernel.org> > Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Right, this one fell of out of my memory due to overload. Sorry. Acked-by: Peter Rosin <peda@axentia.se> Cheers, Peter > >> --- >> .../devicetree/bindings/arm/axentia.txt | 28 ------------------- >> MAINTAINERS | 1 - >> 2 files changed, 29 deletions(-) >> delete mode 100644 Documentation/devicetree/bindings/arm/axentia.txt >> >> diff --git a/Documentation/devicetree/bindings/arm/axentia.txt b/Documentation/devicetree/bindings/arm/axentia.txt >> deleted file mode 100644 >> index de58f2463880..000000000000 >> --- a/Documentation/devicetree/bindings/arm/axentia.txt >> +++ /dev/null >> @@ -1,28 +0,0 @@ >> -Device tree bindings for Axentia ARM devices >> -============================================ >> - >> -Linea CPU module >> ----------------- >> - >> -Required root node properties: >> -compatible = "axentia,linea", >> - "atmel,sama5d31", "atmel,sama5d3", "atmel,sama5"; >> -and following the rules from atmel-at91.txt for a sama5d31 SoC. >> - >> - >> -Nattis v2 board with Natte v2 power board >> ------------------------------------------ >> - >> -Required root node properties: >> -compatible = "axentia,nattis-2", "axentia,natte-2", "axentia,linea", >> - "atmel,sama5d31", "atmel,sama5d3", "atmel,sama5"; >> -and following the rules from above for the axentia,linea CPU module. >> - >> - >> -TSE-850 v3 board >> ----------------- >> - >> -Required root node properties: >> -compatible = "axentia,tse850v3", "axentia,linea", >> - "atmel,sama5d31", "atmel,sama5d3", "atmel,sama5"; >> -and following the rules from above for the axentia,linea CPU module. >> diff --git a/MAINTAINERS b/MAINTAINERS >> index 97b28c913813..8d711f764dfb 100644 >> --- a/MAINTAINERS >> +++ b/MAINTAINERS >> @@ -2859,7 +2859,6 @@ AXENTIA ARM DEVICES >> M: Peter Rosin <peda@axentia.se> >> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) >> S: Maintained >> -F: Documentation/devicetree/bindings/arm/axentia.txt >> F: arch/arm/boot/dts/at91-linea.dtsi >> F: arch/arm/boot/dts/at91-natte.dtsi >> F: arch/arm/boot/dts/at91-nattis-2-natte-2.dts >> -- >> 2.20.1 >> >
On 10/12/2019 11:10:33+0000, Peter Rosin wrote: > On 2019-12-10 12:04, Alexandre Belloni wrote: > > On 20/11/2019 08:55:36-0600, Rob Herring wrote: > >> The bindings described in axentia.txt are already covered by > >> atmel-at91.yaml, so remove the file. > >> > >> Cc: Peter Rosin <peda@axentia.se> > >> Cc: Nicolas Ferre <nicolas.ferre@microchip.com> > >> Cc: Alexandre Belloni <alexandre.belloni@bootlin.com> > >> Cc: Ludovic Desroches <ludovic.desroches@microchip.com> > >> Signed-off-by: Rob Herring <robh@kernel.org> > > Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com> > > Right, this one fell of out of my memory due to overload. Sorry. > > Acked-by: Peter Rosin <peda@axentia.se> > Rob, I assume you are going to apply it in your tree. If you want that to go through arm-soc, tell me, I can apply it too.
On Tue, Dec 10, 2019 at 5:15 AM Alexandre Belloni <alexandre.belloni@bootlin.com> wrote: > > On 10/12/2019 11:10:33+0000, Peter Rosin wrote: > > On 2019-12-10 12:04, Alexandre Belloni wrote: > > > On 20/11/2019 08:55:36-0600, Rob Herring wrote: > > >> The bindings described in axentia.txt are already covered by > > >> atmel-at91.yaml, so remove the file. > > >> > > >> Cc: Peter Rosin <peda@axentia.se> > > >> Cc: Nicolas Ferre <nicolas.ferre@microchip.com> > > >> Cc: Alexandre Belloni <alexandre.belloni@bootlin.com> > > >> Cc: Ludovic Desroches <ludovic.desroches@microchip.com> > > >> Signed-off-by: Rob Herring <robh@kernel.org> > > > Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com> > > > > Right, this one fell of out of my memory due to overload. Sorry. > > > > Acked-by: Peter Rosin <peda@axentia.se> > > > > Rob, I assume you are going to apply it in your tree. If you want that > to go through arm-soc, tell me, I can apply it too. It's already in v5.5-rc1. Rob
diff --git a/Documentation/devicetree/bindings/arm/axentia.txt b/Documentation/devicetree/bindings/arm/axentia.txt deleted file mode 100644 index de58f2463880..000000000000 --- a/Documentation/devicetree/bindings/arm/axentia.txt +++ /dev/null @@ -1,28 +0,0 @@ -Device tree bindings for Axentia ARM devices -============================================ - -Linea CPU module ----------------- - -Required root node properties: -compatible = "axentia,linea", - "atmel,sama5d31", "atmel,sama5d3", "atmel,sama5"; -and following the rules from atmel-at91.txt for a sama5d31 SoC. - - -Nattis v2 board with Natte v2 power board ------------------------------------------ - -Required root node properties: -compatible = "axentia,nattis-2", "axentia,natte-2", "axentia,linea", - "atmel,sama5d31", "atmel,sama5d3", "atmel,sama5"; -and following the rules from above for the axentia,linea CPU module. - - -TSE-850 v3 board ----------------- - -Required root node properties: -compatible = "axentia,tse850v3", "axentia,linea", - "atmel,sama5d31", "atmel,sama5d3", "atmel,sama5"; -and following the rules from above for the axentia,linea CPU module. diff --git a/MAINTAINERS b/MAINTAINERS index 97b28c913813..8d711f764dfb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2859,7 +2859,6 @@ AXENTIA ARM DEVICES M: Peter Rosin <peda@axentia.se> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained -F: Documentation/devicetree/bindings/arm/axentia.txt F: arch/arm/boot/dts/at91-linea.dtsi F: arch/arm/boot/dts/at91-natte.dtsi F: arch/arm/boot/dts/at91-nattis-2-natte-2.dts
The bindings described in axentia.txt are already covered by atmel-at91.yaml, so remove the file. Cc: Peter Rosin <peda@axentia.se> Cc: Nicolas Ferre <nicolas.ferre@microchip.com> Cc: Alexandre Belloni <alexandre.belloni@bootlin.com> Cc: Ludovic Desroches <ludovic.desroches@microchip.com> Signed-off-by: Rob Herring <robh@kernel.org> --- .../devicetree/bindings/arm/axentia.txt | 28 ------------------- MAINTAINERS | 1 - 2 files changed, 29 deletions(-) delete mode 100644 Documentation/devicetree/bindings/arm/axentia.txt