All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] arm: dt: zynq: Add support for the zc706 platform
@ 2013-06-10 17:10 ` Soren Brinkmann
  0 siblings, 0 replies; 10+ messages in thread
From: Soren Brinkmann @ 2013-06-10 17:10 UTC (permalink / raw)
  To: Michal Simek, Russell King
  Cc: Shawn Guo, Olof Johansson, linux-kernel, linux-arm-kernel,
	Soren Brinkmann

Add a DT fragment for the zc706 Zynq platform. Also, adding a
corresponding target to the Makefile and adding an appropriate
compatibility string in the BSP.

Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
---
 arch/arm/boot/dts/Makefile       |  3 ++-
 arch/arm/boot/dts/zynq-zc706.dts | 31 +++++++++++++++++++++++++++++++
 arch/arm/mach-zynq/common.c      |  1 +
 3 files changed, 34 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 b9f7121..2aecf7e 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -206,7 +206,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..a8a1d7d
--- /dev/null
+++ b/arch/arm/boot/dts/zynq-zc706.dts
@@ -0,0 +1,31 @@
+/*
+ *  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 = <0x0 0x40000000>;
+	};
+
+	chosen {
+		bootargs = "console=ttyPS1,115200 earlyprintk";
+	};
+
+};
diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
index 5bfe703..221694b 100644
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@ -99,6 +99,7 @@ static void zynq_system_reset(char mode, const char *cmd)
 
 static const char * const zynq_dt_match[] = {
 	"xlnx,zynq-zc702",
+	"xlnx,zynq-zc706",
 	"xlnx,zynq-7000",
 	NULL
 };
-- 
1.8.3


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [PATCH] arm: dt: zynq: Add support for the zc706 platform
@ 2013-06-10 17:10 ` Soren Brinkmann
  0 siblings, 0 replies; 10+ messages in thread
From: Soren Brinkmann @ 2013-06-10 17:10 UTC (permalink / raw)
  To: linux-arm-kernel

Add a DT fragment for the zc706 Zynq platform. Also, adding a
corresponding target to the Makefile and adding an appropriate
compatibility string in the BSP.

Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
---
 arch/arm/boot/dts/Makefile       |  3 ++-
 arch/arm/boot/dts/zynq-zc706.dts | 31 +++++++++++++++++++++++++++++++
 arch/arm/mach-zynq/common.c      |  1 +
 3 files changed, 34 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 b9f7121..2aecf7e 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -206,7 +206,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..a8a1d7d
