* [PATCH v3 1/4] arm: zynq: Remove board specific compatibility string
2013-06-13 16:37 [PATCH v3 0/4] Zynq: Support more boards Soren Brinkmann
@ 2013-06-13 16:37 ` Soren Brinkmann
2013-06-13 16:37 ` [PATCH v3 2/4] arm: dt: zynq: Use 'status' property for UART nodes Soren Brinkmann
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Soren Brinkmann @ 2013-06-13 16:37 UTC (permalink / raw)
To: Michal Simek, Russell King, Steffen Trumtrar
Cc: Dinh Nguyen, Shawn Guo, Olof Johansson, linux-kernel,
linux-arm-kernel, Soren Brinkmann
It is not necessary to have board specific compatibility strings
in the platform code. The board dts files can use the more generic
'xlnx,zynq-7000' string.
Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
---
arch/arm/mach-zynq/common.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
index 5bfe703..7e3d5f4 100644
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@ -98,7 +98,6 @@ static void zynq_system_reset(char mode, const char *cmd)
}
static const char * const zynq_dt_match[] = {
- "xlnx,zynq-zc702",
"xlnx,zynq-7000",
NULL
};
--
1.8.3
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v3 2/4] arm: dt: zynq: Use 'status' property for UART nodes
2013-06-13 16:37 [PATCH v3 0/4] Zynq: Support more boards Soren Brinkmann
2013-06-13 16:37 ` [PATCH v3 1/4] arm: zynq: Remove board specific compatibility string Soren Brinkmann
@ 2013-06-13 16:37 ` Soren Brinkmann
2013-06-13 16:37 ` [PATCH v3 3/4] arm: dt: zynq: Add support for the zc706 platform Soren Brinkmann
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Soren Brinkmann @ 2013-06-13 16:37 UTC (permalink / raw)
To: Michal Simek, Russell King, Steffen Trumtrar
Cc: Dinh Nguyen, Shawn Guo, Olof Johansson, linux-kernel,
linux-arm-kernel, Soren Brinkmann
Set the default status for UARTs to disabled in the zynq-7000.dtsi file
and let board dts files enable the UARTs on demand.
Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
---
arch/arm/boot/dts/zynq-7000.dtsi | 2 ++
arch/arm/boot/dts/zynq-zc702.dts | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi
index 0dbee2c..6f54a64 100644
--- a/arch/arm/boot/dts/zynq-7000.dtsi
+++ b/arch/arm/boot/dts/zynq-7000.dtsi
@@ -49,6 +49,7 @@
uart0: uart@e0000000 {
compatible = "xlnx,xuartps";
+ status = "disabled";
clocks = <&clkc 23>, <&clkc 40>;
clock-names = "ref_clk", "aper_clk";
reg = <0xE0000000 0x1000>;
@@ -57,6 +58,7 @@
uart1: uart@e0001000 {
compatible = "xlnx,xuartps";
+ status = "disabled";
clocks = <&clkc 24>, <&clkc 41>;
clock-names = "ref_clk", "aper_clk";
reg = <0xE0001000 0x1000>;
diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts
index e25a307..21aea99 100644
--- a/arch/arm/boot/dts/zynq-zc702.dts
+++ b/arch/arm/boot/dts/zynq-zc702.dts
@@ -24,7 +24,11 @@
};
chosen {
- bootargs = "console=ttyPS1,115200 earlyprintk";
+ bootargs = "console=ttyPS0,115200 earlyprintk";
};
};
+
+&uart1 {
+ status = "okay";
+};
--
1.8.3
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v3 3/4] arm: dt: zynq: Add support for the zc706 platform
2013-06-13 16:37 [PATCH v3 0/4] Zynq: Support more boards Soren Brinkmann
2013-06-13 16:37 ` [PATCH v3 1/4] arm: zynq: Remove board specific compatibility string Soren Brinkmann
2013-06-13 16:37 ` [PATCH v3 2/4] arm: dt: zynq: Use 'status' property for UART nodes Soren Brinkmann
@ 2013-06-13 16:37 ` Soren Brinkmann
2013-06-13 16:37 ` [PATCH v3 4/4] arm: dt: zynq: Add support for the zed platform Soren Brinkmann
2013-06-17 8:02 ` [PATCH v3 0/4] Zynq: Support more boards Steffen Trumtrar
4 siblings, 0 replies; 6+ messages in thread
From: Soren Brinkmann @ 2013-06-13 16:37 UTC (permalink / raw)
To: Michal Simek, Russell King, Steffen Trumtrar
Cc: Dinh Nguyen, Shawn Guo, Olof Johansson, linux-kernel,
linux-arm-kernel, Soren Brinkmann
Add a DT fragment for the zc706 Zynq platform and a corresponding
target to the Makefile.
Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
---
v3:
- adding the 'status' override for the UART node
- changing the console device to ttyPS0
arch/arm/boot/dts/Makefile | 3 ++-
arch/arm/boot/dts/zynq-zc706.dts | 35 +++++++++++++++++++++++++++++++++++
2 files changed, 37 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/boot/dts/zynq-zc706.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index f0895c5..2823027 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -208,7 +208,8 @@ dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \
wm8505-ref.dtb \
wm8650-mid.dtb \
wm8850-w70v2.dtb
-dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb
+dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb \
+ zynq-zc706.dtb
targets += dtbs
targets += $(dtb-y)
diff --git a/arch/arm/boot/dts/zynq-zc706.dts b/arch/arm/boot/dts/zynq-zc706.dts
new file mode 100644
index 0000000..79009e0
--- /dev/null
+++ b/arch/arm/boot/dts/zynq-zc706.dts
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2011 Xilinx
+ * Copyright (C) 2012 National Instruments Corp.
+ * Copyright (C) 2013 Xilinx
+ *
+ * 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"
+
+/ {
+ model = "Zynq ZC706 Development Board";
+ compatible = "xlnx,zynq-zc706", "xlnx,zynq-7000";
+
+ memory {
+ device_type = "memory";
+ reg = <0 0x40000000>;
+ };
+
+ chosen {
+ bootargs = "console=ttyPS0,115200 earlyprintk";
+ };
+
+};
+
+&uart1 {
+ status = "okay";
+};
--
1.8.3
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v3 4/4] arm: dt: zynq: Add support for the zed platform
2013-06-13 16:37 [PATCH v3 0/4] Zynq: Support more boards Soren Brinkmann
` (2 preceding siblings ...)
2013-06-13 16:37 ` [PATCH v3 3/4] arm: dt: zynq: Add support for the zc706 platform Soren Brinkmann
@ 2013-06-13 16:37 ` Soren Brinkmann
2013-06-17 8:02 ` [PATCH v3 0/4] Zynq: Support more boards Steffen Trumtrar
4 siblings, 0 replies; 6+ messages in thread
From: Soren Brinkmann @ 2013-06-13 16:37 UTC (permalink / raw)
To: Michal Simek, Russell King, Steffen Trumtrar
Cc: Dinh Nguyen, Shawn Guo, Olof Johansson, linux-kernel,
linux-arm-kernel, Soren Brinkmann
Add a DT fragment for the Zed Zynq platform and a corresponding
target to the Makefile
Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
---
v3:
- adding the 'status' override for the UART node
- changing the console device to ttyPS0
- dropped 'xlnx,zynq-zed' compat string
arch/arm/boot/dts/Makefile | 3 ++-
arch/arm/boot/dts/zynq-zed.dts | 35 +++++++++++++++++++++++++++++++++++
2 files changed, 37 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/boot/dts/zynq-zed.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 2823027..1d4ff16 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -209,7 +209,8 @@ dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \
wm8650-mid.dtb \
wm8850-w70v2.dtb
dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb \
- zynq-zc706.dtb
+ zynq-zc706.dtb \
+ zynq-zed.dtb
targets += dtbs
targets += $(dtb-y)
diff --git a/arch/arm/boot/dts/zynq-zed.dts b/arch/arm/boot/dts/zynq-zed.dts
new file mode 100644
index 0000000..d6acf2b
--- /dev/null
+++ b/arch/arm/boot/dts/zynq-zed.dts
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2011 Xilinx
+ * Copyright (C) 2012 National Instruments Corp.
+ * Copyright (C) 2013 Xilinx
+ *
+ * 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"
+
+/ {
+ model = "Zynq Zed Development Board";
+ compatible = "xlnx,zynq-7000";
+
+ memory {
+ device_type = "memory";
+ reg = <0 0x20000000>;
+ };
+
+ chosen {
+ bootargs = "console=ttyPS0,115200 earlyprintk";
+ };
+
+};
+
+&uart1 {
+ status = "okay";
+};
--
1.8.3
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v3 0/4] Zynq: Support more boards
2013-06-13 16:37 [PATCH v3 0/4] Zynq: Support more boards Soren Brinkmann
` (3 preceding siblings ...)
2013-06-13 16:37 ` [PATCH v3 4/4] arm: dt: zynq: Add support for the zed platform Soren Brinkmann
@ 2013-06-17 8:02 ` Steffen Trumtrar
4 siblings, 0 replies; 6+ messages in thread
From: Steffen Trumtrar @ 2013-06-17 8:02 UTC (permalink / raw)
To: Soren Brinkmann
Cc: Michal Simek, Russell King, Dinh Nguyen, Shawn Guo,
Olof Johansson, linux-kernel, linux-arm-kernel
On Thu, Jun 13, 2013 at 09:37:14AM -0700, Soren Brinkmann wrote:
> Just another respin. Still depending on armsoc/zynq/clk
>
> Sören
>
> v3:
> - adding patch to use 'status' property for UART nodes
> - dropping board specific compat string in the Zed dts
>
> v2:
> - adding patch to remove board specific compat strings from the BSP
> - adding patch adding Zed support
>
> Soren Brinkmann (4):
> arm: zynq: Remove board specific compatibility string
> arm: dt: zynq: Use 'status' property for UART nodes
> arm: dt: zynq: Add support for the zc706 platform
> arm: dt: zynq: Add support for the zed platform
>
> arch/arm/boot/dts/Makefile | 4 +++-
> arch/arm/boot/dts/zynq-7000.dtsi | 2 ++
> arch/arm/boot/dts/zynq-zc702.dts | 6 +++++-
> arch/arm/boot/dts/zynq-zc706.dts | 35 +++++++++++++++++++++++++++++++++++
> arch/arm/boot/dts/zynq-zed.dts | 35 +++++++++++++++++++++++++++++++++++
> arch/arm/mach-zynq/common.c | 1 -
> 6 files changed, 80 insertions(+), 3 deletions(-)
> create mode 100644 arch/arm/boot/dts/zynq-zc706.dts
> create mode 100644 arch/arm/boot/dts/zynq-zed.dts
>
> --
> 1.8.3
>
>
Hi!
The series looks okay now:
Reviewed-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Regards,
Steffen
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 6+ messages in thread