* [PATCH 0/5] arm64: zynqmp: dtsi changes next
@ 2017-08-03 11:36 Michal Simek
2017-08-03 11:36 ` [PATCH 1/5] arm64: zynqmp: Add fpd/lpd dmas Michal Simek
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Michal Simek @ 2017-08-03 11:36 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Sören Brinkmann, Marc Zyngier, monstr, Alexander Graf,
Edgar E. Iglesias, Naga Sureshkumar Relli, devicetree,
Shubhrajyoti Datta, Kedareswara rao Appana, linux-kernel,
Alistair Francis, Bharat Kumar Gogada, Moritz Fischer,
Rob Herring, Stefan Krsmanovic, Will Deacon, Catalin Marinas,
Mark Rutland
Hi,
I have cherry-picked others patches from xilinx soc vendor tree which are
ready for submission.
This patchset targets zynqmp.dtsi and ep108 platform.
Thanks,
Michal
Alistair Francis (1):
arm64: zynqmp: Use C pre-processor for includes
Michal Simek (2):
arm64: zynqmp: Add fpd/lpd dmas
arm64: zynqmp: Add missing mmc aliases in ep108
Naga Sureshkumar Relli (1):
arm64: zynqmp: Enable can1 for ep108
VNSL Durga (1):
arm64: zynqmp: Added clocks to DT for ep108
arch/arm64/boot/dts/xilinx/zynqmp-ep108-clk.dtsi | 48 +++++++
arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts | 10 +-
arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 165 +++++++++++++++++++++++
3 files changed, 221 insertions(+), 2 deletions(-)
--
1.9.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/5] arm64: zynqmp: Add fpd/lpd dmas
2017-08-03 11:36 [PATCH 0/5] arm64: zynqmp: dtsi changes next Michal Simek
@ 2017-08-03 11:36 ` Michal Simek
2017-08-03 11:36 ` [PATCH 2/5] arm64: zynqmp: Use C pre-processor for includes Michal Simek
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Michal Simek @ 2017-08-03 11:36 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Edgar E. Iglesias, Naga Sureshkumar Relli, monstr,
Stefan Krsmanovic, devicetree, Marc Zyngier, Will Deacon,
Shubhrajyoti Datta, Alexander Graf, linux-kernel,
Bharat Kumar Gogada, Rob Herring, Moritz Fischer, Catalin Marinas,
Mark Rutland, Sören Brinkmann
Wire fpd and lpd dma channels to zynqmp.dtsi.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 165 +++++++++++++++++++++++++++++++++
1 file changed, 165 insertions(+)
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
index 787463796348..7665fbddff28 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
+++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
@@ -189,6 +189,171 @@
};
};
+ /* GDMA */
+ fpd_dma_chan1: dma@fd500000 {
+ status = "disabled";
+ compatible = "xlnx,zynqmp-dma-1.0";
+ reg = <0x0 0xfd500000 0x0 0x1000>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 124 4>;
+ clock-names = "clk_main", "clk_apb";
+ xlnx,bus-width = <128>;
+ };
+
+ fpd_dma_chan2: dma@fd510000 {
+ status = "disabled";
+ compatible = "xlnx,zynqmp-dma-1.0";
+ reg = <0x0 0xfd510000 0x0 0x1000>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 125 4>;
+ clock-names = "clk_main", "clk_apb";
+ xlnx,bus-width = <128>;
+ };
+
+ fpd_dma_chan3: dma@fd520000 {
+ status = "disabled";
+ compatible = "xlnx,zynqmp-dma-1.0";
+ reg = <0x0 0xfd520000 0x0 0x1000>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 126 4>;
+ clock-names = "clk_main", "clk_apb";
+ xlnx,bus-width = <128>;
+ };
+
+ fpd_dma_chan4: dma@fd530000 {
+ status = "disabled";
+ compatible = "xlnx,zynqmp-dma-1.0";
+ reg = <0x0 0xfd530000 0x0 0x1000>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 127 4>;
+ clock-names = "clk_main", "clk_apb";
+ xlnx,bus-width = <128>;
+ };
+
+ fpd_dma_chan5: dma@fd540000 {
+ status = "disabled";
+ compatible = "xlnx,zynqmp-dma-1.0";
+ reg = <0x0 0xfd540000 0x0 0x1000>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 128 4>;
+ clock-names = "clk_main", "clk_apb";
+ xlnx,bus-width = <128>;
+ };
+
+ fpd_dma_chan6: dma@fd550000 {
+ status = "disabled";
+ compatible = "xlnx,zynqmp-dma-1.0";
+ reg = <0x0 0xfd550000 0x0 0x1000>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 129 4>;
+ clock-names = "clk_main", "clk_apb";
+ xlnx,bus-width = <128>;
+ };
+
+ fpd_dma_chan7: dma@fd560000 {
+ status = "disabled";
+ compatible = "xlnx,zynqmp-dma-1.0";
+ reg = <0x0 0xfd560000 0x0 0x1000>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 130 4>;
+ clock-names = "clk_main", "clk_apb";
+ xlnx,bus-width = <128>;
+ };
+
+ fpd_dma_chan8: dma@fd570000 {
+ status = "disabled";
+ compatible = "xlnx,zynqmp-dma-1.0";
+ reg = <0x0 0xfd570000 0x0 0x1000>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 131 4>;
+ clock-names = "clk_main", "clk_apb";
+ xlnx,bus-width = <128>;
+ };
+
+ /* LPDDMA default allows only secured access. inorder to enable
+ * These dma channels, Users should ensure that these dma
+ * Channels are allowed for non secure access.
+ */
+ lpd_dma_chan1: dma@ffa80000 {
+ status = "disabled";
+ compatible = "xlnx,zynqmp-dma-1.0";
+ reg = <0x0 0xffa80000 0x0 0x1000>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 77 4>;
+ clock-names = "clk_main", "clk_apb";
+ xlnx,bus-width = <64>;
+ };
+
+ lpd_dma_chan2: dma@ffa90000 {
+ status = "disabled";
+ compatible = "xlnx,zynqmp-dma-1.0";
+ reg = <0x0 0xffa90000 0x0 0x1000>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 78 4>;
+ clock-names = "clk_main", "clk_apb";
+ xlnx,bus-width = <64>;
+ };
+
+ lpd_dma_chan3: dma@ffaa0000 {
+ status = "disabled";
+ compatible = "xlnx,zynqmp-dma-1.0";
+ reg = <0x0 0xffaa0000 0x0 0x1000>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 79 4>;
+ clock-names = "clk_main", "clk_apb";
+ xlnx,bus-width = <64>;
+ };
+
+ lpd_dma_chan4: dma@ffab0000 {
+ status = "disabled";
+ compatible = "xlnx,zynqmp-dma-1.0";
+ reg = <0x0 0xffab0000 0x0 0x1000>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 80 4>;
+ clock-names = "clk_main", "clk_apb";
+ xlnx,bus-width = <64>;
+ };
+
+ lpd_dma_chan5: dma@ffac0000 {
+ status = "disabled";
+ compatible = "xlnx,zynqmp-dma-1.0";
+ reg = <0x0 0xffac0000 0x0 0x1000>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 81 4>;
+ clock-names = "clk_main", "clk_apb";
+ xlnx,bus-width = <64>;
+ };
+
+ lpd_dma_chan6: dma@ffad0000 {
+ status = "disabled";
+ compatible = "xlnx,zynqmp-dma-1.0";
+ reg = <0x0 0xffad0000 0x0 0x1000>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 82 4>;
+ clock-names = "clk_main", "clk_apb";
+ xlnx,bus-width = <64>;
+ };
+
+ lpd_dma_chan7: dma@ffae0000 {
+ status = "disabled";
+ compatible = "xlnx,zynqmp-dma-1.0";
+ reg = <0x0 0xffae0000 0x0 0x1000>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 83 4>;
+ clock-names = "clk_main", "clk_apb";
+ xlnx,bus-width = <64>;
+ };
+
+ lpd_dma_chan8: dma@ffaf0000 {
+ status = "disabled";
+ compatible = "xlnx,zynqmp-dma-1.0";
+ reg = <0x0 0xffaf0000 0x0 0x1000>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 84 4>;
+ clock-names = "clk_main", "clk_apb";
+ xlnx,bus-width = <64>;
+ };
+
gem0: ethernet@ff0b0000 {
compatible = "cdns,gem";
status = "disabled";
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/5] arm64: zynqmp: Use C pre-processor for includes
2017-08-03 11:36 [PATCH 0/5] arm64: zynqmp: dtsi changes next Michal Simek
2017-08-03 11:36 ` [PATCH 1/5] arm64: zynqmp: Add fpd/lpd dmas Michal Simek
@ 2017-08-03 11:36 ` Michal Simek
[not found] ` <cover.1501760202.git.michal.simek-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
2017-08-03 11:36 ` [PATCH 4/5] arm64: zynqmp: Enable can1 for ep108 Michal Simek
3 siblings, 0 replies; 6+ messages in thread
From: Michal Simek @ 2017-08-03 11:36 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Alistair Francis, Sören Brinkmann, Naga Sureshkumar Relli,
monstr, devicetree, Kedareswara rao Appana, linux-kernel,
Rob Herring, Will Deacon, Catalin Marinas, Mark Rutland
From: Alistair Francis <alistair.francis@xilinx.com>
Change the dtsi include code to use the C pre-processor #include instead
of the device tree /include/. This enables option to use dt binding
headers.
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Reviewed-by: Sören Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
index ee7fa27e1e23..fba8f049769b 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
@@ -13,8 +13,8 @@
/dts-v1/;
-/include/ "zynqmp.dtsi"
-/include/ "zynqmp-ep108-clk.dtsi"
+#include "zynqmp.dtsi"
+#include "zynqmp-ep108-clk.dtsi"
/ {
model = "ZynqMP EP108";
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/5] arm64: zynqmp: Added clocks to DT for ep108
[not found] ` <cover.1501760202.git.michal.simek-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
@ 2017-08-03 11:36 ` Michal Simek
2017-08-03 11:36 ` [PATCH 5/5] arm64: zynqmp: Add missing mmc aliases in ep108 Michal Simek
1 sibling, 0 replies; 6+ messages in thread
From: Michal Simek @ 2017-08-03 11:36 UTC (permalink / raw)
To: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
Cc: VNSL Durga, Sören Brinkmann, Naga Sureshkumar Relli,
monstr-pSz03upnqPeHXe+LvDLADg, devicetree-u79uwXL29TY76Z2rM5mHXA,
Kedareswara rao Appana, linux-kernel-u79uwXL29TY76Z2rM5mHXA,
Rob Herring, Will Deacon, Catalin Marinas, Mark Rutland
From: VNSL Durga <vnsl.durga.challa-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
Added clks for ep108 platform.
Signed-off-by: VNSL Durga <vnsldurg-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
Signed-off-by: Michal Simek <michal.simek-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
---
arch/arm64/boot/dts/xilinx/zynqmp-ep108-clk.dtsi | 44 ++++++++++++++++++++++++
1 file changed, 44 insertions(+)
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-ep108-clk.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp-ep108-clk.dtsi
index c03bde79d7d8..31d25327cfb9 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp-ep108-clk.dtsi
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-ep108-clk.dtsi
@@ -29,12 +29,56 @@
#clock-cells = <0>;
clock-frequency = <75000000>;
};
+
+ clk100: clk100 {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <100000000>;
+ };
+
+ clk600: clk600 {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <600000000>;
+ };
};
&can0 {
clocks = <&misc_clk &misc_clk>;
};
+&fpd_dma_chan1 {
+ clocks = <&clk600>, <&clk100>;
+};
+
+&fpd_dma_chan2 {
+ clocks = <&clk600>, <&clk100>;
+};
+
+&fpd_dma_chan3 {
+ clocks = <&clk600>, <&clk100>;
+};
+
+&fpd_dma_chan4 {
+ clocks = <&clk600>, <&clk100>;
+};
+
+&fpd_dma_chan5 {
+ clocks = <&clk600>, <&clk100>;
+};
+
+&fpd_dma_chan6 {
+ clocks = <&clk600>, <&clk100>;
+};
+
+&fpd_dma_chan7 {
+ clocks = <&clk600>, <&clk100>;
+};
+
+&fpd_dma_chan8 {
+ clocks = <&clk600>, <&clk100>;
+};
+
&gem0 {
clocks = <&misc_clk>, <&misc_clk>, <&misc_clk>;
};
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 4/5] arm64: zynqmp: Enable can1 for ep108
2017-08-03 11:36 [PATCH 0/5] arm64: zynqmp: dtsi changes next Michal Simek
` (2 preceding siblings ...)
[not found] ` <cover.1501760202.git.michal.simek-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
@ 2017-08-03 11:36 ` Michal Simek
3 siblings, 0 replies; 6+ messages in thread
From: Michal Simek @ 2017-08-03 11:36 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Naga Sureshkumar Relli, Sören Brinkmann, monstr, VNSL Durga,
devicetree, Kedareswara rao Appana, linux-kernel,
Alistair Francis, Rob Herring, Will Deacon, Catalin Marinas,
Mark Rutland
From: Naga Sureshkumar Relli <naga.sureshkumar.relli@xilinx.com>
This patch enables can1 for ep108.
Signed-off-by: Naga Sureshkumar Relli <nagasure@xilinx.com>
Reviewed-by: Kedareswara rao Appana <appanad@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
arch/arm64/boot/dts/xilinx/zynqmp-ep108-clk.dtsi | 4 ++++
arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-ep108-clk.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp-ep108-clk.dtsi
index 31d25327cfb9..b87b8316f4ac 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp-ep108-clk.dtsi
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-ep108-clk.dtsi
@@ -47,6 +47,10 @@
clocks = <&misc_clk &misc_clk>;
};
+&can1 {
+ clocks = <&misc_clk &misc_clk>;
+};
+
&fpd_dma_chan1 {
clocks = <&clk600>, <&clk100>;
};
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
index fba8f049769b..6a8b4b445531 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
@@ -37,6 +37,10 @@
status = "okay";
};
+&can1 {
+ status = "okay";
+};
+
&gem0 {
status = "okay";
phy-handle = <&phy0>;
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 5/5] arm64: zynqmp: Add missing mmc aliases in ep108
[not found] ` <cover.1501760202.git.michal.simek-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
2017-08-03 11:36 ` [PATCH 3/5] arm64: zynqmp: Added clocks to DT for ep108 Michal Simek
@ 2017-08-03 11:36 ` Michal Simek
1 sibling, 0 replies; 6+ messages in thread
From: Michal Simek @ 2017-08-03 11:36 UTC (permalink / raw)
To: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
Cc: Sören Brinkmann, Naga Sureshkumar Relli,
monstr-pSz03upnqPeHXe+LvDLADg, devicetree-u79uwXL29TY76Z2rM5mHXA,
Kedareswara rao Appana, linux-kernel-u79uwXL29TY76Z2rM5mHXA,
Alistair Francis, Rob Herring, Will Deacon, Catalin Marinas,
Mark Rutland
Add missing mmc aliases.
Signed-off-by: Michal Simek <michal.simek-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
---
arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
index 6a8b4b445531..150e1d1c35d8 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
@@ -20,6 +20,8 @@
model = "ZynqMP EP108";
aliases {
+ mmc0 = &sdhci0;
+ mmc1 = &sdhci1;
serial0 = &uart0;
};
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-08-03 11:36 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-03 11:36 [PATCH 0/5] arm64: zynqmp: dtsi changes next Michal Simek
2017-08-03 11:36 ` [PATCH 1/5] arm64: zynqmp: Add fpd/lpd dmas Michal Simek
2017-08-03 11:36 ` [PATCH 2/5] arm64: zynqmp: Use C pre-processor for includes Michal Simek
[not found] ` <cover.1501760202.git.michal.simek-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
2017-08-03 11:36 ` [PATCH 3/5] arm64: zynqmp: Added clocks to DT for ep108 Michal Simek
2017-08-03 11:36 ` [PATCH 5/5] arm64: zynqmp: Add missing mmc aliases in ep108 Michal Simek
2017-08-03 11:36 ` [PATCH 4/5] arm64: zynqmp: Enable can1 for ep108 Michal Simek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).