[PATCH v2 2/2] ARM: zynq: Use memcpy_toio instead of memcpy on smp bring-up
This fixes a kernel panic on memcpy when
FORTIFY_SOURCE is enabled.
The initial smp implementation on commit aa7eb2bb4e4a
("arm: zynq: Add smp support")
used memcpy, which worked fine until commit ee333554fed5
("ARM: 8749/1: Kconfig: Add ARCH_HAS_FORTIFY_SOURCE")
enabled overflow checks at runtime, producing a read
overflow panic.
The computed size of memcpy args are:
- p_size (dst): 4294967295 = (size_t) -1
- q_size (src): 1
- size (len): 8
Additionally, the memory is marked as __iomem, so one of
the memcpy_* functions should be used for read/write.
Fixes: aa7eb2bb4e4a ("arm: zynq: Add smp support")
Signed-off-by: Luis Araneda
Cc: sta...@vger.kernel.org
---
Changes:
v1 -> v2:
- Reword commit message to include related commits
- Add Fixes tag
- Add Cc to stable
---
arch/arm/mach-zynq/platsmp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-zynq/platsmp.c b/arch/arm/mach-zynq/platsmp.c
index 38728badabd4..a10085be9073 100644
--- a/arch/arm/mach-zynq/platsmp.c
+++ b/arch/arm/mach-zynq/platsmp.c
@@ -57,7 +57,7 @@ int zynq_cpun_start(u32 address, int cpu)
* 0x4: Jump by mov instruction
* 0x8: Jumping address
*/
- memcpy((__force void *)zero, _secondary_trampoline,
+ memcpy_toio(zero, _secondary_trampoline,
trampoline_size);
writel(address, zero + trampoline_size);
--
2.22.0
[PATCH v2 1/2] ARM: zynq: support smp in thumb mode
Add .arm directive to headsmp.S to ensure that the
CPU starts in 32-bit ARM mode and the correct code
size is copied on smp bring-up.
This is related to the fix applied to SoCFPGA by
commit 5616f36713ea
("ARM: SoCFPGA: Fix secondary CPU startup in thumb2 kernel")
Additionally, start secondary CPUs on secondary_startup_arm
to automatically switch from ARM to thumb on a thumb kernel
Signed-off-by: Luis Araneda
Suggested-by: Michal Simek
---
Changes:
v1 -> v2:
- Reword commit message to include related commits
---
arch/arm/mach-zynq/headsmp.S | 2 ++
arch/arm/mach-zynq/platsmp.c | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-zynq/headsmp.S b/arch/arm/mach-zynq/headsmp.S
index ab85003cf9ad..3449e0d1f990 100644
--- a/arch/arm/mach-zynq/headsmp.S
+++ b/arch/arm/mach-zynq/headsmp.S
@@ -7,6 +7,8 @@
#include
#include
+ .arm
+
ENTRY(zynq_secondary_trampoline)
ARM_BE8(setend be) @ ensure we are in BE8 mode
ldr r0, zynq_secondary_trampoline_jump
diff --git a/arch/arm/mach-zynq/platsmp.c b/arch/arm/mach-zynq/platsmp.c
index a7cfe07156f4..38728badabd4 100644
--- a/arch/arm/mach-zynq/platsmp.c
+++ b/arch/arm/mach-zynq/platsmp.c
@@ -81,7 +81,7 @@ EXPORT_SYMBOL(zynq_cpun_start);
static int zynq_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
- return zynq_cpun_start(__pa_symbol(secondary_startup), cpu);
+ return zynq_cpun_start(__pa_symbol(secondary_startup_arm), cpu);
}
/*
--
2.22.0
[PATCH v2 0/2] ARM: zynq: smp improvements
This series adds support for kernel compiled in Thumb mode and fixes a kernel panic on smp bring-up when FORTIFY_SOURCE is enabled. The series started with the second patch as an RFC, and the first patch were suggested on the review to complement the fix. The changes were run-tested on a Digilent Zybo Z7 board --- Changes: v1 -> v2: - Reword commit messages to include related commits - Add Fixes tag to relevant commits - Add Cc to stable to relevant commits Luis Araneda (2): ARM: zynq: support smp in thumb mode ARM: zynq: Use memcpy_toio instead of memcpy on smp bring-up arch/arm/mach-zynq/headsmp.S | 2 ++ arch/arm/mach-zynq/platsmp.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) -- 2.22.0
Re: [PATCH 2/2] ARM: zynq: Use memcpy_toio instead of memcpy on smp bring-up
Hi Michal, On Tue, Aug 6, 2019 at 2:42 AM Michal Simek wrote: > On 06. 08. 19 5:07, Luis Araneda wrote: > > This fixes a kernel panic (read overflow) on memcpy when > > FORTIFY_SOURCE is enabled. > > > > The computed size of memcpy args are: > > - p_size (dst): 4294967295 = (size_t) -1 > > - q_size (src): 1 > > - size (len): 8 > > > > Additionally, the memory is marked as __iomem, so one of > > the memcpy_* functions should be used for read/write > > > > Signed-off-by: Luis Araneda [...] > I would consider this one as stable material. Please also add there link > to the patch which this patch fixes. I'm dropping stable CC (for now), as I'm not sure I completely understood the process for inclusion in stable trees. Do I have to wait for the patch to be on Linus' tree before CCing stable? As for the link which this patch fixes, you mean aa7eb2bb4e4a22e41bbe4612ff46e5885b13c33e (arm: zynq: Add smp support)? where you added SMP support for zynq. Thanks, Luis Araneda.
Re: [PATCH 1/2] ARM: zynq: support smp in thumb mode
Hi, On Tue, Aug 6, 2019 at 2:39 AM Michal Simek wrote: > > On 06. 08. 19 5:07, Luis Araneda wrote: > > Add .arm directive to headsmp.S to ensure that the > > CPU starts in 32-bit ARM mode and the correct code > > size is copied on smp bring-up > > > > Additionally, start secondary CPUs on secondary_startup_arm > > to automatically switch from ARM to thumb on a thumb kernel [...] > > It is really a question if this should go to stable tree. It is pretty > much new feature. > Will be good to also add link to similar patch for example this one > 5616f36713ea77f57ae908bf2fef641364403c9f. Ok, I'm dropping stable from CC. From the previous comments, I thought that the two patches were part of the same fix, but now I realized this is a feature rather than a fix. Michal, do you want a new version with the link to the similar patch or would you take it in its current form? Thanks, Luis Araneda.
[PATCH 2/2] ARM: zynq: Use memcpy_toio instead of memcpy on smp bring-up
This fixes a kernel panic (read overflow) on memcpy when FORTIFY_SOURCE is enabled. The computed size of memcpy args are: - p_size (dst): 4294967295 = (size_t) -1 - q_size (src): 1 - size (len): 8 Additionally, the memory is marked as __iomem, so one of the memcpy_* functions should be used for read/write Signed-off-by: Luis Araneda --- arch/arm/mach-zynq/platsmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-zynq/platsmp.c b/arch/arm/mach-zynq/platsmp.c index 38728badabd4..a10085be9073 100644 --- a/arch/arm/mach-zynq/platsmp.c +++ b/arch/arm/mach-zynq/platsmp.c @@ -57,7 +57,7 @@ int zynq_cpun_start(u32 address, int cpu) * 0x4: Jump by mov instruction * 0x8: Jumping address */ - memcpy((__force void *)zero, _secondary_trampoline, + memcpy_toio(zero, _secondary_trampoline, trampoline_size); writel(address, zero + trampoline_size); -- 2.22.0
[PATCH 0/2] ARM: zynq: smp improvements
This series adds support for kernel compiled in Thumb mode and fixes a kernel panic on smp bring-up when FORTIFY_SOURCE is enabled. The series started with the second patch as an RFC, and the first patch were suggested on the review to complement the fix. The changes were run-tested on a Digilent Zybo Z7 board Luis Araneda (2): ARM: zynq: support smp in thumb mode ARM: zynq: Use memcpy_toio instead of memcpy on smp bring-up arch/arm/mach-zynq/headsmp.S | 2 ++ arch/arm/mach-zynq/platsmp.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) -- 2.22.0
[PATCH 1/2] ARM: zynq: support smp in thumb mode
Add .arm directive to headsmp.S to ensure that the
CPU starts in 32-bit ARM mode and the correct code
size is copied on smp bring-up
Additionally, start secondary CPUs on secondary_startup_arm
to automatically switch from ARM to thumb on a thumb kernel
Suggested-by: Michal Simek
Signed-off-by: Luis Araneda
---
arch/arm/mach-zynq/headsmp.S | 2 ++
arch/arm/mach-zynq/platsmp.c | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-zynq/headsmp.S b/arch/arm/mach-zynq/headsmp.S
index ab85003cf9ad..3449e0d1f990 100644
--- a/arch/arm/mach-zynq/headsmp.S
+++ b/arch/arm/mach-zynq/headsmp.S
@@ -7,6 +7,8 @@
#include
#include
+ .arm
+
ENTRY(zynq_secondary_trampoline)
ARM_BE8(setend be) @ ensure we are in BE8 mode
ldr r0, zynq_secondary_trampoline_jump
diff --git a/arch/arm/mach-zynq/platsmp.c b/arch/arm/mach-zynq/platsmp.c
index a7cfe07156f4..38728badabd4 100644
--- a/arch/arm/mach-zynq/platsmp.c
+++ b/arch/arm/mach-zynq/platsmp.c
@@ -81,7 +81,7 @@ EXPORT_SYMBOL(zynq_cpun_start);
static int zynq_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
- return zynq_cpun_start(__pa_symbol(secondary_startup), cpu);
+ return zynq_cpun_start(__pa_symbol(secondary_startup_arm), cpu);
}
/*
--
2.22.0
Re: [RFC PATCH] ARM: zynq: Use memcpy_toio instead of memcpy on smp bring-up
Hi Michal, Thanks for the review. On Mon, Aug 5, 2019 at 5:53 AM Michal Simek wrote: > > On 31. 07. 19 6:12, Luis Araneda wrote: > > Hi Russell, > > > > Thanks for reviewing. > > > > On Tue, Jul 30, 2019 at 6:47 AM Russell King - ARM Linux admin > > wrote: > >> > >> On Tue, Jul 30, 2019 at 12:43:26AM -0400, Luis Araneda wrote: > >>> This fixes a kernel panic (read overflow) on memcpy when > >>> FORTIFY_SOURCE is enabled. > > [...] > >> > >> I'm not convinced that this is correct. It looks like > >> zynq_secondary_trampoline could be either ARM or Thumb code - there is > >> no .arm directive before it. If it's ARM code, then this is fine. If > >> Thumb code, then zynq_secondary_trampoline will be offset by one, and > >> we will miss copying the first byte of code. > > > > You're right, I tested what happens if the zynq_secondary_trampoline > > is ARM or Thumb by editing the file where it's defined, headsmp.S > > > > When the .arm directive is used, the CPU is brought-up correctly, > > but if I use .thumb, I get the following message (no panic): > >> CPU1: failed to come online > > > > This seems unrelated to solving the panic, as the message > > even appears with memcpy and FORTIFY_SOURCE disabled. > > > > I could add the .arm directive to headsmp.S > > Is that your expected solution? > > Should that change be on a separate commit? > > > > I'd like to know Michal's opinion, as he wrote the code. > > > > There are two things together. Thanks Russel to pointing to it. > 1. How to support SMP in thumb2 mode? > Adding .arm mode to headsmp.S which ensure that cpu starts in proper > mode and correct code size is copied. > And also point to secondary_startup_arm in zynq_boot_secondary to switch > cpu from arm to thumb mode. > > 2. And the second is this patch to fix FORTIFY_SOURCE. > > Feel free to create the first patch too or I will do it myself. I'll be sending the two patches as a series (I already tested that they work), so they can be picked by the stable trees. Thanks, Luis Araneda.
Re: [RFC PATCH] ARM: zynq: Use memcpy_toio instead of memcpy on smp bring-up
Hi Russell, Thanks for reviewing. On Tue, Jul 30, 2019 at 6:47 AM Russell King - ARM Linux admin wrote: > > On Tue, Jul 30, 2019 at 12:43:26AM -0400, Luis Araneda wrote: > > This fixes a kernel panic (read overflow) on memcpy when > > FORTIFY_SOURCE is enabled. [...] > > I'm not convinced that this is correct. It looks like > zynq_secondary_trampoline could be either ARM or Thumb code - there is > no .arm directive before it. If it's ARM code, then this is fine. If > Thumb code, then zynq_secondary_trampoline will be offset by one, and > we will miss copying the first byte of code. You're right, I tested what happens if the zynq_secondary_trampoline is ARM or Thumb by editing the file where it's defined, headsmp.S When the .arm directive is used, the CPU is brought-up correctly, but if I use .thumb, I get the following message (no panic): > CPU1: failed to come online This seems unrelated to solving the panic, as the message even appears with memcpy and FORTIFY_SOURCE disabled. I could add the .arm directive to headsmp.S Is that your expected solution? Should that change be on a separate commit? I'd like to know Michal's opinion, as he wrote the code.
[RFC PATCH] ARM: zynq: Use memcpy_toio instead of memcpy on smp bring-up
This fixes a kernel panic (read overflow) on memcpy when FORTIFY_SOURCE is enabled. The computed size of memcpy args are: - p_size (dst): 4294967295 = (size_t) -1 - q_size (src): 1 - size (len): 8 Additionally, the memory is marked as __iomem, so one of the memcpy_* functions should be used for read/write Signed-off-by: Luis Araneda --- For anyone trying to reproduce / debug this, it panics before the console has any output. I used JTAG to find the panic, but I had to comment-out the call to "zynq_slcr_cpu_stop" as it stops the JTAG interface and the connection is dropped, at least with OpenOCD. I run-tested this on a Digilent Zybo Z7 board --- arch/arm/mach-zynq/platsmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-zynq/platsmp.c b/arch/arm/mach-zynq/platsmp.c index a7cfe07156f4..407abade7336 100644 --- a/arch/arm/mach-zynq/platsmp.c +++ b/arch/arm/mach-zynq/platsmp.c @@ -57,7 +57,7 @@ int zynq_cpun_start(u32 address, int cpu) * 0x4: Jump by mov instruction * 0x8: Jumping address */ - memcpy((__force void *)zero, _secondary_trampoline, + memcpy_toio(zero, _secondary_trampoline, trampoline_size); writel(address, zero + trampoline_size); -- 2.22.0
[PATCH v3 6/6] dt-bindings: xilinx: zynq: Add missing boards
The bindings were missing when the device-tree files were added Signed-off-by: Luis Araneda --- .../devicetree/bindings/arm/xilinx.txt | 17 + 1 file changed, 17 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/xilinx.txt b/Documentation/devicetree/bindings/arm/xilinx.txt index d1a6deac90b5..26fe5ecc4332 100644 --- a/Documentation/devicetree/bindings/arm/xilinx.txt +++ b/Documentation/devicetree/bindings/arm/xilinx.txt @@ -11,12 +11,29 @@ Additional compatible strings: - Adapteva Parallella board "adapteva,parallella" +- Avnet MicroZed board + "avnet,zynq-microzed" + "xlnx,zynq-microzed" + +- Avnet ZedBoard board + "avnet,zynq-zed" + "xlnx,zynq-zed" + +- Digilent Zybo board + "digilent,zynq-zybo" + - Digilent Zybo Z7 board "digilent,zynq-zybo-z7" - Xilinx CC108 internal board "xlnx,zynq-cc108" +- Xilinx ZC702 internal board + "xlnx,zynq-zc702" + +- Xilinx ZC706 internal board + "xlnx,zynq-zc706" + - Xilinx ZC770 internal board, with different FMC cards "xlnx,zynq-zc770-xm010" "xlnx,zynq-zc770-xm011" -- 2.18.0
[PATCH v3 5/6] dt-bindings: Move Paralella board to Xilinx
Move the Adapteva Parallela board to Xilinx dt-bindings, as it's based on a Zynq SoC from Xilinx Signed-off-by: Luis Araneda --- Documentation/devicetree/bindings/arm/adapteva.txt | 7 --- Documentation/devicetree/bindings/arm/xilinx.txt | 3 +++ 2 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 Documentation/devicetree/bindings/arm/adapteva.txt diff --git a/Documentation/devicetree/bindings/arm/adapteva.txt b/Documentation/devicetree/bindings/arm/adapteva.txt deleted file mode 100644 index 1d8af9e36065.. --- a/Documentation/devicetree/bindings/arm/adapteva.txt +++ /dev/null @@ -1,7 +0,0 @@ -Adapteva Platforms Device Tree Bindings - -Parallella board - -Required root node properties: -- compatible = "adapteva,parallella"; diff --git a/Documentation/devicetree/bindings/arm/xilinx.txt b/Documentation/devicetree/bindings/arm/xilinx.txt index a8e70a794d2e..d1a6deac90b5 100644 --- a/Documentation/devicetree/bindings/arm/xilinx.txt +++ b/Documentation/devicetree/bindings/arm/xilinx.txt @@ -8,6 +8,9 @@ Required root node properties: Additional compatible strings: +- Adapteva Parallella board + "adapteva,parallella" + - Digilent Zybo Z7 board "digilent,zynq-zybo-z7" -- 2.18.0
[PATCH v3 6/6] dt-bindings: xilinx: zynq: Add missing boards
The bindings were missing when the device-tree files were added Signed-off-by: Luis Araneda --- .../devicetree/bindings/arm/xilinx.txt | 17 + 1 file changed, 17 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/xilinx.txt b/Documentation/devicetree/bindings/arm/xilinx.txt index d1a6deac90b5..26fe5ecc4332 100644 --- a/Documentation/devicetree/bindings/arm/xilinx.txt +++ b/Documentation/devicetree/bindings/arm/xilinx.txt @@ -11,12 +11,29 @@ Additional compatible strings: - Adapteva Parallella board "adapteva,parallella" +- Avnet MicroZed board + "avnet,zynq-microzed" + "xlnx,zynq-microzed" + +- Avnet ZedBoard board + "avnet,zynq-zed" + "xlnx,zynq-zed" + +- Digilent Zybo board + "digilent,zynq-zybo" + - Digilent Zybo Z7 board "digilent,zynq-zybo-z7" - Xilinx CC108 internal board "xlnx,zynq-cc108" +- Xilinx ZC702 internal board + "xlnx,zynq-zc702" + +- Xilinx ZC706 internal board + "xlnx,zynq-zc706" + - Xilinx ZC770 internal board, with different FMC cards "xlnx,zynq-zc770-xm010" "xlnx,zynq-zc770-xm011" -- 2.18.0
[PATCH v3 5/6] dt-bindings: Move Paralella board to Xilinx
Move the Adapteva Parallela board to Xilinx dt-bindings, as it's based on a Zynq SoC from Xilinx Signed-off-by: Luis Araneda --- Documentation/devicetree/bindings/arm/adapteva.txt | 7 --- Documentation/devicetree/bindings/arm/xilinx.txt | 3 +++ 2 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 Documentation/devicetree/bindings/arm/adapteva.txt diff --git a/Documentation/devicetree/bindings/arm/adapteva.txt b/Documentation/devicetree/bindings/arm/adapteva.txt deleted file mode 100644 index 1d8af9e36065.. --- a/Documentation/devicetree/bindings/arm/adapteva.txt +++ /dev/null @@ -1,7 +0,0 @@ -Adapteva Platforms Device Tree Bindings - -Parallella board - -Required root node properties: -- compatible = "adapteva,parallella"; diff --git a/Documentation/devicetree/bindings/arm/xilinx.txt b/Documentation/devicetree/bindings/arm/xilinx.txt index a8e70a794d2e..d1a6deac90b5 100644 --- a/Documentation/devicetree/bindings/arm/xilinx.txt +++ b/Documentation/devicetree/bindings/arm/xilinx.txt @@ -8,6 +8,9 @@ Required root node properties: Additional compatible strings: +- Adapteva Parallella board + "adapteva,parallella" + - Digilent Zybo Z7 board "digilent,zynq-zybo-z7" -- 2.18.0
[PATCH v3 0/6] arm: dts: zynq: improvements and cleanup
This series attempts to standardize device naming and improve its information for better identification The values of the "compatible" and "model" device-tree properties are corrected for some devices, adding complementary information when necessary Changes since v2: - Split dt-bindings patch (too many changes) - Apply dts patches first (reorder) Changes since v1 (RFC): - Add values to compatible property instead of replacing them - Don't remove "internal" word from Xilinx boards on dt-bindings - Migrate content of adapteva dt-binding file into Xilinx's - Sort additional compatible strings alphabetically by manufacturer - Dropped patch that renamed the zedboard development board (no apparent benefit) - Dropped the patch that removed the "zynq" value from the compatible strings (breaks the ABI) Luis Araneda (6): arm: dts: zynq: Set correct manufacturer for ZedBoard and MicroZed boards arm: dts: zynq: correct and improve the model property of dt files dt-bindings: xilinx: zynq: Improve boards description dt-bindings: xilinx: zynq: Sort entries alphabetically dt-bindings: Move Paralella board to Xilinx dt-bindings: xilinx: zynq: Add missing boards .../devicetree/bindings/arm/adapteva.txt | 7 - .../devicetree/bindings/arm/xilinx.txt| 30 +++ arch/arm/boot/dts/zynq-cc108.dts | 2 +- arch/arm/boot/dts/zynq-microzed.dts | 4 +-- arch/arm/boot/dts/zynq-parallella.dts | 2 +- arch/arm/boot/dts/zynq-zc702.dts | 2 +- arch/arm/boot/dts/zynq-zc706.dts | 2 +- arch/arm/boot/dts/zynq-zc770-xm010.dts| 2 +- arch/arm/boot/dts/zynq-zc770-xm011.dts| 2 +- arch/arm/boot/dts/zynq-zc770-xm012.dts| 2 +- arch/arm/boot/dts/zynq-zc770-xm013.dts| 2 +- arch/arm/boot/dts/zynq-zed.dts| 4 +-- arch/arm/boot/dts/zynq-zybo-z7.dts| 2 +- arch/arm/boot/dts/zynq-zybo.dts | 2 +- 14 files changed, 39 insertions(+), 26 deletions(-) delete mode 100644 Documentation/devicetree/bindings/arm/adapteva.txt -- 2.18.0
[PATCH v3 4/6] dt-bindings: xilinx: zynq: Sort entries alphabetically
Sort additional compatible strings (boards) alphabetically by their manufacturer and model number This will help when finding a board because they will be grouped by their manufacturer Signed-off-by: Luis Araneda --- Documentation/devicetree/bindings/arm/xilinx.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/xilinx.txt b/Documentation/devicetree/bindings/arm/xilinx.txt index 4f1759b2bea7..a8e70a794d2e 100644 --- a/Documentation/devicetree/bindings/arm/xilinx.txt +++ b/Documentation/devicetree/bindings/arm/xilinx.txt @@ -8,6 +8,9 @@ Required root node properties: Additional compatible strings: +- Digilent Zybo Z7 board + "digilent,zynq-zybo-z7" + - Xilinx CC108 internal board "xlnx,zynq-cc108" @@ -17,9 +20,6 @@ Additional compatible strings: "xlnx,zynq-zc770-xm012" "xlnx,zynq-zc770-xm013" -- Digilent Zybo Z7 board - "digilent,zynq-zybo-z7" - --- Xilinx Zynq UltraScale+ MPSoC Platforms Device Tree Bindings -- 2.18.0
[PATCH v3 0/6] arm: dts: zynq: improvements and cleanup
This series attempts to standardize device naming and improve its information for better identification The values of the "compatible" and "model" device-tree properties are corrected for some devices, adding complementary information when necessary Changes since v2: - Split dt-bindings patch (too many changes) - Apply dts patches first (reorder) Changes since v1 (RFC): - Add values to compatible property instead of replacing them - Don't remove "internal" word from Xilinx boards on dt-bindings - Migrate content of adapteva dt-binding file into Xilinx's - Sort additional compatible strings alphabetically by manufacturer - Dropped patch that renamed the zedboard development board (no apparent benefit) - Dropped the patch that removed the "zynq" value from the compatible strings (breaks the ABI) Luis Araneda (6): arm: dts: zynq: Set correct manufacturer for ZedBoard and MicroZed boards arm: dts: zynq: correct and improve the model property of dt files dt-bindings: xilinx: zynq: Improve boards description dt-bindings: xilinx: zynq: Sort entries alphabetically dt-bindings: Move Paralella board to Xilinx dt-bindings: xilinx: zynq: Add missing boards .../devicetree/bindings/arm/adapteva.txt | 7 - .../devicetree/bindings/arm/xilinx.txt| 30 +++ arch/arm/boot/dts/zynq-cc108.dts | 2 +- arch/arm/boot/dts/zynq-microzed.dts | 4 +-- arch/arm/boot/dts/zynq-parallella.dts | 2 +- arch/arm/boot/dts/zynq-zc702.dts | 2 +- arch/arm/boot/dts/zynq-zc706.dts | 2 +- arch/arm/boot/dts/zynq-zc770-xm010.dts| 2 +- arch/arm/boot/dts/zynq-zc770-xm011.dts| 2 +- arch/arm/boot/dts/zynq-zc770-xm012.dts| 2 +- arch/arm/boot/dts/zynq-zc770-xm013.dts| 2 +- arch/arm/boot/dts/zynq-zed.dts| 4 +-- arch/arm/boot/dts/zynq-zybo-z7.dts| 2 +- arch/arm/boot/dts/zynq-zybo.dts | 2 +- 14 files changed, 39 insertions(+), 26 deletions(-) delete mode 100644 Documentation/devicetree/bindings/arm/adapteva.txt -- 2.18.0
[PATCH v3 4/6] dt-bindings: xilinx: zynq: Sort entries alphabetically
Sort additional compatible strings (boards) alphabetically by their manufacturer and model number This will help when finding a board because they will be grouped by their manufacturer Signed-off-by: Luis Araneda --- Documentation/devicetree/bindings/arm/xilinx.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/xilinx.txt b/Documentation/devicetree/bindings/arm/xilinx.txt index 4f1759b2bea7..a8e70a794d2e 100644 --- a/Documentation/devicetree/bindings/arm/xilinx.txt +++ b/Documentation/devicetree/bindings/arm/xilinx.txt @@ -8,6 +8,9 @@ Required root node properties: Additional compatible strings: +- Digilent Zybo Z7 board + "digilent,zynq-zybo-z7" + - Xilinx CC108 internal board "xlnx,zynq-cc108" @@ -17,9 +20,6 @@ Additional compatible strings: "xlnx,zynq-zc770-xm012" "xlnx,zynq-zc770-xm013" -- Digilent Zybo Z7 board - "digilent,zynq-zybo-z7" - --- Xilinx Zynq UltraScale+ MPSoC Platforms Device Tree Bindings -- 2.18.0
[PATCH v3 3/6] dt-bindings: xilinx: zynq: Improve boards description
Change the description of some boards to make it similar to the value of the model property from their respective device-tree, using the format " " Signed-off-by: Luis Araneda --- Documentation/devicetree/bindings/arm/xilinx.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/xilinx.txt b/Documentation/devicetree/bindings/arm/xilinx.txt index b9043bc35c14..4f1759b2bea7 100644 --- a/Documentation/devicetree/bindings/arm/xilinx.txt +++ b/Documentation/devicetree/bindings/arm/xilinx.txt @@ -8,10 +8,10 @@ Required root node properties: Additional compatible strings: -- Xilinx internal board cc108 +- Xilinx CC108 internal board "xlnx,zynq-cc108" -- Xilinx internal board zc770 with different FMC cards +- Xilinx ZC770 internal board, with different FMC cards "xlnx,zynq-zc770-xm010" "xlnx,zynq-zc770-xm011" "xlnx,zynq-zc770-xm012" -- 2.18.0
[PATCH v3 1/6] arm: dts: zynq: Set correct manufacturer for ZedBoard and MicroZed boards
Both boards are made by Avnet, Inc. So add an additional
value to the compatible property
Signed-off-by: Luis Araneda
---
arch/arm/boot/dts/zynq-microzed.dts | 2 +-
arch/arm/boot/dts/zynq-zed.dts | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/zynq-microzed.dts
b/arch/arm/boot/dts/zynq-microzed.dts
index aa4a0b6defb8..574ef2276182 100644
--- a/arch/arm/boot/dts/zynq-microzed.dts
+++ b/arch/arm/boot/dts/zynq-microzed.dts
@@ -8,7 +8,7 @@
/ {
model = "Zynq MicroZED Development Board";
- compatible = "xlnx,zynq-microzed", "xlnx,zynq-7000";
+ compatible = "avnet,zynq-microzed", "xlnx,zynq-microzed",
"xlnx,zynq-7000";
aliases {
ethernet0 =
diff --git a/arch/arm/boot/dts/zynq-zed.dts b/arch/arm/boot/dts/zynq-zed.dts
index 53c6883ce1f6..595022487965 100644
--- a/arch/arm/boot/dts/zynq-zed.dts
+++ b/arch/arm/boot/dts/zynq-zed.dts
@@ -8,7 +8,7 @@
/ {
model = "Zynq Zed Development Board";
- compatible = "xlnx,zynq-zed", "xlnx,zynq-7000";
+ compatible = "avnet,zynq-zed", "xlnx,zynq-zed", "xlnx,zynq-7000";
aliases {
ethernet0 =
--
2.18.0
[PATCH v3 2/6] arm: dts: zynq: correct and improve the model property of dt files
Replace the current value of the model property by a more accurate
description of each board (which includes the manufacturer), as some
of the boards had the same value ("Xilinx Zynq")
Signed-off-by: Luis Araneda
---
arch/arm/boot/dts/zynq-cc108.dts | 2 +-
arch/arm/boot/dts/zynq-microzed.dts| 2 +-
arch/arm/boot/dts/zynq-parallella.dts | 2 +-
arch/arm/boot/dts/zynq-zc702.dts | 2 +-
arch/arm/boot/dts/zynq-zc706.dts | 2 +-
arch/arm/boot/dts/zynq-zc770-xm010.dts | 2 +-
arch/arm/boot/dts/zynq-zc770-xm011.dts | 2 +-
arch/arm/boot/dts/zynq-zc770-xm012.dts | 2 +-
arch/arm/boot/dts/zynq-zc770-xm013.dts | 2 +-
arch/arm/boot/dts/zynq-zed.dts | 2 +-
arch/arm/boot/dts/zynq-zybo-z7.dts | 2 +-
arch/arm/boot/dts/zynq-zybo.dts| 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/arch/arm/boot/dts/zynq-cc108.dts b/arch/arm/boot/dts/zynq-cc108.dts
index 1a0f631c1d8d..8b9ab9bba23b 100644
--- a/arch/arm/boot/dts/zynq-cc108.dts
+++ b/arch/arm/boot/dts/zynq-cc108.dts
@@ -12,8 +12,8 @@
/include/ "zynq-7000.dtsi"
/ {
+ model = "Xilinx CC108 board";
compatible = "xlnx,zynq-cc108", "xlnx,zynq-7000";
- model = "Xilinx Zynq";
aliases {
ethernet0 =
diff --git a/arch/arm/boot/dts/zynq-microzed.dts
b/arch/arm/boot/dts/zynq-microzed.dts
index 574ef2276182..6ed84fb15902 100644
--- a/arch/arm/boot/dts/zynq-microzed.dts
+++ b/arch/arm/boot/dts/zynq-microzed.dts
@@ -7,7 +7,7 @@
/include/ "zynq-7000.dtsi"
/ {
- model = "Zynq MicroZED Development Board";
+ model = "Avnet MicroZed board";
compatible = "avnet,zynq-microzed", "xlnx,zynq-microzed",
"xlnx,zynq-7000";
aliases {
diff --git a/arch/arm/boot/dts/zynq-parallella.dts
b/arch/arm/boot/dts/zynq-parallella.dts
index c05f4b67d4c1..54592aeb92b9 100644
--- a/arch/arm/boot/dts/zynq-parallella.dts
+++ b/arch/arm/boot/dts/zynq-parallella.dts
@@ -12,7 +12,7 @@
/include/ "zynq-7000.dtsi"
/ {
- model = "Adapteva Parallella Board";
+ model = "Adapteva Parallella board";
compatible = "adapteva,parallella", "xlnx,zynq-7000";
aliases {
diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts
index f2330b0cb63d..3f84b94db995 100644
--- a/arch/arm/boot/dts/zynq-zc702.dts
+++ b/arch/arm/boot/dts/zynq-zc702.dts
@@ -7,7 +7,7 @@
#include "zynq-7000.dtsi"
/ {
- model = "Zynq ZC702 Development Board";
+ model = "Xilinx ZC702 board";
compatible = "xlnx,zynq-zc702", "xlnx,zynq-7000";
aliases {
diff --git a/arch/arm/boot/dts/zynq-zc706.dts b/arch/arm/boot/dts/zynq-zc706.dts
index 3ad1260ff2a1..a15908cacbcf 100644
--- a/arch/arm/boot/dts/zynq-zc706.dts
+++ b/arch/arm/boot/dts/zynq-zc706.dts
@@ -7,7 +7,7 @@
#include "zynq-7000.dtsi"
/ {
- model = "Zynq ZC706 Development Board";
+ model = "Xilinx ZC706 board";
compatible = "xlnx,zynq-zc706", "xlnx,zynq-7000";
aliases {
diff --git a/arch/arm/boot/dts/zynq-zc770-xm010.dts
b/arch/arm/boot/dts/zynq-zc770-xm010.dts
index 6884f1ad66b7..0e1bfdd3421f 100644
--- a/arch/arm/boot/dts/zynq-zc770-xm010.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm010.dts
@@ -8,8 +8,8 @@
#include "zynq-7000.dtsi"
/ {
+ model = "Xilinx ZC770 XM010 board";
compatible = "xlnx,zynq-zc770-xm010", "xlnx,zynq-7000";
- model = "Xilinx Zynq";
aliases {
ethernet0 =
diff --git a/arch/arm/boot/dts/zynq-zc770-xm011.dts
b/arch/arm/boot/dts/zynq-zc770-xm011.dts
index b78883cee96a..b7f65862c022 100644
--- a/arch/arm/boot/dts/zynq-zc770-xm011.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm011.dts
@@ -8,8 +8,8 @@
#include "zynq-7000.dtsi"
/ {
+ model = "Xilinx ZC770 XM011 board";
compatible = "xlnx,zynq-zc770-xm011", "xlnx,zynq-7000";
- model = "Xilinx Zynq";
aliases {
i2c0 =
diff --git a/arch/arm/boot/dts/zynq-zc770-xm012.dts
b/arch/arm/boot/dts/zynq-zc770-xm012.dts
index c3169d63600d..d2359b789eb8 100644
--- a/arch/arm/boot/dts/zynq-zc770-xm012.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm012.dts
@@ -8,8 +8,8 @@
#include "zynq-7000.dtsi"
/ {
+ model = "Xilinx ZC770 XM012 board";
compatible = "xlnx,zynq-zc770-xm012", "xlnx,zynq-7000";
- model = "Xilinx Zynq";
aliases {
i2c0 =
diff --git a/arch/arm/boot/dts/zynq-zc770-xm013.dts
b/arch/arm/boot/dts/zynq-zc770-xm013.dts
index 8bb66859d774..651913f1afa2 100644
--- a/arch/arm/boot/dts/zynq-zc770-xm013.dts
+++ b/arch/arm/boot/dts/zyn
[PATCH v3 3/6] dt-bindings: xilinx: zynq: Improve boards description
Change the description of some boards to make it similar to the value of the model property from their respective device-tree, using the format " " Signed-off-by: Luis Araneda --- Documentation/devicetree/bindings/arm/xilinx.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/xilinx.txt b/Documentation/devicetree/bindings/arm/xilinx.txt index b9043bc35c14..4f1759b2bea7 100644 --- a/Documentation/devicetree/bindings/arm/xilinx.txt +++ b/Documentation/devicetree/bindings/arm/xilinx.txt @@ -8,10 +8,10 @@ Required root node properties: Additional compatible strings: -- Xilinx internal board cc108 +- Xilinx CC108 internal board "xlnx,zynq-cc108" -- Xilinx internal board zc770 with different FMC cards +- Xilinx ZC770 internal board, with different FMC cards "xlnx,zynq-zc770-xm010" "xlnx,zynq-zc770-xm011" "xlnx,zynq-zc770-xm012" -- 2.18.0
[PATCH v3 1/6] arm: dts: zynq: Set correct manufacturer for ZedBoard and MicroZed boards
Both boards are made by Avnet, Inc. So add an additional
value to the compatible property
Signed-off-by: Luis Araneda
---
arch/arm/boot/dts/zynq-microzed.dts | 2 +-
arch/arm/boot/dts/zynq-zed.dts | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/zynq-microzed.dts
b/arch/arm/boot/dts/zynq-microzed.dts
index aa4a0b6defb8..574ef2276182 100644
--- a/arch/arm/boot/dts/zynq-microzed.dts
+++ b/arch/arm/boot/dts/zynq-microzed.dts
@@ -8,7 +8,7 @@
/ {
model = "Zynq MicroZED Development Board";
- compatible = "xlnx,zynq-microzed", "xlnx,zynq-7000";
+ compatible = "avnet,zynq-microzed", "xlnx,zynq-microzed",
"xlnx,zynq-7000";
aliases {
ethernet0 =
diff --git a/arch/arm/boot/dts/zynq-zed.dts b/arch/arm/boot/dts/zynq-zed.dts
index 53c6883ce1f6..595022487965 100644
--- a/arch/arm/boot/dts/zynq-zed.dts
+++ b/arch/arm/boot/dts/zynq-zed.dts
@@ -8,7 +8,7 @@
/ {
model = "Zynq Zed Development Board";
- compatible = "xlnx,zynq-zed", "xlnx,zynq-7000";
+ compatible = "avnet,zynq-zed", "xlnx,zynq-zed", "xlnx,zynq-7000";
aliases {
ethernet0 =
--
2.18.0
[PATCH v3 2/6] arm: dts: zynq: correct and improve the model property of dt files
Replace the current value of the model property by a more accurate
description of each board (which includes the manufacturer), as some
of the boards had the same value ("Xilinx Zynq")
Signed-off-by: Luis Araneda
---
arch/arm/boot/dts/zynq-cc108.dts | 2 +-
arch/arm/boot/dts/zynq-microzed.dts| 2 +-
arch/arm/boot/dts/zynq-parallella.dts | 2 +-
arch/arm/boot/dts/zynq-zc702.dts | 2 +-
arch/arm/boot/dts/zynq-zc706.dts | 2 +-
arch/arm/boot/dts/zynq-zc770-xm010.dts | 2 +-
arch/arm/boot/dts/zynq-zc770-xm011.dts | 2 +-
arch/arm/boot/dts/zynq-zc770-xm012.dts | 2 +-
arch/arm/boot/dts/zynq-zc770-xm013.dts | 2 +-
arch/arm/boot/dts/zynq-zed.dts | 2 +-
arch/arm/boot/dts/zynq-zybo-z7.dts | 2 +-
arch/arm/boot/dts/zynq-zybo.dts| 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/arch/arm/boot/dts/zynq-cc108.dts b/arch/arm/boot/dts/zynq-cc108.dts
index 1a0f631c1d8d..8b9ab9bba23b 100644
--- a/arch/arm/boot/dts/zynq-cc108.dts
+++ b/arch/arm/boot/dts/zynq-cc108.dts
@@ -12,8 +12,8 @@
/include/ "zynq-7000.dtsi"
/ {
+ model = "Xilinx CC108 board";
compatible = "xlnx,zynq-cc108", "xlnx,zynq-7000";
- model = "Xilinx Zynq";
aliases {
ethernet0 =
diff --git a/arch/arm/boot/dts/zynq-microzed.dts
b/arch/arm/boot/dts/zynq-microzed.dts
index 574ef2276182..6ed84fb15902 100644
--- a/arch/arm/boot/dts/zynq-microzed.dts
+++ b/arch/arm/boot/dts/zynq-microzed.dts
@@ -7,7 +7,7 @@
/include/ "zynq-7000.dtsi"
/ {
- model = "Zynq MicroZED Development Board";
+ model = "Avnet MicroZed board";
compatible = "avnet,zynq-microzed", "xlnx,zynq-microzed",
"xlnx,zynq-7000";
aliases {
diff --git a/arch/arm/boot/dts/zynq-parallella.dts
b/arch/arm/boot/dts/zynq-parallella.dts
index c05f4b67d4c1..54592aeb92b9 100644
--- a/arch/arm/boot/dts/zynq-parallella.dts
+++ b/arch/arm/boot/dts/zynq-parallella.dts
@@ -12,7 +12,7 @@
/include/ "zynq-7000.dtsi"
/ {
- model = "Adapteva Parallella Board";
+ model = "Adapteva Parallella board";
compatible = "adapteva,parallella", "xlnx,zynq-7000";
aliases {
diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts
index f2330b0cb63d..3f84b94db995 100644
--- a/arch/arm/boot/dts/zynq-zc702.dts
+++ b/arch/arm/boot/dts/zynq-zc702.dts
@@ -7,7 +7,7 @@
#include "zynq-7000.dtsi"
/ {
- model = "Zynq ZC702 Development Board";
+ model = "Xilinx ZC702 board";
compatible = "xlnx,zynq-zc702", "xlnx,zynq-7000";
aliases {
diff --git a/arch/arm/boot/dts/zynq-zc706.dts b/arch/arm/boot/dts/zynq-zc706.dts
index 3ad1260ff2a1..a15908cacbcf 100644
--- a/arch/arm/boot/dts/zynq-zc706.dts
+++ b/arch/arm/boot/dts/zynq-zc706.dts
@@ -7,7 +7,7 @@
#include "zynq-7000.dtsi"
/ {
- model = "Zynq ZC706 Development Board";
+ model = "Xilinx ZC706 board";
compatible = "xlnx,zynq-zc706", "xlnx,zynq-7000";
aliases {
diff --git a/arch/arm/boot/dts/zynq-zc770-xm010.dts
b/arch/arm/boot/dts/zynq-zc770-xm010.dts
index 6884f1ad66b7..0e1bfdd3421f 100644
--- a/arch/arm/boot/dts/zynq-zc770-xm010.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm010.dts
@@ -8,8 +8,8 @@
#include "zynq-7000.dtsi"
/ {
+ model = "Xilinx ZC770 XM010 board";
compatible = "xlnx,zynq-zc770-xm010", "xlnx,zynq-7000";
- model = "Xilinx Zynq";
aliases {
ethernet0 =
diff --git a/arch/arm/boot/dts/zynq-zc770-xm011.dts
b/arch/arm/boot/dts/zynq-zc770-xm011.dts
index b78883cee96a..b7f65862c022 100644
--- a/arch/arm/boot/dts/zynq-zc770-xm011.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm011.dts
@@ -8,8 +8,8 @@
#include "zynq-7000.dtsi"
/ {
+ model = "Xilinx ZC770 XM011 board";
compatible = "xlnx,zynq-zc770-xm011", "xlnx,zynq-7000";
- model = "Xilinx Zynq";
aliases {
i2c0 =
diff --git a/arch/arm/boot/dts/zynq-zc770-xm012.dts
b/arch/arm/boot/dts/zynq-zc770-xm012.dts
index c3169d63600d..d2359b789eb8 100644
--- a/arch/arm/boot/dts/zynq-zc770-xm012.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm012.dts
@@ -8,8 +8,8 @@
#include "zynq-7000.dtsi"
/ {
+ model = "Xilinx ZC770 XM012 board";
compatible = "xlnx,zynq-zc770-xm012", "xlnx,zynq-7000";
- model = "Xilinx Zynq";
aliases {
i2c0 =
diff --git a/arch/arm/boot/dts/zynq-zc770-xm013.dts
b/arch/arm/boot/dts/zynq-zc770-xm013.dts
index 8bb66859d774..651913f1afa2 100644
--- a/arch/arm/boot/dts/zynq-zc770-xm013.dts
+++ b/arch/arm/boot/dts/zyn
Re: [PATCH v2 2/3] dt-bindings: xilinx: Add missing zynq boards and sort entries
Hi Michal, On Mon, Jul 9, 2018 at 4:18 AM Michal Simek wrote: > Please do it with more patches. There are 3 changes in one patch. Ok, I'll split it into 3 different patches on v3. Thanks, Luis Araneda.
Re: [PATCH v2 2/3] dt-bindings: xilinx: Add missing zynq boards and sort entries
Hi Michal, On Mon, Jul 9, 2018 at 4:18 AM Michal Simek wrote: > Please do it with more patches. There are 3 changes in one patch. Ok, I'll split it into 3 different patches on v3. Thanks, Luis Araneda.
[PATCH v2 2/3] dt-bindings: xilinx: Add missing zynq boards and sort entries
The bindings were missing when adding the device-tree files Also, improve description of existing boards, sort them alphabetically by manufacturer, and migrate the contents of adapteva dt dindigns into Xilinx's Signed-off-by: Luis Araneda --- Changes since v1 (RFC): - Don't remove "internal" word from Xilinx boards on dt-bindings - Migrate content of adapteva dt-binding file into Xilinx's - Sort additional compatible strings alphabetically by manufacturer .../devicetree/bindings/arm/adapteva.txt | 7 - .../devicetree/bindings/arm/xilinx.txt| 30 +++ 2 files changed, 25 insertions(+), 12 deletions(-) delete mode 100644 Documentation/devicetree/bindings/arm/adapteva.txt diff --git a/Documentation/devicetree/bindings/arm/adapteva.txt b/Documentation/devicetree/bindings/arm/adapteva.txt deleted file mode 100644 index 1d8af9e36065.. --- a/Documentation/devicetree/bindings/arm/adapteva.txt +++ /dev/null @@ -1,7 +0,0 @@ -Adapteva Platforms Device Tree Bindings - -Parallella board - -Required root node properties: -- compatible = "adapteva,parallella"; diff --git a/Documentation/devicetree/bindings/arm/xilinx.txt b/Documentation/devicetree/bindings/arm/xilinx.txt index b9043bc35c14..26fe5ecc4332 100644 --- a/Documentation/devicetree/bindings/arm/xilinx.txt +++ b/Documentation/devicetree/bindings/arm/xilinx.txt @@ -8,18 +8,38 @@ Required root node properties: Additional compatible strings: -- Xilinx internal board cc108 +- Adapteva Parallella board + "adapteva,parallella" + +- Avnet MicroZed board + "avnet,zynq-microzed" + "xlnx,zynq-microzed" + +- Avnet ZedBoard board + "avnet,zynq-zed" + "xlnx,zynq-zed" + +- Digilent Zybo board + "digilent,zynq-zybo" + +- Digilent Zybo Z7 board + "digilent,zynq-zybo-z7" + +- Xilinx CC108 internal board "xlnx,zynq-cc108" -- Xilinx internal board zc770 with different FMC cards +- Xilinx ZC702 internal board + "xlnx,zynq-zc702" + +- Xilinx ZC706 internal board + "xlnx,zynq-zc706" + +- Xilinx ZC770 internal board, with different FMC cards "xlnx,zynq-zc770-xm010" "xlnx,zynq-zc770-xm011" "xlnx,zynq-zc770-xm012" "xlnx,zynq-zc770-xm013" -- Digilent Zybo Z7 board - "digilent,zynq-zybo-z7" - --- Xilinx Zynq UltraScale+ MPSoC Platforms Device Tree Bindings -- 2.18.0
[PATCH v2 2/3] dt-bindings: xilinx: Add missing zynq boards and sort entries
The bindings were missing when adding the device-tree files Also, improve description of existing boards, sort them alphabetically by manufacturer, and migrate the contents of adapteva dt dindigns into Xilinx's Signed-off-by: Luis Araneda --- Changes since v1 (RFC): - Don't remove "internal" word from Xilinx boards on dt-bindings - Migrate content of adapteva dt-binding file into Xilinx's - Sort additional compatible strings alphabetically by manufacturer .../devicetree/bindings/arm/adapteva.txt | 7 - .../devicetree/bindings/arm/xilinx.txt| 30 +++ 2 files changed, 25 insertions(+), 12 deletions(-) delete mode 100644 Documentation/devicetree/bindings/arm/adapteva.txt diff --git a/Documentation/devicetree/bindings/arm/adapteva.txt b/Documentation/devicetree/bindings/arm/adapteva.txt deleted file mode 100644 index 1d8af9e36065.. --- a/Documentation/devicetree/bindings/arm/adapteva.txt +++ /dev/null @@ -1,7 +0,0 @@ -Adapteva Platforms Device Tree Bindings - -Parallella board - -Required root node properties: -- compatible = "adapteva,parallella"; diff --git a/Documentation/devicetree/bindings/arm/xilinx.txt b/Documentation/devicetree/bindings/arm/xilinx.txt index b9043bc35c14..26fe5ecc4332 100644 --- a/Documentation/devicetree/bindings/arm/xilinx.txt +++ b/Documentation/devicetree/bindings/arm/xilinx.txt @@ -8,18 +8,38 @@ Required root node properties: Additional compatible strings: -- Xilinx internal board cc108 +- Adapteva Parallella board + "adapteva,parallella" + +- Avnet MicroZed board + "avnet,zynq-microzed" + "xlnx,zynq-microzed" + +- Avnet ZedBoard board + "avnet,zynq-zed" + "xlnx,zynq-zed" + +- Digilent Zybo board + "digilent,zynq-zybo" + +- Digilent Zybo Z7 board + "digilent,zynq-zybo-z7" + +- Xilinx CC108 internal board "xlnx,zynq-cc108" -- Xilinx internal board zc770 with different FMC cards +- Xilinx ZC702 internal board + "xlnx,zynq-zc702" + +- Xilinx ZC706 internal board + "xlnx,zynq-zc706" + +- Xilinx ZC770 internal board, with different FMC cards "xlnx,zynq-zc770-xm010" "xlnx,zynq-zc770-xm011" "xlnx,zynq-zc770-xm012" "xlnx,zynq-zc770-xm013" -- Digilent Zybo Z7 board - "digilent,zynq-zybo-z7" - --- Xilinx Zynq UltraScale+ MPSoC Platforms Device Tree Bindings -- 2.18.0
[PATCH v2 3/3] arm: dts: zynq: correct and improve the model property of dt files
Replace the current value of the model property by a more accurate
description of each board (which includes the manufacturer), as some
of the boards had the same value ("Xilinx Zynq")
Signed-off-by: Luis Araneda
---
Changes since v1 (RFC):
- No changes
arch/arm/boot/dts/zynq-cc108.dts | 2 +-
arch/arm/boot/dts/zynq-microzed.dts| 2 +-
arch/arm/boot/dts/zynq-parallella.dts | 2 +-
arch/arm/boot/dts/zynq-zc702.dts | 2 +-
arch/arm/boot/dts/zynq-zc706.dts | 2 +-
arch/arm/boot/dts/zynq-zc770-xm010.dts | 2 +-
arch/arm/boot/dts/zynq-zc770-xm011.dts | 2 +-
arch/arm/boot/dts/zynq-zc770-xm012.dts | 2 +-
arch/arm/boot/dts/zynq-zc770-xm013.dts | 2 +-
arch/arm/boot/dts/zynq-zed.dts | 2 +-
arch/arm/boot/dts/zynq-zybo-z7.dts | 2 +-
arch/arm/boot/dts/zynq-zybo.dts| 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/arch/arm/boot/dts/zynq-cc108.dts b/arch/arm/boot/dts/zynq-cc108.dts
index 1a0f631c1d8d..8b9ab9bba23b 100644
--- a/arch/arm/boot/dts/zynq-cc108.dts
+++ b/arch/arm/boot/dts/zynq-cc108.dts
@@ -12,8 +12,8 @@
/include/ "zynq-7000.dtsi"
/ {
+ model = "Xilinx CC108 board";
compatible = "xlnx,zynq-cc108", "xlnx,zynq-7000";
- model = "Xilinx Zynq";
aliases {
ethernet0 =
diff --git a/arch/arm/boot/dts/zynq-microzed.dts
b/arch/arm/boot/dts/zynq-microzed.dts
index 574ef2276182..6ed84fb15902 100644
--- a/arch/arm/boot/dts/zynq-microzed.dts
+++ b/arch/arm/boot/dts/zynq-microzed.dts
@@ -7,7 +7,7 @@
/include/ "zynq-7000.dtsi"
/ {
- model = "Zynq MicroZED Development Board";
+ model = "Avnet MicroZed board";
compatible = "avnet,zynq-microzed", "xlnx,zynq-microzed",
"xlnx,zynq-7000";
aliases {
diff --git a/arch/arm/boot/dts/zynq-parallella.dts
b/arch/arm/boot/dts/zynq-parallella.dts
index c05f4b67d4c1..54592aeb92b9 100644
--- a/arch/arm/boot/dts/zynq-parallella.dts
+++ b/arch/arm/boot/dts/zynq-parallella.dts
@@ -12,7 +12,7 @@
/include/ "zynq-7000.dtsi"
/ {
- model = "Adapteva Parallella Board";
+ model = "Adapteva Parallella board";
compatible = "adapteva,parallella", "xlnx,zynq-7000";
aliases {
diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts
index f2330b0cb63d..3f84b94db995 100644
--- a/arch/arm/boot/dts/zynq-zc702.dts
+++ b/arch/arm/boot/dts/zynq-zc702.dts
@@ -7,7 +7,7 @@
#include "zynq-7000.dtsi"
/ {
- model = "Zynq ZC702 Development Board";
+ model = "Xilinx ZC702 board";
compatible = "xlnx,zynq-zc702", "xlnx,zynq-7000";
aliases {
diff --git a/arch/arm/boot/dts/zynq-zc706.dts b/arch/arm/boot/dts/zynq-zc706.dts
index 3ad1260ff2a1..a15908cacbcf 100644
--- a/arch/arm/boot/dts/zynq-zc706.dts
+++ b/arch/arm/boot/dts/zynq-zc706.dts
@@ -7,7 +7,7 @@
#include "zynq-7000.dtsi"
/ {
- model = "Zynq ZC706 Development Board";
+ model = "Xilinx ZC706 board";
compatible = "xlnx,zynq-zc706", "xlnx,zynq-7000";
aliases {
diff --git a/arch/arm/boot/dts/zynq-zc770-xm010.dts
b/arch/arm/boot/dts/zynq-zc770-xm010.dts
index 6884f1ad66b7..0e1bfdd3421f 100644
--- a/arch/arm/boot/dts/zynq-zc770-xm010.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm010.dts
@@ -8,8 +8,8 @@
#include "zynq-7000.dtsi"
/ {
+ model = "Xilinx ZC770 XM010 board";
compatible = "xlnx,zynq-zc770-xm010", "xlnx,zynq-7000";
- model = "Xilinx Zynq";
aliases {
ethernet0 =
diff --git a/arch/arm/boot/dts/zynq-zc770-xm011.dts
b/arch/arm/boot/dts/zynq-zc770-xm011.dts
index b78883cee96a..b7f65862c022 100644
--- a/arch/arm/boot/dts/zynq-zc770-xm011.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm011.dts
@@ -8,8 +8,8 @@
#include "zynq-7000.dtsi"
/ {
+ model = "Xilinx ZC770 XM011 board";
compatible = "xlnx,zynq-zc770-xm011", "xlnx,zynq-7000";
- model = "Xilinx Zynq";
aliases {
i2c0 =
diff --git a/arch/arm/boot/dts/zynq-zc770-xm012.dts
b/arch/arm/boot/dts/zynq-zc770-xm012.dts
index c3169d63600d..d2359b789eb8 100644
--- a/arch/arm/boot/dts/zynq-zc770-xm012.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm012.dts
@@ -8,8 +8,8 @@
#include "zynq-7000.dtsi"
/ {
+ model = "Xilinx ZC770 XM012 board";
compatible = "xlnx,zynq-zc770-xm012", "xlnx,zynq-7000";
- model = "Xilinx Zynq";
aliases {
i2c0 =
diff --git a/arch/arm/boot/dts/zynq-zc770-xm013.dts
b/arch/arm/boot/dts/zynq-zc770-xm013.dts
index 8bb66859d774..651913f1afa2 100644
--- a/arch/arm/boot/dts/
[PATCH v2 3/3] arm: dts: zynq: correct and improve the model property of dt files
Replace the current value of the model property by a more accurate
description of each board (which includes the manufacturer), as some
of the boards had the same value ("Xilinx Zynq")
Signed-off-by: Luis Araneda
---
Changes since v1 (RFC):
- No changes
arch/arm/boot/dts/zynq-cc108.dts | 2 +-
arch/arm/boot/dts/zynq-microzed.dts| 2 +-
arch/arm/boot/dts/zynq-parallella.dts | 2 +-
arch/arm/boot/dts/zynq-zc702.dts | 2 +-
arch/arm/boot/dts/zynq-zc706.dts | 2 +-
arch/arm/boot/dts/zynq-zc770-xm010.dts | 2 +-
arch/arm/boot/dts/zynq-zc770-xm011.dts | 2 +-
arch/arm/boot/dts/zynq-zc770-xm012.dts | 2 +-
arch/arm/boot/dts/zynq-zc770-xm013.dts | 2 +-
arch/arm/boot/dts/zynq-zed.dts | 2 +-
arch/arm/boot/dts/zynq-zybo-z7.dts | 2 +-
arch/arm/boot/dts/zynq-zybo.dts| 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/arch/arm/boot/dts/zynq-cc108.dts b/arch/arm/boot/dts/zynq-cc108.dts
index 1a0f631c1d8d..8b9ab9bba23b 100644
--- a/arch/arm/boot/dts/zynq-cc108.dts
+++ b/arch/arm/boot/dts/zynq-cc108.dts
@@ -12,8 +12,8 @@
/include/ "zynq-7000.dtsi"
/ {
+ model = "Xilinx CC108 board";
compatible = "xlnx,zynq-cc108", "xlnx,zynq-7000";
- model = "Xilinx Zynq";
aliases {
ethernet0 =
diff --git a/arch/arm/boot/dts/zynq-microzed.dts
b/arch/arm/boot/dts/zynq-microzed.dts
index 574ef2276182..6ed84fb15902 100644
--- a/arch/arm/boot/dts/zynq-microzed.dts
+++ b/arch/arm/boot/dts/zynq-microzed.dts
@@ -7,7 +7,7 @@
/include/ "zynq-7000.dtsi"
/ {
- model = "Zynq MicroZED Development Board";
+ model = "Avnet MicroZed board";
compatible = "avnet,zynq-microzed", "xlnx,zynq-microzed",
"xlnx,zynq-7000";
aliases {
diff --git a/arch/arm/boot/dts/zynq-parallella.dts
b/arch/arm/boot/dts/zynq-parallella.dts
index c05f4b67d4c1..54592aeb92b9 100644
--- a/arch/arm/boot/dts/zynq-parallella.dts
+++ b/arch/arm/boot/dts/zynq-parallella.dts
@@ -12,7 +12,7 @@
/include/ "zynq-7000.dtsi"
/ {
- model = "Adapteva Parallella Board";
+ model = "Adapteva Parallella board";
compatible = "adapteva,parallella", "xlnx,zynq-7000";
aliases {
diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts
index f2330b0cb63d..3f84b94db995 100644
--- a/arch/arm/boot/dts/zynq-zc702.dts
+++ b/arch/arm/boot/dts/zynq-zc702.dts
@@ -7,7 +7,7 @@
#include "zynq-7000.dtsi"
/ {
- model = "Zynq ZC702 Development Board";
+ model = "Xilinx ZC702 board";
compatible = "xlnx,zynq-zc702", "xlnx,zynq-7000";
aliases {
diff --git a/arch/arm/boot/dts/zynq-zc706.dts b/arch/arm/boot/dts/zynq-zc706.dts
index 3ad1260ff2a1..a15908cacbcf 100644
--- a/arch/arm/boot/dts/zynq-zc706.dts
+++ b/arch/arm/boot/dts/zynq-zc706.dts
@@ -7,7 +7,7 @@
#include "zynq-7000.dtsi"
/ {
- model = "Zynq ZC706 Development Board";
+ model = "Xilinx ZC706 board";
compatible = "xlnx,zynq-zc706", "xlnx,zynq-7000";
aliases {
diff --git a/arch/arm/boot/dts/zynq-zc770-xm010.dts
b/arch/arm/boot/dts/zynq-zc770-xm010.dts
index 6884f1ad66b7..0e1bfdd3421f 100644
--- a/arch/arm/boot/dts/zynq-zc770-xm010.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm010.dts
@@ -8,8 +8,8 @@
#include "zynq-7000.dtsi"
/ {
+ model = "Xilinx ZC770 XM010 board";
compatible = "xlnx,zynq-zc770-xm010", "xlnx,zynq-7000";
- model = "Xilinx Zynq";
aliases {
ethernet0 =
diff --git a/arch/arm/boot/dts/zynq-zc770-xm011.dts
b/arch/arm/boot/dts/zynq-zc770-xm011.dts
index b78883cee96a..b7f65862c022 100644
--- a/arch/arm/boot/dts/zynq-zc770-xm011.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm011.dts
@@ -8,8 +8,8 @@
#include "zynq-7000.dtsi"
/ {
+ model = "Xilinx ZC770 XM011 board";
compatible = "xlnx,zynq-zc770-xm011", "xlnx,zynq-7000";
- model = "Xilinx Zynq";
aliases {
i2c0 =
diff --git a/arch/arm/boot/dts/zynq-zc770-xm012.dts
b/arch/arm/boot/dts/zynq-zc770-xm012.dts
index c3169d63600d..d2359b789eb8 100644
--- a/arch/arm/boot/dts/zynq-zc770-xm012.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm012.dts
@@ -8,8 +8,8 @@
#include "zynq-7000.dtsi"
/ {
+ model = "Xilinx ZC770 XM012 board";
compatible = "xlnx,zynq-zc770-xm012", "xlnx,zynq-7000";
- model = "Xilinx Zynq";
aliases {
i2c0 =
diff --git a/arch/arm/boot/dts/zynq-zc770-xm013.dts
b/arch/arm/boot/dts/zynq-zc770-xm013.dts
index 8bb66859d774..651913f1afa2 100644
--- a/arch/arm/boot/dts/
[PATCH v2 1/3] arm: dts: zynq: Set correct manufacturer for ZedBoard and MicroZed boards
Both boards are made by Avnet, Inc. So add an additional
value to the compatible property
Signed-off-by: Luis Araneda
---
Changes since v1 (RFC):
- Add values to compatible property instead of replacing them
arch/arm/boot/dts/zynq-microzed.dts | 2 +-
arch/arm/boot/dts/zynq-zed.dts | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/zynq-microzed.dts
b/arch/arm/boot/dts/zynq-microzed.dts
index aa4a0b6defb8..574ef2276182 100644
--- a/arch/arm/boot/dts/zynq-microzed.dts
+++ b/arch/arm/boot/dts/zynq-microzed.dts
@@ -8,7 +8,7 @@
/ {
model = "Zynq MicroZED Development Board";
- compatible = "xlnx,zynq-microzed", "xlnx,zynq-7000";
+ compatible = "avnet,zynq-microzed", "xlnx,zynq-microzed",
"xlnx,zynq-7000";
aliases {
ethernet0 =
diff --git a/arch/arm/boot/dts/zynq-zed.dts b/arch/arm/boot/dts/zynq-zed.dts
index 53c6883ce1f6..595022487965 100644
--- a/arch/arm/boot/dts/zynq-zed.dts
+++ b/arch/arm/boot/dts/zynq-zed.dts
@@ -8,7 +8,7 @@
/ {
model = "Zynq Zed Development Board";
- compatible = "xlnx,zynq-zed", "xlnx,zynq-7000";
+ compatible = "avnet,zynq-zed", "xlnx,zynq-zed", "xlnx,zynq-7000";
aliases {
ethernet0 =
--
2.18.0
[PATCH v2 1/3] arm: dts: zynq: Set correct manufacturer for ZedBoard and MicroZed boards
Both boards are made by Avnet, Inc. So add an additional
value to the compatible property
Signed-off-by: Luis Araneda
---
Changes since v1 (RFC):
- Add values to compatible property instead of replacing them
arch/arm/boot/dts/zynq-microzed.dts | 2 +-
arch/arm/boot/dts/zynq-zed.dts | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/zynq-microzed.dts
b/arch/arm/boot/dts/zynq-microzed.dts
index aa4a0b6defb8..574ef2276182 100644
--- a/arch/arm/boot/dts/zynq-microzed.dts
+++ b/arch/arm/boot/dts/zynq-microzed.dts
@@ -8,7 +8,7 @@
/ {
model = "Zynq MicroZED Development Board";
- compatible = "xlnx,zynq-microzed", "xlnx,zynq-7000";
+ compatible = "avnet,zynq-microzed", "xlnx,zynq-microzed",
"xlnx,zynq-7000";
aliases {
ethernet0 =
diff --git a/arch/arm/boot/dts/zynq-zed.dts b/arch/arm/boot/dts/zynq-zed.dts
index 53c6883ce1f6..595022487965 100644
--- a/arch/arm/boot/dts/zynq-zed.dts
+++ b/arch/arm/boot/dts/zynq-zed.dts
@@ -8,7 +8,7 @@
/ {
model = "Zynq Zed Development Board";
- compatible = "xlnx,zynq-zed", "xlnx,zynq-7000";
+ compatible = "avnet,zynq-zed", "xlnx,zynq-zed", "xlnx,zynq-7000";
aliases {
ethernet0 =
--
2.18.0
[PATCH v2 0/3] arm: dts: zynq: improvements and cleanup
This series attempts to standardize device naming and improve its information for better identification The values of the "compatible" and "model" device-tree properties are corrected for some devices, adding complementary information when necessary Changes since v1 (RFC): - Add values to compatible property instead of replacing them - Don't remove "internal" word from Xilinx boards on dt-bindings - Migrate content of adapteva dt-binding file into Xilinx's - Sort additional compatible strings alphabetically by manufacturer - Dropped patch that renamed the zedboard development board (no apparent benefit) - Dropped the patch that removed the "zynq" value from the compatible strings (breaks the ABI) Luis Araneda (3): arm: dts: zynq: Set correct manufacturer for ZedBoard and MicroZed boards dt-bindings: xilinx: Add missing zynq boards and sort entries arm: dts: zynq: correct and improve the model property of dt files .../devicetree/bindings/arm/adapteva.txt | 7 - .../devicetree/bindings/arm/xilinx.txt| 30 +++ arch/arm/boot/dts/zynq-cc108.dts | 2 +- arch/arm/boot/dts/zynq-microzed.dts | 4 +-- arch/arm/boot/dts/zynq-parallella.dts | 2 +- arch/arm/boot/dts/zynq-zc702.dts | 2 +- arch/arm/boot/dts/zynq-zc706.dts | 2 +- arch/arm/boot/dts/zynq-zc770-xm010.dts| 2 +- arch/arm/boot/dts/zynq-zc770-xm011.dts| 2 +- arch/arm/boot/dts/zynq-zc770-xm012.dts| 2 +- arch/arm/boot/dts/zynq-zc770-xm013.dts| 2 +- arch/arm/boot/dts/zynq-zed.dts| 4 +-- arch/arm/boot/dts/zynq-zybo-z7.dts| 2 +- arch/arm/boot/dts/zynq-zybo.dts | 2 +- 14 files changed, 39 insertions(+), 26 deletions(-) delete mode 100644 Documentation/devicetree/bindings/arm/adapteva.txt -- 2.18.0
[PATCH v2 0/3] arm: dts: zynq: improvements and cleanup
This series attempts to standardize device naming and improve its information for better identification The values of the "compatible" and "model" device-tree properties are corrected for some devices, adding complementary information when necessary Changes since v1 (RFC): - Add values to compatible property instead of replacing them - Don't remove "internal" word from Xilinx boards on dt-bindings - Migrate content of adapteva dt-binding file into Xilinx's - Sort additional compatible strings alphabetically by manufacturer - Dropped patch that renamed the zedboard development board (no apparent benefit) - Dropped the patch that removed the "zynq" value from the compatible strings (breaks the ABI) Luis Araneda (3): arm: dts: zynq: Set correct manufacturer for ZedBoard and MicroZed boards dt-bindings: xilinx: Add missing zynq boards and sort entries arm: dts: zynq: correct and improve the model property of dt files .../devicetree/bindings/arm/adapteva.txt | 7 - .../devicetree/bindings/arm/xilinx.txt| 30 +++ arch/arm/boot/dts/zynq-cc108.dts | 2 +- arch/arm/boot/dts/zynq-microzed.dts | 4 +-- arch/arm/boot/dts/zynq-parallella.dts | 2 +- arch/arm/boot/dts/zynq-zc702.dts | 2 +- arch/arm/boot/dts/zynq-zc706.dts | 2 +- arch/arm/boot/dts/zynq-zc770-xm010.dts| 2 +- arch/arm/boot/dts/zynq-zc770-xm011.dts| 2 +- arch/arm/boot/dts/zynq-zc770-xm012.dts| 2 +- arch/arm/boot/dts/zynq-zc770-xm013.dts| 2 +- arch/arm/boot/dts/zynq-zed.dts| 4 +-- arch/arm/boot/dts/zynq-zybo-z7.dts| 2 +- arch/arm/boot/dts/zynq-zybo.dts | 2 +- 14 files changed, 39 insertions(+), 26 deletions(-) delete mode 100644 Documentation/devicetree/bindings/arm/adapteva.txt -- 2.18.0
Re: [RFC PATCH 5/5] arm: dts: zynq: remove "zynq" prefix from compatible property
Hi Rob, On Tue, Jul 3, 2018 at 7:07 PM Rob Herring wrote: > Maybe so, but you can't just go around changing compatible strings. Once > set, it's an ABI. Ok, I'll drop the patch from v2. Thanks, Luis Araneda.
Re: [RFC PATCH 5/5] arm: dts: zynq: remove "zynq" prefix from compatible property
Hi Rob, On Tue, Jul 3, 2018 at 7:07 PM Rob Herring wrote: > Maybe so, but you can't just go around changing compatible strings. Once > set, it's an ABI. Ok, I'll drop the patch from v2. Thanks, Luis Araneda.
Re: [RFC PATCH 2/5] dt-bindings: xilinx: Add missing zynq boards
Hi Rob, Thanks for reviewing. On Tue, Jul 3, 2018 at 7:04 PM Rob Herring wrote: > > On Thu, Jun 28, 2018 at 01:42:02AM -0400, Luis Araneda wrote: > > +- Adapteva Parallella board > > + "adapteva,parallella" > > This is documented in adapteva.txt, but I'd prefer if you put it > here and remove adapteva.txt. Ouch, I should have used git grep to find that. I'll remove the adapteva.txt file on v2, which I'll be sending later today. Thanks, Luis Araneda.
Re: [RFC PATCH 2/5] dt-bindings: xilinx: Add missing zynq boards
Hi Rob, Thanks for reviewing. On Tue, Jul 3, 2018 at 7:04 PM Rob Herring wrote: > > On Thu, Jun 28, 2018 at 01:42:02AM -0400, Luis Araneda wrote: > > +- Adapteva Parallella board > > + "adapteva,parallella" > > This is documented in adapteva.txt, but I'd prefer if you put it > here and remove adapteva.txt. Ouch, I should have used git grep to find that. I'll remove the adapteva.txt file on v2, which I'll be sending later today. Thanks, Luis Araneda.
Re: [RFC PATCH 5/5] arm: dts: zynq: remove "zynq" prefix from compatible property
Hi Michal, On Thu, Jun 28, 2018 at 2:42 AM Michal Simek wrote: > zynq name here is correct which is saying that hardblock is going to be > described. Without it it is suggesting that hardblock is not used and it > is for example on zybo with microblaze. In my opinion, the zynq name is just adding redundant information to the "xlnx,zynq-7000" value. Taking the Zybo board, the current compatible property is: > compatible = "digilent,zynq-zybo", "xlnx,zynq-7000"; I'm proposing to change it to: > compatible = "digilent,zybo", "xlnx,zynq-7000"; (I know I must keep the old value too, I'm simplifying) In the case of a Zybo board with a microblaze, the property could be: > compatible = "digilent,zybo", "xlnx,microblaze"; That would allow to differentiate between zynq and microblaze. I have no problem on dropping the patch if you like. There might be something that I'm not seeing or a use case that I'm missing. Thanks, Luis Araneda.
Re: [RFC PATCH 5/5] arm: dts: zynq: remove "zynq" prefix from compatible property
Hi Michal, On Thu, Jun 28, 2018 at 2:42 AM Michal Simek wrote: > zynq name here is correct which is saying that hardblock is going to be > described. Without it it is suggesting that hardblock is not used and it > is for example on zybo with microblaze. In my opinion, the zynq name is just adding redundant information to the "xlnx,zynq-7000" value. Taking the Zybo board, the current compatible property is: > compatible = "digilent,zynq-zybo", "xlnx,zynq-7000"; I'm proposing to change it to: > compatible = "digilent,zybo", "xlnx,zynq-7000"; (I know I must keep the old value too, I'm simplifying) In the case of a Zybo board with a microblaze, the property could be: > compatible = "digilent,zybo", "xlnx,microblaze"; That would allow to differentiate between zynq and microblaze. I have no problem on dropping the patch if you like. There might be something that I'm not seeing or a use case that I'm missing. Thanks, Luis Araneda.
Re: [RFC PATCH 4/5] arm: dts: zynq: rename board zed to zedboard
Hi Michal,
On Thu, Jun 28, 2018 at 2:40 AM Michal Simek wrote:
> > diff --git a/arch/arm/boot/dts/zynq-zed.dts
> > b/arch/arm/boot/dts/zynq-zedboard.dts
> > similarity index 93%
> > rename from arch/arm/boot/dts/zynq-zed.dts
> > rename to arch/arm/boot/dts/zynq-zedboard.dts
> > index bf3e26dbf..540581c56 100644
> > --- a/arch/arm/boot/dts/zynq-zed.dts
> > +++ b/arch/arm/boot/dts/zynq-zedboard.dts
> > @@ -8,7 +8,7 @@
> >
> > / {
> > model = "Avnet ZedBoard board";
> > - compatible = "avnet,zynq-zed", "xlnx,zynq-7000";
> > + compatible = "avnet,zynq-zedboard", "xlnx,zynq-7000";
> >
> > aliases {
> > ethernet0 =
> >
>
> It will just cause confusion and I can't see any benefit to rename this
> file. If you want to state different compatible string with full board
> name I am fine with that but that's it.
Ok, I'll drop this patch for V2.
Thanks,
Luis Araneda.
Re: [RFC PATCH 4/5] arm: dts: zynq: rename board zed to zedboard
Hi Michal,
On Thu, Jun 28, 2018 at 2:40 AM Michal Simek wrote:
> > diff --git a/arch/arm/boot/dts/zynq-zed.dts
> > b/arch/arm/boot/dts/zynq-zedboard.dts
> > similarity index 93%
> > rename from arch/arm/boot/dts/zynq-zed.dts
> > rename to arch/arm/boot/dts/zynq-zedboard.dts
> > index bf3e26dbf..540581c56 100644
> > --- a/arch/arm/boot/dts/zynq-zed.dts
> > +++ b/arch/arm/boot/dts/zynq-zedboard.dts
> > @@ -8,7 +8,7 @@
> >
> > / {
> > model = "Avnet ZedBoard board";
> > - compatible = "avnet,zynq-zed", "xlnx,zynq-7000";
> > + compatible = "avnet,zynq-zedboard", "xlnx,zynq-7000";
> >
> > aliases {
> > ethernet0 =
> >
>
> It will just cause confusion and I can't see any benefit to rename this
> file. If you want to state different compatible string with full board
> name I am fine with that but that's it.
Ok, I'll drop this patch for V2.
Thanks,
Luis Araneda.
Re: [RFC PATCH 2/5] dt-bindings: xilinx: Add missing zynq boards
Hi Michal, On Thu, Jun 28, 2018 at 2:44 AM Michal Simek wrote: > > -- Xilinx internal board cc108 > > +- Xilinx CC108 board > > No reason to remove internal word from here. Ok. Thanks, Luis Araneda.
Re: [RFC PATCH 2/5] dt-bindings: xilinx: Add missing zynq boards
Hi Michal, On Thu, Jun 28, 2018 at 2:44 AM Michal Simek wrote: > > -- Xilinx internal board cc108 > > +- Xilinx CC108 board > > No reason to remove internal word from here. Ok. Thanks, Luis Araneda.
Re: [RFC PATCH 1/5] arm: dts: zynq: Set correct manufacturer for ZedBoard and MicroZed boards
Hi Michal, On Thu, Jun 28, 2018 at 2:37 AM Michal Simek wrote: > > On 28.6.2018 07:42, Luis Araneda wrote: > Unfortunately we don't know who is parsing this string. It means please > keep that origin compatible string there. > > I have no problem with this. > compatible = "avnet,zynq-zed", "xlnx,zynq-zed", "xlnx,zynq-7000"; Ok, I'll change that for V2, and I'll keep it in mind for the rest of the series too. Thanks for reviewing, Luis Araneda.
Re: [RFC PATCH 1/5] arm: dts: zynq: Set correct manufacturer for ZedBoard and MicroZed boards
Hi Michal, On Thu, Jun 28, 2018 at 2:37 AM Michal Simek wrote: > > On 28.6.2018 07:42, Luis Araneda wrote: > Unfortunately we don't know who is parsing this string. It means please > keep that origin compatible string there. > > I have no problem with this. > compatible = "avnet,zynq-zed", "xlnx,zynq-zed", "xlnx,zynq-7000"; Ok, I'll change that for V2, and I'll keep it in mind for the rest of the series too. Thanks for reviewing, Luis Araneda.
[RFC PATCH 4/5] arm: dts: zynq: rename board zed to zedboard
The real name of the board is ZedBoard, from Avnet
Signed-off-by: Luis Araneda
---
Documentation/devicetree/bindings/arm/xilinx.txt | 2 +-
arch/arm/boot/dts/Makefile| 2 +-
arch/arm/boot/dts/{zynq-zed.dts => zynq-zedboard.dts} | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
rename arch/arm/boot/dts/{zynq-zed.dts => zynq-zedboard.dts} (93%)
diff --git a/Documentation/devicetree/bindings/arm/xilinx.txt
b/Documentation/devicetree/bindings/arm/xilinx.txt
index f1e911058..d10adc4d0 100644
--- a/Documentation/devicetree/bindings/arm/xilinx.txt
+++ b/Documentation/devicetree/bindings/arm/xilinx.txt
@@ -30,7 +30,7 @@ Additional compatible strings:
"xlnx,zynq-zc770-xm013"
- Avnet ZedBoard board
- "avnet,zynq-zed"
+ "avnet,zynq-zedboard"
- Digilent Zybo board
"digilent,zynq-zybo"
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 37a3de760..e4c39e26f 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -1108,7 +1108,7 @@ dtb-$(CONFIG_ARCH_ZYNQ) += \
zynq-zc770-xm011.dtb \
zynq-zc770-xm012.dtb \
zynq-zc770-xm013.dtb \
- zynq-zed.dtb \
+ zynq-zedboard.dtb \
zynq-zybo.dtb \
zynq-zybo-z7.dtb
dtb-$(CONFIG_MACH_ARMADA_370) += \
diff --git a/arch/arm/boot/dts/zynq-zed.dts
b/arch/arm/boot/dts/zynq-zedboard.dts
similarity index 93%
rename from arch/arm/boot/dts/zynq-zed.dts
rename to arch/arm/boot/dts/zynq-zedboard.dts
index bf3e26dbf..540581c56 100644
--- a/arch/arm/boot/dts/zynq-zed.dts
+++ b/arch/arm/boot/dts/zynq-zedboard.dts
@@ -8,7 +8,7 @@
/ {
model = "Avnet ZedBoard board";
- compatible = "avnet,zynq-zed", "xlnx,zynq-7000";
+ compatible = "avnet,zynq-zedboard", "xlnx,zynq-7000";
aliases {
ethernet0 =
--
2.18.0
[RFC PATCH 4/5] arm: dts: zynq: rename board zed to zedboard
The real name of the board is ZedBoard, from Avnet
Signed-off-by: Luis Araneda
---
Documentation/devicetree/bindings/arm/xilinx.txt | 2 +-
arch/arm/boot/dts/Makefile| 2 +-
arch/arm/boot/dts/{zynq-zed.dts => zynq-zedboard.dts} | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
rename arch/arm/boot/dts/{zynq-zed.dts => zynq-zedboard.dts} (93%)
diff --git a/Documentation/devicetree/bindings/arm/xilinx.txt
b/Documentation/devicetree/bindings/arm/xilinx.txt
index f1e911058..d10adc4d0 100644
--- a/Documentation/devicetree/bindings/arm/xilinx.txt
+++ b/Documentation/devicetree/bindings/arm/xilinx.txt
@@ -30,7 +30,7 @@ Additional compatible strings:
"xlnx,zynq-zc770-xm013"
- Avnet ZedBoard board
- "avnet,zynq-zed"
+ "avnet,zynq-zedboard"
- Digilent Zybo board
"digilent,zynq-zybo"
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 37a3de760..e4c39e26f 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -1108,7 +1108,7 @@ dtb-$(CONFIG_ARCH_ZYNQ) += \
zynq-zc770-xm011.dtb \
zynq-zc770-xm012.dtb \
zynq-zc770-xm013.dtb \
- zynq-zed.dtb \
+ zynq-zedboard.dtb \
zynq-zybo.dtb \
zynq-zybo-z7.dtb
dtb-$(CONFIG_MACH_ARMADA_370) += \
diff --git a/arch/arm/boot/dts/zynq-zed.dts
b/arch/arm/boot/dts/zynq-zedboard.dts
similarity index 93%
rename from arch/arm/boot/dts/zynq-zed.dts
rename to arch/arm/boot/dts/zynq-zedboard.dts
index bf3e26dbf..540581c56 100644
--- a/arch/arm/boot/dts/zynq-zed.dts
+++ b/arch/arm/boot/dts/zynq-zedboard.dts
@@ -8,7 +8,7 @@
/ {
model = "Avnet ZedBoard board";
- compatible = "avnet,zynq-zed", "xlnx,zynq-7000";
+ compatible = "avnet,zynq-zedboard", "xlnx,zynq-7000";
aliases {
ethernet0 =
--
2.18.0
[RFC PATCH 0/5] arm: dts: zynq: improvements and cleanup
This series attempts to standardize device naming and improve
its information for better identification
The values of the "compatible" and "model" device-tree properties
are corrected for some devices, adding complementary information
when necessary
Additionally, a device-tree file is renamed to reflect the real model
of the device
I'm sending the series as an RFC because I don't know if
device-tree files can be renamed and properties be changed
(the last patch in particular)
The patches are sorted (descending) by what I think is
the probability of being accepted
Luis Araneda (5):
arm: dts: zynq: Set correct manufacturer for ZedBoard and MicroZed
boards
dt-bindings: xilinx: Add missing zynq boards
arm: dts: zynq: correct and improve the model property of dt files
arm: dts: zynq: rename board zed to zedboard
arm: dts: zynq: remove "zynq" prefix from compatible property
.../devicetree/bindings/arm/xilinx.txt| 34 ++-
arch/arm/boot/dts/Makefile| 2 +-
arch/arm/boot/dts/zynq-cc108.dts | 4 +--
arch/arm/boot/dts/zynq-microzed.dts | 4 +--
arch/arm/boot/dts/zynq-parallella.dts | 2 +-
arch/arm/boot/dts/zynq-zc702.dts | 4 +--
arch/arm/boot/dts/zynq-zc706.dts | 4 +--
arch/arm/boot/dts/zynq-zc770-xm010.dts| 4 +--
arch/arm/boot/dts/zynq-zc770-xm011.dts| 4 +--
arch/arm/boot/dts/zynq-zc770-xm012.dts| 4 +--
arch/arm/boot/dts/zynq-zc770-xm013.dts| 4 +--
.../dts/{zynq-zed.dts => zynq-zedboard.dts} | 4 +--
arch/arm/boot/dts/zynq-zybo-z7.dts| 4 +--
arch/arm/boot/dts/zynq-zybo.dts | 4 +--
14 files changed, 50 insertions(+), 32 deletions(-)
rename arch/arm/boot/dts/{zynq-zed.dts => zynq-zedboard.dts} (89%)
--
2.18.0
[RFC PATCH 2/5] dt-bindings: xilinx: Add missing zynq boards
The bindings were missing when adding the device-tree files Also, improve description of existing boards Signed-off-by: Luis Araneda --- .../devicetree/bindings/arm/xilinx.txt| 22 +-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/xilinx.txt b/Documentation/devicetree/bindings/arm/xilinx.txt index b9043bc35..f1e911058 100644 --- a/Documentation/devicetree/bindings/arm/xilinx.txt +++ b/Documentation/devicetree/bindings/arm/xilinx.txt @@ -8,15 +8,33 @@ Required root node properties: Additional compatible strings: -- Xilinx internal board cc108 +- Xilinx CC108 board "xlnx,zynq-cc108" -- Xilinx internal board zc770 with different FMC cards +- Avnet MicroZed board + "avnet,zynq-microzed" + +- Adapteva Parallella board + "adapteva,parallella" + +- Xilinx ZC702 board + "xlnx,zynq-zc702" + +- Xilinx ZC706 board + "xlnx,zynq-zc706" + +- Xilinx ZC770 board, with different FMC cards "xlnx,zynq-zc770-xm010" "xlnx,zynq-zc770-xm011" "xlnx,zynq-zc770-xm012" "xlnx,zynq-zc770-xm013" +- Avnet ZedBoard board + "avnet,zynq-zed" + +- Digilent Zybo board + "digilent,zynq-zybo" + - Digilent Zybo Z7 board "digilent,zynq-zybo-z7" -- 2.18.0
[RFC PATCH 5/5] arm: dts: zynq: remove "zynq" prefix from compatible property
The value "zynq" isn't officially part of the model on any board.
Additionally, the value is redundant as it's included in a
subsequent value of the property.
Signed-off-by: Luis Araneda
---
.../devicetree/bindings/arm/xilinx.txt| 22 +--
arch/arm/boot/dts/zynq-cc108.dts | 2 +-
arch/arm/boot/dts/zynq-microzed.dts | 2 +-
arch/arm/boot/dts/zynq-zc702.dts | 2 +-
arch/arm/boot/dts/zynq-zc706.dts | 2 +-
arch/arm/boot/dts/zynq-zc770-xm010.dts| 2 +-
arch/arm/boot/dts/zynq-zc770-xm011.dts| 2 +-
arch/arm/boot/dts/zynq-zc770-xm012.dts| 2 +-
arch/arm/boot/dts/zynq-zc770-xm013.dts| 2 +-
arch/arm/boot/dts/zynq-zedboard.dts | 2 +-
arch/arm/boot/dts/zynq-zybo-z7.dts| 2 +-
arch/arm/boot/dts/zynq-zybo.dts | 2 +-
12 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/Documentation/devicetree/bindings/arm/xilinx.txt
b/Documentation/devicetree/bindings/arm/xilinx.txt
index d10adc4d0..0785acce4 100644
--- a/Documentation/devicetree/bindings/arm/xilinx.txt
+++ b/Documentation/devicetree/bindings/arm/xilinx.txt
@@ -9,34 +9,34 @@ Required root node properties:
Additional compatible strings:
- Xilinx CC108 board
- "xlnx,zynq-cc108"
+ "xlnx,cc108"
- Avnet MicroZed board
- "avnet,zynq-microzed"
+ "avnet,microzed"
- Adapteva Parallella board
"adapteva,parallella"
- Xilinx ZC702 board
- "xlnx,zynq-zc702"
+ "xlnx,zc702"
- Xilinx ZC706 board
- "xlnx,zynq-zc706"
+ "xlnx,zc706"
- Xilinx ZC770 board, with different FMC cards
- "xlnx,zynq-zc770-xm010"
- "xlnx,zynq-zc770-xm011"
- "xlnx,zynq-zc770-xm012"
- "xlnx,zynq-zc770-xm013"
+ "xlnx,zc770-xm010"
+ "xlnx,zc770-xm011"
+ "xlnx,zc770-xm012"
+ "xlnx,zc770-xm013"
- Avnet ZedBoard board
- "avnet,zynq-zedboard"
+ "avnet,zedboard"
- Digilent Zybo board
- "digilent,zynq-zybo"
+ "digilent,zybo"
- Digilent Zybo Z7 board
- "digilent,zynq-zybo-z7"
+ "digilent,zybo-z7"
---
diff --git a/arch/arm/boot/dts/zynq-cc108.dts b/arch/arm/boot/dts/zynq-cc108.dts
index 8b9ab9bba..ccff20099 100644
--- a/arch/arm/boot/dts/zynq-cc108.dts
+++ b/arch/arm/boot/dts/zynq-cc108.dts
@@ -13,7 +13,7 @@
/ {
model = "Xilinx CC108 board";
- compatible = "xlnx,zynq-cc108", "xlnx,zynq-7000";
+ compatible = "xlnx,cc108", "xlnx,zynq-7000";
aliases {
ethernet0 =
diff --git a/arch/arm/boot/dts/zynq-microzed.dts
b/arch/arm/boot/dts/zynq-microzed.dts
index 3cc957428..ef55adb02 100644
--- a/arch/arm/boot/dts/zynq-microzed.dts
+++ b/arch/arm/boot/dts/zynq-microzed.dts
@@ -8,7 +8,7 @@
/ {
model = "Avnet MicroZed board";
- compatible = "avnet,zynq-microzed", "xlnx,zynq-7000";
+ compatible = "avnet,microzed", "xlnx,zynq-7000";
aliases {
ethernet0 =
diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts
index 3f84b94db..bd633a9bc 100644
--- a/arch/arm/boot/dts/zynq-zc702.dts
+++ b/arch/arm/boot/dts/zynq-zc702.dts
@@ -8,7 +8,7 @@
/ {
model = "Xilinx ZC702 board";
- compatible = "xlnx,zynq-zc702", "xlnx,zynq-7000";
+ compatible = "xlnx,zc702", "xlnx,zynq-7000";
aliases {
ethernet0 =
diff --git a/arch/arm/boot/dts/zynq-zc706.dts b/arch/arm/boot/dts/zynq-zc706.dts
index a15908cac..f4805f01b 100644
--- a/arch/arm/boot/dts/zynq-zc706.dts
+++ b/arch/arm/boot/dts/zynq-zc706.dts
@@ -8,7 +8,7 @@
/ {
model = "Xilinx ZC706 board";
- compatible = "xlnx,zynq-zc706", "xlnx,zynq-7000";
+ compatible = "xlnx,zc706", "xlnx,zynq-7000";
aliases {
ethernet0 =
diff --git a/arch/arm/boot/dts/zynq-zc770-xm010.dts
b/arch/arm/boot/dts/zynq-zc770-xm010.dts
index 0e1bfdd34..21f457656 100644
--- a/arch/arm/boot/dts/zynq-zc770-xm010.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm010.dts
@@ -9,7 +9,7 @@
/ {
model = "Xilinx ZC770 XM010 board";
- compatible = "xlnx,zynq-zc770-xm010", "xlnx,zynq-7000";
+ compatible = "xlnx,zc770-xm010", "xlnx,zynq-7000";
aliases {
ethernet0 =
diff --git a/arch/arm/boot/dts/zynq-zc770-xm011.dts
b/arch/arm/boot/dts/zynq-zc770-xm011.dts
index b7f65862c..e4a0b2629 100644
--- a/arch/arm/boot/dts/zynq-zc770-xm011.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm011.dts
@@ -9,7 +9,7 @@
/ {
model = "Xi
[RFC PATCH 0/5] arm: dts: zynq: improvements and cleanup
This series attempts to standardize device naming and improve
its information for better identification
The values of the "compatible" and "model" device-tree properties
are corrected for some devices, adding complementary information
when necessary
Additionally, a device-tree file is renamed to reflect the real model
of the device
I'm sending the series as an RFC because I don't know if
device-tree files can be renamed and properties be changed
(the last patch in particular)
The patches are sorted (descending) by what I think is
the probability of being accepted
Luis Araneda (5):
arm: dts: zynq: Set correct manufacturer for ZedBoard and MicroZed
boards
dt-bindings: xilinx: Add missing zynq boards
arm: dts: zynq: correct and improve the model property of dt files
arm: dts: zynq: rename board zed to zedboard
arm: dts: zynq: remove "zynq" prefix from compatible property
.../devicetree/bindings/arm/xilinx.txt| 34 ++-
arch/arm/boot/dts/Makefile| 2 +-
arch/arm/boot/dts/zynq-cc108.dts | 4 +--
arch/arm/boot/dts/zynq-microzed.dts | 4 +--
arch/arm/boot/dts/zynq-parallella.dts | 2 +-
arch/arm/boot/dts/zynq-zc702.dts | 4 +--
arch/arm/boot/dts/zynq-zc706.dts | 4 +--
arch/arm/boot/dts/zynq-zc770-xm010.dts| 4 +--
arch/arm/boot/dts/zynq-zc770-xm011.dts| 4 +--
arch/arm/boot/dts/zynq-zc770-xm012.dts| 4 +--
arch/arm/boot/dts/zynq-zc770-xm013.dts| 4 +--
.../dts/{zynq-zed.dts => zynq-zedboard.dts} | 4 +--
arch/arm/boot/dts/zynq-zybo-z7.dts| 4 +--
arch/arm/boot/dts/zynq-zybo.dts | 4 +--
14 files changed, 50 insertions(+), 32 deletions(-)
rename arch/arm/boot/dts/{zynq-zed.dts => zynq-zedboard.dts} (89%)
--
2.18.0
[RFC PATCH 2/5] dt-bindings: xilinx: Add missing zynq boards
The bindings were missing when adding the device-tree files Also, improve description of existing boards Signed-off-by: Luis Araneda --- .../devicetree/bindings/arm/xilinx.txt| 22 +-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/xilinx.txt b/Documentation/devicetree/bindings/arm/xilinx.txt index b9043bc35..f1e911058 100644 --- a/Documentation/devicetree/bindings/arm/xilinx.txt +++ b/Documentation/devicetree/bindings/arm/xilinx.txt @@ -8,15 +8,33 @@ Required root node properties: Additional compatible strings: -- Xilinx internal board cc108 +- Xilinx CC108 board "xlnx,zynq-cc108" -- Xilinx internal board zc770 with different FMC cards +- Avnet MicroZed board + "avnet,zynq-microzed" + +- Adapteva Parallella board + "adapteva,parallella" + +- Xilinx ZC702 board + "xlnx,zynq-zc702" + +- Xilinx ZC706 board + "xlnx,zynq-zc706" + +- Xilinx ZC770 board, with different FMC cards "xlnx,zynq-zc770-xm010" "xlnx,zynq-zc770-xm011" "xlnx,zynq-zc770-xm012" "xlnx,zynq-zc770-xm013" +- Avnet ZedBoard board + "avnet,zynq-zed" + +- Digilent Zybo board + "digilent,zynq-zybo" + - Digilent Zybo Z7 board "digilent,zynq-zybo-z7" -- 2.18.0
[RFC PATCH 5/5] arm: dts: zynq: remove "zynq" prefix from compatible property
The value "zynq" isn't officially part of the model on any board.
Additionally, the value is redundant as it's included in a
subsequent value of the property.
Signed-off-by: Luis Araneda
---
.../devicetree/bindings/arm/xilinx.txt| 22 +--
arch/arm/boot/dts/zynq-cc108.dts | 2 +-
arch/arm/boot/dts/zynq-microzed.dts | 2 +-
arch/arm/boot/dts/zynq-zc702.dts | 2 +-
arch/arm/boot/dts/zynq-zc706.dts | 2 +-
arch/arm/boot/dts/zynq-zc770-xm010.dts| 2 +-
arch/arm/boot/dts/zynq-zc770-xm011.dts| 2 +-
arch/arm/boot/dts/zynq-zc770-xm012.dts| 2 +-
arch/arm/boot/dts/zynq-zc770-xm013.dts| 2 +-
arch/arm/boot/dts/zynq-zedboard.dts | 2 +-
arch/arm/boot/dts/zynq-zybo-z7.dts| 2 +-
arch/arm/boot/dts/zynq-zybo.dts | 2 +-
12 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/Documentation/devicetree/bindings/arm/xilinx.txt
b/Documentation/devicetree/bindings/arm/xilinx.txt
index d10adc4d0..0785acce4 100644
--- a/Documentation/devicetree/bindings/arm/xilinx.txt
+++ b/Documentation/devicetree/bindings/arm/xilinx.txt
@@ -9,34 +9,34 @@ Required root node properties:
Additional compatible strings:
- Xilinx CC108 board
- "xlnx,zynq-cc108"
+ "xlnx,cc108"
- Avnet MicroZed board
- "avnet,zynq-microzed"
+ "avnet,microzed"
- Adapteva Parallella board
"adapteva,parallella"
- Xilinx ZC702 board
- "xlnx,zynq-zc702"
+ "xlnx,zc702"
- Xilinx ZC706 board
- "xlnx,zynq-zc706"
+ "xlnx,zc706"
- Xilinx ZC770 board, with different FMC cards
- "xlnx,zynq-zc770-xm010"
- "xlnx,zynq-zc770-xm011"
- "xlnx,zynq-zc770-xm012"
- "xlnx,zynq-zc770-xm013"
+ "xlnx,zc770-xm010"
+ "xlnx,zc770-xm011"
+ "xlnx,zc770-xm012"
+ "xlnx,zc770-xm013"
- Avnet ZedBoard board
- "avnet,zynq-zedboard"
+ "avnet,zedboard"
- Digilent Zybo board
- "digilent,zynq-zybo"
+ "digilent,zybo"
- Digilent Zybo Z7 board
- "digilent,zynq-zybo-z7"
+ "digilent,zybo-z7"
---
diff --git a/arch/arm/boot/dts/zynq-cc108.dts b/arch/arm/boot/dts/zynq-cc108.dts
index 8b9ab9bba..ccff20099 100644
--- a/arch/arm/boot/dts/zynq-cc108.dts
+++ b/arch/arm/boot/dts/zynq-cc108.dts
@@ -13,7 +13,7 @@
/ {
model = "Xilinx CC108 board";
- compatible = "xlnx,zynq-cc108", "xlnx,zynq-7000";
+ compatible = "xlnx,cc108", "xlnx,zynq-7000";
aliases {
ethernet0 =
diff --git a/arch/arm/boot/dts/zynq-microzed.dts
b/arch/arm/boot/dts/zynq-microzed.dts
index 3cc957428..ef55adb02 100644
--- a/arch/arm/boot/dts/zynq-microzed.dts
+++ b/arch/arm/boot/dts/zynq-microzed.dts
@@ -8,7 +8,7 @@
/ {
model = "Avnet MicroZed board";
- compatible = "avnet,zynq-microzed", "xlnx,zynq-7000";
+ compatible = "avnet,microzed", "xlnx,zynq-7000";
aliases {
ethernet0 =
diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts
index 3f84b94db..bd633a9bc 100644
--- a/arch/arm/boot/dts/zynq-zc702.dts
+++ b/arch/arm/boot/dts/zynq-zc702.dts
@@ -8,7 +8,7 @@
/ {
model = "Xilinx ZC702 board";
- compatible = "xlnx,zynq-zc702", "xlnx,zynq-7000";
+ compatible = "xlnx,zc702", "xlnx,zynq-7000";
aliases {
ethernet0 =
diff --git a/arch/arm/boot/dts/zynq-zc706.dts b/arch/arm/boot/dts/zynq-zc706.dts
index a15908cac..f4805f01b 100644
--- a/arch/arm/boot/dts/zynq-zc706.dts
+++ b/arch/arm/boot/dts/zynq-zc706.dts
@@ -8,7 +8,7 @@
/ {
model = "Xilinx ZC706 board";
- compatible = "xlnx,zynq-zc706", "xlnx,zynq-7000";
+ compatible = "xlnx,zc706", "xlnx,zynq-7000";
aliases {
ethernet0 =
diff --git a/arch/arm/boot/dts/zynq-zc770-xm010.dts
b/arch/arm/boot/dts/zynq-zc770-xm010.dts
index 0e1bfdd34..21f457656 100644
--- a/arch/arm/boot/dts/zynq-zc770-xm010.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm010.dts
@@ -9,7 +9,7 @@
/ {
model = "Xilinx ZC770 XM010 board";
- compatible = "xlnx,zynq-zc770-xm010", "xlnx,zynq-7000";
+ compatible = "xlnx,zc770-xm010", "xlnx,zynq-7000";
aliases {
ethernet0 =
diff --git a/arch/arm/boot/dts/zynq-zc770-xm011.dts
b/arch/arm/boot/dts/zynq-zc770-xm011.dts
index b7f65862c..e4a0b2629 100644
--- a/arch/arm/boot/dts/zynq-zc770-xm011.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm011.dts
@@ -9,7 +9,7 @@
/ {
model = "Xi
[RFC PATCH 3/5] arm: dts: zynq: correct and improve the model property of dt files
Replace the current value of the model property by a more accurate
description of each board (which includes the manufacturer), as some
of the boards had the same value ("Xilinx Zynq")
Signed-off-by: Luis Araneda
---
arch/arm/boot/dts/zynq-cc108.dts | 2 +-
arch/arm/boot/dts/zynq-microzed.dts| 2 +-
arch/arm/boot/dts/zynq-parallella.dts | 2 +-
arch/arm/boot/dts/zynq-zc702.dts | 2 +-
arch/arm/boot/dts/zynq-zc706.dts | 2 +-
arch/arm/boot/dts/zynq-zc770-xm010.dts | 2 +-
arch/arm/boot/dts/zynq-zc770-xm011.dts | 2 +-
arch/arm/boot/dts/zynq-zc770-xm012.dts | 2 +-
arch/arm/boot/dts/zynq-zc770-xm013.dts | 2 +-
arch/arm/boot/dts/zynq-zed.dts | 2 +-
arch/arm/boot/dts/zynq-zybo-z7.dts | 2 +-
arch/arm/boot/dts/zynq-zybo.dts| 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/arch/arm/boot/dts/zynq-cc108.dts b/arch/arm/boot/dts/zynq-cc108.dts
index 1a0f631c1..8b9ab9bba 100644
--- a/arch/arm/boot/dts/zynq-cc108.dts
+++ b/arch/arm/boot/dts/zynq-cc108.dts
@@ -12,8 +12,8 @@
/include/ "zynq-7000.dtsi"
/ {
+ model = "Xilinx CC108 board";
compatible = "xlnx,zynq-cc108", "xlnx,zynq-7000";
- model = "Xilinx Zynq";
aliases {
ethernet0 =
diff --git a/arch/arm/boot/dts/zynq-microzed.dts
b/arch/arm/boot/dts/zynq-microzed.dts
index e40f40a7f..3cc957428 100644
--- a/arch/arm/boot/dts/zynq-microzed.dts
+++ b/arch/arm/boot/dts/zynq-microzed.dts
@@ -7,7 +7,7 @@
/include/ "zynq-7000.dtsi"
/ {
- model = "Zynq MicroZED Development Board";
+ model = "Avnet MicroZed board";
compatible = "avnet,zynq-microzed", "xlnx,zynq-7000";
aliases {
diff --git a/arch/arm/boot/dts/zynq-parallella.dts
b/arch/arm/boot/dts/zynq-parallella.dts
index c05f4b67d..54592aeb9 100644
--- a/arch/arm/boot/dts/zynq-parallella.dts
+++ b/arch/arm/boot/dts/zynq-parallella.dts
@@ -12,7 +12,7 @@
/include/ "zynq-7000.dtsi"
/ {
- model = "Adapteva Parallella Board";
+ model = "Adapteva Parallella board";
compatible = "adapteva,parallella", "xlnx,zynq-7000";
aliases {
diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts
index f2330b0cb..3f84b94db 100644
--- a/arch/arm/boot/dts/zynq-zc702.dts
+++ b/arch/arm/boot/dts/zynq-zc702.dts
@@ -7,7 +7,7 @@
#include "zynq-7000.dtsi"
/ {
- model = "Zynq ZC702 Development Board";
+ model = "Xilinx ZC702 board";
compatible = "xlnx,zynq-zc702", "xlnx,zynq-7000";
aliases {
diff --git a/arch/arm/boot/dts/zynq-zc706.dts b/arch/arm/boot/dts/zynq-zc706.dts
index 3ad1260ff..a15908cac 100644
--- a/arch/arm/boot/dts/zynq-zc706.dts
+++ b/arch/arm/boot/dts/zynq-zc706.dts
@@ -7,7 +7,7 @@
#include "zynq-7000.dtsi"
/ {
- model = "Zynq ZC706 Development Board";
+ model = "Xilinx ZC706 board";
compatible = "xlnx,zynq-zc706", "xlnx,zynq-7000";
aliases {
diff --git a/arch/arm/boot/dts/zynq-zc770-xm010.dts
b/arch/arm/boot/dts/zynq-zc770-xm010.dts
index 6884f1ad6..0e1bfdd34 100644
--- a/arch/arm/boot/dts/zynq-zc770-xm010.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm010.dts
@@ -8,8 +8,8 @@
#include "zynq-7000.dtsi"
/ {
+ model = "Xilinx ZC770 XM010 board";
compatible = "xlnx,zynq-zc770-xm010", "xlnx,zynq-7000";
- model = "Xilinx Zynq";
aliases {
ethernet0 =
diff --git a/arch/arm/boot/dts/zynq-zc770-xm011.dts
b/arch/arm/boot/dts/zynq-zc770-xm011.dts
index b78883cee..b7f65862c 100644
--- a/arch/arm/boot/dts/zynq-zc770-xm011.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm011.dts
@@ -8,8 +8,8 @@
#include "zynq-7000.dtsi"
/ {
+ model = "Xilinx ZC770 XM011 board";
compatible = "xlnx,zynq-zc770-xm011", "xlnx,zynq-7000";
- model = "Xilinx Zynq";
aliases {
i2c0 =
diff --git a/arch/arm/boot/dts/zynq-zc770-xm012.dts
b/arch/arm/boot/dts/zynq-zc770-xm012.dts
index c3169d636..d2359b789 100644
--- a/arch/arm/boot/dts/zynq-zc770-xm012.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm012.dts
@@ -8,8 +8,8 @@
#include "zynq-7000.dtsi"
/ {
+ model = "Xilinx ZC770 XM012 board";
compatible = "xlnx,zynq-zc770-xm012", "xlnx,zynq-7000";
- model = "Xilinx Zynq";
aliases {
i2c0 =
diff --git a/arch/arm/boot/dts/zynq-zc770-xm013.dts
b/arch/arm/boot/dts/zynq-zc770-xm013.dts
index 8bb66859d..651913f1a 100644
--- a/arch/arm/boot/dts/zynq-zc770-xm013.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm013.dts
@@ -8,8 +8,8 @@
#include "zynq-7000.dtsi"
[RFC PATCH 3/5] arm: dts: zynq: correct and improve the model property of dt files
Replace the current value of the model property by a more accurate
description of each board (which includes the manufacturer), as some
of the boards had the same value ("Xilinx Zynq")
Signed-off-by: Luis Araneda
---
arch/arm/boot/dts/zynq-cc108.dts | 2 +-
arch/arm/boot/dts/zynq-microzed.dts| 2 +-
arch/arm/boot/dts/zynq-parallella.dts | 2 +-
arch/arm/boot/dts/zynq-zc702.dts | 2 +-
arch/arm/boot/dts/zynq-zc706.dts | 2 +-
arch/arm/boot/dts/zynq-zc770-xm010.dts | 2 +-
arch/arm/boot/dts/zynq-zc770-xm011.dts | 2 +-
arch/arm/boot/dts/zynq-zc770-xm012.dts | 2 +-
arch/arm/boot/dts/zynq-zc770-xm013.dts | 2 +-
arch/arm/boot/dts/zynq-zed.dts | 2 +-
arch/arm/boot/dts/zynq-zybo-z7.dts | 2 +-
arch/arm/boot/dts/zynq-zybo.dts| 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/arch/arm/boot/dts/zynq-cc108.dts b/arch/arm/boot/dts/zynq-cc108.dts
index 1a0f631c1..8b9ab9bba 100644
--- a/arch/arm/boot/dts/zynq-cc108.dts
+++ b/arch/arm/boot/dts/zynq-cc108.dts
@@ -12,8 +12,8 @@
/include/ "zynq-7000.dtsi"
/ {
+ model = "Xilinx CC108 board";
compatible = "xlnx,zynq-cc108", "xlnx,zynq-7000";
- model = "Xilinx Zynq";
aliases {
ethernet0 =
diff --git a/arch/arm/boot/dts/zynq-microzed.dts
b/arch/arm/boot/dts/zynq-microzed.dts
index e40f40a7f..3cc957428 100644
--- a/arch/arm/boot/dts/zynq-microzed.dts
+++ b/arch/arm/boot/dts/zynq-microzed.dts
@@ -7,7 +7,7 @@
/include/ "zynq-7000.dtsi"
/ {
- model = "Zynq MicroZED Development Board";
+ model = "Avnet MicroZed board";
compatible = "avnet,zynq-microzed", "xlnx,zynq-7000";
aliases {
diff --git a/arch/arm/boot/dts/zynq-parallella.dts
b/arch/arm/boot/dts/zynq-parallella.dts
index c05f4b67d..54592aeb9 100644
--- a/arch/arm/boot/dts/zynq-parallella.dts
+++ b/arch/arm/boot/dts/zynq-parallella.dts
@@ -12,7 +12,7 @@
/include/ "zynq-7000.dtsi"
/ {
- model = "Adapteva Parallella Board";
+ model = "Adapteva Parallella board";
compatible = "adapteva,parallella", "xlnx,zynq-7000";
aliases {
diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts
index f2330b0cb..3f84b94db 100644
--- a/arch/arm/boot/dts/zynq-zc702.dts
+++ b/arch/arm/boot/dts/zynq-zc702.dts
@@ -7,7 +7,7 @@
#include "zynq-7000.dtsi"
/ {
- model = "Zynq ZC702 Development Board";
+ model = "Xilinx ZC702 board";
compatible = "xlnx,zynq-zc702", "xlnx,zynq-7000";
aliases {
diff --git a/arch/arm/boot/dts/zynq-zc706.dts b/arch/arm/boot/dts/zynq-zc706.dts
index 3ad1260ff..a15908cac 100644
--- a/arch/arm/boot/dts/zynq-zc706.dts
+++ b/arch/arm/boot/dts/zynq-zc706.dts
@@ -7,7 +7,7 @@
#include "zynq-7000.dtsi"
/ {
- model = "Zynq ZC706 Development Board";
+ model = "Xilinx ZC706 board";
compatible = "xlnx,zynq-zc706", "xlnx,zynq-7000";
aliases {
diff --git a/arch/arm/boot/dts/zynq-zc770-xm010.dts
b/arch/arm/boot/dts/zynq-zc770-xm010.dts
index 6884f1ad6..0e1bfdd34 100644
--- a/arch/arm/boot/dts/zynq-zc770-xm010.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm010.dts
@@ -8,8 +8,8 @@
#include "zynq-7000.dtsi"
/ {
+ model = "Xilinx ZC770 XM010 board";
compatible = "xlnx,zynq-zc770-xm010", "xlnx,zynq-7000";
- model = "Xilinx Zynq";
aliases {
ethernet0 =
diff --git a/arch/arm/boot/dts/zynq-zc770-xm011.dts
b/arch/arm/boot/dts/zynq-zc770-xm011.dts
index b78883cee..b7f65862c 100644
--- a/arch/arm/boot/dts/zynq-zc770-xm011.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm011.dts
@@ -8,8 +8,8 @@
#include "zynq-7000.dtsi"
/ {
+ model = "Xilinx ZC770 XM011 board";
compatible = "xlnx,zynq-zc770-xm011", "xlnx,zynq-7000";
- model = "Xilinx Zynq";
aliases {
i2c0 =
diff --git a/arch/arm/boot/dts/zynq-zc770-xm012.dts
b/arch/arm/boot/dts/zynq-zc770-xm012.dts
index c3169d636..d2359b789 100644
--- a/arch/arm/boot/dts/zynq-zc770-xm012.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm012.dts
@@ -8,8 +8,8 @@
#include "zynq-7000.dtsi"
/ {
+ model = "Xilinx ZC770 XM012 board";
compatible = "xlnx,zynq-zc770-xm012", "xlnx,zynq-7000";
- model = "Xilinx Zynq";
aliases {
i2c0 =
diff --git a/arch/arm/boot/dts/zynq-zc770-xm013.dts
b/arch/arm/boot/dts/zynq-zc770-xm013.dts
index 8bb66859d..651913f1a 100644
--- a/arch/arm/boot/dts/zynq-zc770-xm013.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm013.dts
@@ -8,8 +8,8 @@
#include "zynq-7000.dtsi"
[RFC PATCH 1/5] arm: dts: zynq: Set correct manufacturer for ZedBoard and MicroZed boards
Both boards are made by Avnet, Inc.
Signed-off-by: Luis Araneda
---
arch/arm/boot/dts/zynq-microzed.dts | 2 +-
arch/arm/boot/dts/zynq-zed.dts | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/zynq-microzed.dts
b/arch/arm/boot/dts/zynq-microzed.dts
index aa4a0b6de..e40f40a7f 100644
--- a/arch/arm/boot/dts/zynq-microzed.dts
+++ b/arch/arm/boot/dts/zynq-microzed.dts
@@ -8,7 +8,7 @@
/ {
model = "Zynq MicroZED Development Board";
- compatible = "xlnx,zynq-microzed", "xlnx,zynq-7000";
+ compatible = "avnet,zynq-microzed", "xlnx,zynq-7000";
aliases {
ethernet0 =
diff --git a/arch/arm/boot/dts/zynq-zed.dts b/arch/arm/boot/dts/zynq-zed.dts
index 53c6883ce..98381cc85 100644
--- a/arch/arm/boot/dts/zynq-zed.dts
+++ b/arch/arm/boot/dts/zynq-zed.dts
@@ -8,7 +8,7 @@
/ {
model = "Zynq Zed Development Board";
- compatible = "xlnx,zynq-zed", "xlnx,zynq-7000";
+ compatible = "avnet,zynq-zed", "xlnx,zynq-7000";
aliases {
ethernet0 =
--
2.18.0
[RFC PATCH 1/5] arm: dts: zynq: Set correct manufacturer for ZedBoard and MicroZed boards
Both boards are made by Avnet, Inc.
Signed-off-by: Luis Araneda
---
arch/arm/boot/dts/zynq-microzed.dts | 2 +-
arch/arm/boot/dts/zynq-zed.dts | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/zynq-microzed.dts
b/arch/arm/boot/dts/zynq-microzed.dts
index aa4a0b6de..e40f40a7f 100644
--- a/arch/arm/boot/dts/zynq-microzed.dts
+++ b/arch/arm/boot/dts/zynq-microzed.dts
@@ -8,7 +8,7 @@
/ {
model = "Zynq MicroZED Development Board";
- compatible = "xlnx,zynq-microzed", "xlnx,zynq-7000";
+ compatible = "avnet,zynq-microzed", "xlnx,zynq-7000";
aliases {
ethernet0 =
diff --git a/arch/arm/boot/dts/zynq-zed.dts b/arch/arm/boot/dts/zynq-zed.dts
index 53c6883ce..98381cc85 100644
--- a/arch/arm/boot/dts/zynq-zed.dts
+++ b/arch/arm/boot/dts/zynq-zed.dts
@@ -8,7 +8,7 @@
/ {
model = "Zynq Zed Development Board";
- compatible = "xlnx,zynq-zed", "xlnx,zynq-7000";
+ compatible = "avnet,zynq-zed", "xlnx,zynq-7000";
aliases {
ethernet0 =
--
2.18.0
[PATCH] dt-bindings: Add vendor prefix for AsusTek Computer Inc.
"AsusTek Computer Inc. is a Taiwanese multinational computer and phone hardware and electronics company headquartered in Beitou District, Taipei, Taiwan." - Wikipedia.org Website: https://www.asus.com The prefix is already in use by at least 5 ARM boards Signed-off-by: Luis Araneda --- Documentation/devicetree/bindings/vendor-prefixes.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index 7cad06619..09101914a 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -41,6 +41,7 @@ arrow Arrow Electronics artesynArtesyn Embedded Technologies Inc. asahi-kaseiAsahi Kasei Corp. aspeed ASPEED Technology Inc. +asus AsusTek Computer Inc. atlas Atlas Scientific LLC atmel Atmel Corporation auoAU Optronics Corporation -- 2.18.0
[PATCH] dt-bindings: Add vendor prefix for AsusTek Computer Inc.
"AsusTek Computer Inc. is a Taiwanese multinational computer and phone hardware and electronics company headquartered in Beitou District, Taipei, Taiwan." - Wikipedia.org Website: https://www.asus.com The prefix is already in use by at least 5 ARM boards Signed-off-by: Luis Araneda --- Documentation/devicetree/bindings/vendor-prefixes.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index 7cad06619..09101914a 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -41,6 +41,7 @@ arrow Arrow Electronics artesynArtesyn Embedded Technologies Inc. asahi-kaseiAsahi Kasei Corp. aspeed ASPEED Technology Inc. +asus AsusTek Computer Inc. atlas Atlas Scientific LLC atmel Atmel Corporation auoAU Optronics Corporation -- 2.18.0
[PATCH] arm: dts: zynq: Fix memory size on the Zybo Z7 board
According to the reference manual, the board has two Micron
MT41K256M16HA-125 DDR3L memory ICs, which have 512 MiB each
Tested on a ZYBO-Z7-20 board
Signed-off-by: Luis Araneda
---
arch/arm/boot/dts/zynq-zybo-z7.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/zynq-zybo-z7.dts
b/arch/arm/boot/dts/zynq-zybo-z7.dts
index 1e713dc98..bc81ebee5 100644
--- a/arch/arm/boot/dts/zynq-zybo-z7.dts
+++ b/arch/arm/boot/dts/zynq-zybo-z7.dts
@@ -13,7 +13,7 @@
memory@0 {
device_type = "memory";
- reg = <0x0 0x2000>;
+ reg = <0x0 0x4000>;
};
chosen {
--
2.18.0
[PATCH] arm: dts: zynq: Fix memory size on the Zybo Z7 board
According to the reference manual, the board has two Micron
MT41K256M16HA-125 DDR3L memory ICs, which have 512 MiB each
Tested on a ZYBO-Z7-20 board
Signed-off-by: Luis Araneda
---
arch/arm/boot/dts/zynq-zybo-z7.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/zynq-zybo-z7.dts
b/arch/arm/boot/dts/zynq-zybo-z7.dts
index 1e713dc98..bc81ebee5 100644
--- a/arch/arm/boot/dts/zynq-zybo-z7.dts
+++ b/arch/arm/boot/dts/zynq-zybo-z7.dts
@@ -13,7 +13,7 @@
memory@0 {
device_type = "memory";
- reg = <0x0 0x2000>;
+ reg = <0x0 0x4000>;
};
chosen {
--
2.18.0
