* [PATCH 00/10] arm64: zynqmp: dtsi changes
@ 2017-07-20 12:16 Michal Simek
2017-07-20 12:17 ` [PATCH 01/10] arm64: zynqmp: Add references to cpu nodes Michal Simek
` (10 more replies)
0 siblings, 11 replies; 14+ messages in thread
From: Michal Simek @ 2017-07-20 12:16 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Mark Rutland, devicetree, Catalin Marinas, Will Deacon,
Edgar E. Iglesias, Alexander Graf, Krzysztof Kozlowski,
Marc Zyngier, Punnaiah Choudary Kalluri, Naga Sureshkumar Relli,
Stefan Krsmanovic, Bharat Kumar Gogada, Shubhrajyoti Datta,
Will Wong, Rob Herring, Moritz Fischer, Sören Brinkmann,
monstr, Duc Dang, linux-kernel, Carlo Caione, Dinh Nguyen
Hi,
I have cherry-picked all patches from xilinx soc vendor tree which are
ready for submission.
This patchset targets only zynqmp.dtsi which is shared with all zynqmp
families.
Thanks,
Michal
Bharat Kumar Gogada (1):
arm64: zynqmp: Adding prefetchable memory space to pcie node
Edgar E. Iglesias (1):
arm64: zynqmp: Correct IRQ nr for the SMMU
Michal Simek (5):
arm64: zynqmp: Add references to cpu nodes
arm64: zynqmp: Add dcc console for zynqmp
arm64: zynqmp: Add CCI-400 node
arm64: zynqmp: Add support for RTC
arm64: zynqmp: Add new uartps compatible string
Naga Sureshkumar Relli (1):
arm64: zynqmp: Set status disabled in dtsi
Shubhrajyoti Datta (1):
arm64: zynqmp: Add operating points
Stefan Krsmanovic (1):
arm64: zynqmp: Add idle state for ZynqMP
arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 111 ++++++++++++++++++++++++++++-----
1 file changed, 94 insertions(+), 17 deletions(-)
--
1.9.1
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 01/10] arm64: zynqmp: Add references to cpu nodes
2017-07-20 12:16 [PATCH 00/10] arm64: zynqmp: dtsi changes Michal Simek
@ 2017-07-20 12:17 ` Michal Simek
[not found] ` <b9a61dfe7f5d4309b3131c1b9a82890888838087.1500552941.git.michal.simek-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
2017-07-20 12:17 ` [PATCH 02/10] arm64: zynqmp: Add idle state for ZynqMP Michal Simek
` (9 subsequent siblings)
10 siblings, 1 reply; 14+ messages in thread
From: Michal Simek @ 2017-07-20 12:17 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Edgar E. Iglesias, devicetree, monstr, Stefan Krsmanovic,
Marc Zyngier, Will Deacon, Shubhrajyoti Datta, linux-kernel,
Bharat Kumar Gogada, Rob Herring, Moritz Fischer, Carlo Caione,
Catalin Marinas, Mark Rutland, Will Wong, Sören Brinkmann
Add missing references to all cpu nodes.
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 1a3f5e928bb9..4f7d9905e235 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
+++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
@@ -20,28 +20,28 @@
#address-cells = <1>;
#size-cells = <0>;
- cpu@0 {
+ cpu0: cpu@0 {
compatible = "arm,cortex-a53", "arm,armv8";
device_type = "cpu";
enable-method = "psci";
reg = <0x0>;
};
- cpu@1 {
+ cpu1: cpu@1 {
compatible = "arm,cortex-a53", "arm,armv8";
device_type = "cpu";
enable-method = "psci";
reg = <0x1>;
};
- cpu@2 {
+ cpu2: cpu@2 {
compatible = "arm,cortex-a53", "arm,armv8";
device_type = "cpu";
enable-method = "psci";
reg = <0x2>;
};
- cpu@3 {
+ cpu3: cpu@3 {
compatible = "arm,cortex-a53", "arm,armv8";
device_type = "cpu";
enable-method = "psci";
--
1.9.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 02/10] arm64: zynqmp: Add idle state for ZynqMP
2017-07-20 12:16 [PATCH 00/10] arm64: zynqmp: dtsi changes Michal Simek
2017-07-20 12:17 ` [PATCH 01/10] arm64: zynqmp: Add references to cpu nodes Michal Simek
@ 2017-07-20 12:17 ` Michal Simek
2017-07-20 12:17 ` [PATCH 03/10] arm64: zynqmp: Add operating points Michal Simek
` (8 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Michal Simek @ 2017-07-20 12:17 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Edgar E. Iglesias, devicetree, monstr, Stefan Krsmanovic,
Marc Zyngier, Will Deacon, Mark Rutland, Shubhrajyoti Datta,
linux-kernel, Bharat Kumar Gogada, Rob Herring, Moritz Fischer,
Catalin Marinas, Punnaiah Choudary Kalluri, Dinh Nguyen,
Sören Brinkmann
From: Stefan Krsmanovic <stefan.krsmanovic@aggios.com>
Added the idle-states node to describe zynqmp idle states. Only
cpu-sleep-0 idle state is added in this patch. References to the
idle-states node are added in all CPU nodes. Time values: entry/exit
latencies and min-residency, needs to be tuned. arm,psci-suspend-param
is selected to comply with PSCIv1.0 and Extended StateID format.
Signed-off-by: Stefan Krsmanovic <stefan.krsmanovic@aggios.com>
Acked-by: Will Wong <willw@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
index 4f7d9905e235..8e6cf0cf3a69 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
+++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
@@ -25,6 +25,7 @@
device_type = "cpu";
enable-method = "psci";
reg = <0x0>;
+ cpu-idle-states = <&CPU_SLEEP_0>;
};
cpu1: cpu@1 {
@@ -32,6 +33,7 @@
device_type = "cpu";
enable-method = "psci";
reg = <0x1>;
+ cpu-idle-states = <&CPU_SLEEP_0>;
};
cpu2: cpu@2 {
@@ -39,6 +41,7 @@
device_type = "cpu";
enable-method = "psci";
reg = <0x2>;
+ cpu-idle-states = <&CPU_SLEEP_0>;
};
cpu3: cpu@3 {
@@ -46,6 +49,20 @@
device_type = "cpu";
enable-method = "psci";
reg = <0x3>;
+ cpu-idle-states = <&CPU_SLEEP_0>;
+ };
+
+ idle-states {
+ entry-method = "arm,psci";
+
+ CPU_SLEEP_0: cpu-sleep-0 {
+ compatible = "arm,idle-state";
+ arm,psci-suspend-param = <0x40000000>;
+ local-timer-stop;
+ entry-latency-us = <300>;
+ exit-latency-us = <600>;
+ min-residency-us = <10000>;
+ };
};
};
--
1.9.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 03/10] arm64: zynqmp: Add operating points
2017-07-20 12:16 [PATCH 00/10] arm64: zynqmp: dtsi changes Michal Simek
2017-07-20 12:17 ` [PATCH 01/10] arm64: zynqmp: Add references to cpu nodes Michal Simek
2017-07-20 12:17 ` [PATCH 02/10] arm64: zynqmp: Add idle state for ZynqMP Michal Simek
@ 2017-07-20 12:17 ` Michal Simek
2017-07-20 12:17 ` [PATCH 04/10] arm64: zynqmp: Add dcc console for zynqmp Michal Simek
` (7 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Michal Simek @ 2017-07-20 12:17 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Edgar E. Iglesias, devicetree, monstr, Stefan Krsmanovic,
Marc Zyngier, Will Deacon, Duc Dang, Shubhrajyoti Datta,
linux-kernel, Bharat Kumar Gogada, Rob Herring, Moritz Fischer,
Carlo Caione, Catalin Marinas, Punnaiah Choudary Kalluri,
Mark Rutland, Sören Brinkmann
From: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
Adding operating-points-v2 for zynqmp.
Signed-off-by: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
index 8e6cf0cf3a69..50636e098724 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
+++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
@@ -24,6 +24,7 @@
compatible = "arm,cortex-a53", "arm,armv8";
device_type = "cpu";
enable-method = "psci";
+ operating-points-v2 = <&cpu_opp_table>;
reg = <0x0>;
cpu-idle-states = <&CPU_SLEEP_0>;
};
@@ -33,6 +34,7 @@
device_type = "cpu";
enable-method = "psci";
reg = <0x1>;
+ operating-points-v2 = <&cpu_opp_table>;
cpu-idle-states = <&CPU_SLEEP_0>;
};
@@ -41,6 +43,7 @@
device_type = "cpu";
enable-method = "psci";
reg = <0x2>;
+ operating-points-v2 = <&cpu_opp_table>;
cpu-idle-states = <&CPU_SLEEP_0>;
};
@@ -49,6 +52,7 @@
device_type = "cpu";
enable-method = "psci";
reg = <0x3>;
+ operating-points-v2 = <&cpu_opp_table>;
cpu-idle-states = <&CPU_SLEEP_0>;
};
@@ -66,6 +70,31 @@
};
};
+ cpu_opp_table: cpu_opp_table {
+ compatible = "operating-points-v2";
+ opp-shared;
+ opp00 {
+ opp-hz = /bits/ 64 <1199999988>;
+ opp-microvolt = <1000000>;
+ clock-latency-ns = <500000>;
+ };
+ opp01 {
+ opp-hz = /bits/ 64 <599999994>;
+ opp-microvolt = <1000000>;
+ clock-latency-ns = <500000>;
+ };
+ opp02 {
+ opp-hz = /bits/ 64 <399999996>;
+ opp-microvolt = <1000000>;
+ clock-latency-ns = <500000>;
+ };
+ opp03 {
+ opp-hz = /bits/ 64 <299999997>;
+ opp-microvolt = <1000000>;
+ clock-latency-ns = <500000>;
+ };
+ };
+
pmu {
compatible = "arm,armv8-pmuv3";
interrupt-parent = <&gic>;
--
1.9.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 04/10] arm64: zynqmp: Add dcc console for zynqmp
2017-07-20 12:16 [PATCH 00/10] arm64: zynqmp: dtsi changes Michal Simek
` (2 preceding siblings ...)
2017-07-20 12:17 ` [PATCH 03/10] arm64: zynqmp: Add operating points Michal Simek
@ 2017-07-20 12:17 ` Michal Simek
2017-07-20 12:17 ` [PATCH 05/10] arm64: zynqmp: Add CCI-400 node Michal Simek
` (6 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Michal Simek @ 2017-07-20 12:17 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Edgar E. Iglesias, devicetree, monstr, Stefan Krsmanovic,
Marc Zyngier, Will Deacon, Shubhrajyoti Datta, linux-kernel,
Bharat Kumar Gogada, Rob Herring, Catalin Marinas,
Punnaiah Choudary Kalluri, Mark Rutland, Sören Brinkmann
Add debug console to dtsi to be able to enable it in
board dts file.
Keep in your mind that every core has separate dcc port in case you want
to run SMP kernel.
DCC is very helpful communication channel for debugging.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
index 50636e098724..3657fdbdb552 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
+++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
@@ -95,6 +95,11 @@
};
};
+ dcc: dcc {
+ compatible = "arm,dcc";
+ status = "disabled";
+ };
+
pmu {
compatible = "arm,armv8-pmuv3";
interrupt-parent = <&gic>;
--
1.9.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 05/10] arm64: zynqmp: Add CCI-400 node
2017-07-20 12:16 [PATCH 00/10] arm64: zynqmp: dtsi changes Michal Simek
` (3 preceding siblings ...)
2017-07-20 12:17 ` [PATCH 04/10] arm64: zynqmp: Add dcc console for zynqmp Michal Simek
@ 2017-07-20 12:17 ` Michal Simek
2017-07-20 12:17 ` [PATCH 06/10] arm64: zynqmp: Adding prefetchable memory space to pcie node Michal Simek
` (5 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Michal Simek @ 2017-07-20 12:17 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,
Punnaiah Choudary Kalluri, Mark Rutland, Will Wong,
Sören Brinkmann
Add CCI-400 node to DTSI.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
index 3657fdbdb552..f3968737e613 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
+++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
@@ -170,6 +170,25 @@
rx-fifo-depth = <0x40>;
};
+ cci: cci@fd6e0000 {
+ compatible = "arm,cci-400";
+ reg = <0x0 0xfd6e0000 0x0 0x9000>;
+ ranges = <0x0 0x0 0xfd6e0000 0x10000>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ pmu@9000 {
+ compatible = "arm,cci-400-pmu,r1";
+ reg = <0x9000 0x5000>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 123 4>,
+ <0 123 4>,
+ <0 123 4>,
+ <0 123 4>,
+ <0 123 4>;
+ };
+ };
+
gem0: ethernet@ff0b0000 {
compatible = "cdns,gem";
status = "disabled";
--
1.9.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 06/10] arm64: zynqmp: Adding prefetchable memory space to pcie node
2017-07-20 12:16 [PATCH 00/10] arm64: zynqmp: dtsi changes Michal Simek
` (4 preceding siblings ...)
2017-07-20 12:17 ` [PATCH 05/10] arm64: zynqmp: Add CCI-400 node Michal Simek
@ 2017-07-20 12:17 ` Michal Simek
2017-07-20 12:17 ` [PATCH 07/10] arm64: zynqmp: Add support for RTC Michal Simek
` (4 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Michal Simek @ 2017-07-20 12:17 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Edgar E. Iglesias, devicetree, monstr, Stefan Krsmanovic,
Bharat Kumar Gogada, Will Deacon, Shubhrajyoti Datta,
linux-kernel, Krzysztof Kozlowski, Marc Zyngier, Rob Herring,
Moritz Fischer, Catalin Marinas, Mark Rutland,
Sören Brinkmann
From: Bharat Kumar Gogada <bharat.kumar.gogada@xilinx.com>
Adding prefetchable memory space to pcie device tree node.
Shifting configuration space to 64-bit address space.
Removing pcie device tree node from amba as it requires size-cells=<2>
in order to access 64-bit address space.
Signed-off-by: Bharat Kumar Gogada <bharatku@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
index f3968737e613..e7d1815c114b 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
+++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
@@ -285,12 +285,8 @@
<0x0 0xfd480000 0x0 0x1000>,
<0x80 0x00000000 0x0 0x1000000>;
reg-names = "breg", "pcireg", "cfg";
- ranges = <0x02000000 0x00000000 0xe0000000 0x00000000
- 0xe0000000 0x00000000 0x10000000
- /* non-prefetchable memory */
- 0x43000000 0x00000006 0x00000000 0x00000006
- 0x00000000 0x00000002 0x00000000>;
- /* prefetchable memory */
+ ranges = <0x02000000 0x00000000 0xe0000000 0x00000000 0xe0000000 0x00000000 0x10000000 /* non-prefetchable memory */
+ 0x43000000 0x00000006 0x00000000 0x00000006 0x00000000 0x00000002 0x00000000>;/* prefetchable memory */
bus-range = <0x00 0xff>;
interrupt-map-mask = <0x0 0x0 0x0 0x7>;
interrupt-map = <0x0 0x0 0x0 0x1 &pcie_intc 0x1>,
--
1.9.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 07/10] arm64: zynqmp: Add support for RTC
2017-07-20 12:16 [PATCH 00/10] arm64: zynqmp: dtsi changes Michal Simek
` (5 preceding siblings ...)
2017-07-20 12:17 ` [PATCH 06/10] arm64: zynqmp: Adding prefetchable memory space to pcie node Michal Simek
@ 2017-07-20 12:17 ` Michal Simek
2017-07-20 12:17 ` [PATCH 08/10] arm64: zynqmp: Correct IRQ nr for the SMMU Michal Simek
` (3 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Michal Simek @ 2017-07-20 12:17 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Edgar E. Iglesias, devicetree, monstr, Stefan Krsmanovic,
Marc Zyngier, Will Deacon, Duc Dang, Shubhrajyoti Datta,
Alexander Graf, linux-kernel, Bharat Kumar Gogada, Rob Herring,
Catalin Marinas, Punnaiah Choudary Kalluri, Mark Rutland,
Sören Brinkmann
Add support for RTC.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
index e7d1815c114b..1272fa6d4f99 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
+++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
@@ -300,6 +300,16 @@
};
};
+ rtc: rtc@ffa60000 {
+ compatible = "xlnx,zynqmp-rtc";
+ status = "disabled";
+ reg = <0x0 0xffa60000 0x0 0x100>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 26 4>, <0 27 4>;
+ interrupt-names = "alarm", "sec";
+ calibration = <0x8000>;
+ };
+
sata: ahci@fd0c0000 {
compatible = "ceva,ahci-1v84";
status = "disabled";
--
1.9.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 08/10] arm64: zynqmp: Correct IRQ nr for the SMMU
2017-07-20 12:16 [PATCH 00/10] arm64: zynqmp: dtsi changes Michal Simek
` (6 preceding siblings ...)
2017-07-20 12:17 ` [PATCH 07/10] arm64: zynqmp: Add support for RTC Michal Simek
@ 2017-07-20 12:17 ` Michal Simek
2017-07-20 12:17 ` [PATCH 09/10] arm64: zynqmp: Add new uartps compatible string Michal Simek
` (2 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Michal Simek @ 2017-07-20 12:17 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Edgar E. Iglesias, Naga Sureshkumar Relli, monstr,
Stefan Krsmanovic, devicetree, Marc Zyngier, Will Deacon,
Mark Rutland, Shubhrajyoti Datta, Alexander Graf, linux-kernel,
Bharat Kumar Gogada, Rob Herring, Catalin Marinas, Dinh Nguyen,
Sören Brinkmann
From: "Edgar E. Iglesias" <edgar.iglesias@xilinx.com>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
index 1272fa6d4f99..4adf5285f56d 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
+++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
@@ -341,11 +341,11 @@
reg = <0x0 0xfd800000 0x0 0x20000>;
#global-interrupts = <1>;
interrupt-parent = <&gic>;
- interrupts = <0 157 4>,
- <0 157 4>, <0 157 4>, <0 157 4>, <0 157 4>,
- <0 157 4>, <0 157 4>, <0 157 4>, <0 157 4>,
- <0 157 4>, <0 157 4>, <0 157 4>, <0 157 4>,
- <0 157 4>, <0 157 4>, <0 157 4>, <0 157 4>;
+ interrupts = <0 155 4>,
+ <0 155 4>, <0 155 4>, <0 155 4>, <0 155 4>,
+ <0 155 4>, <0 155 4>, <0 155 4>, <0 155 4>,
+ <0 155 4>, <0 155 4>, <0 155 4>, <0 155 4>,
+ <0 155 4>, <0 155 4>, <0 155 4>, <0 155 4>;
};
spi0: spi@ff040000 {
--
1.9.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 09/10] arm64: zynqmp: Add new uartps compatible string
2017-07-20 12:16 [PATCH 00/10] arm64: zynqmp: dtsi changes Michal Simek
` (7 preceding siblings ...)
2017-07-20 12:17 ` [PATCH 08/10] arm64: zynqmp: Correct IRQ nr for the SMMU Michal Simek
@ 2017-07-20 12:17 ` Michal Simek
[not found] ` <4babfd9b8311073566a5d5730353c035bb5afa2a.1500552941.git.michal.simek-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
2017-07-20 12:17 ` [PATCH 10/10] arm64: zynqmp: Set status disabled in dtsi Michal Simek
2017-08-03 11:31 ` [PATCH 00/10] arm64: zynqmp: dtsi changes Michal Simek
10 siblings, 1 reply; 14+ messages in thread
From: Michal Simek @ 2017-07-20 12:17 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Edgar E. Iglesias, devicetree, monstr, Stefan Krsmanovic,
Marc Zyngier, Will Deacon, Shubhrajyoti Datta, linux-kernel,
Bharat Kumar Gogada, Rob Herring, Moritz Fischer, Carlo Caione,
Catalin Marinas, Punnaiah Choudary Kalluri, Mark Rutland,
Sören Brinkmann
Mainline kernel has r1p12 compatible string now. Use this new compatible
string and also append generic compatible string.
Keep in your mind that using this generic compatible string not all uart
features will be available.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
index 4adf5285f56d..9304249a23ed 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
+++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
@@ -407,7 +407,7 @@
};
uart0: serial@ff000000 {
- compatible = "cdns,uart-r1p8";
+ compatible = "cdns,uart-r1p12", "xlnx,xuartps";
status = "disabled";
interrupt-parent = <&gic>;
interrupts = <0 21 4>;
@@ -416,7 +416,7 @@
};
uart1: serial@ff010000 {
- compatible = "cdns,uart-r1p8";
+ compatible = "cdns,uart-r1p12", "xlnx,xuartps";
status = "disabled";
interrupt-parent = <&gic>;
interrupts = <0 22 4>;
--
1.9.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 10/10] arm64: zynqmp: Set status disabled in dtsi
2017-07-20 12:16 [PATCH 00/10] arm64: zynqmp: dtsi changes Michal Simek
` (8 preceding siblings ...)
2017-07-20 12:17 ` [PATCH 09/10] arm64: zynqmp: Add new uartps compatible string Michal Simek
@ 2017-07-20 12:17 ` Michal Simek
2017-08-03 11:31 ` [PATCH 00/10] arm64: zynqmp: dtsi changes Michal Simek
10 siblings, 0 replies; 14+ messages in thread
From: Michal Simek @ 2017-07-20 12:17 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Edgar E. Iglesias, Naga Sureshkumar Relli, monstr,
Stefan Krsmanovic, devicetree, Marc Zyngier, Will Deacon,
Shubhrajyoti Datta, linux-kernel, Bharat Kumar Gogada,
Rob Herring, Catalin Marinas, Mark Rutland, Sören Brinkmann
From: Naga Sureshkumar Relli <naga.sureshkumar.relli@xilinx.com>
Do not enable smmu via dtsi. Enable it in board file when needed.
Signed-off-by: Naga Sureshkumar Relli <nagasure@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
index 9304249a23ed..787463796348 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
+++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
@@ -339,6 +339,7 @@
smmu: smmu@fd800000 {
compatible = "arm,mmu-500";
reg = <0x0 0xfd800000 0x0 0x20000>;
+ status = "disabled";
#global-interrupts = <1>;
interrupt-parent = <&gic>;
interrupts = <0 155 4>,
--
1.9.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH 01/10] arm64: zynqmp: Add references to cpu nodes
[not found] ` <b9a61dfe7f5d4309b3131c1b9a82890888838087.1500552941.git.michal.simek-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
@ 2017-07-25 16:47 ` Moritz Fischer
0 siblings, 0 replies; 14+ messages in thread
From: Moritz Fischer @ 2017-07-25 16:47 UTC (permalink / raw)
To: Michal Simek
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
Sören Brinkmann, Marc Zyngier, monstr-pSz03upnqPeHXe+LvDLADg,
Edgar E. Iglesias, Carlo Caione, Shubhrajyoti Datta,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, Bharat Kumar Gogada,
Moritz Fischer, Rob Herring, Stefan Krsmanovic, Will Deacon,
Will Wong, Catalin Marinas, Mark Rutland
[-- Attachment #1: Type: text/plain, Size: 1409 bytes --]
On Thu, Jul 20, 2017 at 02:17:00PM +0200, Michal Simek wrote:
> Add missing references to all cpu nodes.
>
> Signed-off-by: Michal Simek <michal.simek-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
Reviewed-by: Moritz Fischer <mdf-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
> ---
>
> 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 1a3f5e928bb9..4f7d9905e235 100644
> --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> @@ -20,28 +20,28 @@
> #address-cells = <1>;
> #size-cells = <0>;
>
> - cpu@0 {
> + cpu0: cpu@0 {
> compatible = "arm,cortex-a53", "arm,armv8";
> device_type = "cpu";
> enable-method = "psci";
> reg = <0x0>;
> };
>
> - cpu@1 {
> + cpu1: cpu@1 {
> compatible = "arm,cortex-a53", "arm,armv8";
> device_type = "cpu";
> enable-method = "psci";
> reg = <0x1>;
> };
>
> - cpu@2 {
> + cpu2: cpu@2 {
> compatible = "arm,cortex-a53", "arm,armv8";
> device_type = "cpu";
> enable-method = "psci";
> reg = <0x2>;
> };
>
> - cpu@3 {
> + cpu3: cpu@3 {
> compatible = "arm,cortex-a53", "arm,armv8";
> device_type = "cpu";
> enable-method = "psci";
> --
> 1.9.1
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 455 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 09/10] arm64: zynqmp: Add new uartps compatible string
[not found] ` <4babfd9b8311073566a5d5730353c035bb5afa2a.1500552941.git.michal.simek-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
@ 2017-07-25 16:49 ` Moritz Fischer
0 siblings, 0 replies; 14+ messages in thread
From: Moritz Fischer @ 2017-07-25 16:49 UTC (permalink / raw)
To: Michal Simek
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
Sören Brinkmann, Punnaiah Choudary Kalluri,
monstr-pSz03upnqPeHXe+LvDLADg, Edgar E. Iglesias, Carlo Caione,
Shubhrajyoti Datta, devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, Marc Zyngier,
Bharat Kumar Gogada, Moritz Fischer, Rob Herring,
Stefan Krsmanovic, Will Deacon, Catalin Marinas, Mark Rutland
[-- Attachment #1: Type: text/plain, Size: 1344 bytes --]
On Thu, Jul 20, 2017 at 02:17:08PM +0200, Michal Simek wrote:
> Mainline kernel has r1p12 compatible string now. Use this new compatible
> string and also append generic compatible string.
> Keep in your mind that using this generic compatible string not all uart
> features will be available.
>
> Signed-off-by: Michal Simek <michal.simek-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
Reviewed-by: Moritz Fischer <mdf-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
> ---
>
> arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> index 4adf5285f56d..9304249a23ed 100644
> --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> @@ -407,7 +407,7 @@
> };
>
> uart0: serial@ff000000 {
> - compatible = "cdns,uart-r1p8";
> + compatible = "cdns,uart-r1p12", "xlnx,xuartps";
> status = "disabled";
> interrupt-parent = <&gic>;
> interrupts = <0 21 4>;
> @@ -416,7 +416,7 @@
> };
>
> uart1: serial@ff010000 {
> - compatible = "cdns,uart-r1p8";
> + compatible = "cdns,uart-r1p12", "xlnx,xuartps";
> status = "disabled";
> interrupt-parent = <&gic>;
> interrupts = <0 22 4>;
> --
> 1.9.1
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 455 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 00/10] arm64: zynqmp: dtsi changes
2017-07-20 12:16 [PATCH 00/10] arm64: zynqmp: dtsi changes Michal Simek
` (9 preceding siblings ...)
2017-07-20 12:17 ` [PATCH 10/10] arm64: zynqmp: Set status disabled in dtsi Michal Simek
@ 2017-08-03 11:31 ` Michal Simek
10 siblings, 0 replies; 14+ messages in thread
From: Michal Simek @ 2017-08-03 11:31 UTC (permalink / raw)
To: linux-arm
Cc: Punnaiah Choudary Kalluri, Dinh Nguyen, Rob Herring,
Stefan Krsmanovic, Catalin Marinas, Sören Brinkmann,
Naga Sureshkumar Relli, Krzysztof Kozlowski, Will Deacon,
devicetree@vger.kernel.org, Alexander Graf, Shubhrajyoti Datta,
Duc Dang, Moritz Fischer, Mark Rutland, Michal Simek,
Edgar E. Iglesias, Carlo Caione, LKML, Bharat Kumar Gogada,
Will Wong, Marc Zyngier
[-- Attachment #1: Type: text/plain, Size: 1389 bytes --]
Hi,
2017-07-20 14:16 GMT+02:00 Michal Simek <michal.simek@xilinx.com>:
> Hi,
>
> I have cherry-picked all patches from xilinx soc vendor tree which are
> ready for submission.
> This patchset targets only zynqmp.dtsi which is shared with all zynqmp
> families.
>
> Thanks,
> Michal
>
>
> Bharat Kumar Gogada (1):
> arm64: zynqmp: Adding prefetchable memory space to pcie node
>
> Edgar E. Iglesias (1):
> arm64: zynqmp: Correct IRQ nr for the SMMU
>
> Michal Simek (5):
> arm64: zynqmp: Add references to cpu nodes
> arm64: zynqmp: Add dcc console for zynqmp
> arm64: zynqmp: Add CCI-400 node
> arm64: zynqmp: Add support for RTC
> arm64: zynqmp: Add new uartps compatible string
>
> Naga Sureshkumar Relli (1):
> arm64: zynqmp: Set status disabled in dtsi
>
> Shubhrajyoti Datta (1):
> arm64: zynqmp: Add operating points
>
> Stefan Krsmanovic (1):
> arm64: zynqmp: Add idle state for ZynqMP
>
> arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 111
> ++++++++++++++++++++++++++++-----
> 1 file changed, 94 insertions(+), 17 deletions(-)
>
>
>
Applied all.
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform
[-- Attachment #2: Type: text/html, Size: 2165 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2017-08-03 11:31 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-20 12:16 [PATCH 00/10] arm64: zynqmp: dtsi changes Michal Simek
2017-07-20 12:17 ` [PATCH 01/10] arm64: zynqmp: Add references to cpu nodes Michal Simek
[not found] ` <b9a61dfe7f5d4309b3131c1b9a82890888838087.1500552941.git.michal.simek-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
2017-07-25 16:47 ` Moritz Fischer
2017-07-20 12:17 ` [PATCH 02/10] arm64: zynqmp: Add idle state for ZynqMP Michal Simek
2017-07-20 12:17 ` [PATCH 03/10] arm64: zynqmp: Add operating points Michal Simek
2017-07-20 12:17 ` [PATCH 04/10] arm64: zynqmp: Add dcc console for zynqmp Michal Simek
2017-07-20 12:17 ` [PATCH 05/10] arm64: zynqmp: Add CCI-400 node Michal Simek
2017-07-20 12:17 ` [PATCH 06/10] arm64: zynqmp: Adding prefetchable memory space to pcie node Michal Simek
2017-07-20 12:17 ` [PATCH 07/10] arm64: zynqmp: Add support for RTC Michal Simek
2017-07-20 12:17 ` [PATCH 08/10] arm64: zynqmp: Correct IRQ nr for the SMMU Michal Simek
2017-07-20 12:17 ` [PATCH 09/10] arm64: zynqmp: Add new uartps compatible string Michal Simek
[not found] ` <4babfd9b8311073566a5d5730353c035bb5afa2a.1500552941.git.michal.simek-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
2017-07-25 16:49 ` Moritz Fischer
2017-07-20 12:17 ` [PATCH 10/10] arm64: zynqmp: Set status disabled in dtsi Michal Simek
2017-08-03 11:31 ` [PATCH 00/10] arm64: zynqmp: dtsi changes 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).