[PATCH 0/6] Hi,

[PATCH 0/6] Hi,

[Michal Simek]

this patchset is adding minor dt pieces for ep108.
Also adding SPDX headers, fixing minor coding style issue and extending
gem compatible string for all boards.
The next patchset will add much more zynqmp based board.

Thanks,
Michal



Anurag Kumar Vulisha (1):
  arm64: zynqmp: Added OOB timing settings in zynqmp-ep108.dts

Michal Simek (4):
  arm64: zynqmp: Use zynqmp specific compatible string for macb
  arm64: zynqmp: Fix alignment in dts files
  arm64: zynqmp: Add SPDX license identifier
  arm64: zynqmp: Add missing aliases for ep108

P L Sai Krishna (1):
  arm64: zynqmp: Add 8-bit bus width property for ep108

 arch/arm64/boot/dts/xilinx/Makefile              |  1 +
 arch/arm64/boot/dts/xilinx/zynqmp-ep108-clk.dtsi |  1 +
 arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts      | 18 +++++++++++++++++-
 arch/arm64/boot/dts/xilinx/zynqmp.dtsi           | 17 +++++++++--------
 4 files changed, 28 insertions(+), 9 deletions(-)

-- 
1.9.1

[PATCH 1/6] arm64: zynqmp: Use zynqmp specific compatible string for macb

[Michal Simek]

The patch
"devicetree: Add compatible string for Zynq Ultrascale+ MPSoC"
(commit <988d6f07fc0a29e392035ba56e3bcfaf7b397d95>)
introduced specific compatible string for ZynqMP which should be used
first.

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

 arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
