| Message ID | 1457403939-12080-2-git-send-email-Zhiqiang.Hou@nxp.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Mar 08, 2016 at 10:25:39AM +0800, Zhiqiang Hou wrote: > From: Shaohui Xie <Shaohui.Xie@freescale.com> > > The LS1043a-QDS board is a high-performance computing, evaluation, > development, and test platform supporting the LS1043a SoC. > > Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com> > Signed-off-by: Mingkai Hu <Mingkai.Hu@freescale.com> > Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> The series looks good to me. There are a couple of small comments in this patch as below, but I decided to fix them myself and applied both patches. > --- > v4: > - No change. > > v3: > - Resort the nodes alphabetically. > - Correct the compatible of nodes adt7461a at24,24c512 and pca9547. > - Change the name of adt7461a to temp-sensor. > > v2: > - Add root node compatible property. > > arch/arm64/boot/dts/freescale/Makefile | 1 + > arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts | 167 ++++++++++++++++++++++ > 2 files changed, 168 insertions(+) > create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts > > diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile > index f3c2516..1423fa4 100644 > --- a/arch/arm64/boot/dts/freescale/Makefile > +++ b/arch/arm64/boot/dts/freescale/Makefile > @@ -2,6 +2,7 @@ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2080a-qds.dtb > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2080a-rdb.dtb > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2080a-simu.dtb > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1043a-rdb.dtb > +dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1043a-qds.dtb The list should maintained alphabetically. > > always := $(dtb-y) > subdir-y := $(dts-dirs) > diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts > new file mode 100644 > index 0000000..97e9906 > --- /dev/null > +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts > @@ -0,0 +1,167 @@ > +/* > + * Device Tree Include file for Freescale Layerscape-1043A family SoC. > + * > + * Copyright 2014-2015, Freescale Semiconductor > + * > + * Mingkai Hu <Mingkai.hu@freescale.com> > + * > + * This file is dual-licensed: you can use it either under the terms > + * of the GPLv2 or the X11 license, at your option. Note that this dual > + * licensing only applies to this file, and not this project as a > + * whole. > + * > + * a) This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License as > + * published by the Free Software Foundation; either version 2 of the > + * License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * Or, alternatively, > + * > + * b) Permission is hereby granted, free of charge, to any person > + * obtaining a copy of this software and associated documentation > + * files (the "Software"), to deal in the Software without > + * restriction, including without limitation the rights to use, > + * copy, modify, merge, publish, distribute, sublicense, and/or > + * sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following > + * conditions: > + * > + * The above copyright notice and this permission notice shall be > + * included in all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, > + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES > + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT > + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, > + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > + * OTHER DEALINGS IN THE SOFTWARE. > + */ > + > +/dts-v1/; > +/include/ "fsl-ls1043a.dtsi" > + > +/ { > + model = "LS1043A QDS Board"; > + compatible = "fsl,ls1043a-qds", "fsl,ls1043a"; > + > + aliases { > + gpio0 = &gpio1; > + gpio1 = &gpio2; > + gpio2 = &gpio3; > + gpio3 = &gpio4; > + serial0 = &lpuart0; > + serial1 = &lpuart1; > + serial2 = &lpuart2; > + serial3 = &lpuart3; > + serial4 = &lpuart4; > + serial5 = &lpuart5; > + }; > +}; > + > +&duart0 { > + status = "okay"; > +}; > + > +&duart1 { > + status = "okay"; > +}; > + > +&ifc { > + #address-cells = <2>; > + #size-cells = <1>; > + /* NOR, NAND Flashes and FPGA on board */ > + ranges = <0x0 0x0 0x0 0x60000000 0x08000000 > + 0x1 0x0 0x0 0x7e800000 0x00010000 > + 0x2 0x0 0x0 0x7fb00000 0x00000100>; > + status = "okay"; > + > + nor@0,0 { > + compatible = "cfi-flash"; > + reg = <0x0 0x0 0x8000000>; > + bank-width = <2>; > + device-width = <1>; > + }; > + > + nand@1,0 { > + compatible = "fsl,ifc-nand"; > + reg = <0x1 0x0 0x10000>; > + }; > + > + fpga: board-control@2,0 { > + compatible = "fsl,ls1043aqds-fpga", "fsl,fpga-qixis"; > + reg = <0x2 0x0 0x0000100>; > + }; > +}; > + > +&i2c0 { > + status = "okay"; We generally have a new line between properties and sub-node. Shawn > + pca9547@77 { > + compatible = "nxp,pca9547"; > + reg = <0x77>; > + #address-cells = <1>; > + #size-cells = <0>; > + > + i2c@0 { > + #address-cells = <1>; > + #size-cells = <0>; > + reg = <0x0>; > + > + rtc@68 { > + compatible = "dallas,ds3232"; > + reg = <0x68>; > + /* IRQ10_B */ > + interrupts = <0 150 0x4>; > + }; > + }; > + > + i2c@2 { > + #address-cells = <1>; > + #size-cells = <0>; > + reg = <0x2>; > + > + ina220@40 { > + compatible = "ti,ina220"; > + reg = <0x40>; > + shunt-resistor = <1000>; > + }; > + > + ina220@41 { > + compatible = "ti,ina220"; > + reg = <0x41>; > + shunt-resistor = <1000>; > + }; > + }; > + > + i2c@3 { > + #address-cells = <1>; > + #size-cells = <0>; > + reg = <0x3>; > + > + eeprom@56 { > + compatible = "atmel,24c512"; > + reg = <0x56>; > + }; > + > + eeprom@57 { > + compatible = "atmel,24c512"; > + reg = <0x57>; > + }; > + > + temp-sensor@4c { > + compatible = "adi,adt7461a"; > + reg = <0x4c>; > + }; > + }; > + }; > +}; > + > +&lpuart0 { > + status = "okay"; > +}; > -- > 2.1.0.27.g96db324 > >
Hi Shawn, Thanks for your comments. > -----Original Message----- > From: Shawn Guo [mailto:shawnguo@kernel.org] > Sent: 2016?3?30? 22:06 > To: Zhiqiang Hou <zhiqiang.hou@nxp.com> > Cc: devicetree@vger.kernel.org; robh+dt@kernel.org; mark.rutland@arm.com; > pawel.moll@arm.com; ijc+devicetree@hellion.org.uk; galak@codeaurora.org; > linux-arm-kernel@lists.infradead.org; catalin.marinas@arm.com; > will.deacon@arm.com; Scott Wood <scott.wood@nxp.com>; Mingkai Hu > <mingkai.hu@nxp.com>; Shaohui Xie <shaohui.xie@nxp.com>; Shaohui Xie > <Shaohui.Xie@freescale.com>; Mingkai Hu <Mingkai.Hu@freescale.com> > Subject: Re: [PATCH v4 2/2] arm64: dts: add LS1043a-QDS board support > > On Tue, Mar 08, 2016 at 10:25:39AM +0800, Zhiqiang Hou wrote: > > From: Shaohui Xie <Shaohui.Xie@freescale.com> > > > > The LS1043a-QDS board is a high-performance computing, evaluation, > > development, and test platform supporting the LS1043a SoC. > > > > Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com> > > Signed-off-by: Mingkai Hu <Mingkai.Hu@freescale.com> > > Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> > > The series looks good to me. There are a couple of small comments in this patch > as below, but I decided to fix them myself and applied both patches. > > > --- > > v4: > > - No change. > > > > v3: > > - Resort the nodes alphabetically. > > - Correct the compatible of nodes adt7461a at24,24c512 and pca9547. > > - Change the name of adt7461a to temp-sensor. > > > > v2: > > - Add root node compatible property. > > > > arch/arm64/boot/dts/freescale/Makefile | 1 + > > arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts | 167 > > ++++++++++++++++++++++ > > 2 files changed, 168 insertions(+) > > create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts > > > > diff --git a/arch/arm64/boot/dts/freescale/Makefile > > b/arch/arm64/boot/dts/freescale/Makefile > > index f3c2516..1423fa4 100644 > > --- a/arch/arm64/boot/dts/freescale/Makefile > > +++ b/arch/arm64/boot/dts/freescale/Makefile > > @@ -2,6 +2,7 @@ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2080a-qds.dtb > > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2080a-rdb.dtb > > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2080a-simu.dtb > > dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1043a-rdb.dtb > > +dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1043a-qds.dtb > > The list should maintained alphabetically. > > > > > always := $(dtb-y) > > subdir-y := $(dts-dirs) > > diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts > > b/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts > > new file mode 100644 > > index 0000000..97e9906 > > --- /dev/null > > +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts > > @@ -0,0 +1,167 @@ > > +/* > > + * Device Tree Include file for Freescale Layerscape-1043A family SoC. > > + * > > + * Copyright 2014-2015, Freescale Semiconductor > > + * > > + * Mingkai Hu <Mingkai.hu@freescale.com> > > + * > > + * This file is dual-licensed: you can use it either under the terms > > + * of the GPLv2 or the X11 license, at your option. Note that this > > +dual > > + * licensing only applies to this file, and not this project as a > > + * whole. > > + * > > + * a) This library is free software; you can redistribute it and/or > > + * modify it under the terms of the GNU General Public License as > > + * published by the Free Software Foundation; either version 2 of the > > + * License, or (at your option) any later version. > > + * > > + * This library is distributed in the hope that it will be useful, > > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > > + * GNU General Public License for more details. > > + * > > + * Or, alternatively, > > + * > > + * b) Permission is hereby granted, free of charge, to any person > > + * obtaining a copy of this software and associated documentation > > + * files (the "Software"), to deal in the Software without > > + * restriction, including without limitation the rights to use, > > + * copy, modify, merge, publish, distribute, sublicense, and/or > > + * sell copies of the Software, and to permit persons to whom the > > + * Software is furnished to do so, subject to the following > > + * conditions: > > + * > > + * The above copyright notice and this permission notice shall be > > + * included in all copies or substantial portions of the Software. > > + * > > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, > > + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES > > + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > > + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT > > + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, > > + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > > + * OTHER DEALINGS IN THE SOFTWARE. > > + */ > > + > > +/dts-v1/; > > +/include/ "fsl-ls1043a.dtsi" > > + > > +/ { > > + model = "LS1043A QDS Board"; > > + compatible = "fsl,ls1043a-qds", "fsl,ls1043a"; > > + > > + aliases { > > + gpio0 = &gpio1; > > + gpio1 = &gpio2; > > + gpio2 = &gpio3; > > + gpio3 = &gpio4; > > + serial0 = &lpuart0; > > + serial1 = &lpuart1; > > + serial2 = &lpuart2; > > + serial3 = &lpuart3; > > + serial4 = &lpuart4; > > + serial5 = &lpuart5; > > + }; > > +}; > > + > > +&duart0 { > > + status = "okay"; > > +}; > > + > > +&duart1 { > > + status = "okay"; > > +}; > > + > > +&ifc { > > + #address-cells = <2>; > > + #size-cells = <1>; > > + /* NOR, NAND Flashes and FPGA on board */ > > + ranges = <0x0 0x0 0x0 0x60000000 0x08000000 > > + 0x1 0x0 0x0 0x7e800000 0x00010000 > > + 0x2 0x0 0x0 0x7fb00000 0x00000100>; > > + status = "okay"; > > + > > + nor@0,0 { > > + compatible = "cfi-flash"; > > + reg = <0x0 0x0 0x8000000>; > > + bank-width = <2>; > > + device-width = <1>; > > + }; > > + > > + nand@1,0 { > > + compatible = "fsl,ifc-nand"; > > + reg = <0x1 0x0 0x10000>; > > + }; > > + > > + fpga: board-control@2,0 { > > + compatible = "fsl,ls1043aqds-fpga", "fsl,fpga-qixis"; > > + reg = <0x2 0x0 0x0000100>; > > + }; > > +}; > > + > > +&i2c0 { > > + status = "okay"; > > We generally have a new line between properties and sub-node. > > Shawn > > > + pca9547@77 { > > + compatible = "nxp,pca9547"; > > + reg = <0x77>; > > + #address-cells = <1>; > > + #size-cells = <0>; > > + > > + i2c@0 { > > + #address-cells = <1>; > > + #size-cells = <0>; > > + reg = <0x0>; > > + > > + rtc@68 { > > + compatible = "dallas,ds3232"; > > + reg = <0x68>; > > + /* IRQ10_B */ > > + interrupts = <0 150 0x4>; > > + }; > > + }; > > + > > + i2c@2 { > > + #address-cells = <1>; > > + #size-cells = <0>; > > + reg = <0x2>; > > + > > + ina220@40 { > > + compatible = "ti,ina220"; > > + reg = <0x40>; > > + shunt-resistor = <1000>; > > + }; > > + > > + ina220@41 { > > + compatible = "ti,ina220"; > > + reg = <0x41>; > > + shunt-resistor = <1000>; > > + }; > > + }; > > + > > + i2c@3 { > > + #address-cells = <1>; > > + #size-cells = <0>; > > + reg = <0x3>; > > + > > + eeprom@56 { > > + compatible = "atmel,24c512"; > > + reg = <0x56>; > > + }; > > + > > + eeprom@57 { > > + compatible = "atmel,24c512"; > > + reg = <0x57>; > > + }; > > + > > + temp-sensor@4c { > > + compatible = "adi,adt7461a"; > > + reg = <0x4c>; > > + }; > > + }; > > + }; > > +}; > > + > > +&lpuart0 { > > + status = "okay"; > > +}; > > -- > > 2.1.0.27.g96db324 > > > > Thanks, Zhiqiang
diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile index f3c2516..1423fa4 100644 --- a/arch/arm64/boot/dts/freescale/Makefile +++ b/arch/arm64/boot/dts/freescale/Makefile @@ -2,6 +2,7 @@ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2080a-qds.dtb dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2080a-rdb.dtb dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2080a-simu.dtb dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1043a-rdb.dtb +dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1043a-qds.dtb always := $(dtb-y) subdir-y := $(dts-dirs) diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts new file mode 100644 index 0000000..97e9906 --- /dev/null +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts @@ -0,0 +1,167 @@ +/* + * Device Tree Include file for Freescale Layerscape-1043A family SoC. + * + * Copyright 2014-2015, Freescale Semiconductor + * + * Mingkai Hu <Mingkai.hu@freescale.com> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPLv2 or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively, + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +/dts-v1/; +/include/ "fsl-ls1043a.dtsi" + +/ { + model = "LS1043A QDS Board"; + compatible = "fsl,ls1043a-qds", "fsl,ls1043a"; + + aliases { + gpio0 = &gpio1; + gpio1 = &gpio2; + gpio2 = &gpio3; + gpio3 = &gpio4; + serial0 = &lpuart0; + serial1 = &lpuart1; + serial2 = &lpuart2; + serial3 = &lpuart3; + serial4 = &lpuart4; + serial5 = &lpuart5; + }; +}; + +&duart0 { + status = "okay"; +}; + +&duart1 { + status = "okay"; +}; + +&ifc { + #address-cells = <2>; + #size-cells = <1>; + /* NOR, NAND Flashes and FPGA on board */ + ranges = <0x0 0x0 0x0 0x60000000 0x08000000 + 0x1 0x0 0x0 0x7e800000 0x00010000 + 0x2 0x0 0x0 0x7fb00000 0x00000100>; + status = "okay"; + + nor@0,0 { + compatible = "cfi-flash"; + reg = <0x0 0x0 0x8000000>; + bank-width = <2>; + device-width = <1>; + }; + + nand@1,0 { + compatible = "fsl,ifc-nand"; + reg = <0x1 0x0 0x10000>; + }; + + fpga: board-control@2,0 { + compatible = "fsl,ls1043aqds-fpga", "fsl,fpga-qixis"; + reg = <0x2 0x0 0x0000100>; + }; +}; + +&i2c0 { + status = "okay"; + pca9547@77 { + compatible = "nxp,pca9547"; + reg = <0x77>; + #address-cells = <1>; + #size-cells = <0>; + + i2c@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0x0>; + + rtc@68 { + compatible = "dallas,ds3232"; + reg = <0x68>; + /* IRQ10_B */ + interrupts = <0 150 0x4>; + }; + }; + + i2c@2 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0x2>; + + ina220@40 { + compatible = "ti,ina220"; + reg = <0x40>; + shunt-resistor = <1000>; + }; + + ina220@41 { + compatible = "ti,ina220"; + reg = <0x41>; + shunt-resistor = <1000>; + }; + }; + + i2c@3 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0x3>; + + eeprom@56 { + compatible = "atmel,24c512"; + reg = <0x56>; + }; + + eeprom@57 { + compatible = "atmel,24c512"; + reg = <0x57>; + }; + + temp-sensor@4c { + compatible = "adi,adt7461a"; + reg = <0x4c>; + }; + }; + }; +}; + +&lpuart0 { + status = "okay"; +};