linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2 0/5] arm: zynq: Adding new Xilinx boards
@ 2018-02-23 15:00 Michal Simek
  2018-02-23 15:00 ` [PATCH v2 1/5] arm: zynq: Add Xilinx cc108 board Michal Simek
                   ` (4 more replies)
  0 siblings, 5 replies; 12+ messages in thread
From: Michal Simek @ 2018-02-23 15:00 UTC (permalink / raw)
  To: devicetree
  Cc: monstr, Steffen Trumtrar, linux-kernel, Peter Crosthwaite,
	Rob Herring, Rob Herring, Mark Rutland, Josh Cartwright,
	Russell King, linux-arm-kernel

Hi,

this patchset is adding 5 new dts files which target cc108 and zc770
boards.
Please let me know if you see any issue with them.

Series depends on this one patch
https://lkml.org/lkml/2018/2/23/412

Thanks,
Michal

Changes in v2:
- Record compatible string to xilinx.txt
- Record compatible string to xilinx.txt
- Record compatible string to xilinx.txt
- Record compatible string to xilinx.txt
- use eeprom as node name instead of at25
- Record compatible string to xilinx.txt

Michal Simek (5):
  arm: zynq: Add Xilinx cc108 board
  arm: zynq: Add support for Xilinx zc770 xm010 dc1 board
  arm: zynq: Add support for Xilinx zc770 xm011 dc2 board
  arm: zynq: Add support for Xilinx zc770 xm012 dc3 board
  arm: zynq: Add support for Xilinx zc770 xm013 dc4 board

 Documentation/devicetree/bindings/arm/xilinx.txt | 11 +++
 arch/arm/boot/dts/Makefile                       |  5 ++
 arch/arm/boot/dts/zynq-cc108.dts                 | 75 +++++++++++++++++++
 arch/arm/boot/dts/zynq-zc770-xm010.dts           | 92 ++++++++++++++++++++++++
 arch/arm/boot/dts/zynq-zc770-xm011.dts           | 64 +++++++++++++++++
 arch/arm/boot/dts/zynq-zc770-xm012.dts           | 64 +++++++++++++++++
 arch/arm/boot/dts/zynq-zc770-xm013.dts           | 78 ++++++++++++++++++++
 7 files changed, 389 insertions(+)
 create mode 100644 arch/arm/boot/dts/zynq-cc108.dts
 create mode 100644 arch/arm/boot/dts/zynq-zc770-xm010.dts
 create mode 100644 arch/arm/boot/dts/zynq-zc770-xm011.dts
 create mode 100644 arch/arm/boot/dts/zynq-zc770-xm012.dts
 create mode 100644 arch/arm/boot/dts/zynq-zc770-xm013.dts

-- 
1.9.1

^ permalink raw reply	[flat|nested] 12+ messages in thread
* [PATCH v2 1/5] arm: zynq: Add Xilinx cc108 board
  2018-02-23 15:00 [PATCH v2 0/5] arm: zynq: Adding new Xilinx boards Michal Simek
@ 2018-02-23 15:00 ` Michal Simek
  2018-03-02 18:13   ` Rob Herring
  2018-02-23 15:00 ` [PATCH v2 2/5] arm: zynq: Add support for Xilinx zc770 xm010 dc1 board Michal Simek
                   ` (3 subsequent siblings)
  4 siblings, 1 reply; 12+ messages in thread
From: Michal Simek @ 2018-02-23 15:00 UTC (permalink / raw)
  To: devicetree
  Cc: monstr, Steffen Trumtrar, linux-kernel, Peter Crosthwaite,
	Rob Herring, Rob Herring, Mark Rutland, Josh Cartwright,
	Russell King, linux-arm-kernel

The board contains 7z010 with 512MB memory, ethernet, qspi, uart, usbs
and sd. But board is not supporting booting from sd card.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

Changes in v2:
- Record compatible string to xilinx.txt

 Documentation/devicetree/bindings/arm/xilinx.txt |  5 ++
 arch/arm/boot/dts/Makefile                       |  1 +
 arch/arm/boot/dts/zynq-cc108.dts                 | 75 ++++++++++++++++++++++++
 3 files changed, 81 insertions(+)
 create mode 100644 arch/arm/boot/dts/zynq-cc108.dts

diff --git a/Documentation/devicetree/bindings/arm/xilinx.txt b/Documentation/devicetree/bindings/arm/xilinx.txt
index 549e70a022cb..425c74fcc560 100644
--- a/Documentation/devicetree/bindings/arm/xilinx.txt
+++ b/Documentation/devicetree/bindings/arm/xilinx.txt
@@ -6,6 +6,11 @@ shall have the following properties.
 Required root node properties:
     - compatible = "xlnx,zynq-7000";
 
+Additional compatible strings:
+
+- Xilinx internal board cc108
+  "xlnx,zynq-cc108"
+
 ---------------------------------------------------------------
 
 Xilinx Zynq UltraScale+ MPSoC Platforms Device Tree Bindings
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index ade7a38543dc..c6810e84d4d7 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -1062,6 +1062,7 @@ dtb-$(CONFIG_ARCH_VT8500) += \
 	wm8750-apc8750.dtb \
 	wm8850-w70v2.dtb
 dtb-$(CONFIG_ARCH_ZYNQ) += \
+	zynq-cc108.dtb \
 	zynq-microzed.dtb \
 	zynq-parallella.dtb \
 	zynq-zc702.dtb \
