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-dev@lists.ozlabs.org
> Cc: linux-ker...@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..0000000
> --- 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 0xe8000000 0x08000000
> - 2 0 0xf 0xff800000 0x00010000
> - 3 0 0xf 0xffdf0000 0x00008000>;
> -
> - nor@0,0 {
> - #address-cells = <1>;
> - #size-cells = <1>;
> - compatible = "cfi-flash";
> - reg = <0x0 0x0 0x8000000>;
> - bank-width = <2>;
> - device-width = <1>;
> - };
> -
> - nand@2,0 {
> - #address-cells = <1>;
> - #size-cells = <1>;
> - compatible = "fsl,ifc-nand";
> - reg = <0x2 0x0 0x10000>;
> -
> - partition@0 {
> - /* This location must not be altered */
> - /* 1MB for u-boot Bootloader Image */
> - reg = <0x0 0x00100000>;
> - label = "NAND U-Boot Image";
> - read-only;
> - };
> -
> - partition@100000 {
> - /* 1MB for DTB Image */
> - reg = <0x00100000 0x00100000>;
> - label = "NAND DTB Image";
> - };
> -
> - partition@200000 {
> - /* 10MB for Linux Kernel Image */
> - reg = <0x00200000 0x00A00000>;
> - label = "NAND Linux Kernel Image";
> - };
> -
> - partition@c00000 {
> - /* 500MB for Root file System Image */
> - reg = <0x00c00000 0x1F400000>;
> - label = "NAND RFS Image";
> - };
> - };
> -
> - board-control@3,0 {
> - compatible = "fsl,b4qds-fpga", "fsl,fpga-qixis";
> - reg = <3 0 0x300>;
> - };
> - };
> -
> - memory {
> - device_type = "memory";
> - };
> -
> - dcsr: dcsr@f00000000 {
> - ranges = <0x00000000 0xf 0x00000000 0x01052000>;
> - };
> -
> - soc: soc@ffe000000 {
> - ranges = <0x00000000 0xf 0xfe000000 0x1000000>;
> - reg = <0xf 0xfe000000 0 0x00001000>;
> - spi@110000 {
> - flash@0 {
> - #address-cells = <1>;
> - #size-cells = <1>;
> - compatible = "sst,sst25wf040";
> - reg = <0>;
> - spi-max-frequency = <40000000>; /*
input clock */
> - };
> - };
> -
> - sdhc@114000 {
> - /*Disabled as there is no sdhc connector on
B4420QDS board*/
> - status = "disabled";
> - };
> -
> - i2c@118000 {
> - eeprom@50 {
> - compatible = "at24,24c64";
> - reg = <0x50>;
> - };
> - eeprom@51 {
> - compatible = "at24,24c256";
> - reg = <0x51>;
> - };
> - eeprom@53 {
> - compatible = "at24,24c256";
> - reg = <0x53>;
> - };
> - eeprom@57 {
> - compatible = "at24,24c256";
> - reg = <0x57>;
> - };
> - rtc@68 {
> - compatible = "dallas,ds3232";
> - reg = <0x68>;
> - };
> - };
> -
> - usb@210000 {
> - dr_mode = "host";
> - phy_type = "ulpi";
> - };
> -
> - };
> -
> - pci0: pcie@ffe200000 {
> - reg = <0xf 0xfe200000 0 0x10000>;
> - ranges = <0x02000000 0 0xe0000000 0xc 0x00000000 0x0
0x20000000
> - 0x01000000 0 0x00000000 0xf 0xf8000000 0x0
0x00010000>;
> - pcie@0 {
> - ranges = <0x02000000 0 0xe0000000
> - 0x02000000 0 0xe0000000
> - 0 0x20000000
> -
> - 0x01000000 0 0x00000000
> - 0x01000000 0 0x00000000
> - 0 0x00010000>;
> - };
> - };
> -
> -};
> -
> -/include/ "fsl/b4si-post.dtsi"
> diff --git a/arch/powerpc/boot/dts/b4qds.dtsi
b/arch/powerpc/boot/dts/b4qds.dtsi
> new file mode 100644
> index 0000000..e6d2f8f
> --- /dev/null
> +++ b/arch/powerpc/boot/dts/b4qds.dtsi
> @@ -0,0 +1,169 @@
> +/*
> + * 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 0xe8000000 0x08000000
> + 2 0 0xf 0xff800000 0x00010000
> + 3 0 0xf 0xffdf0000 0x00008000>;
> +
> + nor@0,0 {
> + #address-cells = <1>;
> + #size-cells = <1>;
> + compatible = "cfi-flash";
> + reg = <0x0 0x0 0x8000000>;
> + bank-width = <2>;
> + device-width = <1>;
> + };
> +
> + nand@2,0 {
> + #address-cells = <1>;
> + #size-cells = <1>;
> + compatible = "fsl,ifc-nand";
> + reg = <0x2 0x0 0x10000>;
> +
> + partition@0 {
> + /* This location must not be altered */
> + /* 1MB for u-boot Bootloader Image */
> + reg = <0x0 0x00100000>;
> + label = "NAND U-Boot Image";
> + read-only;
> + };
> +
> + partition@100000 {
> + /* 1MB for DTB Image */
> + reg = <0x00100000 0x00100000>;
> + label = "NAND DTB Image";
> + };
> +
> + partition@200000 {
> + /* 10MB for Linux Kernel Image */
> + reg = <0x00200000 0x00A00000>;
> + label = "NAND Linux Kernel Image";
> + };
> +
> + partition@c00000 {
> + /* 500MB for Root file System Image */
> + reg = <0x00c00000 0x1F400000>;
> + label = "NAND RFS Image";
> + };
> + };
> +
> + board-control@3,0 {
> + compatible = "fsl,b4qds-fpga", "fsl,fpga-qixis";
> + reg = <3 0 0x300>;
> + };
> + };
> +
> + memory {
> + device_type = "memory";
> + };
> +
> + dcsr: dcsr@f00000000 {
> + ranges = <0x00000000 0xf 0x00000000 0x01052000>;
> + };
> +
> + soc: soc@ffe000000 {
> + ranges = <0x00000000 0xf 0xfe000000 0x1000000>;
> + reg = <0xf 0xfe000000 0 0x00001000>;
> + spi@110000 {
> + flash@0 {
> + #address-cells = <1>;
> + #size-cells = <1>;
> + compatible = "sst,sst25wf040";
> + reg = <0>;
> + spi-max-frequency = <40000000>; /*
input clock */
> + };
> + };
> +
> + sdhc@114000 {
> + /*Disabled as there is no sdhc connector on
B4420QDS board*/
> + status = "disabled";
> + };
> +
> + i2c@118000 {
> + eeprom@50 {
> + compatible = "at24,24c64";
> + reg = <0x50>;
> + };
> + eeprom@51 {
> + compatible = "at24,24c256";
> + reg = <0x51>;
> + };
> + eeprom@53 {
> + compatible = "at24,24c256";
> + reg = <0x53>;
> + };
> + eeprom@57 {
> + compatible = "at24,24c256";
> + reg = <0x57>;
> + };
> + rtc@68 {
> + compatible = "dallas,ds3232";
> + reg = <0x68>;
> + };
> + };
> +
> + usb@210000 {
> + dr_mode = "host";
> + phy_type = "ulpi";
> + };
> +
> + };
> +
> + pci0: pcie@ffe200000 {
> + reg = <0xf 0xfe200000 0 0x10000>;
> + ranges = <0x02000000 0 0xe0000000 0xc 0x00000000 0x0
0x20000000
> + 0x01000000 0 0x00000000 0xf 0xf8000000 0x0
0x00010000>;
> + pcie@0 {
> + ranges = <0x02000000 0 0xe0000000
> + 0x02000000 0 0xe0000000
> + 0 0x20000000
> +
> + 0x01000000 0 0x00000000
> + 0x01000000 0 0x00000000
> + 0 0x00010000>;
> + };
> + };
> +
> +};
> +
> +/include/ "fsl/b4si-post.dtsi"
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
