* [PATCH 1/2] arm: dts: zynq: Add Digilent Zybo Z7 board @ 2018-02-26 0:59 Nobuhiro Iwamatsu 2018-02-26 0:59 ` [PATCH 2/2] arm: dts: zynq: Extract common Digilent Zybo board support Nobuhiro Iwamatsu 2018-02-27 13:02 ` [PATCH 1/2] arm: dts: zynq: Add Digilent Zybo Z7 board Michal Simek 0 siblings, 2 replies; 6+ messages in thread From: Nobuhiro Iwamatsu @ 2018-02-26 0:59 UTC (permalink / raw) To: linux-arm-kernel This add a DTS for the Digilent Zybo Z7 board. This board is the successor board of Zybo, these are almost the same except for ps-clk-frequency specifications. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu@cybertrust.co.jp> --- arch/arm/boot/dts/Makefile | 3 +- arch/arm/boot/dts/zynq-zybo-z7.dts | 65 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 arch/arm/boot/dts/zynq-zybo-z7.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index ade7a38543dc..62605d600681 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1067,7 +1067,8 @@ dtb-$(CONFIG_ARCH_ZYNQ) += \ zynq-zc702.dtb \ zynq-zc706.dtb \ zynq-zed.dtb \ - zynq-zybo.dtb + zynq-zybo.dtb \ + zynq-zybo-z7.dtb dtb-$(CONFIG_MACH_ARMADA_370) += \ armada-370-db.dtb \ armada-370-dlink-dns327l.dtb \ diff --git a/arch/arm/boot/dts/zynq-zybo-z7.dts b/arch/arm/boot/dts/zynq-zybo-z7.dts new file mode 100644 index 000000000000..97e487913f8f --- /dev/null +++ b/arch/arm/boot/dts/zynq-zybo-z7.dts @@ -0,0 +1,65 @@ +/* + * Digilent Zybo Z7 board DTS + * + * Copyright (C) 2017 Cybertrust Japan Co., Ltd. + * Copyright (C) 2017 Nobuhiro Iwamatsu <nobuhiro.iwamatsu@cybertrust.co.jp> + * + * SPDX-License-Identifier: GPL-2.0+ + */ +/dts-v1/; +#include "zynq-7000.dtsi" + +/ { + model = "Zynq ZYBO Z7 Development Board"; + compatible = "digilent,zynq-zybo-z7", "xlnx,zynq-7000"; + + aliases { + ethernet0 = &gem0; + serial0 = &uart1; + }; + + memory { + device_type = "memory"; + reg = <0x0 0x20000000>; + }; + + chosen { + bootargs = ""; + stdout-path = "serial0:115200n8"; + }; + + usb_phy0: phy0 { + #phy-cells = <0>; + compatible = "usb-nop-xceiv"; + reset-gpios = <&gpio0 46 1>; + }; +}; + +&clkc { + ps-clk-frequency = <33333333>; +}; + +&gem0 { + status = "okay"; + phy-mode = "rgmii-id"; + phy-handle = <ðernet_phy>; + + ethernet_phy: ethernet-phy at 0 { + reg = <0>; + device_type = "ethernet-phy"; + }; +}; + +&sdhci0 { + status = "okay"; +}; + +&uart1 { + status = "okay"; +}; + +&usb0 { + status = "okay"; + dr_mode = "host"; + usb-phy = <&usb_phy0>; +}; -- 2.16.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] arm: dts: zynq: Extract common Digilent Zybo board support 2018-02-26 0:59 [PATCH 1/2] arm: dts: zynq: Add Digilent Zybo Z7 board Nobuhiro Iwamatsu @ 2018-02-26 0:59 ` Nobuhiro Iwamatsu 2018-02-27 12:54 ` Michal Simek 2018-02-27 13:02 ` [PATCH 1/2] arm: dts: zynq: Add Digilent Zybo Z7 board Michal Simek 1 sibling, 1 reply; 6+ messages in thread From: Nobuhiro Iwamatsu @ 2018-02-26 0:59 UTC (permalink / raw) To: linux-arm-kernel The Digilent Zybo and Zybo Z7 boards are very similar. To avoid duplication, this extract common board parts into own dtsi file. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu@cybertrust.co.jp> --- arch/arm/boot/dts/zynq-zybo-common.dtsi | 58 +++++++++++++++++++++++++++++++++ arch/arm/boot/dts/zynq-zybo-z7.dts | 45 ++----------------------- arch/arm/boot/dts/zynq-zybo.dts | 43 +----------------------- 3 files changed, 61 insertions(+), 85 deletions(-) create mode 100644 arch/arm/boot/dts/zynq-zybo-common.dtsi diff --git a/arch/arm/boot/dts/zynq-zybo-common.dtsi b/arch/arm/boot/dts/zynq-zybo-common.dtsi new file mode 100644 index 000000000000..9c9a92d59cc7 --- /dev/null +++ b/arch/arm/boot/dts/zynq-zybo-common.dtsi @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2011 - 2014 Xilinx + * Copyright (C) 2012 National Instruments Corp. + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and + * may be copied, distributed, and modified under those terms. + * + * This program 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. + */ +/dts-v1/; +#include "zynq-7000.dtsi" + +/ { + aliases { + ethernet0 = &gem0; + serial0 = &uart1; + }; + + memory at 0 { + device_type = "memory"; + reg = <0x0 0x20000000>; + }; + + usb_phy0: phy0 { + #phy-cells = <0>; + compatible = "usb-nop-xceiv"; + reset-gpios = <&gpio0 46 1>; + }; +}; + +&gem0 { + status = "okay"; + phy-mode = "rgmii-id"; + phy-handle = <ðernet_phy>; + + ethernet_phy: ethernet-phy at 0 { + reg = <0>; + device_type = "ethernet-phy"; + }; +}; + +&sdhci0 { + status = "okay"; +}; + +&uart1 { + status = "okay"; +}; + +&usb0 { + status = "okay"; + dr_mode = "host"; + usb-phy = <&usb_phy0>; +}; diff --git a/arch/arm/boot/dts/zynq-zybo-z7.dts b/arch/arm/boot/dts/zynq-zybo-z7.dts index 97e487913f8f..bd94147792cd 100644 --- a/arch/arm/boot/dts/zynq-zybo-z7.dts +++ b/arch/arm/boot/dts/zynq-zybo-z7.dts @@ -7,59 +7,18 @@ * SPDX-License-Identifier: GPL-2.0+ */ /dts-v1/; -#include "zynq-7000.dtsi" +#include "zynq-zybo-common.dtsi" / { - model = "Zynq ZYBO Z7 Development Board"; + model = "Zynq Zybo Z7 Development Board"; compatible = "digilent,zynq-zybo-z7", "xlnx,zynq-7000"; - aliases { - ethernet0 = &gem0; - serial0 = &uart1; - }; - - memory { - device_type = "memory"; - reg = <0x0 0x20000000>; - }; - chosen { bootargs = ""; stdout-path = "serial0:115200n8"; }; - - usb_phy0: phy0 { - #phy-cells = <0>; - compatible = "usb-nop-xceiv"; - reset-gpios = <&gpio0 46 1>; - }; }; &clkc { ps-clk-frequency = <33333333>; }; - -&gem0 { - status = "okay"; - phy-mode = "rgmii-id"; - phy-handle = <ðernet_phy>; - - ethernet_phy: ethernet-phy at 0 { - reg = <0>; - device_type = "ethernet-phy"; - }; -}; - -&sdhci0 { - status = "okay"; -}; - -&uart1 { - status = "okay"; -}; - -&usb0 { - status = "okay"; - dr_mode = "host"; - usb-phy = <&usb_phy0>; -}; diff --git a/arch/arm/boot/dts/zynq-zybo.dts b/arch/arm/boot/dts/zynq-zybo.dts index e40cafc5ee5b..920294f41aff 100644 --- a/arch/arm/boot/dts/zynq-zybo.dts +++ b/arch/arm/boot/dts/zynq-zybo.dts @@ -12,59 +12,18 @@ * GNU General Public License for more details. */ /dts-v1/; -#include "zynq-7000.dtsi" +#include "zynq-zybo-common.dtsi" / { model = "Zynq ZYBO Development Board"; compatible = "digilent,zynq-zybo", "xlnx,zynq-7000"; - aliases { - ethernet0 = &gem0; - serial0 = &uart1; - }; - - memory at 0 { - device_type = "memory"; - reg = <0x0 0x20000000>; - }; - chosen { bootargs = ""; stdout-path = "serial0:115200n8"; }; - - usb_phy0: phy0 { - #phy-cells = <0>; - compatible = "usb-nop-xceiv"; - reset-gpios = <&gpio0 46 1>; - }; }; &clkc { ps-clk-frequency = <50000000>; }; - -&gem0 { - status = "okay"; - phy-mode = "rgmii-id"; - phy-handle = <ðernet_phy>; - - ethernet_phy: ethernet-phy at 0 { - reg = <0>; - device_type = "ethernet-phy"; - }; -}; - -&sdhci0 { - status = "okay"; -}; - -&uart1 { - status = "okay"; -}; - -&usb0 { - status = "okay"; - dr_mode = "host"; - usb-phy = <&usb_phy0>; -}; -- 2.16.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] arm: dts: zynq: Extract common Digilent Zybo board support 2018-02-26 0:59 ` [PATCH 2/2] arm: dts: zynq: Extract common Digilent Zybo board support Nobuhiro Iwamatsu @ 2018-02-27 12:54 ` Michal Simek 2018-02-28 1:49 ` Nobuhiro Iwamatsu 0 siblings, 1 reply; 6+ messages in thread From: Michal Simek @ 2018-02-27 12:54 UTC (permalink / raw) To: linux-arm-kernel On 26.2.2018 01:59, Nobuhiro Iwamatsu wrote: > The Digilent Zybo and Zybo Z7 boards are very similar. > To avoid duplication, this extract common board parts into own dtsi file. > > Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu@cybertrust.co.jp> > --- > arch/arm/boot/dts/zynq-zybo-common.dtsi | 58 +++++++++++++++++++++++++++++++++ > arch/arm/boot/dts/zynq-zybo-z7.dts | 45 ++----------------------- > arch/arm/boot/dts/zynq-zybo.dts | 43 +----------------------- > 3 files changed, 61 insertions(+), 85 deletions(-) > create mode 100644 arch/arm/boot/dts/zynq-zybo-common.dtsi > > diff --git a/arch/arm/boot/dts/zynq-zybo-common.dtsi b/arch/arm/boot/dts/zynq-zybo-common.dtsi > new file mode 100644 > index 000000000000..9c9a92d59cc7 > --- /dev/null > +++ b/arch/arm/boot/dts/zynq-zybo-common.dtsi > @@ -0,0 +1,58 @@ > +/* > + * Copyright (C) 2011 - 2014 Xilinx > + * Copyright (C) 2012 National Instruments Corp. > + * > + * This software is licensed under the terms of the GNU General Public > + * License version 2, as published by the Free Software Foundation, and > + * may be copied, distributed, and modified under those terms. > + * > + * This program 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. > + */ > +/dts-v1/; > +#include "zynq-7000.dtsi" > + > +/ { > + aliases { > + ethernet0 = &gem0; > + serial0 = &uart1; > + }; > + > + memory at 0 { > + device_type = "memory"; > + reg = <0x0 0x20000000>; > + }; > + > + usb_phy0: phy0 { > + #phy-cells = <0>; > + compatible = "usb-nop-xceiv"; > + reset-gpios = <&gpio0 46 1>; > + }; > +}; > + > +&gem0 { > + status = "okay"; > + phy-mode = "rgmii-id"; > + phy-handle = <ðernet_phy>; > + > + ethernet_phy: ethernet-phy at 0 { > + reg = <0>; > + device_type = "ethernet-phy"; > + }; > +}; > + > +&sdhci0 { > + status = "okay"; > +}; > + > +&uart1 { > + status = "okay"; > +}; > + > +&usb0 { > + status = "okay"; > + dr_mode = "host"; > + usb-phy = <&usb_phy0>; > +}; > diff --git a/arch/arm/boot/dts/zynq-zybo-z7.dts b/arch/arm/boot/dts/zynq-zybo-z7.dts > index 97e487913f8f..bd94147792cd 100644 > --- a/arch/arm/boot/dts/zynq-zybo-z7.dts > +++ b/arch/arm/boot/dts/zynq-zybo-z7.dts > @@ -7,59 +7,18 @@ > * SPDX-License-Identifier: GPL-2.0+ > */ > /dts-v1/; > -#include "zynq-7000.dtsi" > +#include "zynq-zybo-common.dtsi" > > / { > - model = "Zynq ZYBO Z7 Development Board"; > + model = "Zynq Zybo Z7 Development Board"; > compatible = "digilent,zynq-zybo-z7", "xlnx,zynq-7000"; > > - aliases { > - ethernet0 = &gem0; > - serial0 = &uart1; > - }; > - > - memory { > - device_type = "memory"; > - reg = <0x0 0x20000000>; > - }; > - > chosen { > bootargs = ""; > stdout-path = "serial0:115200n8"; > }; > - > - usb_phy0: phy0 { > - #phy-cells = <0>; > - compatible = "usb-nop-xceiv"; > - reset-gpios = <&gpio0 46 1>; > - }; > }; > > &clkc { > ps-clk-frequency = <33333333>; > }; > - > -&gem0 { > - status = "okay"; > - phy-mode = "rgmii-id"; > - phy-handle = <ðernet_phy>; > - > - ethernet_phy: ethernet-phy at 0 { > - reg = <0>; > - device_type = "ethernet-phy"; > - }; > -}; > - > -&sdhci0 { > - status = "okay"; > -}; > - > -&uart1 { > - status = "okay"; > -}; > - > -&usb0 { > - status = "okay"; > - dr_mode = "host"; > - usb-phy = <&usb_phy0>; > -}; > diff --git a/arch/arm/boot/dts/zynq-zybo.dts b/arch/arm/boot/dts/zynq-zybo.dts > index e40cafc5ee5b..920294f41aff 100644 > --- a/arch/arm/boot/dts/zynq-zybo.dts > +++ b/arch/arm/boot/dts/zynq-zybo.dts > @@ -12,59 +12,18 @@ > * GNU General Public License for more details. > */ > /dts-v1/; > -#include "zynq-7000.dtsi" > +#include "zynq-zybo-common.dtsi" > > / { > model = "Zynq ZYBO Development Board"; > compatible = "digilent,zynq-zybo", "xlnx,zynq-7000"; > > - aliases { > - ethernet0 = &gem0; > - serial0 = &uart1; > - }; > - > - memory at 0 { > - device_type = "memory"; > - reg = <0x0 0x20000000>; > - }; > - > chosen { > bootargs = ""; > stdout-path = "serial0:115200n8"; > }; > - > - usb_phy0: phy0 { > - #phy-cells = <0>; > - compatible = "usb-nop-xceiv"; > - reset-gpios = <&gpio0 46 1>; > - }; > }; > > &clkc { > ps-clk-frequency = <50000000>; > }; > - > -&gem0 { > - status = "okay"; > - phy-mode = "rgmii-id"; > - phy-handle = <ðernet_phy>; > - > - ethernet_phy: ethernet-phy at 0 { > - reg = <0>; > - device_type = "ethernet-phy"; > - }; > -}; > - > -&sdhci0 { > - status = "okay"; > -}; > - > -&uart1 { > - status = "okay"; > -}; > - > -&usb0 { > - status = "okay"; > - dr_mode = "host"; > - usb-phy = <&usb_phy0>; > -}; > TBH: I wouldn't bother with this. It is not huge duplication anyway. If that file is huge that not a problem with it but it is pretty small that's why I can't see a reason for it. M ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] arm: dts: zynq: Extract common Digilent Zybo board support 2018-02-27 12:54 ` Michal Simek @ 2018-02-28 1:49 ` Nobuhiro Iwamatsu 0 siblings, 0 replies; 6+ messages in thread From: Nobuhiro Iwamatsu @ 2018-02-28 1:49 UTC (permalink / raw) To: linux-arm-kernel Hi, Michal. Thanks for your review. On Tue, 27 Feb 2018 13:54:40 +0100 Michal Simek <michal.simek@xilinx.com> wrote: > On 26.2.2018 01:59, Nobuhiro Iwamatsu wrote: > > The Digilent Zybo and Zybo Z7 boards are very similar. > > To avoid duplication, this extract common board parts into own dtsi > > file. > > > > Signed-off-by: Nobuhiro Iwamatsu > > <nobuhiro.iwamatsu@cybertrust.co.jp> --- > > arch/arm/boot/dts/zynq-zybo-common.dtsi | 58 > > +++++++++++++++++++++++++++++++++ > > arch/arm/boot/dts/zynq-zybo-z7.dts | 45 > > ++----------------------- arch/arm/boot/dts/zynq-zybo.dts | > > 43 +----------------------- 3 files changed, 61 insertions(+), 85 > > deletions(-) create mode 100644 > > arch/arm/boot/dts/zynq-zybo-common.dtsi > > > > diff --git a/arch/arm/boot/dts/zynq-zybo-common.dtsi > > b/arch/arm/boot/dts/zynq-zybo-common.dtsi new file mode 100644 > > index 000000000000..9c9a92d59cc7 > > --- /dev/null > > +++ b/arch/arm/boot/dts/zynq-zybo-common.dtsi > > @@ -0,0 +1,58 @@ > > +/* > > + * Copyright (C) 2011 - 2014 Xilinx > > + * Copyright (C) 2012 National Instruments Corp. > > + * > > + * This software is licensed under the terms of the GNU General > > Public > > + * License version 2, as published by the Free Software > > Foundation, and > > + * may be copied, distributed, and modified under those terms. > > + * > > + * This program 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. > > + */ > > +/dts-v1/; > > +#include "zynq-7000.dtsi" > > + > > +/ { > > + aliases { > > + ethernet0 = &gem0; > > + serial0 = &uart1; > > + }; > > + > > + memory at 0 { > > + device_type = "memory"; > > + reg = <0x0 0x20000000>; > > + }; > > + > > + usb_phy0: phy0 { > > + #phy-cells = <0>; > > + compatible = "usb-nop-xceiv"; > > + reset-gpios = <&gpio0 46 1>; > > + }; > > +}; > > + > > +&gem0 { > > + status = "okay"; > > + phy-mode = "rgmii-id"; > > + phy-handle = <ðernet_phy>; > > + > > + ethernet_phy: ethernet-phy at 0 { > > + reg = <0>; > > + device_type = "ethernet-phy"; > > + }; > > +}; > > + > > +&sdhci0 { > > + status = "okay"; > > +}; > > + > > +&uart1 { > > + status = "okay"; > > +}; > > + > > +&usb0 { > > + status = "okay"; > > + dr_mode = "host"; > > + usb-phy = <&usb_phy0>; > > +}; > > diff --git a/arch/arm/boot/dts/zynq-zybo-z7.dts > > b/arch/arm/boot/dts/zynq-zybo-z7.dts index > > 97e487913f8f..bd94147792cd 100644 --- > > a/arch/arm/boot/dts/zynq-zybo-z7.dts +++ > > b/arch/arm/boot/dts/zynq-zybo-z7.dts @@ -7,59 +7,18 @@ > > * SPDX-License-Identifier: GPL-2.0+ > > */ > > /dts-v1/; > > -#include "zynq-7000.dtsi" > > +#include "zynq-zybo-common.dtsi" > > > > / { > > - model = "Zynq ZYBO Z7 Development Board"; > > + model = "Zynq Zybo Z7 Development Board"; > > compatible = "digilent,zynq-zybo-z7", "xlnx,zynq-7000"; > > > > - aliases { > > - ethernet0 = &gem0; > > - serial0 = &uart1; > > - }; > > - > > - memory { > > - device_type = "memory"; > > - reg = <0x0 0x20000000>; > > - }; > > - > > chosen { > > bootargs = ""; > > stdout-path = "serial0:115200n8"; > > }; > > - > > - usb_phy0: phy0 { > > - #phy-cells = <0>; > > - compatible = "usb-nop-xceiv"; > > - reset-gpios = <&gpio0 46 1>; > > - }; > > }; > > > > &clkc { > > ps-clk-frequency = <33333333>; > > }; > > - > > -&gem0 { > > - status = "okay"; > > - phy-mode = "rgmii-id"; > > - phy-handle = <ðernet_phy>; > > - > > - ethernet_phy: ethernet-phy at 0 { > > - reg = <0>; > > - device_type = "ethernet-phy"; > > - }; > > -}; > > - > > -&sdhci0 { > > - status = "okay"; > > -}; > > - > > -&uart1 { > > - status = "okay"; > > -}; > > - > > -&usb0 { > > - status = "okay"; > > - dr_mode = "host"; > > - usb-phy = <&usb_phy0>; > > -}; > > diff --git a/arch/arm/boot/dts/zynq-zybo.dts > > b/arch/arm/boot/dts/zynq-zybo.dts index e40cafc5ee5b..920294f41aff > > 100644 --- a/arch/arm/boot/dts/zynq-zybo.dts > > +++ b/arch/arm/boot/dts/zynq-zybo.dts > > @@ -12,59 +12,18 @@ > > * GNU General Public License for more details. > > */ > > /dts-v1/; > > -#include "zynq-7000.dtsi" > > +#include "zynq-zybo-common.dtsi" > > > > / { > > model = "Zynq ZYBO Development Board"; > > compatible = "digilent,zynq-zybo", "xlnx,zynq-7000"; > > > > - aliases { > > - ethernet0 = &gem0; > > - serial0 = &uart1; > > - }; > > - > > - memory at 0 { > > - device_type = "memory"; > > - reg = <0x0 0x20000000>; > > - }; > > - > > chosen { > > bootargs = ""; > > stdout-path = "serial0:115200n8"; > > }; > > - > > - usb_phy0: phy0 { > > - #phy-cells = <0>; > > - compatible = "usb-nop-xceiv"; > > - reset-gpios = <&gpio0 46 1>; > > - }; > > }; > > > > &clkc { > > ps-clk-frequency = <50000000>; > > }; > > - > > -&gem0 { > > - status = "okay"; > > - phy-mode = "rgmii-id"; > > - phy-handle = <ðernet_phy>; > > - > > - ethernet_phy: ethernet-phy at 0 { > > - reg = <0>; > > - device_type = "ethernet-phy"; > > - }; > > -}; > > - > > -&sdhci0 { > > - status = "okay"; > > -}; > > - > > -&uart1 { > > - status = "okay"; > > -}; > > - > > -&usb0 { > > - status = "okay"; > > - dr_mode = "host"; > > - usb-phy = <&usb_phy0>; > > -}; > > > > TBH: I wouldn't bother with this. It is not huge duplication anyway. > If that file is huge that not a problem with it but it is pretty small > that's why I can't see a reason for it. > OK. I withdraw this patch. > M > > Best regards, Nobuhiro ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2] arm: dts: zynq: Add Digilent Zybo Z7 board 2018-02-26 0:59 [PATCH 1/2] arm: dts: zynq: Add Digilent Zybo Z7 board Nobuhiro Iwamatsu 2018-02-26 0:59 ` [PATCH 2/2] arm: dts: zynq: Extract common Digilent Zybo board support Nobuhiro Iwamatsu @ 2018-02-27 13:02 ` Michal Simek 2018-02-28 1:52 ` Nobuhiro Iwamatsu 1 sibling, 1 reply; 6+ messages in thread From: Michal Simek @ 2018-02-27 13:02 UTC (permalink / raw) To: linux-arm-kernel On 26.2.2018 01:59, Nobuhiro Iwamatsu wrote: > This add a DTS for the Digilent Zybo Z7 board. > This board is the successor board of Zybo, these are almost the same except > for ps-clk-frequency specifications. > > Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu@cybertrust.co.jp> > --- > arch/arm/boot/dts/Makefile | 3 +- > arch/arm/boot/dts/zynq-zybo-z7.dts | 65 ++++++++++++++++++++++++++++++++++++++ > 2 files changed, 67 insertions(+), 1 deletion(-) > create mode 100644 arch/arm/boot/dts/zynq-zybo-z7.dts > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > index ade7a38543dc..62605d600681 100644 > --- a/arch/arm/boot/dts/Makefile > +++ b/arch/arm/boot/dts/Makefile > @@ -1067,7 +1067,8 @@ dtb-$(CONFIG_ARCH_ZYNQ) += \ > zynq-zc702.dtb \ > zynq-zc706.dtb \ > zynq-zed.dtb \ > - zynq-zybo.dtb > + zynq-zybo.dtb \ > + zynq-zybo-z7.dtb > dtb-$(CONFIG_MACH_ARMADA_370) += \ > armada-370-db.dtb \ > armada-370-dlink-dns327l.dtb \ > diff --git a/arch/arm/boot/dts/zynq-zybo-z7.dts b/arch/arm/boot/dts/zynq-zybo-z7.dts > new file mode 100644 > index 000000000000..97e487913f8f > --- /dev/null > +++ b/arch/arm/boot/dts/zynq-zybo-z7.dts > @@ -0,0 +1,65 @@ > +/* > + * Digilent Zybo Z7 board DTS > + * > + * Copyright (C) 2017 Cybertrust Japan Co., Ltd. > + * Copyright (C) 2017 Nobuhiro Iwamatsu <nobuhiro.iwamatsu@cybertrust.co.jp> > + * > + * SPDX-License-Identifier: GPL-2.0+ This should be the first line with starting // > + */ > +/dts-v1/; > +#include "zynq-7000.dtsi" > + > +/ { > + model = "Zynq ZYBO Z7 Development Board"; > + compatible = "digilent,zynq-zybo-z7", "xlnx,zynq-7000"; Please based it on this series: https://www.mail-archive.com/linux-kernel at vger.kernel.org/msg1618031.html or https://github.com/Xilinx/linux-xlnx/tree/zynq/dt And you should record digilent,zynq-zybo-z7 compatible string. I have not a problem if you want to extend xilinx.txt file with it. Documentation/devicetree/bindings/arm/xilinx.txt > + > + aliases { > + ethernet0 = &gem0; > + serial0 = &uart1; > + }; > + > + memory { this should be memory at 0 > + device_type = "memory"; > + reg = <0x0 0x20000000>; > + }; > + > + chosen { > + bootargs = ""; > + stdout-path = "serial0:115200n8"; > + }; > + > + usb_phy0: phy0 { > + #phy-cells = <0>; > + compatible = "usb-nop-xceiv"; > + reset-gpios = <&gpio0 46 1>; > + }; > +}; > + > +&clkc { > + ps-clk-frequency = <33333333>; > +}; > + > +&gem0 { > + status = "okay"; > + phy-mode = "rgmii-id"; > + phy-handle = <ðernet_phy>; > + > + ethernet_phy: ethernet-phy at 0 { > + reg = <0>; > + device_type = "ethernet-phy"; > + }; > +}; > + > +&sdhci0 { > + status = "okay"; > +}; > + > +&uart1 { > + status = "okay"; > +}; > + > +&usb0 { > + status = "okay"; > + dr_mode = "host"; > + usb-phy = <&usb_phy0>; > +}; > Thanks, Michal ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2] arm: dts: zynq: Add Digilent Zybo Z7 board 2018-02-27 13:02 ` [PATCH 1/2] arm: dts: zynq: Add Digilent Zybo Z7 board Michal Simek @ 2018-02-28 1:52 ` Nobuhiro Iwamatsu 0 siblings, 0 replies; 6+ messages in thread From: Nobuhiro Iwamatsu @ 2018-02-28 1:52 UTC (permalink / raw) To: linux-arm-kernel Hi, Michal. Thanks for your review. On Tue, 27 Feb 2018 14:02:24 +0100 Michal Simek <michal.simek@xilinx.com> wrote: > On 26.2.2018 01:59, Nobuhiro Iwamatsu wrote: > > This add a DTS for the Digilent Zybo Z7 board. > > This board is the successor board of Zybo, these are almost the > > same except for ps-clk-frequency specifications. > > > > Signed-off-by: Nobuhiro Iwamatsu > > <nobuhiro.iwamatsu@cybertrust.co.jp> --- > > arch/arm/boot/dts/Makefile | 3 +- > > arch/arm/boot/dts/zynq-zybo-z7.dts | 65 > > ++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 > > insertions(+), 1 deletion(-) create mode 100644 > > arch/arm/boot/dts/zynq-zybo-z7.dts > > > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > > index ade7a38543dc..62605d600681 100644 > > --- a/arch/arm/boot/dts/Makefile > > +++ b/arch/arm/boot/dts/Makefile > > @@ -1067,7 +1067,8 @@ dtb-$(CONFIG_ARCH_ZYNQ) += \ > > zynq-zc702.dtb \ > > zynq-zc706.dtb \ > > zynq-zed.dtb \ > > - zynq-zybo.dtb > > + zynq-zybo.dtb \ > > + zynq-zybo-z7.dtb > > dtb-$(CONFIG_MACH_ARMADA_370) += \ > > armada-370-db.dtb \ > > armada-370-dlink-dns327l.dtb \ > > diff --git a/arch/arm/boot/dts/zynq-zybo-z7.dts > > b/arch/arm/boot/dts/zynq-zybo-z7.dts new file mode 100644 > > index 000000000000..97e487913f8f > > --- /dev/null > > +++ b/arch/arm/boot/dts/zynq-zybo-z7.dts > > @@ -0,0 +1,65 @@ > > +/* > > + * Digilent Zybo Z7 board DTS > > + * > > + * Copyright (C) 2017 Cybertrust Japan Co., Ltd. > > + * Copyright (C) 2017 Nobuhiro Iwamatsu > > <nobuhiro.iwamatsu@cybertrust.co.jp> > > + * > > + * SPDX-License-Identifier: GPL-2.0+ > > This should be the first line with starting // OK, I'll fix this. > > > + */ > > +/dts-v1/; > > +#include "zynq-7000.dtsi" > > + > > +/ { > > + model = "Zynq ZYBO Z7 Development Board"; > > + compatible = "digilent,zynq-zybo-z7", "xlnx,zynq-7000"; > > Please based it on this series: > https://www.mail-archive.com/linux-kernel at vger.kernel.org/msg1618031.html > or https://github.com/Xilinx/linux-xlnx/tree/zynq/dt > OK. I will rebase dt branch. > And you should record digilent,zynq-zybo-z7 compatible string. > > I have not a problem if you want to extend xilinx.txt file with it. > Documentation/devicetree/bindings/arm/xilinx.txt > I see. I'll add this into next patch. > > > > + > > + aliases { > > + ethernet0 = &gem0; > > + serial0 = &uart1; > > + }; > > + > > + memory { > > this should be memory at 0 My bad. I will fix it. Thanks! > > > + device_type = "memory"; > > + reg = <0x0 0x20000000>; > > + }; > > + > > + chosen { > > + bootargs = ""; > > + stdout-path = "serial0:115200n8"; > > + }; > > + > > + usb_phy0: phy0 { > > + #phy-cells = <0>; > > + compatible = "usb-nop-xceiv"; > > + reset-gpios = <&gpio0 46 1>; > > + }; > > +}; > > + > > +&clkc { > > + ps-clk-frequency = <33333333>; > > +}; > > + > > +&gem0 { > > + status = "okay"; > > + phy-mode = "rgmii-id"; > > + phy-handle = <ðernet_phy>; > > + > > + ethernet_phy: ethernet-phy at 0 { > > + reg = <0>; > > + device_type = "ethernet-phy"; > > + }; > > +}; > > + > > +&sdhci0 { > > + status = "okay"; > > +}; > > + > > +&uart1 { > > + status = "okay"; > > +}; > > + > > +&usb0 { > > + status = "okay"; > > + dr_mode = "host"; > > + usb-phy = <&usb_phy0>; > > +}; > > > > Thanks, > Michal > Best regards, Nobuhiro ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-02-28 1:52 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2018-02-26 0:59 [PATCH 1/2] arm: dts: zynq: Add Digilent Zybo Z7 board Nobuhiro Iwamatsu 2018-02-26 0:59 ` [PATCH 2/2] arm: dts: zynq: Extract common Digilent Zybo board support Nobuhiro Iwamatsu 2018-02-27 12:54 ` Michal Simek 2018-02-28 1:49 ` Nobuhiro Iwamatsu 2018-02-27 13:02 ` [PATCH 1/2] arm: dts: zynq: Add Digilent Zybo Z7 board Michal Simek 2018-02-28 1:52 ` Nobuhiro Iwamatsu
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox