[PATCH 0/5] arm64: xilinx: DT sync
Hi,
I have found 5 more patches internally which should be also upstreamed to get DT in sync and descrease amount of differences.
Thanks, Michal
Michal Simek (4): arm64: zynqmp: Use mdio node by vp-x-a2785-00-revA and vpk120-revA arm64: zynqmp: Remove xlnx,zynqmp-aes node Revert "arm64: zynqmp: Add power domain description for PL" arm64: zynqmp: Remove address/size-cells from ams node
Piyush Mehta (1): arm64: zynqmp: remove snps,xhci-stream-quirk property for usb
arch/arm/dts/zynqmp-vp-x-a2785-00-revA.dts | 10 +++++++--- arch/arm/dts/zynqmp-vpk120-revA.dts | 10 +++++++--- arch/arm/dts/zynqmp.dtsi | 9 --------- 3 files changed, 14 insertions(+), 15 deletions(-)
All boards have been converted to use mdio node that's why move ethernet phys under mdio node too.
Signed-off-by: Michal Simek michal.simek@amd.com ---
Same change was done by: https://lore.kernel.org/r/ff165281a70a38e2b76fee91e6255ce95ce8021b.169537883... --- arch/arm/dts/zynqmp-vp-x-a2785-00-revA.dts | 10 +++++++--- arch/arm/dts/zynqmp-vpk120-revA.dts | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/arch/arm/dts/zynqmp-vp-x-a2785-00-revA.dts b/arch/arm/dts/zynqmp-vp-x-a2785-00-revA.dts index 2f88aa4a0d28..9ab8f5bfffe4 100644 --- a/arch/arm/dts/zynqmp-vp-x-a2785-00-revA.dts +++ b/arch/arm/dts/zynqmp-vp-x-a2785-00-revA.dts @@ -119,9 +119,13 @@ phy-mode = "sgmii"; /* DTG generates this properly 1512 */ is-internal-pcspma; /* phys = <&psgtr 0 PHY_TYPE_SGMII 0 0>; */ - /* phy-reset-gpios = <&gpio 142 GPIO_ACTIVE_LOW>; */ - phy0: ethernet-phy@0 { /* u131 - M88e1512 */ - reg = <0>; + mdio: mdio { + #address-cells = <1>; + #size-cells = <0>; + /* reset-gpios = <&gpio 142 GPIO_ACTIVE_LOW>; */ + phy0: ethernet-phy@0 { /* u131 - M88e1512 */ + reg = <0>; + }; }; };
diff --git a/arch/arm/dts/zynqmp-vpk120-revA.dts b/arch/arm/dts/zynqmp-vpk120-revA.dts index 66919f578e02..ce76e0b3db36 100644 --- a/arch/arm/dts/zynqmp-vpk120-revA.dts +++ b/arch/arm/dts/zynqmp-vpk120-revA.dts @@ -120,9 +120,13 @@ phy-mode = "sgmii"; /* DTG generates this properly 1512 */ is-internal-pcspma; /* phys = <&psgtr 0 PHY_TYPE_SGMII 0 0>; */ - /* phy-reset-gpios = <&gpio 142 GPIO_ACTIVE_LOW>; */ - phy0: ethernet-phy@0 { - reg = <0>; + mdio: mdio { + #address-cells = <1>; + #size-cells = <0>; + /* reset-gpios = <&gpio 142 GPIO_ACTIVE_LOW>; */ + phy0: ethernet-phy@0 { + reg = <0>; + }; }; };
AES can be discovered via firmware interface that's why remove node for it.
Signed-off-by: Michal Simek michal.simek@amd.com ---
arch/arm/dts/zynqmp.dtsi | 4 ---- 1 file changed, 4 deletions(-)
diff --git a/arch/arm/dts/zynqmp.dtsi b/arch/arm/dts/zynqmp.dtsi index f03c201caee9..463ac14f4b59 100644 --- a/arch/arm/dts/zynqmp.dtsi +++ b/arch/arm/dts/zynqmp.dtsi @@ -220,10 +220,6 @@ compatible = "xlnx,zynqmp-pcap-fpga"; };
- xlnx_aes: zynqmp-aes { - compatible = "xlnx,zynqmp-aes"; - }; - zynqmp_reset: reset-controller { compatible = "xlnx,zynqmp-reset"; #reset-cells = <1>;
This reverts commit d59fac2f3f247470708a1aed1af96802a05e0e61.
This power domain shouldn't be enabled by default. Power domain behavior should be handled on case by case basis. Adding this property to zynqmp.dtsi is breaking some suspend/resume cases that's why remove it from this file.
Signed-off-by: Michal Simek michal.simek@amd.com ---
arch/arm/dts/zynqmp.dtsi | 1 - 1 file changed, 1 deletion(-)
diff --git a/arch/arm/dts/zynqmp.dtsi b/arch/arm/dts/zynqmp.dtsi index 463ac14f4b59..366b50a104be 100644 --- a/arch/arm/dts/zynqmp.dtsi +++ b/arch/arm/dts/zynqmp.dtsi @@ -257,7 +257,6 @@ #address-cells = <2>; #size-cells = <2>; ranges; - power-domains = <&zynqmp_firmware PD_PL>; };
remoteproc {
Remove unused address/size-cells which is also done upstream that's why this is pretty much sync patch with upstream.
Signed-off-by: Michal Simek michal.simek@amd.com ---
arch/arm/dts/zynqmp.dtsi | 2 -- 1 file changed, 2 deletions(-)
diff --git a/arch/arm/dts/zynqmp.dtsi b/arch/arm/dts/zynqmp.dtsi index 366b50a104be..de60233fd061 100644 --- a/arch/arm/dts/zynqmp.dtsi +++ b/arch/arm/dts/zynqmp.dtsi @@ -1034,8 +1034,6 @@ compatible = "xlnx,zynqmp-ams-pl"; status = "disabled"; reg = <0x400 0x400>; - #address-cells = <1>; - #size-cells = <0>; }; };
From: Piyush Mehta piyush.mehta@amd.com
To sync up with the upstream bulk-stream feature, removed 'snps,xhci-stream-quirk' DT property for usb.
Signed-off-by: Piyush Mehta piyush.mehta@amd.com Signed-off-by: Michal Simek michal.simek@amd.com ---
arch/arm/dts/zynqmp.dtsi | 2 -- 1 file changed, 2 deletions(-)
diff --git a/arch/arm/dts/zynqmp.dtsi b/arch/arm/dts/zynqmp.dtsi index de60233fd061..2253e773d386 100644 --- a/arch/arm/dts/zynqmp.dtsi +++ b/arch/arm/dts/zynqmp.dtsi @@ -955,7 +955,6 @@ snps,quirk-frame-length-adjustment = <0x20>; clock-names = "ref"; snps,enable_guctl1_ipd_quirk; - snps,xhci-stream-quirk; snps,resume-hs-terminations; /* dma-coherent; */ }; @@ -988,7 +987,6 @@ snps,quirk-frame-length-adjustment = <0x20>; clock-names = "ref"; snps,enable_guctl1_ipd_quirk; - snps,xhci-stream-quirk; snps,resume-hs-terminations; /* dma-coherent; */ };
On 10/12/23 14:58, Michal Simek wrote:
Hi,
I have found 5 more patches internally which should be also upstreamed to get DT in sync and descrease amount of differences.
Thanks, Michal
Michal Simek (4): arm64: zynqmp: Use mdio node by vp-x-a2785-00-revA and vpk120-revA arm64: zynqmp: Remove xlnx,zynqmp-aes node Revert "arm64: zynqmp: Add power domain description for PL" arm64: zynqmp: Remove address/size-cells from ams node
Piyush Mehta (1): arm64: zynqmp: remove snps,xhci-stream-quirk property for usb
arch/arm/dts/zynqmp-vp-x-a2785-00-revA.dts | 10 +++++++--- arch/arm/dts/zynqmp-vpk120-revA.dts | 10 +++++++--- arch/arm/dts/zynqmp.dtsi | 9 --------- 3 files changed, 14 insertions(+), 15 deletions(-)
Applied. M
participants (1)
-
Michal Simek