Re: [PATCH] powerpc/fsl-booke: Rename b4qds.dts -> b4qds.dtsi.
I've got it in my queue that I hope to send soon.
-Scott
On 07/31/2013 09:45:25 AM, Ian Campbell wrote:
ping?
On Fri, 2013-05-31 at 11:14 +0100, Ian Campbell wrote:
> This file is a common include for B4860 and B4420 but is not a
valid DTS itself:
> DTC arch/powerpc/boot/b4qds.dtb
>Error: arch/powerpc/boot/dts/b4qds.dts:35.1-2 syntax error
>FATAL ERROR: Unable to parse input tree
>make[1]: *** [arch/powerpc/boot/b4qds.dtb] Error 1
>make: *** [b4qds.dtb] Error 2
>
> I spotted in build tests of device-tree.git, announcement
> https://lkml.org/lkml/2013/4/24/209, which builds *.dts. Probably
no one would
> do this this in real life on linux.git but it still seems worth
fixing.
>
> Signed-off-by: Ian Campbell
> Cc: Shaveta Leekha
> Cc: Minghuan Lian
> Cc: Andy Fleming
> Cc: Poonam Aggrwal
> Cc: Ramneek Mehresh
> Cc: Kumar Gala
> Cc: Benjamin Herrenschmidt
> Cc: Paul Mackerras
> Cc: linuxppc-...@lists.ozlabs.org
> Cc: linux-kernel@vger.kernel.org
> ---
> arch/powerpc/boot/dts/b4420qds.dts |2 +-
> arch/powerpc/boot/dts/b4860qds.dts |2 +-
> arch/powerpc/boot/dts/b4qds.dts| 169
> arch/powerpc/boot/dts/b4qds.dtsi | 169
> 4 files changed, 171 insertions(+), 171 deletions(-)
> delete mode 100644 arch/powerpc/boot/dts/b4qds.dts
> create mode 100644 arch/powerpc/boot/dts/b4qds.dtsi
>
> diff --git a/arch/powerpc/boot/dts/b4420qds.dts
b/arch/powerpc/boot/dts/b4420qds.dts
> index 923156d..508dbdf 100644
> --- a/arch/powerpc/boot/dts/b4420qds.dts
> +++ b/arch/powerpc/boot/dts/b4420qds.dts
> @@ -33,7 +33,7 @@
> */
>
> /include/ "fsl/b4420si-pre.dtsi"
> -/include/ "b4qds.dts"
> +/include/ "b4qds.dtsi"
>
> / {
>model = "fsl,B4420QDS";
> diff --git a/arch/powerpc/boot/dts/b4860qds.dts
b/arch/powerpc/boot/dts/b4860qds.dts
> index 78907f3..6bb3707 100644
> --- a/arch/powerpc/boot/dts/b4860qds.dts
> +++ b/arch/powerpc/boot/dts/b4860qds.dts
> @@ -33,7 +33,7 @@
> */
>
> /include/ "fsl/b4860si-pre.dtsi"
> -/include/ "b4qds.dts"
> +/include/ "b4qds.dtsi"
>
> / {
>model = "fsl,B4860QDS";
> diff --git a/arch/powerpc/boot/dts/b4qds.dts
b/arch/powerpc/boot/dts/b4qds.dts
> deleted file mode 100644
> index e6d2f8f..000
> --- a/arch/powerpc/boot/dts/b4qds.dts
> +++ /dev/null
> @@ -1,169 +0,0 @@
> -/*
> - * B4420DS Device Tree Source
> - *
> - * Copyright 2012 Freescale Semiconductor, Inc.
> - *
> - * Redistribution and use in source and binary forms, with or
without
> - * modification, are permitted provided that the following
conditions are met:
> - * * Redistributions of source code must retain the above
copyright
> - * notice, this list of conditions and the following
disclaimer.
> - * * Redistributions in binary form must reproduce the above
copyright
> - * notice, this list of conditions and the following
disclaimer in the
> - * documentation and/or other materials provided with the
distribution.
> - * * Neither the name of Freescale Semiconductor nor the
> - * names of its contributors may be used to endorse or
promote products
> - * derived from this software without specific prior written
permission.
> - *
> - *
> - * ALTERNATIVELY, this software may be distributed under the terms
of the
> - * GNU General Public License ("GPL") as published by the Free
Software
> - * Foundation, either version 2 of that License or (at your
option) any
> - * later version.
> - *
> - * This software is provided by Freescale Semiconductor "as is"
and any
> - * express or implied warranties, including, but not limited to,
the implied
> - * warranties of merchantability and fitness for a particular
purpose are
> - * disclaimed. In no event shall Freescale Semiconductor be liable
for any
> - * direct, indirect, incidental, special, exemplary, or
consequential damages
> - * (including, but not limited to, procurement of substitute goods
or services;
> - * loss of use, data, or profits; or business interruption)
however caused and
> - * on any theory of liability, whether in contract, strict
liability, or tort
> - * (including negligence or otherwise) arising in any way out of
the use of
> - * this software, even if advised of the possibility of such
damage.
> - */
> -
> -/ {
> - model = "fsl,B4QDS";
> - compatible = "fsl,B4QDS";
> - #address-cells = <2>;
> - #size-cells = <2>;
> - interrupt-parent = <>;
> -
> - ifc: localbus@ffe124000 {
> - reg = <0xf 0xfe124000 0 0x2000>;
> - ranges = <0 0 0xf 0xe800 0x0800
> -2 0 0xf 0xff80 0x0001
> -3 0 0xf 0xffdf 0x8000>;
> -
> - nor@0,0 {
> - #address-cells = <1>;
> - #size-cells = <1>;
> - compatible = "cfi-flash";
> - reg = <0x0 0x0 0x800>;
> - bank-width = <2>;
> -
Re: [PATCH] powerpc/fsl-booke: Rename b4qds.dts -> b4qds.dtsi.
ping?
On Fri, 2013-05-31 at 11:14 +0100, Ian Campbell wrote:
> This file is a common include for B4860 and B4420 but is not a valid DTS
> itself:
> DTC arch/powerpc/boot/b4qds.dtb
> Error: arch/powerpc/boot/dts/b4qds.dts:35.1-2 syntax error
> FATAL ERROR: Unable to parse input tree
> make[1]: *** [arch/powerpc/boot/b4qds.dtb] Error 1
> make: *** [b4qds.dtb] Error 2
>
> I spotted in build tests of device-tree.git, announcement
> https://lkml.org/lkml/2013/4/24/209, which builds *.dts. Probably no one would
> do this this in real life on linux.git but it still seems worth fixing.
>
> Signed-off-by: Ian Campbell
> Cc: Shaveta Leekha
> Cc: Minghuan Lian
> Cc: Andy Fleming
> Cc: Poonam Aggrwal
> Cc: Ramneek Mehresh
> Cc: Kumar Gala
> Cc: Benjamin Herrenschmidt
> Cc: Paul Mackerras
> Cc: linuxppc-...@lists.ozlabs.org
> Cc: linux-kernel@vger.kernel.org
> ---
> arch/powerpc/boot/dts/b4420qds.dts |2 +-
> arch/powerpc/boot/dts/b4860qds.dts |2 +-
> arch/powerpc/boot/dts/b4qds.dts| 169
>
> arch/powerpc/boot/dts/b4qds.dtsi | 169
>
> 4 files changed, 171 insertions(+), 171 deletions(-)
> delete mode 100644 arch/powerpc/boot/dts/b4qds.dts
> create mode 100644 arch/powerpc/boot/dts/b4qds.dtsi
>
> diff --git a/arch/powerpc/boot/dts/b4420qds.dts
> b/arch/powerpc/boot/dts/b4420qds.dts
> index 923156d..508dbdf 100644
> --- a/arch/powerpc/boot/dts/b4420qds.dts
> +++ b/arch/powerpc/boot/dts/b4420qds.dts
> @@ -33,7 +33,7 @@
> */
>
> /include/ "fsl/b4420si-pre.dtsi"
> -/include/ "b4qds.dts"
> +/include/ "b4qds.dtsi"
>
> / {
> model = "fsl,B4420QDS";
> diff --git a/arch/powerpc/boot/dts/b4860qds.dts
> b/arch/powerpc/boot/dts/b4860qds.dts
> index 78907f3..6bb3707 100644
> --- a/arch/powerpc/boot/dts/b4860qds.dts
> +++ b/arch/powerpc/boot/dts/b4860qds.dts
> @@ -33,7 +33,7 @@
> */
>
> /include/ "fsl/b4860si-pre.dtsi"
> -/include/ "b4qds.dts"
> +/include/ "b4qds.dtsi"
>
> / {
> model = "fsl,B4860QDS";
> diff --git a/arch/powerpc/boot/dts/b4qds.dts b/arch/powerpc/boot/dts/b4qds.dts
> deleted file mode 100644
> index e6d2f8f..000
> --- a/arch/powerpc/boot/dts/b4qds.dts
> +++ /dev/null
> @@ -1,169 +0,0 @@
> -/*
> - * B4420DS Device Tree Source
> - *
> - * Copyright 2012 Freescale Semiconductor, Inc.
> - *
> - * Redistribution and use in source and binary forms, with or without
> - * modification, are permitted provided that the following conditions are
> met:
> - * * Redistributions of source code must retain the above copyright
> - * notice, this list of conditions and the following disclaimer.
> - * * Redistributions in binary form must reproduce the above copyright
> - * notice, this list of conditions and the following disclaimer in the
> - * documentation and/or other materials provided with the distribution.
> - * * Neither the name of Freescale Semiconductor nor the
> - * names of its contributors may be used to endorse or promote products
> - * derived from this software without specific prior written
> permission.
> - *
> - *
> - * ALTERNATIVELY, this software may be distributed under the terms of the
> - * GNU General Public License ("GPL") as published by the Free Software
> - * Foundation, either version 2 of that License or (at your option) any
> - * later version.
> - *
> - * This software is provided by Freescale Semiconductor "as is" and any
> - * express or implied warranties, including, but not limited to, the implied
> - * warranties of merchantability and fitness for a particular purpose are
> - * disclaimed. In no event shall Freescale Semiconductor be liable for any
> - * direct, indirect, incidental, special, exemplary, or consequential damages
> - * (including, but not limited to, procurement of substitute goods or
> services;
> - * loss of use, data, or profits; or business interruption) however caused
> and
> - * on any theory of liability, whether in contract, strict liability, or tort
> - * (including negligence or otherwise) arising in any way out of the use of
> - * this software, even if advised of the possibility of such damage.
> - */
> -
> -/ {
> - model = "fsl,B4QDS";
> - compatible = "fsl,B4QDS";
> - #address-cells = <2>;
> - #size-cells = <2>;
> - interrupt-parent = <>;
> -
> - ifc: localbus@ffe124000 {
> - reg = <0xf 0xfe124000 0 0x2000>;
> - ranges = <0 0 0xf 0xe800 0x0800
> - 2 0 0xf 0xff80 0x0001
> - 3 0 0xf 0xffdf 0x8000>;
> -
> - nor@0,0 {
> - #address-cells = <1>;
> - #size-cells = <1>;
> - compatible = "cfi-flash";
> - reg = <0x0 0x0 0x800>;
> - bank-width = <2>;
> - device-width = <1>;
> - };
> -
> -
Re: [PATCH] powerpc/fsl-booke: Rename b4qds.dts - b4qds.dtsi.
ping?
On Fri, 2013-05-31 at 11:14 +0100, Ian Campbell wrote:
This file is a common include for B4860 and B4420 but is not a valid DTS
itself:
DTC arch/powerpc/boot/b4qds.dtb
Error: arch/powerpc/boot/dts/b4qds.dts:35.1-2 syntax error
FATAL ERROR: Unable to parse input tree
make[1]: *** [arch/powerpc/boot/b4qds.dtb] Error 1
make: *** [b4qds.dtb] Error 2
I spotted in build tests of device-tree.git, announcement
https://lkml.org/lkml/2013/4/24/209, which builds *.dts. Probably no one would
do this this in real life on linux.git but it still seems worth fixing.
Signed-off-by: Ian Campbell ian.campb...@citrix.com
Cc: Shaveta Leekha shav...@freescale.com
Cc: Minghuan Lian minghuan.l...@freescale.com
Cc: Andy Fleming aflem...@freescale.com
Cc: Poonam Aggrwal poonam.aggr...@freescale.com
Cc: Ramneek Mehresh ramneek.mehr...@freescale.com
Cc: Kumar Gala ga...@kernel.crashing.org
Cc: Benjamin Herrenschmidt b...@kernel.crashing.org
Cc: Paul Mackerras pau...@samba.org
Cc: linuxppc-...@lists.ozlabs.org
Cc: linux-kernel@vger.kernel.org
---
arch/powerpc/boot/dts/b4420qds.dts |2 +-
arch/powerpc/boot/dts/b4860qds.dts |2 +-
arch/powerpc/boot/dts/b4qds.dts| 169
arch/powerpc/boot/dts/b4qds.dtsi | 169
4 files changed, 171 insertions(+), 171 deletions(-)
delete mode 100644 arch/powerpc/boot/dts/b4qds.dts
create mode 100644 arch/powerpc/boot/dts/b4qds.dtsi
diff --git a/arch/powerpc/boot/dts/b4420qds.dts
b/arch/powerpc/boot/dts/b4420qds.dts
index 923156d..508dbdf 100644
--- a/arch/powerpc/boot/dts/b4420qds.dts
+++ b/arch/powerpc/boot/dts/b4420qds.dts
@@ -33,7 +33,7 @@
*/
/include/ fsl/b4420si-pre.dtsi
-/include/ b4qds.dts
+/include/ b4qds.dtsi
/ {
model = fsl,B4420QDS;
diff --git a/arch/powerpc/boot/dts/b4860qds.dts
b/arch/powerpc/boot/dts/b4860qds.dts
index 78907f3..6bb3707 100644
--- a/arch/powerpc/boot/dts/b4860qds.dts
+++ b/arch/powerpc/boot/dts/b4860qds.dts
@@ -33,7 +33,7 @@
*/
/include/ fsl/b4860si-pre.dtsi
-/include/ b4qds.dts
+/include/ b4qds.dtsi
/ {
model = fsl,B4860QDS;
diff --git a/arch/powerpc/boot/dts/b4qds.dts b/arch/powerpc/boot/dts/b4qds.dts
deleted file mode 100644
index e6d2f8f..000
--- a/arch/powerpc/boot/dts/b4qds.dts
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * B4420DS Device Tree Source
- *
- * Copyright 2012 Freescale Semiconductor, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Freescale Semiconductor nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written
permission.
- *
- *
- * ALTERNATIVELY, this software may be distributed under the terms of the
- * GNU General Public License (GPL) as published by the Free Software
- * Foundation, either version 2 of that License or (at your option) any
- * later version.
- *
- * This software is provided by Freescale Semiconductor as is and any
- * express or implied warranties, including, but not limited to, the implied
- * warranties of merchantability and fitness for a particular purpose are
- * disclaimed. In no event shall Freescale Semiconductor be liable for any
- * direct, indirect, incidental, special, exemplary, or consequential damages
- * (including, but not limited to, procurement of substitute goods or
services;
- * loss of use, data, or profits; or business interruption) however caused
and
- * on any theory of liability, whether in contract, strict liability, or tort
- * (including negligence or otherwise) arising in any way out of the use of
- * this software, even if advised of the possibility of such damage.
- */
-
-/ {
- model = fsl,B4QDS;
- compatible = fsl,B4QDS;
- #address-cells = 2;
- #size-cells = 2;
- interrupt-parent = mpic;
-
- ifc: localbus@ffe124000 {
- reg = 0xf 0xfe124000 0 0x2000;
- ranges = 0 0 0xf 0xe800 0x0800
- 2 0 0xf 0xff80 0x0001
- 3 0 0xf 0xffdf 0x8000;
-
- nor@0,0 {
- #address-cells = 1;
- #size-cells = 1;
- compatible = cfi-flash;
- reg = 0x0 0x0 0x800;
- bank-width = 2;
-
Re: [PATCH] powerpc/fsl-booke: Rename b4qds.dts - b4qds.dtsi.
I've got it in my queue that I hope to send soon.
-Scott
On 07/31/2013 09:45:25 AM, Ian Campbell wrote:
ping?
On Fri, 2013-05-31 at 11:14 +0100, Ian Campbell wrote:
This file is a common include for B4860 and B4420 but is not a
valid DTS itself:
DTC arch/powerpc/boot/b4qds.dtb
Error: arch/powerpc/boot/dts/b4qds.dts:35.1-2 syntax error
FATAL ERROR: Unable to parse input tree
make[1]: *** [arch/powerpc/boot/b4qds.dtb] Error 1
make: *** [b4qds.dtb] Error 2
I spotted in build tests of device-tree.git, announcement
https://lkml.org/lkml/2013/4/24/209, which builds *.dts. Probably
no one would
do this this in real life on linux.git but it still seems worth
fixing.
Signed-off-by: Ian Campbell ian.campb...@citrix.com
Cc: Shaveta Leekha shav...@freescale.com
Cc: Minghuan Lian minghuan.l...@freescale.com
Cc: Andy Fleming aflem...@freescale.com
Cc: Poonam Aggrwal poonam.aggr...@freescale.com
Cc: Ramneek Mehresh ramneek.mehr...@freescale.com
Cc: Kumar Gala ga...@kernel.crashing.org
Cc: Benjamin Herrenschmidt b...@kernel.crashing.org
Cc: Paul Mackerras pau...@samba.org
Cc: linuxppc-...@lists.ozlabs.org
Cc: linux-kernel@vger.kernel.org
---
arch/powerpc/boot/dts/b4420qds.dts |2 +-
arch/powerpc/boot/dts/b4860qds.dts |2 +-
arch/powerpc/boot/dts/b4qds.dts| 169
arch/powerpc/boot/dts/b4qds.dtsi | 169
4 files changed, 171 insertions(+), 171 deletions(-)
delete mode 100644 arch/powerpc/boot/dts/b4qds.dts
create mode 100644 arch/powerpc/boot/dts/b4qds.dtsi
diff --git a/arch/powerpc/boot/dts/b4420qds.dts
b/arch/powerpc/boot/dts/b4420qds.dts
index 923156d..508dbdf 100644
--- a/arch/powerpc/boot/dts/b4420qds.dts
+++ b/arch/powerpc/boot/dts/b4420qds.dts
@@ -33,7 +33,7 @@
*/
/include/ fsl/b4420si-pre.dtsi
-/include/ b4qds.dts
+/include/ b4qds.dtsi
/ {
model = fsl,B4420QDS;
diff --git a/arch/powerpc/boot/dts/b4860qds.dts
b/arch/powerpc/boot/dts/b4860qds.dts
index 78907f3..6bb3707 100644
--- a/arch/powerpc/boot/dts/b4860qds.dts
+++ b/arch/powerpc/boot/dts/b4860qds.dts
@@ -33,7 +33,7 @@
*/
/include/ fsl/b4860si-pre.dtsi
-/include/ b4qds.dts
+/include/ b4qds.dtsi
/ {
model = fsl,B4860QDS;
diff --git a/arch/powerpc/boot/dts/b4qds.dts
b/arch/powerpc/boot/dts/b4qds.dts
deleted file mode 100644
index e6d2f8f..000
--- a/arch/powerpc/boot/dts/b4qds.dts
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * B4420DS Device Tree Source
- *
- * Copyright 2012 Freescale Semiconductor, Inc.
- *
- * Redistribution and use in source and binary forms, with or
without
- * modification, are permitted provided that the following
conditions are met:
- * * Redistributions of source code must retain the above
copyright
- * notice, this list of conditions and the following
disclaimer.
- * * Redistributions in binary form must reproduce the above
copyright
- * notice, this list of conditions and the following
disclaimer in the
- * documentation and/or other materials provided with the
distribution.
- * * Neither the name of Freescale Semiconductor nor the
- * names of its contributors may be used to endorse or
promote products
- * derived from this software without specific prior written
permission.
- *
- *
- * ALTERNATIVELY, this software may be distributed under the terms
of the
- * GNU General Public License (GPL) as published by the Free
Software
- * Foundation, either version 2 of that License or (at your
option) any
- * later version.
- *
- * This software is provided by Freescale Semiconductor as is
and any
- * express or implied warranties, including, but not limited to,
the implied
- * warranties of merchantability and fitness for a particular
purpose are
- * disclaimed. In no event shall Freescale Semiconductor be liable
for any
- * direct, indirect, incidental, special, exemplary, or
consequential damages
- * (including, but not limited to, procurement of substitute goods
or services;
- * loss of use, data, or profits; or business interruption)
however caused and
- * on any theory of liability, whether in contract, strict
liability, or tort
- * (including negligence or otherwise) arising in any way out of
the use of
- * this software, even if advised of the possibility of such
damage.
- */
-
-/ {
- model = fsl,B4QDS;
- compatible = fsl,B4QDS;
- #address-cells = 2;
- #size-cells = 2;
- interrupt-parent = mpic;
-
- ifc: localbus@ffe124000 {
- reg = 0xf 0xfe124000 0 0x2000;
- ranges = 0 0 0xf 0xe800 0x0800
-2 0 0xf 0xff80 0x0001
-3 0 0xf 0xffdf 0x8000;
-
- nor@0,0 {
- #address-cells = 1;
- #size-cells = 1;
- compatible = cfi-flash;
- reg = 0x0
[PATCH] powerpc/fsl-booke: Rename b4qds.dts -> b4qds.dtsi.
This file is a common include for B4860 and B4420 but is not a valid DTS itself:
DTC arch/powerpc/boot/b4qds.dtb
Error: arch/powerpc/boot/dts/b4qds.dts:35.1-2 syntax error
FATAL ERROR: Unable to parse input tree
make[1]: *** [arch/powerpc/boot/b4qds.dtb] Error 1
make: *** [b4qds.dtb] Error 2
I spotted in build tests of device-tree.git, announcement
https://lkml.org/lkml/2013/4/24/209, which builds *.dts. Probably no one would
do this this in real life on linux.git but it still seems worth fixing.
Signed-off-by: Ian Campbell
Cc: Shaveta Leekha
Cc: Minghuan Lian
Cc: Andy Fleming
Cc: Poonam Aggrwal
Cc: Ramneek Mehresh
Cc: Kumar Gala
Cc: Benjamin Herrenschmidt
Cc: Paul Mackerras
Cc: linuxppc-...@lists.ozlabs.org
Cc: linux-kernel@vger.kernel.org
---
arch/powerpc/boot/dts/b4420qds.dts |2 +-
arch/powerpc/boot/dts/b4860qds.dts |2 +-
arch/powerpc/boot/dts/b4qds.dts| 169
arch/powerpc/boot/dts/b4qds.dtsi | 169
4 files changed, 171 insertions(+), 171 deletions(-)
delete mode 100644 arch/powerpc/boot/dts/b4qds.dts
create mode 100644 arch/powerpc/boot/dts/b4qds.dtsi
diff --git a/arch/powerpc/boot/dts/b4420qds.dts
b/arch/powerpc/boot/dts/b4420qds.dts
index 923156d..508dbdf 100644
--- a/arch/powerpc/boot/dts/b4420qds.dts
+++ b/arch/powerpc/boot/dts/b4420qds.dts
@@ -33,7 +33,7 @@
*/
/include/ "fsl/b4420si-pre.dtsi"
-/include/ "b4qds.dts"
+/include/ "b4qds.dtsi"
/ {
model = "fsl,B4420QDS";
diff --git a/arch/powerpc/boot/dts/b4860qds.dts
b/arch/powerpc/boot/dts/b4860qds.dts
index 78907f3..6bb3707 100644
--- a/arch/powerpc/boot/dts/b4860qds.dts
+++ b/arch/powerpc/boot/dts/b4860qds.dts
@@ -33,7 +33,7 @@
*/
/include/ "fsl/b4860si-pre.dtsi"
-/include/ "b4qds.dts"
+/include/ "b4qds.dtsi"
/ {
model = "fsl,B4860QDS";
diff --git a/arch/powerpc/boot/dts/b4qds.dts b/arch/powerpc/boot/dts/b4qds.dts
deleted file mode 100644
index e6d2f8f..000
--- a/arch/powerpc/boot/dts/b4qds.dts
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * B4420DS Device Tree Source
- *
- * Copyright 2012 Freescale Semiconductor, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Freescale Semiconductor nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- *
- * ALTERNATIVELY, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") as published by the Free Software
- * Foundation, either version 2 of that License or (at your option) any
- * later version.
- *
- * This software is provided by Freescale Semiconductor "as is" and any
- * express or implied warranties, including, but not limited to, the implied
- * warranties of merchantability and fitness for a particular purpose are
- * disclaimed. In no event shall Freescale Semiconductor be liable for any
- * direct, indirect, incidental, special, exemplary, or consequential damages
- * (including, but not limited to, procurement of substitute goods or services;
- * loss of use, data, or profits; or business interruption) however caused and
- * on any theory of liability, whether in contract, strict liability, or tort
- * (including negligence or otherwise) arising in any way out of the use of
- * this software, even if advised of the possibility of such damage.
- */
-
-/ {
- model = "fsl,B4QDS";
- compatible = "fsl,B4QDS";
- #address-cells = <2>;
- #size-cells = <2>;
- interrupt-parent = <>;
-
- ifc: localbus@ffe124000 {
- reg = <0xf 0xfe124000 0 0x2000>;
- ranges = <0 0 0xf 0xe800 0x0800
- 2 0 0xf 0xff80 0x0001
- 3 0 0xf 0xffdf 0x8000>;
-
- nor@0,0 {
- #address-cells = <1>;
- #size-cells = <1>;
- compatible = "cfi-flash";
- reg = <0x0 0x0 0x800>;
- bank-width = <2>;
- device-width = <1>;
- };
-
- nand@2,0 {
- #address-cells = <1>;
- #size-cells = <1>;
- compatible = "fsl,ifc-nand";
- reg = <0x2 0x0 0x1>;
-
- partition@0 {
-
[PATCH] powerpc/fsl-booke: Rename b4qds.dts - b4qds.dtsi.
This file is a common include for B4860 and B4420 but is not a valid DTS itself:
DTC arch/powerpc/boot/b4qds.dtb
Error: arch/powerpc/boot/dts/b4qds.dts:35.1-2 syntax error
FATAL ERROR: Unable to parse input tree
make[1]: *** [arch/powerpc/boot/b4qds.dtb] Error 1
make: *** [b4qds.dtb] Error 2
I spotted in build tests of device-tree.git, announcement
https://lkml.org/lkml/2013/4/24/209, which builds *.dts. Probably no one would
do this this in real life on linux.git but it still seems worth fixing.
Signed-off-by: Ian Campbell ian.campb...@citrix.com
Cc: Shaveta Leekha shav...@freescale.com
Cc: Minghuan Lian minghuan.l...@freescale.com
Cc: Andy Fleming aflem...@freescale.com
Cc: Poonam Aggrwal poonam.aggr...@freescale.com
Cc: Ramneek Mehresh ramneek.mehr...@freescale.com
Cc: Kumar Gala ga...@kernel.crashing.org
Cc: Benjamin Herrenschmidt b...@kernel.crashing.org
Cc: Paul Mackerras pau...@samba.org
Cc: linuxppc-...@lists.ozlabs.org
Cc: linux-kernel@vger.kernel.org
---
arch/powerpc/boot/dts/b4420qds.dts |2 +-
arch/powerpc/boot/dts/b4860qds.dts |2 +-
arch/powerpc/boot/dts/b4qds.dts| 169
arch/powerpc/boot/dts/b4qds.dtsi | 169
4 files changed, 171 insertions(+), 171 deletions(-)
delete mode 100644 arch/powerpc/boot/dts/b4qds.dts
create mode 100644 arch/powerpc/boot/dts/b4qds.dtsi
diff --git a/arch/powerpc/boot/dts/b4420qds.dts
b/arch/powerpc/boot/dts/b4420qds.dts
index 923156d..508dbdf 100644
--- a/arch/powerpc/boot/dts/b4420qds.dts
+++ b/arch/powerpc/boot/dts/b4420qds.dts
@@ -33,7 +33,7 @@
*/
/include/ fsl/b4420si-pre.dtsi
-/include/ b4qds.dts
+/include/ b4qds.dtsi
/ {
model = fsl,B4420QDS;
diff --git a/arch/powerpc/boot/dts/b4860qds.dts
b/arch/powerpc/boot/dts/b4860qds.dts
index 78907f3..6bb3707 100644
--- a/arch/powerpc/boot/dts/b4860qds.dts
+++ b/arch/powerpc/boot/dts/b4860qds.dts
@@ -33,7 +33,7 @@
*/
/include/ fsl/b4860si-pre.dtsi
-/include/ b4qds.dts
+/include/ b4qds.dtsi
/ {
model = fsl,B4860QDS;
diff --git a/arch/powerpc/boot/dts/b4qds.dts b/arch/powerpc/boot/dts/b4qds.dts
deleted file mode 100644
index e6d2f8f..000
--- a/arch/powerpc/boot/dts/b4qds.dts
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * B4420DS Device Tree Source
- *
- * Copyright 2012 Freescale Semiconductor, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Freescale Semiconductor nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- *
- * ALTERNATIVELY, this software may be distributed under the terms of the
- * GNU General Public License (GPL) as published by the Free Software
- * Foundation, either version 2 of that License or (at your option) any
- * later version.
- *
- * This software is provided by Freescale Semiconductor as is and any
- * express or implied warranties, including, but not limited to, the implied
- * warranties of merchantability and fitness for a particular purpose are
- * disclaimed. In no event shall Freescale Semiconductor be liable for any
- * direct, indirect, incidental, special, exemplary, or consequential damages
- * (including, but not limited to, procurement of substitute goods or services;
- * loss of use, data, or profits; or business interruption) however caused and
- * on any theory of liability, whether in contract, strict liability, or tort
- * (including negligence or otherwise) arising in any way out of the use of
- * this software, even if advised of the possibility of such damage.
- */
-
-/ {
- model = fsl,B4QDS;
- compatible = fsl,B4QDS;
- #address-cells = 2;
- #size-cells = 2;
- interrupt-parent = mpic;
-
- ifc: localbus@ffe124000 {
- reg = 0xf 0xfe124000 0 0x2000;
- ranges = 0 0 0xf 0xe800 0x0800
- 2 0 0xf 0xff80 0x0001
- 3 0 0xf 0xffdf 0x8000;
-
- nor@0,0 {
- #address-cells = 1;
- #size-cells = 1;
- compatible = cfi-flash;
- reg = 0x0 0x0 0x800;
- bank-width = 2;
- device-width = 1;
- };
-
- nand@2,0 {
- #address-cells = 1;
- #size-cells = 1;
-