--- /dev/null
+++ b/arch/arm/boot/dts/zynq-zc706.dts
@@ -0,0 +1,31 @@
+/*
+ *  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 = <0x0 0x40000000>;
+	};
+
+	chosen {
+		bootargs = "console=ttyPS1,115200 earlyprintk";
+	};
+
+};
diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
index 5bfe703..221694b 100644
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@ -99,6 +99,7 @@ static void zynq_system_reset(char mode, const char *cmd)
 
 static const char * const zynq_dt_match[] = {
 	"xlnx,zynq-zc702",
+	"xlnx,zynq-zc706",
 	"xlnx,zynq-7000",
 	NULL
 };
-- 
1.8.3

^ permalink raw reply related	[flat|nested] 10+ messages in thread
* Re: [PATCH] arm: dt: zynq: Add support for the zc706 platform
  2013-06-10 17:10 ` Soren Brinkmann
@ 2013-06-10 17:13   ` Sören Brinkmann
  -1 siblings, 0 replies; 10+ messages in thread
From: Sören Brinkmann @ 2013-06-10 17:13 UTC (permalink / raw)
  To: Michal Simek, Russell King
  Cc: Shawn Guo, Olof Johansson, linux-kernel, linux-arm-kernel

On Mon, Jun 10, 2013 at 10:10:04AM -0700, Soren Brinkmann wrote:
> Add a DT fragment for the zc706 Zynq platform. Also, adding a
> corresponding target to the Makefile and adding an appropriate
> compatibility string in the BSP.
I forgot to mention: This patch depends on the branch armsoc/zynq/clk.

	Sören



^ permalink raw reply	[flat|nested] 10+ messages in thread
* [PATCH] arm: dt: zynq: Add support for the zc706 platform
@ 2013-06-10 17:13   ` Sören Brinkmann
  0 siblings, 0 replies; 10+ messages in thread
From: Sören Brinkmann @ 2013-06-10 17:13 UTC (permalink / raw)
  To: linux-arm-kernel

On Mon, Jun 10, 2013 at 10:10:04AM -0700, Soren Brinkmann wrote:
> Add a DT fragment for the zc706 Zynq platform. Also, adding a
> corresponding target to the Makefile and adding an appropriate
> compatibility string in the BSP.
I forgot to mention: This patch depends on the branch armsoc/zynq/clk.

	S?ren

^ permalink raw reply	[flat|nested] 10+ messages in thread
* Re: [PATCH] arm: dt: zynq: Add support for the zc706 platform
  2013-06-10 17:10 ` Soren Brinkmann
@ 2013-06-11 21:24   ` Dinh Nguyen
  -1 siblings, 0 replies; 10+ messages in thread
From: Dinh Nguyen @ 2013-06-11 21:24 UTC (permalink / raw)
  To: Soren Brinkmann
  Cc: Michal Simek, Russell King, Olof Johansson, Shawn Guo,
	linux-kernel, linux-arm-kernel

Hi Soren,

On Mon, 2013-06-10 at 10:10 -0700, Soren Brinkmann wrote:
> Add a DT fragment for the zc706 Zynq platform. Also, adding a
> corresponding target to the Makefile and adding an appropriate
> compatibility string in the BSP.
> 
> Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
> ---
>  arch/arm/boot/dts/Makefile       |  3 ++-
>  arch/arm/boot/dts/zynq-zc706.dts | 31 +++++++++++++++++++++++++++++++
>  arch/arm/mach-zynq/common.c      |  1 +
>  3 files changed, 34 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 b9f7121..2aecf7e 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -206,7 +206,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..a8a1d7d
> --- /dev/null
> +++ b/arch/arm/boot/dts/zynq-zc706.dts
> @@ -0,0 +1,31 @@
> +/*
> + *  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 = <0x0 0x40000000>;
> +	};
> +
> +	chosen {
> +		bootargs = "console=ttyPS1,115200 earlyprintk";
> +	};
> +
> +};
> diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
> index 5bfe703..221694b 100644
> --- a/arch/arm/mach-zynq/common.c
> +++ b/arch/arm/mach-zynq/common.c
> @@ -99,6 +99,7 @@ static void zynq_system_reset(char mode, const char *cmd)
>  
>  static const char * const zynq_dt_match[] = {
>  	"xlnx,zynq-zc702",
> +	"xlnx,zynq-zc706",

You really don't need to add zc706 here if it is already compatable with
zynq-7000.

Dinh
>  	"xlnx,zynq-7000",
>  	NULL
>  };




^ permalink raw reply	[flat|nested] 10+ messages in thread
* [PATCH] arm: dt: zynq: Add support for the zc706 platform
@ 2013-06-11 21:24   ` Dinh Nguyen
  0 siblings, 0 replies; 10+ messages in thread
From: Dinh Nguyen @ 2013-06-11 21:24 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Soren,

On Mon, 2013-06-10 at 10:10 -0700, Soren Brinkmann wrote:
> Add a DT fragment for the zc706 Zynq platform. Also, adding a
> corresponding target to the Makefile and adding an appropriate
> compatibility string in the BSP.
> 
> Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
> ---
>  arch/arm/boot/dts/Makefile       |  3 ++-
>  arch/arm/boot/dts/zynq-zc706.dts | 31 +++++++++++++++++++++++++++++++
>  arch/arm/mach-zynq/common.c      |  1 +
>  3 files changed, 34 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 b9f7121..2aecf7e 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -206,7 +206,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..a8a1d7d
> --- /dev/null
> +++ b/arch/arm/boot/dts/zynq-zc706.dts
> @@ -0,0 +1,31 @@
> +/*
> + *  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 = <0x0 0x40000000>;
> +	};
> +
> +	chosen {
> +		bootargs = "console=ttyPS1,115200 earlyprintk";
> +	};
> +
> +};
> diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
> index 5bfe703..221694b 100644
> --- a/arch/arm/mach-zynq/common.c
> +++ b/arch/arm/mach-zynq/common.c
> @@ -99,6 +99,7 @@ static void zynq_system_reset(char mode, const char *cmd)
>  
>  static const char * const zynq_dt_match[] = {
>  	"xlnx,zynq-zc702",
> +	"xlnx,zynq-zc706",

You really don't need to add zc706 here if it is already compatable with
zynq-7000.

Dinh
>  	"xlnx,zynq-7000",
>  	NULL
>  };

^ permalink raw reply	[flat|nested] 10+ messages in thread
* Re: [PATCH] arm: dt: zynq: Add support for the zc706 platform
  2013-06-11 21:24   ` Dinh Nguyen
@ 2013-06-11 21:28     ` Sören Brinkmann
  -1 siblings, 0 replies; 10+ messages in thread
From: Sören Brinkmann @ 2013-06-11 21:28 UTC (permalink / raw)
  To: Dinh Nguyen
  Cc: Michal Simek, Russell King, Olof Johansson, Shawn Guo,
	linux-kernel, linux-arm-kernel

On Tue, Jun 11, 2013 at 04:24:48PM -0500, Dinh Nguyen wrote:
> Hi Soren,
> 
> On Mon, 2013-06-10 at 10:10 -0700, Soren Brinkmann wrote:
> > Add a DT fragment for the zc706 Zynq platform. Also, adding a
> > corresponding target to the Makefile and adding an appropriate
> > compatibility string in the BSP.
> > 
> > Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
> > ---
> >  arch/arm/boot/dts/Makefile       |  3 ++-
> >  arch/arm/boot/dts/zynq-zc706.dts | 31 +++++++++++++++++++++++++++++++
> >  arch/arm/mach-zynq/common.c      |  1 +
> >  3 files changed, 34 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 b9f7121..2aecf7e 100644
> > --- a/arch/arm/boot/dts/Makefile
> > +++ b/arch/arm/boot/dts/Makefile
> > @@ -206,7 +206,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..a8a1d7d
> > --- /dev/null
> > +++ b/arch/arm/boot/dts/zynq-zc706.dts
> > @@ -0,0 +1,31 @@
> > +/*
> > + *  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 = <0x0 0x40000000>;
> > +	};
> > +
> > +	chosen {
> > +		bootargs = "console=ttyPS1,115200 earlyprintk";
> > +	};
> > +
> > +};
> > diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
> > index 5bfe703..221694b 100644
> > --- a/arch/arm/mach-zynq/common.c
> > +++ b/arch/arm/mach-zynq/common.c
> > @@ -99,6 +99,7 @@ static void zynq_system_reset(char mode, const char *cmd)
> >  
> >  static const char * const zynq_dt_match[] = {
> >  	"xlnx,zynq-zc702",
> > +	"xlnx,zynq-zc706",
> 
> You really don't need to add zc706 here if it is already compatable with
> zynq-7000.
I actually thought about this and decided to add it, since there already
was an entry for the zc702. What is the best methord for this cases?
Rather remove the specific ones and migrate all to the zynq-7000
compatibility string?

	Sören



^ permalink raw reply	[flat|nested] 10+ messages in thread
* [PATCH] arm: dt: zynq: Add support for the zc706 platform
@ 2013-06-11 21:28     ` Sören Brinkmann
  0 siblings, 0 replies; 10+ messages in thread
From: Sören Brinkmann @ 2013-06-11 21:28 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Jun 11, 2013 at 04:24:48PM -0500, Dinh Nguyen wrote:
> Hi Soren,
> 
> On Mon, 2013-06-10 at 10:10 -0700, Soren Brinkmann wrote:
> > Add a DT fragment for the zc706 Zynq platform. Also, adding a
> > corresponding target to the Makefile and adding an appropriate
> > compatibility string in the BSP.
> > 
> > Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
> > ---
> >  arch/arm/boot/dts/Makefile       |  3 ++-
> >  arch/arm/boot/dts/zynq-zc706.dts | 31 +++++++++++++++++++++++++++++++
> >  arch/arm/mach-zynq/common.c      |  1 +
> >  3 files changed, 34 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 b9f7121..2aecf7e 100644
> > --- a/arch/arm/boot/dts/Makefile
> > +++ b/arch/arm/boot/dts/Makefile
> > @@ -206,7 +206,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..a8a1d7d
> > --- /dev/null
> > +++ b/arch/arm/boot/dts/zynq-zc706.dts
> > @@ -0,0 +1,31 @@
> > +/*
> > + *  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 = <0x0 0x40000000>;
> > +	};
> > +
> > +	chosen {
> > +		bootargs = "console=ttyPS1,115200 earlyprintk";
> > +	};
> > +
> > +};
> > diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
> > index 5bfe703..221694b 100644
> > --- a/arch/arm/mach-zynq/common.c
> > +++ b/arch/arm/mach-zynq/common.c
> > @@ -99,6 +99,7 @@ static void zynq_system_reset(char mode, const char *cmd)
> >  
> >  static const char * const zynq_dt_match[] = {
> >  	"xlnx,zynq-zc702",
> > +	"xlnx,zynq-zc706",
> 
> You really don't need to add zc706 here if it is already compatable with
> zynq-7000.
I actually thought about this and decided to add it, since there already
was an entry for the zc702. What is the best methord for this cases?
Rather remove the specific ones and migrate all to the zynq-7000
compatibility string?

	S?ren

^ permalink raw reply	[flat|nested] 10+ messages in thread
* Re: [PATCH] arm: dt: zynq: Add support for the zc706 platform
  2013-06-11 21:28     ` Sören Brinkmann
@ 2013-06-12  7:46       ` Michal Simek
  -1 siblings, 0 replies; 10+ messages in thread
From: Michal Simek @ 2013-06-12  7:46 UTC (permalink / raw)
  To: Sören Brinkmann
  Cc: Dinh Nguyen, Michal Simek, Russell King, Olof Johansson,
	Shawn Guo, linux-kernel, linux-arm-kernel

[-- Attachment #1: Type: text/plain, Size: 3620 bytes --]

On 06/11/2013 11:28 PM, Sören Brinkmann wrote:
> On Tue, Jun 11, 2013 at 04:24:48PM -0500, Dinh Nguyen wrote:
>> Hi Soren,
>>
>> On Mon, 2013-06-10 at 10:10 -0700, Soren Brinkmann wrote:
>>> Add a DT fragment for the zc706 Zynq platform. Also, adding a
>>> corresponding target to the Makefile and adding an appropriate
>>> compatibility string in the BSP.
>>>
>>> Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
>>> ---
>>>  arch/arm/boot/dts/Makefile       |  3 ++-
>>>  arch/arm/boot/dts/zynq-zc706.dts | 31 +++++++++++++++++++++++++++++++
>>>  arch/arm/mach-zynq/common.c      |  1 +
>>>  3 files changed, 34 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 b9f7121..2aecf7e 100644
>>> --- a/arch/arm/boot/dts/Makefile
>>> +++ b/arch/arm/boot/dts/Makefile
>>> @@ -206,7 +206,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..a8a1d7d
>>> --- /dev/null
>>> +++ b/arch/arm/boot/dts/zynq-zc706.dts
>>> @@ -0,0 +1,31 @@
>>> +/*
>>> + *  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 = <0x0 0x40000000>;
>>> +	};
>>> +
>>> +	chosen {
>>> +		bootargs = "console=ttyPS1,115200 earlyprintk";
>>> +	};
>>> +
>>> +};
>>> diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
>>> index 5bfe703..221694b 100644
>>> --- a/arch/arm/mach-zynq/common.c
>>> +++ b/arch/arm/mach-zynq/common.c
>>> @@ -99,6 +99,7 @@ static void zynq_system_reset(char mode, const char *cmd)
>>>  
>>>  static const char * const zynq_dt_match[] = {
>>>  	"xlnx,zynq-zc702",
>>> +	"xlnx,zynq-zc706",
>>
>> You really don't need to add zc706 here if it is already compatable with
>> zynq-7000.
> I actually thought about this and decided to add it, since there already
> was an entry for the zc702. What is the best methord for this cases?
> Rather remove the specific ones and migrate all to the zynq-7000
> compatibility string?

Please remove zc702 compatibility string from common.c and
don't add zc706.

Thanks,
Michal

-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform



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

^ permalink raw reply	[flat|nested] 10+ messages in thread
* [PATCH] arm: dt: zynq: Add support for the zc706 platform
@ 2013-06-12  7:46       ` Michal Simek
  0 siblings, 0 replies; 10+ messages in thread
From: Michal Simek @ 2013-06-12  7:46 UTC (permalink / raw)
  To: linux-arm-kernel

On 06/11/2013 11:28 PM, S?ren Brinkmann wrote:
> On Tue, Jun 11, 2013 at 04:24:48PM -0500, Dinh Nguyen wrote:
>> Hi Soren,
>>
>> On Mon, 2013-06-10 at 10:10 -0700, Soren Brinkmann wrote:
>>> Add a DT fragment for the zc706 Zynq platform. Also, adding a
>>> corresponding target to the Makefile and adding an appropriate
>>> compatibility string in the BSP.
>>>
>>> Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
>>> ---
>>>  arch/arm/boot/dts/Makefile       |  3 ++-
>>>  arch/arm/boot/dts/zynq-zc706.dts | 31 +++++++++++++++++++++++++++++++
>>>  arch/arm/mach-zynq/common.c      |  1 +
>>>  3 files changed, 34 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 b9f7121..2aecf7e 100644
>>> --- a/arch/arm/boot/dts/Makefile
>>> +++ b/arch/arm/boot/dts/Makefile
>>> @@ -206,7 +206,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..a8a1d7d
>>> --- /dev/null
>>> +++ b/arch/arm/boot/dts/zynq-zc706.dts
>>> @@ -0,0 +1,31 @@
>>> +/*
>>> + *  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 = <0x0 0x40000000>;
>>> +	};
>>> +
>>> +	chosen {
>>> +		bootargs = "console=ttyPS1,115200 earlyprintk";
>>> +	};
>>> +
>>> +};
>>> diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
>>> index 5bfe703..221694b 100644
>>> --- a/arch/arm/mach-zynq/common.c
>>> +++ b/arch/arm/mach-zynq/common.c
>>> @@ -99,6 +99,7 @@ static void zynq_system_reset(char mode, const char *cmd)
>>>  
>>>  static const char * const zynq_dt_match[] = {
>>>  	"xlnx,zynq-zc702",
>>> +	"xlnx,zynq-zc706",
>>
>> You really don't need to add zc706 here if it is already compatable with
>> zynq-7000.
> I actually thought about this and decided to add it, since there already
> was an entry for the zc702. What is the best methord for this cases?
> Rather remove the specific ones and migrate all to the zynq-7000
> compatibility string?

Please remove zc702 compatibility string from common.c and
don't add zc706.

Thanks,
Michal

-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 263 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130612/c5698226/attachment.sig>

^ permalink raw reply	[flat|nested] 10+ messages in thread
end of thread, other threads:[~2013-06-12  7:46 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-06-10 17:10 [PATCH] arm: dt: zynq: Add support for the zc706 platform Soren Brinkmann
2013-06-10 17:10 ` Soren Brinkmann
2013-06-10 17:13 ` Sören Brinkmann
2013-06-10 17:13   ` Sören Brinkmann
2013-06-11 21:24 ` Dinh Nguyen
2013-06-11 21:24   ` Dinh Nguyen
2013-06-11 21:28   ` Sören Brinkmann
2013-06-11 21:28     ` Sören Brinkmann
2013-06-12  7:46     ` Michal Simek
2013-06-12  7:46       ` Michal Simek

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.