diff --git a/arch/arm/boot/dts/zynq-cc108.dts b/arch/arm/boot/dts/zynq-cc108.dts
new file mode 100644
index 000000000000..1a0f631c1d8d
--- /dev/null
+++ b/arch/arm/boot/dts/zynq-cc108.dts
@@ -0,0 +1,75 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Xilinx CC108 board DTS
+ *
+ * (C) Copyright 2007-2018 Xilinx, Inc.
+ * (C) Copyright 2007-2013 Michal Simek
+ * (C) Copyright 2007-2012 PetaLogix Qld Pty Ltd
+ *
+ * Michal SIMEK <monstr@monstr.eu>
+ */
+/dts-v1/;
+/include/ "zynq-7000.dtsi"
+
+/ {
+	compatible = "xlnx,zynq-cc108", "xlnx,zynq-7000";
+	model = "Xilinx Zynq";
+
+	aliases {
+		ethernet0 = &gem0;
+		serial0 = &uart0;
+	};
+
+	chosen {
+		bootargs = "";
+		stdout-path = "serial0:115200n8";
+	};
+
+	memory@0 {
+		device_type = "memory";
+		reg = <0x0 0x20000000>;
+	};
+
+	usb_phy0: phy0 {
+		compatible = "usb-nop-xceiv";
+		#phy-cells = <0>;
+	};
+
+	usb_phy1: phy1 {
+		compatible = "usb-nop-xceiv";
+		#phy-cells = <0>;
+	};
+};
+
+&gem0 {
+	status = "okay";
+	phy-mode = "rgmii-id";
+	phy-handle = <&ethernet_phy>;
+
+	ethernet_phy: ethernet-phy@1 {
+		reg = <1>;
+		device_type = "ethernet-phy";
+	};
+};
+
+&sdhci1 {
+	status = "okay";
+	broken-cd ;
+	wp-inverted ;
+};
+
+&uart0 {
+	status = "okay";
+};
+
+&usb0 {
+	status = "okay";
+	dr_mode = "host";
+	usb-phy = <&usb_phy0>;
+};
+
+&usb1 {
+	status = "okay";
+	dr_mode = "host";
+	usb-phy = <&usb_phy1>;
+};
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [PATCH v2 2/5] arm: zynq: Add support for Xilinx zc770 xm010 dc1 board
  2018-02-23 15:00 [PATCH v2 0/5] arm: zynq: Adding new Xilinx boards Michal Simek
  2018-02-23 15:00 ` [PATCH v2 1/5] arm: zynq: Add Xilinx cc108 board Michal Simek
@ 2018-02-23 15:00 ` Michal Simek
  2018-03-02 18:50   ` Rob Herring
  2018-02-23 15:00 ` [PATCH v2 3/5] arm: zynq: Add support for Xilinx zc770 xm011 dc2 board Michal Simek
                   ` (2 subsequent siblings)
  4 siblings, 1 reply; 12+ messages in thread
From: Michal Simek @ 2018-02-23 15:00 UTC (permalink / raw)
  To: devicetree
  Cc: monstr, Steffen Trumtrar, linux-kernel, Peter Crosthwaite,
	Rob Herring, Rob Herring, Mark Rutland, Josh Cartwright,
	Russell King, linux-arm-kernel

zc770 is based board which is extended by FMC/DC cards for SoC
validation. FMCs/DCs are supposed to cover all SoC configurations.
FMC/DC contains ethernet port, can, i2c, sd, qspi, spi, uart and usb.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

Changes in v2:
- Record compatible string to xilinx.txt

 Documentation/devicetree/bindings/arm/xilinx.txt |  3 +
 arch/arm/boot/dts/Makefile                       |  1 +
 arch/arm/boot/dts/zynq-zc770-xm010.dts           | 92 ++++++++++++++++++++++++
 3 files changed, 96 insertions(+)
 create mode 100644 arch/arm/boot/dts/zynq-zc770-xm010.dts

diff --git a/Documentation/devicetree/bindings/arm/xilinx.txt b/Documentation/devicetree/bindings/arm/xilinx.txt
index 425c74fcc560..019e69037d42 100644
--- a/Documentation/devicetree/bindings/arm/xilinx.txt
+++ b/Documentation/devicetree/bindings/arm/xilinx.txt
@@ -11,6 +11,9 @@ Additional compatible strings:
 - Xilinx internal board cc108
   "xlnx,zynq-cc108"
 
+- Xilinx internal board zc770 with different FMC cards
+  "xlnx,zynq-zc770-xm010"
+
 ---------------------------------------------------------------
 
 Xilinx Zynq UltraScale+ MPSoC Platforms Device Tree Bindings
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index c6810e84d4d7..be9ffae2a1ec 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -1067,6 +1067,7 @@ dtb-$(CONFIG_ARCH_ZYNQ) += \
 	zynq-parallella.dtb \
 	zynq-zc702.dtb \
 	zynq-zc706.dtb \
+	zynq-zc770-xm010.dtb \
 	zynq-zed.dtb \
 	zynq-zybo.dtb
 dtb-$(CONFIG_MACH_ARMADA_370) += \
diff --git a/arch/arm/boot/dts/zynq-zc770-xm010.dts b/arch/arm/boot/dts/zynq-zc770-xm010.dts
new file mode 100644
index 000000000000..b1cfb4ede434
--- /dev/null
+++ b/arch/arm/boot/dts/zynq-zc770-xm010.dts
@@ -0,0 +1,92 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Xilinx ZC770 XM010 board DTS
+ *
+ * Copyright (C) 2013-2018 Xilinx, Inc.
+ */
+/dts-v1/;
+#include "zynq-7000.dtsi"
+
+/ {
+	compatible = "xlnx,zynq-zc770-xm010", "xlnx,zynq-7000";
+	model = "Xilinx Zynq";
+
+	aliases {
+		ethernet0 = &gem0;
+		i2c0 = &i2c0;
+		serial0 = &uart1;
+		spi1 = &spi1;
+	};
+
+	chosen {
+		bootargs = "";
+		stdout-path = "serial0:115200n8";
+	};
+
+	memory@0 {
+		device_type = "memory";
+		reg = <0x0 0x40000000>;
+	};
+
+	usb_phy0: phy0 {
+		compatible = "usb-nop-xceiv";
+		#phy-cells = <0>;
+	};
+};
+
+&can0 {
+	status = "okay";
+};
+
+&gem0 {
+	status = "okay";
+	phy-mode = "rgmii-id";
+	phy-handle = <&ethernet_phy>;
+
+	ethernet_phy: ethernet-phy@7 {
+		reg = <7>;
+		device_type = "ethernet-phy";
+	};
+};
+
+&i2c0 {
+	status = "okay";
+	clock-frequency = <400000>;
+
+	eeprom: eeprom@52 {
+		compatible = "atmel,24c02";
+		reg = <0x52>;
+	};
+
+};
+
+&sdhci0 {
+	status = "okay";
+};
+
+&spi1 {
+	status = "okay";
+	num-cs = <4>;
+	is-decoded-cs = <0>;
+	flash@0 {
+		compatible = "sst25wf080", "jedec,spi-nor";
+		reg = <1>;
+		spi-max-frequency = <1000000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+		partition@test {
+			label = "spi-flash";
+			reg = <0x0 0x100000>;
+		};
+	};
+};
+
+&uart1 {
+	status = "okay";
+};
+
+&usb0 {
+	status = "okay";
+	dr_mode = "host";
+	usb-phy = <&usb_phy0>;
+};
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [PATCH v2 3/5] arm: zynq: Add support for Xilinx zc770 xm011 dc2 board
  2018-02-23 15:00 [PATCH v2 0/5] arm: zynq: Adding new Xilinx boards Michal Simek
  2018-02-23 15:00 ` [PATCH v2 1/5] arm: zynq: Add Xilinx cc108 board Michal Simek
  2018-02-23 15:00 ` [PATCH v2 2/5] arm: zynq: Add support for Xilinx zc770 xm010 dc1 board Michal Simek
@ 2018-02-23 15:00 ` Michal Simek
  2018-03-02 18:50   ` Rob Herring
  2018-02-23 15:00 ` [PATCH v2 4/5] arm: zynq: Add support for Xilinx zc770 xm012 dc3 board Michal Simek
  2018-02-23 15:00 ` [PATCH v2 5/5] arm: zynq: Add support for Xilinx zc770 xm013 dc4 board Michal Simek
  4 siblings, 1 reply; 12+ messages in thread
From: Michal Simek @ 2018-02-23 15:00 UTC (permalink / raw)
  To: devicetree
  Cc: monstr, Steffen Trumtrar, linux-kernel, Peter Crosthwaite,
	Rob Herring, Rob Herring, Mark Rutland, Josh Cartwright,
	Russell King, linux-arm-kernel

zc770 is based board which is extended by FMC/DC cards for SoC
validation. FMCs/DCs are supposed to cover all SoC configurations.
FMC/DC contains can, i2c, nand uart, spi and usb.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

Changes in v2:
- Record compatible string to xilinx.txt

 Documentation/devicetree/bindings/arm/xilinx.txt |  1 +
 arch/arm/boot/dts/Makefile                       |  1 +
 arch/arm/boot/dts/zynq-zc770-xm011.dts           | 64 ++++++++++++++++++++++++
 3 files changed, 66 insertions(+)
 create mode 100644 arch/arm/boot/dts/zynq-zc770-xm011.dts

diff --git a/Documentation/devicetree/bindings/arm/xilinx.txt b/Documentation/devicetree/bindings/arm/xilinx.txt
index 019e69037d42..80139a7cfcdc 100644
--- a/Documentation/devicetree/bindings/arm/xilinx.txt
+++ b/Documentation/devicetree/bindings/arm/xilinx.txt
@@ -13,6 +13,7 @@ Additional compatible strings:
 
 - Xilinx internal board zc770 with different FMC cards
   "xlnx,zynq-zc770-xm010"
+  "xlnx,zynq-zc770-xm011"
 
 ---------------------------------------------------------------
 
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index be9ffae2a1ec..801a46a88e93 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -1068,6 +1068,7 @@ dtb-$(CONFIG_ARCH_ZYNQ) += \
 	zynq-zc702.dtb \
 	zynq-zc706.dtb \
 	zynq-zc770-xm010.dtb \
+	zynq-zc770-xm011.dtb \
 	zynq-zed.dtb \
 	zynq-zybo.dtb
 dtb-$(CONFIG_MACH_ARMADA_370) += \
diff --git a/arch/arm/boot/dts/zynq-zc770-xm011.dts b/arch/arm/boot/dts/zynq-zc770-xm011.dts
new file mode 100644
index 000000000000..b78883cee96a
--- /dev/null
+++ b/arch/arm/boot/dts/zynq-zc770-xm011.dts
@@ -0,0 +1,64 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Xilinx ZC770 XM013 board DTS
+ *
+ * Copyright (C) 2013-2018 Xilinx, Inc.
+ */
+/dts-v1/;
+#include "zynq-7000.dtsi"
+
+/ {
+	compatible = "xlnx,zynq-zc770-xm011", "xlnx,zynq-7000";
+	model = "Xilinx Zynq";
+
+	aliases {
+		i2c0 = &i2c1;
+		serial0 = &uart1;
+		spi0 = &spi0;
+	};
+
+	chosen {
+		bootargs = "";
+		stdout-path = "serial0:115200n8";
+	};
+
+	memory@0 {
+		device_type = "memory";
+		reg = <0x0 0x40000000>;
+	};
+
+	usb_phy1: phy1 {
+		compatible = "usb-nop-xceiv";
+		#phy-cells = <0>;
+	};
+};
+
+&can0 {
+	status = "okay";
+};
+
+&i2c1 {
+	status = "okay";
+	clock-frequency = <400000>;
+
+	eeprom: eeprom@52 {
+		compatible = "atmel,24c02";
+		reg = <0x52>;
+	};
+};
+
+&spi0 {
+	status = "okay";
+	num-cs = <4>;
+	is-decoded-cs = <0>;
+};
+
+&uart1 {
+	status = "okay";
+};
+
+&usb1 {
+	status = "okay";
+	dr_mode = "host";
+	usb-phy = <&usb_phy1>;
+};
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [PATCH v2 4/5] arm: zynq: Add support for Xilinx zc770 xm012 dc3 board
  2018-02-23 15:00 [PATCH v2 0/5] arm: zynq: Adding new Xilinx boards Michal Simek
                   ` (2 preceding siblings ...)
  2018-02-23 15:00 ` [PATCH v2 3/5] arm: zynq: Add support for Xilinx zc770 xm011 dc2 board Michal Simek
@ 2018-02-23 15:00 ` Michal Simek
  2018-03-02 18:51   ` Rob Herring
  2018-02-23 15:00 ` [PATCH v2 5/5] arm: zynq: Add support for Xilinx zc770 xm013 dc4 board Michal Simek
  4 siblings, 1 reply; 12+ messages in thread