index 7665fbddff28..0da98007753b 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
+++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
@@ -355,7 +355,7 @@
 		};
 
 		gem0: ethernet@ff0b0000 {
-			compatible = "cdns,gem";
+			compatible = "cdns,zynqmp-gem", "cdns,gem";
 			status = "disabled";
 			interrupt-parent = <&gic>;
 			interrupts = <0 57 4>, <0 57 4>;
@@ -366,7 +366,7 @@
 		};
 
 		gem1: ethernet@ff0c0000 {
-			compatible = "cdns,gem";
+			compatible = "cdns,zynqmp-gem", "cdns,gem";
 			status = "disabled";
 			interrupt-parent = <&gic>;
 			interrupts = <0 59 4>, <0 59 4>;
@@ -377,7 +377,7 @@
 		};
 
 		gem2: ethernet@ff0d0000 {
-			compatible = "cdns,gem";
+			compatible = "cdns,zynqmp-gem", "cdns,gem";
 			status = "disabled";
 			interrupt-parent = <&gic>;
 			interrupts = <0 61 4>, <0 61 4>;
@@ -388,7 +388,7 @@
 		};
 
 		gem3: ethernet@ff0e0000 {
-			compatible = "cdns,gem";
+			compatible = "cdns,zynqmp-gem", "cdns,gem";
 			status = "disabled";
 			interrupt-parent = <&gic>;
 			interrupts = <0 63 4>, <0 63 4>;
-- 
1.9.1

[PATCH 2/6] arm64: zynqmp: Fix alignment in dts files

[Michal Simek]

Trivial changes.

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

 arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts | 2 +-
 arch/arm64/boot/dts/xilinx/zynqmp.dtsi      | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
index bf552674a834..fe7c48b6fa78 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
@@ -47,7 +47,7 @@
 	status = "okay";
 	phy-handle = <&phy0>;
 	phy-mode = "rgmii-id";
-	phy0: phy@0{
+	phy0: phy@0 {
 		reg = <0>;
 		max-speed = <100>;
 	};
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
index 0da98007753b..9ca4d1f83b51 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
+++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
@@ -439,10 +439,10 @@
 			device_type = "pci";
 			interrupt-parent = <&gic>;
 			interrupts = <0 118 4>,
-				    <0 117 4>,
-				    <0 116 4>,
-				    <0 115 4>,	/* MSI_1 [63...32] */
-				    <0 114 4>;	/* MSI_0 [31...0] */
+				     <0 117 4>,
+				     <0 116 4>,
+				     <0 115 4>,	/* MSI_1 [63...32] */
+				     <0 114 4>;	/* MSI_0 [31...0] */
 			interrupt-names = "misc", "dummy", "intx",
 					  "msi1", "msi0";
 			msi-parent = <&pcie>;
-- 
1.9.1

[PATCH 3/6] arm64: zynqmp: Add SPDX license identifier

[Michal Simek]

Add SPDX identifier as was done by for example by:
"License cleanup: add SPDX GPL-2.0 license identifier to files with no
license" (commit <b24413180f5600bcb3bb70fbed5cf186b60864bd>)

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

 arch/arm64/boot/dts/xilinx/Makefile              | 1 +
 arch/arm64/boot/dts/xilinx/zynqmp-ep108-clk.dtsi | 1 +
 arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts      | 1 +
 arch/arm64/boot/dts/xilinx/zynqmp.dtsi           | 1 +
 4 files changed, 4 insertions(+)

diff --git a/arch/arm64/boot/dts/xilinx/Makefile b/arch/arm64/boot/dts/xilinx/Makefile
index a2d67084a514..eba179b23b17 100644
--- a/arch/arm64/boot/dts/xilinx/Makefile
+++ b/arch/arm64/boot/dts/xilinx/Makefile
@@ -1 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0
 dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-ep108.dtb
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-ep108-clk.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp-ep108-clk.dtsi
index b87b8316f4ac..9f5eedbc2139 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp-ep108-clk.dtsi
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-ep108-clk.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * clock specification for Xilinx ZynqMP ep108 development board
  *
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
index fe7c48b6fa78..84fe7057fcb0 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * dts file for Xilinx ZynqMP ep108 development board
  *
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
index 9ca4d1f83b51..a091e6f03014 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
+++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * dts file for Xilinx ZynqMP
  *
-- 
1.9.1

[PATCH 4/6] arm64: zynqmp: Add missing aliases for ep108

[Michal Simek]

Add missing aliases for gem0/spis and usbs
spi0 alias is allocated for qspi which is out of tree driver now.

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

 arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
index 84fe7057fcb0..67eababceb93 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
@@ -21,9 +21,14 @@
 	model = "ZynqMP EP108";
 
 	aliases {
+		ethernet0 = &gem0;
 		mmc0 = &sdhci0;
 		mmc1 = &sdhci1;
 		serial0 = &uart0;
+		spi1 = &spi0;
+		spi2 = &spi1;
+		usb0 = &usb0;
+		usb1 = &usb1;
 	};
 
 	chosen {
-- 
1.9.1

[PATCH 5/6] arm64: zynqmp: Added OOB timing settings in zynqmp-ep108.dts

[Michal Simek]

From: Anurag Kumar Vulisha <anurag.kumar.vulisha@xilinx.com>

This patch adds the sata port phy OOB timing values in the sata
device-tree node.

Signed-off-by: Anurag Kumar Vulisha <anuragku@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

 arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
index 67eababceb93..22ea2973800c 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
@@ -84,6 +84,15 @@
 &sata {
 	status = "okay";
 	ceva,broken-gen2;
+	/* SATA Phy OOB timing settings */
+	ceva,p0-cominit-params = /bits/ 8 <0x0F 0x25 0x18 0x29>;
+	ceva,p0-comwake-params = /bits/ 8 <0x04 0x0B 0x08 0x0F>;
+	ceva,p0-burst-params = /bits/ 8 <0x0A 0x08 0x4A 0x06>;
+	ceva,p0-retry-params = /bits/ 16 <0x0216 0x7F06>;
+	ceva,p1-cominit-params = /bits/ 8 <0x0F 0x25 0x18 0x29>;
+	ceva,p1-comwake-params = /bits/ 8 <0x04 0x0B 0x08 0x0F>;
+	ceva,p1-burst-params = /bits/ 8 <0x0A 0x08 0x4A 0x06>;
+	ceva,p1-retry-params = /bits/ 16 <0x0216 0x7F06>;
 };
 
 &sdhci0 {
-- 
1.9.1

[PATCH 6/6] arm64: zynqmp: Add 8-bit bus width property for ep108

[Michal Simek]

From: P L Sai Krishna <lakshmi.sai.krishna.potthuri@xilinx.com>

This patch add 8-bit bus width property to eMMC node.

Signed-off-by: P L Sai Krishna <lakshmis@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

 arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
index 22ea2973800c..b089f715c1fb 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
@@ -97,6 +97,7 @@
 
 &sdhci0 {
 	status = "okay";
+	bus-width = <8>;
 };
 
 &sdhci1 {
-- 
1.9.1

Re: [PATCH 0/6] arm64: zynqmp: Various dts cleanups

[Michal Simek]

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

Hi,

On 17.1.2018 16:29, Michal Simek wrote:
> this patchset is adding minor dt pieces for ep108.
> Also adding SPDX headers, fixing minor coding style issue and extending
> gem compatible string for all boards.
> The next patchset will add much more zynqmp based board.
> 
> Thanks,
> Michal
> 
> 
> 
> Anurag Kumar Vulisha (1):
>   arm64: zynqmp: Added OOB timing settings in zynqmp-ep108.dts
> 
> Michal Simek (4):
>   arm64: zynqmp: Use zynqmp specific compatible string for macb
>   arm64: zynqmp: Fix alignment in dts files
>   arm64: zynqmp: Add SPDX license identifier
>   arm64: zynqmp: Add missing aliases for ep108
> 
> P L Sai Krishna (1):
>   arm64: zynqmp: Add 8-bit bus width property for ep108
> 
>  arch/arm64/boot/dts/xilinx/Makefile              |  1 +
>  arch/arm64/boot/dts/xilinx/zynqmp-ep108-clk.dtsi |  1 +
>  arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts      | 18 +++++++++++++++++-
>  arch/arm64/boot/dts/xilinx/zynqmp.dtsi           | 17 +++++++++--------
>  4 files changed, 28 insertions(+), 9 deletions(-)
> 

subject wasn't propagated properly that's why I am fixing it now. But
patches should be fine.

Thanks,
Michal


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



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