* [PATCH 1/5] arm64: zynqmp: Sync #dma-cells property location
2022-12-09 12:56 [PATCH 0/5] arm64: zynqmp: DT sync with Linux kernel Michal Simek
@ 2022-12-09 12:56 ` Michal Simek
2022-12-09 12:56 ` [PATCH 2/5] arm64: zynqmp: Added GEM reset definitions Michal Simek
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Michal Simek @ 2022-12-09 12:56 UTC (permalink / raw)
To: u-boot, git
Cc: Ashok Reddy Soma, Ayan Kumar Halder, Piyush Mehta, Robert Hancock,
Shravya Kumbham
Sync property location with Linux kernel done by Linux commit
(1ff2d58e60c8093e9be935b1f191341c0cda957a).
Signed-off-by: Michal Simek <michal.simek@amd.com>
---
Link: https://lore.kernel.org/r/20220112151541.1328732-3-m.tretter@pengutronix.de
---
arch/arm/dts/zynqmp.dtsi | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/arch/arm/dts/zynqmp.dtsi b/arch/arm/dts/zynqmp.dtsi
index b210bc4b87ec..9434c48e4f59 100644
--- a/arch/arm/dts/zynqmp.dtsi
+++ b/arch/arm/dts/zynqmp.dtsi
@@ -280,10 +280,10 @@
interrupt-parent = <&gic>;
interrupts = <0 124 4>;
clock-names = "clk_main", "clk_apb";
+ #dma-cells = <1>;
xlnx,bus-width = <128>;
iommus = <&smmu 0x14e8>;
power-domains = <&zynqmp_firmware PD_GDMA>;
- #dma-cells = <1>;
};
fpd_dma_chan2: dma-controller@fd510000 {
@@ -293,10 +293,10 @@
interrupt-parent = <&gic>;
interrupts = <0 125 4>;
clock-names = "clk_main", "clk_apb";
+ #dma-cells = <1>;
xlnx,bus-width = <128>;
iommus = <&smmu 0x14e9>;
power-domains = <&zynqmp_firmware PD_GDMA>;
- #dma-cells = <1>;
};
fpd_dma_chan3: dma-controller@fd520000 {
@@ -306,10 +306,10 @@
interrupt-parent = <&gic>;
interrupts = <0 126 4>;
clock-names = "clk_main", "clk_apb";
+ #dma-cells = <1>;
xlnx,bus-width = <128>;
iommus = <&smmu 0x14ea>;
power-domains = <&zynqmp_firmware PD_GDMA>;
- #dma-cells = <1>;
};
fpd_dma_chan4: dma-controller@fd530000 {
@@ -319,10 +319,10 @@
interrupt-parent = <&gic>;
interrupts = <0 127 4>;
clock-names = "clk_main", "clk_apb";
+ #dma-cells = <1>;
xlnx,bus-width = <128>;
iommus = <&smmu 0x14eb>;
power-domains = <&zynqmp_firmware PD_GDMA>;
- #dma-cells = <1>;
};
fpd_dma_chan5: dma-controller@fd540000 {
@@ -332,10 +332,10 @@
interrupt-parent = <&gic>;
interrupts = <0 128 4>;
clock-names = "clk_main", "clk_apb";
+ #dma-cells = <1>;
xlnx,bus-width = <128>;
iommus = <&smmu 0x14ec>;
power-domains = <&zynqmp_firmware PD_GDMA>;
- #dma-cells = <1>;
};
fpd_dma_chan6: dma-controller@fd550000 {
@@ -345,10 +345,10 @@
interrupt-parent = <&gic>;
interrupts = <0 129 4>;
clock-names = "clk_main", "clk_apb";
+ #dma-cells = <1>;
xlnx,bus-width = <128>;
iommus = <&smmu 0x14ed>;
power-domains = <&zynqmp_firmware PD_GDMA>;
- #dma-cells = <1>;
};
fpd_dma_chan7: dma-controller@fd560000 {
@@ -358,10 +358,10 @@
interrupt-parent = <&gic>;
interrupts = <0 130 4>;
clock-names = "clk_main", "clk_apb";
+ #dma-cells = <1>;
xlnx,bus-width = <128>;
iommus = <&smmu 0x14ee>;
power-domains = <&zynqmp_firmware PD_GDMA>;
- #dma-cells = <1>;
};
fpd_dma_chan8: dma-controller@fd570000 {
@@ -371,10 +371,10 @@
interrupt-parent = <&gic>;
interrupts = <0 131 4>;
clock-names = "clk_main", "clk_apb";
+ #dma-cells = <1>;
xlnx,bus-width = <128>;
iommus = <&smmu 0x14ef>;
power-domains = <&zynqmp_firmware PD_GDMA>;
- #dma-cells = <1>;
};
gic: interrupt-controller@f9010000 {
@@ -411,10 +411,10 @@
interrupt-parent = <&gic>;
interrupts = <0 77 4>;
clock-names = "clk_main", "clk_apb";
+ #dma-cells = <1>;
xlnx,bus-width = <64>;
iommus = <&smmu 0x868>;
power-domains = <&zynqmp_firmware PD_ADMA>;
- #dma-cells = <1>;
};
lpd_dma_chan2: dma-controller@ffa90000 {
@@ -424,10 +424,10 @@
interrupt-parent = <&gic>;
interrupts = <0 78 4>;
clock-names = "clk_main", "clk_apb";
+ #dma-cells = <1>;
xlnx,bus-width = <64>;
iommus = <&smmu 0x869>;
power-domains = <&zynqmp_firmware PD_ADMA>;
- #dma-cells = <1>;
};
lpd_dma_chan3: dma-controller@ffaa0000 {
@@ -437,10 +437,10 @@
interrupt-parent = <&gic>;
interrupts = <0 79 4>;
clock-names = "clk_main", "clk_apb";
+ #dma-cells = <1>;
xlnx,bus-width = <64>;
iommus = <&smmu 0x86a>;
power-domains = <&zynqmp_firmware PD_ADMA>;
- #dma-cells = <1>;
};
lpd_dma_chan4: dma-controller@ffab0000 {
@@ -450,10 +450,10 @@
interrupt-parent = <&gic>;
interrupts = <0 80 4>;
clock-names = "clk_main", "clk_apb";
+ #dma-cells = <1>;
xlnx,bus-width = <64>;
iommus = <&smmu 0x86b>;
power-domains = <&zynqmp_firmware PD_ADMA>;
- #dma-cells = <1>;
};
lpd_dma_chan5: dma-controller@ffac0000 {
@@ -463,10 +463,10 @@
interrupt-parent = <&gic>;
interrupts = <0 81 4>;
clock-names = "clk_main", "clk_apb";
+ #dma-cells = <1>;
xlnx,bus-width = <64>;
iommus = <&smmu 0x86c>;
power-domains = <&zynqmp_firmware PD_ADMA>;
- #dma-cells = <1>;
};
lpd_dma_chan6: dma-controller@ffad0000 {
@@ -476,10 +476,10 @@
interrupt-parent = <&gic>;
interrupts = <0 82 4>;
clock-names = "clk_main", "clk_apb";
+ #dma-cells = <1>;
xlnx,bus-width = <64>;
iommus = <&smmu 0x86d>;
power-domains = <&zynqmp_firmware PD_ADMA>;
- #dma-cells = <1>;
};
lpd_dma_chan7: dma-controller@ffae0000 {
@@ -489,10 +489,10 @@
interrupt-parent = <&gic>;
interrupts = <0 83 4>;
clock-names = "clk_main", "clk_apb";
+ #dma-cells = <1>;
xlnx,bus-width = <64>;
iommus = <&smmu 0x86e>;
power-domains = <&zynqmp_firmware PD_ADMA>;
- #dma-cells = <1>;
};
lpd_dma_chan8: dma-controller@ffaf0000 {
@@ -502,10 +502,10 @@
interrupt-parent = <&gic>;
interrupts = <0 84 4>;
clock-names = "clk_main", "clk_apb";
+ #dma-cells = <1>;
xlnx,bus-width = <64>;
iommus = <&smmu 0x86f>;
power-domains = <&zynqmp_firmware PD_ADMA>;
- #dma-cells = <1>;
};
mc: memory-controller@fd070000 {
--
2.36.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 2/5] arm64: zynqmp: Added GEM reset definitions
2022-12-09 12:56 [PATCH 0/5] arm64: zynqmp: DT sync with Linux kernel Michal Simek
2022-12-09 12:56 ` [PATCH 1/5] arm64: zynqmp: Sync #dma-cells property location Michal Simek
@ 2022-12-09 12:56 ` Michal Simek
2022-12-09 12:56 ` [PATCH 3/5] arm64: zynqmp: Fix AMS device tree node Michal Simek
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Michal Simek @ 2022-12-09 12:56 UTC (permalink / raw)
To: u-boot, git
Cc: Ashok Reddy Soma, Ayan Kumar Halder, Harini Katakam, Piyush Mehta,
Robert Hancock, Sai Krishna Potthuri, Shravya Kumbham
The Cadence GEM/MACB driver now utilizes the platform-level reset on the
ZynqMP platform. Add reset definitions to the ZynqMP platform device
tree to allow this to be used.
Linux upstream commit (e461bd6f43f4e568f7436a8b6bc21c4ce6914c36).
Signed-off-by: Robert Hancock <robert.hancock@calian.com>
Signed-off-by: Michal Simek <michal.simek@amd.com>
---
https://lore.kernel.org/netdev/20220112181113.875567-4-robert.hancock@calian.com/
---
arch/arm/dts/zynqmp.dtsi | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/dts/zynqmp.dtsi b/arch/arm/dts/zynqmp.dtsi
index 9434c48e4f59..e2eb27b3151e 100644
--- a/arch/arm/dts/zynqmp.dtsi
+++ b/arch/arm/dts/zynqmp.dtsi
@@ -540,6 +540,7 @@
iommus = <&smmu 0x874>;
power-domains = <&zynqmp_firmware PD_ETH_0>;
resets = <&zynqmp_reset ZYNQMP_RESET_GEM0>;
+ reset-names = "gem0_rst";
};
gem1: ethernet@ff0c0000 {
@@ -554,6 +555,7 @@
iommus = <&smmu 0x875>;
power-domains = <&zynqmp_firmware PD_ETH_1>;
resets = <&zynqmp_reset ZYNQMP_RESET_GEM1>;
+ reset-names = "gem1_rst";
};
gem2: ethernet@ff0d0000 {
@@ -568,6 +570,7 @@
iommus = <&smmu 0x876>;
power-domains = <&zynqmp_firmware PD_ETH_2>;
resets = <&zynqmp_reset ZYNQMP_RESET_GEM2>;
+ reset-names = "gem2_rst";
};
gem3: ethernet@ff0e0000 {
@@ -582,6 +585,7 @@
iommus = <&smmu 0x877>;
power-domains = <&zynqmp_firmware PD_ETH_3>;
resets = <&zynqmp_reset ZYNQMP_RESET_GEM3>;
+ reset-names = "gem3_rst";
};
gpio: gpio@ff0a0000 {
--
2.36.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 3/5] arm64: zynqmp: Fix AMS device tree node
2022-12-09 12:56 [PATCH 0/5] arm64: zynqmp: DT sync with Linux kernel Michal Simek
2022-12-09 12:56 ` [PATCH 1/5] arm64: zynqmp: Sync #dma-cells property location Michal Simek
2022-12-09 12:56 ` [PATCH 2/5] arm64: zynqmp: Added GEM reset definitions Michal Simek
@ 2022-12-09 12:56 ` Michal Simek
2022-12-09 12:56 ` [PATCH 4/5] arm64: zynqmp: Align gpio-key node names with dtschema Michal Simek
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Michal Simek @ 2022-12-09 12:56 UTC (permalink / raw)
To: u-boot, git
Cc: Ayan Kumar Halder, Harini Katakam, Manish Narani, Piyush Mehta,
Robert Hancock, Sai Krishna Potthuri, Shravya Kumbham
Aligned node description with the Linux kernel. Node has been added by
kernel commit (271c1fa01c2307cf74f4656390d6299991119c3e).
Signed-off-by: Robert Hancock <robert.hancock@calian.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
Link: https://lore.kernel.org/r/20220120010246.3794962-2-robert.hancock@calian.com
Signed-off-by: Michal Simek <michal.simek@amd.com>
---
arch/arm/dts/zynqmp.dtsi | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/arch/arm/dts/zynqmp.dtsi b/arch/arm/dts/zynqmp.dtsi
index e2eb27b3151e..4e1113db1a7e 100644
--- a/arch/arm/dts/zynqmp.dtsi
+++ b/arch/arm/dts/zynqmp.dtsi
@@ -938,21 +938,23 @@
interrupt-names = "ams-irq";
reg = <0x0 0xffa50000 0x0 0x800>;
reg-names = "ams-base";
- #address-cells = <2>;
- #size-cells = <2>;
+ #address-cells = <1>;
+ #size-cells = <1>;
#io-channel-cells = <1>;
- ranges;
+ ranges = <0 0 0xffa50800 0x800>;
- ams_ps: ams_ps@ffa50800 {
+ ams_ps: ams_ps@0 {
compatible = "xlnx,zynqmp-ams-ps";
status = "disabled";
- reg = <0x0 0xffa50800 0x0 0x400>;
+ reg = <0x0 0x400>;
};
- ams_pl: ams_pl@ffa50c00 {
+ ams_pl: ams_pl@400 {
compatible = "xlnx,zynqmp-ams-pl";
status = "disabled";
- reg = <0x0 0xffa50c00 0x0 0x400>;
+ reg = <0x400 0x400>;
+ #address-cells = <1>;
+ #size-cells = <0>;
};
};
--
2.36.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 4/5] arm64: zynqmp: Align gpio-key node names with dtschema
2022-12-09 12:56 [PATCH 0/5] arm64: zynqmp: DT sync with Linux kernel Michal Simek
` (2 preceding siblings ...)
2022-12-09 12:56 ` [PATCH 3/5] arm64: zynqmp: Fix AMS device tree node Michal Simek
@ 2022-12-09 12:56 ` Michal Simek
2022-12-09 12:56 ` [PATCH 5/5] arm64: zynqmp: Remove id from usb node name Michal Simek
2022-12-15 11:49 ` [PATCH 0/5] arm64: zynqmp: DT sync with Linux kernel Michal Simek
5 siblings, 0 replies; 7+ messages in thread
From: Michal Simek @ 2022-12-09 12:56 UTC (permalink / raw)
To: u-boot, git
The node names should be generic and DT schema expects certain pattern
(e.g. with key/button/switch).
It is based on kernel commit (228e8a88b1915a2b467c83d8d0976605f1272fae).
Signed-off-by: Michal Simek <michal.simek@amd.com>
---
Link: https://lore.kernel.org/r/20220616005333.18491-30-krzysztof.kozlowski@linaro.org
---
arch/arm/dts/zynqmp-sm-k26-revA.dts | 2 +-
arch/arm/dts/zynqmp-zcu100-revC.dts | 2 +-
arch/arm/dts/zynqmp-zcu102-revA.dts | 2 +-
arch/arm/dts/zynqmp-zcu106-revA.dts | 2 +-
arch/arm/dts/zynqmp-zcu111-revA.dts | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/dts/zynqmp-sm-k26-revA.dts b/arch/arm/dts/zynqmp-sm-k26-revA.dts
index bae24aabdbd1..aafaaec3f1c4 100644
--- a/arch/arm/dts/zynqmp-sm-k26-revA.dts
+++ b/arch/arm/dts/zynqmp-sm-k26-revA.dts
@@ -53,7 +53,7 @@
gpio-keys {
compatible = "gpio-keys";
autorepeat;
- fwuen {
+ key-fwuen {
label = "fwuen";
gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
linux,code = <BTN_MISC>;
diff --git a/arch/arm/dts/zynqmp-zcu100-revC.dts b/arch/arm/dts/zynqmp-zcu100-revC.dts
index 5e7bc7384fce..eea703ab67ea 100644
--- a/arch/arm/dts/zynqmp-zcu100-revC.dts
+++ b/arch/arm/dts/zynqmp-zcu100-revC.dts
@@ -49,7 +49,7 @@
gpio-keys {
compatible = "gpio-keys";
autorepeat;
- sw4 {
+ switch-4 {
label = "sw4";
gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>;
diff --git a/arch/arm/dts/zynqmp-zcu102-revA.dts b/arch/arm/dts/zynqmp-zcu102-revA.dts
index 9d8e551ed277..d78bfb8987fc 100644
--- a/arch/arm/dts/zynqmp-zcu102-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu102-revA.dts
@@ -47,7 +47,7 @@
gpio-keys {
compatible = "gpio-keys";
autorepeat;
- sw19 {
+ switch-19 {
label = "sw19";
gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
linux,code = <KEY_DOWN>;
diff --git a/arch/arm/dts/zynqmp-zcu106-revA.dts b/arch/arm/dts/zynqmp-zcu106-revA.dts
index 4858b4d1f5e9..266c24e41259 100644
--- a/arch/arm/dts/zynqmp-zcu106-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu106-revA.dts
@@ -47,7 +47,7 @@
gpio-keys {
compatible = "gpio-keys";
autorepeat;
- sw19 {
+ switch-19 {
label = "sw19";
gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
linux,code = <KEY_DOWN>;
diff --git a/arch/arm/dts/zynqmp-zcu111-revA.dts b/arch/arm/dts/zynqmp-zcu111-revA.dts
index 2e95f22c3f08..8535cc089132 100644
--- a/arch/arm/dts/zynqmp-zcu111-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu111-revA.dts
@@ -47,7 +47,7 @@
gpio-keys {
compatible = "gpio-keys";
autorepeat;
- sw19 {
+ switch-19 {
label = "sw19";
gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
linux,code = <KEY_DOWN>;
--
2.36.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 5/5] arm64: zynqmp: Remove id from usb node name
2022-12-09 12:56 [PATCH 0/5] arm64: zynqmp: DT sync with Linux kernel Michal Simek
` (3 preceding siblings ...)
2022-12-09 12:56 ` [PATCH 4/5] arm64: zynqmp: Align gpio-key node names with dtschema Michal Simek
@ 2022-12-09 12:56 ` Michal Simek
2022-12-15 11:49 ` [PATCH 0/5] arm64: zynqmp: DT sync with Linux kernel Michal Simek
5 siblings, 0 replies; 7+ messages in thread
From: Michal Simek @ 2022-12-09 12:56 UTC (permalink / raw)
To: u-boot, git
Cc: Ashok Reddy Soma, Ayan Kumar Halder, Piyush Mehta, Robert Hancock,
Shravya Kumbham
There is no reason to have number in usb node name. This is also sync up
patch with upstream kernel.
Signed-off-by: Michal Simek <michal.simek@amd.com>
---
arch/arm/dts/zynqmp.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/dts/zynqmp.dtsi b/arch/arm/dts/zynqmp.dtsi
index 4e1113db1a7e..34504a8cbb92 100644
--- a/arch/arm/dts/zynqmp.dtsi
+++ b/arch/arm/dts/zynqmp.dtsi
@@ -846,7 +846,7 @@
power-domains = <&zynqmp_firmware PD_UART_1>;
};
- usb0: usb0@ff9d0000 {
+ usb0: usb@ff9d0000 {
#address-cells = <2>;
#size-cells = <2>;
status = "disabled";
@@ -879,7 +879,7 @@
};
};
- usb1: usb1@ff9e0000 {
+ usb1: usb@ff9e0000 {
#address-cells = <2>;
#size-cells = <2>;
status = "disabled";
--
2.36.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH 0/5] arm64: zynqmp: DT sync with Linux kernel
2022-12-09 12:56 [PATCH 0/5] arm64: zynqmp: DT sync with Linux kernel Michal Simek
` (4 preceding siblings ...)
2022-12-09 12:56 ` [PATCH 5/5] arm64: zynqmp: Remove id from usb node name Michal Simek
@ 2022-12-15 11:49 ` Michal Simek
5 siblings, 0 replies; 7+ messages in thread
From: Michal Simek @ 2022-12-15 11:49 UTC (permalink / raw)
To: u-boot, git
Cc: Ashok Reddy Soma, Ayan Kumar Halder, Harini Katakam,
Manish Narani, Piyush Mehta, Robert Hancock, Sai Krishna Potthuri,
Shravya Kumbham
On 12/9/22 13:56, Michal Simek wrote:
> Hi,
>
> I found some differences between kernel and u-boot that's why do small sync
> up.
>
> Thanks,
> Michal
>
>
> Michal Simek (5):
> arm64: zynqmp: Sync #dma-cells property location
> arm64: zynqmp: Added GEM reset definitions
> arm64: zynqmp: Fix AMS device tree node
> arm64: zynqmp: Align gpio-key node names with dtschema
> arm64: zynqmp: Remove id from usb node name
>
> arch/arm/dts/zynqmp-sm-k26-revA.dts | 2 +-
> arch/arm/dts/zynqmp-zcu100-revC.dts | 2 +-
> arch/arm/dts/zynqmp-zcu102-revA.dts | 2 +-
> arch/arm/dts/zynqmp-zcu106-revA.dts | 2 +-
> arch/arm/dts/zynqmp-zcu111-revA.dts | 2 +-
> arch/arm/dts/zynqmp.dtsi | 56 ++++++++++++++++-------------
> 6 files changed, 36 insertions(+), 30 deletions(-)
>
Queue for next.
M
^ permalink raw reply [flat|nested] 7+ messages in thread