From: Michal Simek @ 2018-02-23 15:00 UTC (permalink / raw)
  To: devicetree
  Cc: monstr, Steffen Trumtrar, linux-kernel, Peter Crosthwaite,
	Rob Herring, Rob Herring, Mark Rutland, Josh Cartwright,
	Russell King, linux-arm-kernel

zc770 is based board which is extended by FMC/DC cards for SoC
validation. FMCs/DCs are supposed to cover all SoC configurations.
FMC/DC contains can, 2x i2c, nor flash, spi and uart.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

Changes in v2:
- Record compatible string to xilinx.txt

 Documentation/devicetree/bindings/arm/xilinx.txt |  1 +
 arch/arm/boot/dts/Makefile                       |  1 +
 arch/arm/boot/dts/zynq-zc770-xm012.dts           | 64 ++++++++++++++++++++++++
 3 files changed, 66 insertions(+)
 create mode 100644 arch/arm/boot/dts/zynq-zc770-xm012.dts

diff --git a/Documentation/devicetree/bindings/arm/xilinx.txt b/Documentation/devicetree/bindings/arm/xilinx.txt
index 80139a7cfcdc..745c898f2f7f 100644
--- a/Documentation/devicetree/bindings/arm/xilinx.txt
+++ b/Documentation/devicetree/bindings/arm/xilinx.txt
@@ -14,6 +14,7 @@ Additional compatible strings:
 - Xilinx internal board zc770 with different FMC cards
   "xlnx,zynq-zc770-xm010"
   "xlnx,zynq-zc770-xm011"
+  "xlnx,zynq-zc770-xm012"
 
 ---------------------------------------------------------------
 
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 801a46a88e93..2c74b935ad1c 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -1069,6 +1069,7 @@ dtb-$(CONFIG_ARCH_ZYNQ) += \
 	zynq-zc706.dtb \
 	zynq-zc770-xm010.dtb \
 	zynq-zc770-xm011.dtb \
+	zynq-zc770-xm012.dtb \
 	zynq-zed.dtb \
 	zynq-zybo.dtb
 dtb-$(CONFIG_MACH_ARMADA_370) += \
diff --git a/arch/arm/boot/dts/zynq-zc770-xm012.dts b/arch/arm/boot/dts/zynq-zc770-xm012.dts
new file mode 100644
index 000000000000..c3169d63600d
--- /dev/null
+++ b/arch/arm/boot/dts/zynq-zc770-xm012.dts
@@ -0,0 +1,64 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Xilinx ZC770 XM012 board DTS
+ *
+ * Copyright (C) 2013-2018 Xilinx, Inc.
+ */
+/dts-v1/;
+#include "zynq-7000.dtsi"
+
+/ {
+	compatible = "xlnx,zynq-zc770-xm012", "xlnx,zynq-7000";
+	model = "Xilinx Zynq";
+
+	aliases {
+		i2c0 = &i2c0;
+		i2c1 = &i2c1;
+		serial0 = &uart1;
+		spi0 = &spi1;
+	};
+
+	chosen {
+		bootargs = "";
+		stdout-path = "serial0:115200n8";
+	};
+
+	memory@0 {
+		device_type = "memory";
+		reg = <0x0 0x40000000>;
+	};
+};
+
+&can1 {
+	status = "okay";
+};
+
+&i2c0 {
+	status = "okay";
+	clock-frequency = <400000>;
+
+	eeprom0: eeprom@52 {
+		compatible = "atmel,24c02";
+		reg = <0x52>;
+	};
+};
+
+&i2c1 {
+	status = "okay";
+	clock-frequency = <400000>;
+
+	eeprom1: eeprom@52 {
+		compatible = "atmel,24c02";
+		reg = <0x52>;
+	};
+};
+
+&spi1 {
+	status = "okay";
+	num-cs = <4>;
+	is-decoded-cs = <0>;
+};
+
+&uart1 {
+	status = "okay";
+};
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [PATCH v2 5/5]  arm: zynq: Add support for Xilinx zc770 xm013 dc4 board
  2018-02-23 15:00 [PATCH v2 0/5] arm: zynq: Adding new Xilinx boards Michal Simek
                   ` (3 preceding siblings ...)
  2018-02-23 15:00 ` [PATCH v2 4/5] arm: zynq: Add support for Xilinx zc770 xm012 dc3 board Michal Simek
@ 2018-02-23 15:00 ` Michal Simek
  2018-03-02 18:53   ` Rob Herring
  4 siblings, 1 reply; 12+ messages in thread
From: Michal Simek @ 2018-02-23 15:00 UTC (permalink / raw)
  To: devicetree
  Cc: linux-kernel, Rob Herring, Mark Rutland, Russell King, linux-arm-kernel

zc770 is based board which is extended by FMC/DC cards for SoC
validation. FMCs/DCs are supposed to cover all SoC configurations.
FMC/DC contains can, ethernet, i2c, qspi, spi and uart.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

Changes in v2:
- use eeprom as node name instead of at25
- Record compatible string to xilinx.txt

 Documentation/devicetree/bindings/arm/xilinx.txt |  1 +
 arch/arm/boot/dts/Makefile                       |  1 +
 arch/arm/boot/dts/zynq-zc770-xm013.dts           | 78 ++++++++++++++++++++++++
 3 files changed, 80 insertions(+)
 create mode 100644 arch/arm/boot/dts/zynq-zc770-xm013.dts

diff --git a/Documentation/devicetree/bindings/arm/xilinx.txt b/Documentation/devicetree/bindings/arm/xilinx.txt
index 745c898f2f7f..63705a451251 100644
--- a/Documentation/devicetree/bindings/arm/xilinx.txt
+++ b/Documentation/devicetree/bindings/arm/xilinx.txt
@@ -15,6 +15,7 @@ Additional compatible strings:
   "xlnx,zynq-zc770-xm010"
   "xlnx,zynq-zc770-xm011"
   "xlnx,zynq-zc770-xm012"
+  "xlnx,zynq-zc770-xm013"
 
 ---------------------------------------------------------------
 
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 2c74b935ad1c..d5de3748a80a 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -1070,6 +1070,7 @@ dtb-$(CONFIG_ARCH_ZYNQ) += \
 	zynq-zc770-xm010.dtb \
 	zynq-zc770-xm011.dtb \
 	zynq-zc770-xm012.dtb \
+	zynq-zc770-xm013.dtb \
 	zynq-zed.dtb \
 	zynq-zybo.dtb
 dtb-$(CONFIG_MACH_ARMADA_370) += \
diff --git a/arch/arm/boot/dts/zynq-zc770-xm013.dts b/arch/arm/boot/dts/zynq-zc770-xm013.dts
new file mode 100644
index 000000000000..8bb66859d774
--- /dev/null
+++ b/arch/arm/boot/dts/zynq-zc770-xm013.dts
@@ -0,0 +1,78 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Xilinx ZC770 XM013 board DTS
+ *
+ * Copyright (C) 2013 Xilinx, Inc.
+ */
+/dts-v1/;
+#include "zynq-7000.dtsi"
+
+/ {
+	compatible = "xlnx,zynq-zc770-xm013", "xlnx,zynq-7000";
+	model = "Xilinx Zynq";
+
+	aliases {
+		ethernet0 = &gem1;
+		i2c0 = &i2c1;
+		serial0 = &uart0;
+		spi1 = &spi0;
+	};
+
+	chosen {
+		bootargs = "";
+		stdout-path = "serial0:115200n8";
+	};
+
+	memory@0 {
+		device_type = "memory";
+		reg = <0x0 0x40000000>;
+	};
+};
+
+&can1 {
+	status = "okay";
+};
+
+&gem1 {
+	status = "okay";
+	phy-mode = "rgmii-id";
+	phy-handle = <&ethernet_phy>;
+
+	ethernet_phy: ethernet-phy@7 {
+		reg = <7>;
+		device_type = "ethernet-phy";
+	};
+};
+
+&i2c1 {
+	status = "okay";
+	clock-frequency = <400000>;
+
+	si570: clock-generator@55 {
+		#clock-cells = <0>;
+		compatible = "silabs,si570";
+		temperature-stability = <50>;
+		reg = <0x55>;
+		factory-fout = <156250000>;
+		clock-frequency = <148500000>;
+	};
+};
+
+&spi0 {
+	status = "okay";
+	num-cs = <4>;
+	is-decoded-cs = <0>;
+	eeprom: eeprom@0 {
+		at25,byte-len = <8192>;
+		at25,addr-mode = <2>;
+		at25,page-size = <32>;
+
+		compatible = "atmel,at25";
+		reg = <2>;
+		spi-max-frequency = <1000000>;
+	};
+};
+
+&uart0 {
+	status = "okay";
+};
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* Re: [PATCH v2 1/5] arm: zynq: Add Xilinx cc108 board
  2018-02-23 15:00 ` [PATCH v2 1/5] arm: zynq: Add Xilinx cc108 board Michal Simek
@ 2018-03-02 18:13   ` Rob Herring
  0 siblings, 0 replies; 12+ messages in thread
From: Rob Herring @ 2018-03-02 18:13 UTC (permalink / raw)
  To: Michal Simek
  Cc: devicetree, monstr, Steffen Trumtrar, linux-kernel,
	Peter Crosthwaite, Rob Herring, Mark Rutland, Josh Cartwright,
	Russell King, linux-arm-kernel

On Fri, Feb 23, 2018 at 04:00:19PM +0100, Michal Simek wrote:
> The board contains 7z010 with 512MB memory, ethernet, qspi, uart, usbs
> and sd. But board is not supporting booting from sd card.
> 
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---
> 
> Changes in v2:
> - Record compatible string to xilinx.txt
> 
>  Documentation/devicetree/bindings/arm/xilinx.txt |  5 ++
>  arch/arm/boot/dts/Makefile                       |  1 +
>  arch/arm/boot/dts/zynq-cc108.dts                 | 75 ++++++++++++++++++++++++
>  3 files changed, 81 insertions(+)
>  create mode 100644 arch/arm/boot/dts/zynq-cc108.dts

Reviewed-by: Rob Herring <robh@kernel.org>

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH v2 2/5] arm: zynq: Add support for Xilinx zc770 xm010 dc1 board
  2018-02-23 15:00 ` [PATCH v2 2/5] arm: zynq: Add support for Xilinx zc770 xm010 dc1 board Michal Simek
@ 2018-03-02 18:50   ` Rob Herring
  2018-03-02 19:16     ` Michal Simek
  0 siblings, 1 reply; 12+ messages in thread
From: Rob Herring @ 2018-03-02 18:50 UTC (permalink / raw)
  To: Michal Simek
  Cc: devicetree, monstr, Steffen Trumtrar, linux-kernel,
	Peter Crosthwaite, Rob Herring, Mark Rutland, Josh Cartwright,
	Russell King, linux-arm-kernel

On Fri, Feb 23, 2018 at 04:00:20PM +0100, Michal Simek wrote:
> zc770 is based board which is extended by FMC/DC cards for SoC
> validation. FMCs/DCs are supposed to cover all SoC configurations.
> FMC/DC contains ethernet port, can, i2c, sd, qspi, spi, uart and usb.
> 
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---
> 
> Changes in v2:
> - Record compatible string to xilinx.txt
> 
>  Documentation/devicetree/bindings/arm/xilinx.txt |  3 +
>  arch/arm/boot/dts/Makefile                       |  1 +
>  arch/arm/boot/dts/zynq-zc770-xm010.dts           | 92 ++++++++++++++++++++++++
>  3 files changed, 96 insertions(+)
>  create mode 100644 arch/arm/boot/dts/zynq-zc770-xm010.dts
> 
> diff --git a/Documentation/devicetree/bindings/arm/xilinx.txt b/Documentation/devicetree/bindings/arm/xilinx.txt
> index 425c74fcc560..019e69037d42 100644
> --- a/Documentation/devicetree/bindings/arm/xilinx.txt
> +++ b/Documentation/devicetree/bindings/arm/xilinx.txt
> @@ -11,6 +11,9 @@ Additional compatible strings:
>  - Xilinx internal board cc108
>    "xlnx,zynq-cc108"
>  
> +- Xilinx internal board zc770 with different FMC cards
> +  "xlnx,zynq-zc770-xm010"
> +
>  ---------------------------------------------------------------
>  
>  Xilinx Zynq UltraScale+ MPSoC Platforms Device Tree Bindings
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index c6810e84d4d7..be9ffae2a1ec 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -1067,6 +1067,7 @@ dtb-$(CONFIG_ARCH_ZYNQ) += \
>  	zynq-parallella.dtb \
>  	zynq-zc702.dtb \
>  	zynq-zc706.dtb \
> +	zynq-zc770-xm010.dtb \
>  	zynq-zed.dtb \
>  	zynq-zybo.dtb
>  dtb-$(CONFIG_MACH_ARMADA_370) += \
> diff --git a/arch/arm/boot/dts/zynq-zc770-xm010.dts b/arch/arm/boot/dts/zynq-zc770-xm010.dts
> new file mode 100644
> index 000000000000..b1cfb4ede434
> --- /dev/null
> +++ b/arch/arm/boot/dts/zynq-zc770-xm010.dts
> @@ -0,0 +1,92 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Xilinx ZC770 XM010 board DTS
> + *
> + * Copyright (C) 2013-2018 Xilinx, Inc.
> + */
> +/dts-v1/;
> +#include "zynq-7000.dtsi"
> +
> +/ {
> +	compatible = "xlnx,zynq-zc770-xm010", "xlnx,zynq-7000";
> +	model = "Xilinx Zynq";
> +
> +	aliases {
> +		ethernet0 = &gem0;
> +		i2c0 = &i2c0;
> +		serial0 = &uart1;
> +		spi1 = &spi1;
> +	};
> +
> +	chosen {
> +		bootargs = "";
> +		stdout-path = "serial0:115200n8";
> +	};
> +
> +	memory@0 {
> +		device_type = "memory";
> +		reg = <0x0 0x40000000>;
> +	};
> +
> +	usb_phy0: phy0 {
> +		compatible = "usb-nop-xceiv";
> +		#phy-cells = <0>;
> +	};
> +};
> +
> +&can0 {
> +	status = "okay";
> +};
> +
> +&gem0 {
> +	status = "okay";
> +	phy-mode = "rgmii-id";
> +	phy-handle = <&ethernet_phy>;
> +
> +	ethernet_phy: ethernet-phy@7 {
> +		reg = <7>;
> +		device_type = "ethernet-phy";
> +	};
> +};
> +
> +&i2c0 {
> +	status = "okay";
> +	clock-frequency = <400000>;
> +
> +	eeprom: eeprom@52 {
> +		compatible = "atmel,24c02";
> +		reg = <0x52>;
> +	};
> +
> +};
> +
> +&sdhci0 {
> +	status = "okay";
> +};
> +
> +&spi1 {
> +	status = "okay";
> +	num-cs = <4>;
> +	is-decoded-cs = <0>;
> +	flash@0 {
> +		compatible = "sst25wf080", "jedec,spi-nor";
> +		reg = <1>;
> +		spi-max-frequency = <1000000>;
> +		#address-cells = <1>;
> +		#size-cells = <1>;
> +		partition@test {

@test?

Use a partitions node too.

> +			label = "spi-flash";

Should be what the partition contains.

> +			reg = <0x0 0x100000>;
> +		};
> +	};
> +};
> +
> +&uart1 {
> +	status = "okay";
> +};
> +
> +&usb0 {
> +	status = "okay";
> +	dr_mode = "host";
> +	usb-phy = <&usb_phy0>;
> +};
> -- 
> 1.9.1
> 

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH v2 3/5] arm: zynq: Add support for Xilinx zc770 xm011 dc2 board
  2018-02-23 15:00 ` [PATCH v2 3/5] arm: zynq: Add support for Xilinx zc770 xm011 dc2 board Michal Simek
@ 2018-03-02 18:50   ` Rob Herring
  0 siblings, 0 replies; 12+ messages in thread
From: Rob Herring @ 2018-03-02 18:50 UTC (permalink / raw)
  To: Michal Simek
  Cc: devicetree, monstr, Steffen Trumtrar, linux-kernel,
	Peter Crosthwaite, Rob Herring, Mark Rutland, Josh Cartwright,
	Russell King, linux-arm-kernel

On Fri, Feb 23, 2018 at 04:00:21PM +0100, Michal Simek wrote:
> zc770 is based board which is extended by FMC/DC cards for SoC
> validation. FMCs/DCs are supposed to cover all SoC configurations.
> FMC/DC contains can, i2c, nand uart, spi and usb.
> 
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---
> 
> Changes in v2:
> - Record compatible string to xilinx.txt
> 
>  Documentation/devicetree/bindings/arm/xilinx.txt |  1 +
>  arch/arm/boot/dts/Makefile                       |  1 +
>  arch/arm/boot/dts/zynq-zc770-xm011.dts           | 64 ++++++++++++++++++++++++
>  3 files changed, 66 insertions(+)
>  create mode 100644 arch/arm/boot/dts/zynq-zc770-xm011.dts

Reviewed-by: Rob Herring <robh@kernel.org>

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH v2 4/5] arm: zynq: Add support for Xilinx zc770 xm012 dc3 board
  2018-02-23 15:00 ` [PATCH v2 4/5] arm: zynq: Add support for Xilinx zc770 xm012 dc3 board Michal Simek
@ 2018-03-02 18:51   ` Rob Herring
  0 siblings, 0 replies; 12+ messages in thread
From: Rob Herring @ 2018-03-02 18:51 UTC (permalink / raw)
  To: Michal Simek
  Cc: devicetree, monstr, Steffen Trumtrar, linux-kernel,
	Peter Crosthwaite, Rob Herring, Mark Rutland, Josh Cartwright,
	Russell King, linux-arm-kernel

On Fri, Feb 23, 2018 at 04:00:22PM +0100, Michal Simek wrote:
> zc770 is based board which is extended by FMC/DC cards for SoC
> validation. FMCs/DCs are supposed to cover all SoC configurations.
> FMC/DC contains can, 2x i2c, nor flash, spi and uart.
> 
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---
> 
> Changes in v2:
> - Record compatible string to xilinx.txt
> 
>  Documentation/devicetree/bindings/arm/xilinx.txt |  1 +
>  arch/arm/boot/dts/Makefile                       |  1 +
>  arch/arm/boot/dts/zynq-zc770-xm012.dts           | 64 ++++++++++++++++++++++++
>  3 files changed, 66 insertions(+)
>  create mode 100644 arch/arm/boot/dts/zynq-zc770-xm012.dts

Reviewed-by: Rob Herring <robh@kernel.org>

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH v2 5/5]  arm: zynq: Add support for Xilinx zc770 xm013 dc4 board
  2018-02-23 15:00 ` [PATCH v2 5/5] arm: zynq: Add support for Xilinx zc770 xm013 dc4 board Michal Simek
@ 2018-03-02 18:53   ` Rob Herring
  0 siblings, 0 replies; 12+ messages in thread
From: Rob Herring @ 2018-03-02 18:53 UTC (permalink / raw)
  To: Michal Simek
  Cc: devicetree, linux-kernel, Mark Rutland, Russell King, linux-arm-kernel

On Fri, Feb 23, 2018 at 04:00:23PM +0100, Michal Simek wrote:
> zc770 is based board which is extended by FMC/DC cards for SoC
> validation. FMCs/DCs are supposed to cover all SoC configurations.
> FMC/DC contains can, ethernet, i2c, qspi, spi and uart.
> 
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---
> 
> Changes in v2:
> - use eeprom as node name instead of at25
> - Record compatible string to xilinx.txt
> 
>  Documentation/devicetree/bindings/arm/xilinx.txt |  1 +
>  arch/arm/boot/dts/Makefile                       |  1 +
>  arch/arm/boot/dts/zynq-zc770-xm013.dts           | 78 ++++++++++++++++++++++++
>  3 files changed, 80 insertions(+)
>  create mode 100644 arch/arm/boot/dts/zynq-zc770-xm013.dts

Reviewed-by: Rob Herring <robh@kernel.org>

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH v2 2/5] arm: zynq: Add support for Xilinx zc770 xm010 dc1 board
  2018-03-02 18:50   ` Rob Herring
@ 2018-03-02 19:16     ` Michal Simek
  0 siblings, 0 replies; 12+ messages in thread
From: Michal Simek @ 2018-03-02 19:16 UTC (permalink / raw)
  To: Rob Herring, Michal Simek
  Cc: devicetree, Steffen Trumtrar, linux-kernel, Peter Crosthwaite,
	Rob Herring, Mark Rutland, Josh Cartwright, Russell King,
	linux-arm-kernel


[-- Attachment #1.1: Type: text/plain, Size: 4067 bytes --]

On 2.3.2018 19:50, Rob Herring wrote:
> On Fri, Feb 23, 2018 at 04:00:20PM +0100, Michal Simek wrote:
>> zc770 is based board which is extended by FMC/DC cards for SoC
>> validation. FMCs/DCs are supposed to cover all SoC configurations.
>> FMC/DC contains ethernet port, can, i2c, sd, qspi, spi, uart and usb.
>>
>> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
>> ---
>>
>> Changes in v2:
>> - Record compatible string to xilinx.txt
>>
>>  Documentation/devicetree/bindings/arm/xilinx.txt |  3 +
>>  arch/arm/boot/dts/Makefile                       |  1 +
>>  arch/arm/boot/dts/zynq-zc770-xm010.dts           | 92 ++++++++++++++++++++++++
>>  3 files changed, 96 insertions(+)
>>  create mode 100644 arch/arm/boot/dts/zynq-zc770-xm010.dts
>>
>> diff --git a/Documentation/devicetree/bindings/arm/xilinx.txt b/Documentation/devicetree/bindings/arm/xilinx.txt
>> index 425c74fcc560..019e69037d42 100644
>> --- a/Documentation/devicetree/bindings/arm/xilinx.txt
>> +++ b/Documentation/devicetree/bindings/arm/xilinx.txt
>> @@ -11,6 +11,9 @@ Additional compatible strings:
>>  - Xilinx internal board cc108
>>    "xlnx,zynq-cc108"
>>  
>> +- Xilinx internal board zc770 with different FMC cards
>> +  "xlnx,zynq-zc770-xm010"
>> +
>>  ---------------------------------------------------------------
>>  
>>  Xilinx Zynq UltraScale+ MPSoC Platforms Device Tree Bindings
>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
>> index c6810e84d4d7..be9ffae2a1ec 100644
>> --- a/arch/arm/boot/dts/Makefile
>> +++ b/arch/arm/boot/dts/Makefile
>> @@ -1067,6 +1067,7 @@ dtb-$(CONFIG_ARCH_ZYNQ) += \
>>  	zynq-parallella.dtb \
>>  	zynq-zc702.dtb \
>>  	zynq-zc706.dtb \
>> +	zynq-zc770-xm010.dtb \
>>  	zynq-zed.dtb \
>>  	zynq-zybo.dtb
>>  dtb-$(CONFIG_MACH_ARMADA_370) += \
>> diff --git a/arch/arm/boot/dts/zynq-zc770-xm010.dts b/arch/arm/boot/dts/zynq-zc770-xm010.dts
>> new file mode 100644
>> index 000000000000..b1cfb4ede434
>> --- /dev/null
>> +++ b/arch/arm/boot/dts/zynq-zc770-xm010.dts
>> @@ -0,0 +1,92 @@
>> +// SPDX-License-Identifier: GPL-2.0+
>> +/*
>> + * Xilinx ZC770 XM010 board DTS
>> + *
>> + * Copyright (C) 2013-2018 Xilinx, Inc.
>> + */
>> +/dts-v1/;
>> +#include "zynq-7000.dtsi"
>> +
>> +/ {
>> +	compatible = "xlnx,zynq-zc770-xm010", "xlnx,zynq-7000";
>> +	model = "Xilinx Zynq";
>> +
>> +	aliases {
>> +		ethernet0 = &gem0;
>> +		i2c0 = &i2c0;
>> +		serial0 = &uart1;
>> +		spi1 = &spi1;
>> +	};
>> +
>> +	chosen {
>> +		bootargs = "";
>> +		stdout-path = "serial0:115200n8";
>> +	};
>> +
>> +	memory@0 {
>> +		device_type = "memory";
>> +		reg = <0x0 0x40000000>;
>> +	};
>> +
>> +	usb_phy0: phy0 {
>> +		compatible = "usb-nop-xceiv";
>> +		#phy-cells = <0>;
>> +	};
>> +};
>> +
>> +&can0 {
>> +	status = "okay";
>> +};
>> +
>> +&gem0 {
>> +	status = "okay";
>> +	phy-mode = "rgmii-id";
>> +	phy-handle = <&ethernet_phy>;
>> +
>> +	ethernet_phy: ethernet-phy@7 {
>> +		reg = <7>;
>> +		device_type = "ethernet-phy";
>> +	};
>> +};
>> +
>> +&i2c0 {
>> +	status = "okay";
>> +	clock-frequency = <400000>;
>> +
>> +	eeprom: eeprom@52 {
>> +		compatible = "atmel,24c02";
>> +		reg = <0x52>;
>> +	};
>> +
>> +};
>> +
>> +&sdhci0 {
>> +	status = "okay";
>> +};
>> +
>> +&spi1 {
>> +	status = "okay";
>> +	num-cs = <4>;
>> +	is-decoded-cs = <0>;
>> +	flash@0 {
>> +		compatible = "sst25wf080", "jedec,spi-nor";
>> +		reg = <1>;
>> +		spi-max-frequency = <1000000>;
>> +		#address-cells = <1>;
>> +		#size-cells = <1>;
>> +		partition@test {
> 
> @test?
> 
> Use a partitions node too.

ok done.

> 
>> +			label = "spi-flash";
> 
> Should be what the partition contains.


I have fixed this to data.

Thanks,
M

-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP SoCs



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

^ permalink raw reply	[flat|nested] 12+ messages in thread
end of thread, other threads:[~2018-03-02 19:16 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-23 15:00 [PATCH v2 0/5] arm: zynq: Adding new Xilinx boards Michal Simek
2018-02-23 15:00 ` [PATCH v2 1/5] arm: zynq: Add Xilinx cc108 board Michal Simek
2018-03-02 18:13   ` Rob Herring
2018-02-23 15:00 ` [PATCH v2 2/5] arm: zynq: Add support for Xilinx zc770 xm010 dc1 board Michal Simek
2018-03-02 18:50   ` Rob Herring
2018-03-02 19:16     ` Michal Simek
2018-02-23 15:00 ` [PATCH v2 3/5] arm: zynq: Add support for Xilinx zc770 xm011 dc2 board Michal Simek
2018-03-02 18:50   ` Rob Herring
2018-02-23 15:00 ` [PATCH v2 4/5] arm: zynq: Add support for Xilinx zc770 xm012 dc3 board Michal Simek
2018-03-02 18:51   ` Rob Herring
2018-02-23 15:00 ` [PATCH v2 5/5] arm: zynq: Add support for Xilinx zc770 xm013 dc4 board Michal Simek
2018-03-02 18:53   ` Rob Herring

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).