arm64: zynqmp: Various DT fixes
Subsystems (2)
v2 cover arm64: zynqmp: Various DT fixes
Hi,
I am sending various DT fixes which have been found over the xilinx release.
1-2 patches are fixing reported description issues
3-8 patches are actual fixes.
Thanks,
Michal
Changes in v2:
- Add missing patch
- Add missing patch
Michal Simek (7):
arm64: zynqmp: Use ethernet-phy as node name for ethernet phys
arm64: zynqmp: Remove addition number in node name
arm64: zynqmp: Fix address for tca6416_u97 chip on zcu104
arm64: zynqmp: Turn comment to gpio-line-names
arm64: zynqmp: Setup clock-output-names for si570 chips
arm64: zynqmp: Remove broken-cd from zcu100-revC
arm64: zynqmp: Setup default number of chipselects for zcu100
Venkatesh Yadav Abbarapu (1):
arm64: zynqmp: Fix the si570 clock frequency on zcu111
.../dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 2 +- .../dts/xilinx/zynqmp-zc1751-xm016-dc2.dts | 6 +-- .../dts/xilinx/zynqmp-zc1751-xm017-dc3.dts | 2 +- .../dts/xilinx/zynqmp-zc1751-xm019-dc5.dts | 2 +- .../boot/dts/xilinx/zynqmp-zcu100-revC.dts | 3 +- .../boot/dts/xilinx/zynqmp-zcu102-revA.dts | 47 +++++-------------- .../boot/dts/xilinx/zynqmp-zcu102-revB.dts | 4 +- .../boot/dts/xilinx/zynqmp-zcu104-revA.dts | 6 +-- .../boot/dts/xilinx/zynqmp-zcu106-revA.dts | 4 +- .../boot/dts/xilinx/zynqmp-zcu111-revA.dts | 6 ++- 10 files changed, 32 insertions(+), 50 deletions(-)
Signature · 1 line
2.24.0
PATCH v2 1/8 arm64: zynqmp: Use ethernet-phy as node name for ethernet phys
Ethernet phys based on devicetree specification should be using ethernet-phy@ node name instead of pure phy@.
---
Changes in v2:
- Add missing patch
arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 2 +- arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts | 2 +- arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm017-dc3.dts | 2 +- arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm019-dc5.dts | 2 +- arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 2 +- arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revB.dts | 4 ++-- arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts | 2 +- arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts | 2 +- arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-)
arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts +1 -1
@@ -73,7 +73,7 @@ &gem3 { status = "okay"; phy-handle = <&phy0>; phy-mode = "rgmii-id"; - phy0: phy@0 { + phy0: ethernet-phy@0 { reg = <0>; }; };
arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts +1 -1
@@ -84,7 +84,7 @@ &gem2 { status = "okay"; phy-handle = <&phy0>; phy-mode = "rgmii-id"; - phy0: phy@5 { + phy0: ethernet-phy@5 { reg = <5>; ti,rx-internal-delay = <0x8>; ti,tx-internal-delay = <0xa>;
arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm017-dc3.dts +1 -1
@@ -73,7 +73,7 @@ &gem0 { status = "okay"; phy-handle = <&phy0>; phy-mode = "rgmii-id"; - phy0: phy@0 { /* VSC8211 */ + phy0: ethernet-phy@0 { /* VSC8211 */ reg = <0>; }; };
arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm019-dc5.dts +1 -1
@@ -74,7 +74,7 @@ &gem1 { status = "okay"; phy-handle = <&phy0>; phy-mode = "rgmii-id"; - phy0: phy@0 { + phy0: ethernet-phy@0 { reg = <0>; }; };
arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts +1 -1
@@ -105,7 +105,7 @@ &gem3 { status = "okay"; phy-handle = <&phy0>; phy-mode = "rgmii-id"; - phy0: phy@21 { + phy0: ethernet-phy@21 { reg = <21>; ti,rx-internal-delay = <0x8>; ti,tx-internal-delay = <0xa>;
arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revB.dts +2 -2
@@ -16,7 +16,7 @@ / { &gem3 { phy-handle = <&phyc>; - phyc: phy@c { + phyc: ethernet-phy@c { reg = <0xc>; ti,rx-internal-delay = <0x8>; ti,tx-internal-delay = <0xa>;
@@ -24,7 +24,7 @@ phyc: phy@c { ti,dp83867-rxctrl-strap-quirk; }; /* Cleanup from RevA */ - /delete-node/ phy@21; + /delete-node/ ethernet-phy@21; }; /* Fix collision with u61 */
arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts +1 -1
@@ -50,7 +50,7 @@ &gem3 { status = "okay"; phy-handle = <&phy0>; phy-mode = "rgmii-id"; - phy0: phy@c { + phy0: ethernet-phy@c { reg = <0xc>; ti,rx-internal-delay = <0x8>; ti,tx-internal-delay = <0xa>;
arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts +1 -1
@@ -106,7 +106,7 @@ &gem3 { status = "okay"; phy-handle = <&phy0>; phy-mode = "rgmii-id"; - phy0: phy@c { + phy0: ethernet-phy@c { reg = <0xc>; ti,rx-internal-delay = <0x8>; ti,tx-internal-delay = <0xa>;
arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts +1 -1
@@ -101,7 +101,7 @@ &gem3 { status = "okay"; phy-handle = <&phy0>; phy-mode = "rgmii-id"; - phy0: phy@c { + phy0: ethernet-phy@c { reg = <0xc>; ti,rx-internal-delay = <0x8>; ti,tx-internal-delay = <0xa>;
Signature · 1 line
2.24.0
PATCH v2 2/8 arm64: zynqmp: Remove addition number in node name
In reply to Michal SimekThis change is coming from mainline review that's why this patch is sync.
---
Changes in v2:
- Add missing patch
arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts +2 -2
@@ -123,7 +123,7 @@ &spi0 { status = "okay"; num-cs = <1>; - spi0_flash0: flash0@0 { + spi0_flash0: flash@0 { #address-cells = <1>; #size-cells = <1>; compatible = "sst,sst25wf080", "jedec,spi-nor";
@@ -141,7 +141,7 @@ &spi1 { status = "okay"; num-cs = <1>; - spi1_flash0: flash0@0 { + spi1_flash0: flash@0 { #address-cells = <1>; #size-cells = <1>; compatible = "atmel,at45db041e", "atmel,at45", "atmel,dataflash";
Signature · 1 line
2.24.0
PATCH v2 3/8 arm64: zynqmp: Fix address for tca6416_u97 chip on zcu104
In reply to Michal SimekI2c address is not 0x21 but 0x20.
---
Changes in v2: None
arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts +2 -2
@@ -118,9 +118,9 @@ i2c@4 { #address-cells = <1>; #size-cells = <0>; reg = <4>; - tca6416_u97: gpio@21 { + tca6416_u97: gpio@20 { compatible = "ti,tca6416"; - reg = <0x21>; + reg = <0x20>; gpio-controller; #gpio-cells = <2>; /*
Signature · 1 line
2.24.0
PATCH v2 4/8 arm64: zynqmp: Turn comment to gpio-line-names
In reply to Michal SimekLabel gpio lines properly.
---
Changes in v2: None
.../boot/dts/xilinx/zynqmp-zcu102-revA.dts | 43 ++++--------------- 1 file changed, 9 insertions(+), 34 deletions(-)
arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts +9 -34
@@ -125,21 +125,11 @@ &i2c0 { tca6416_u97: gpio@20 { compatible = "ti,tca6416"; reg = <0x20>; - gpio-controller; + gpio-controller; /* IRQ not connected */ #gpio-cells = <2>; - /* - * IRQ not connected - * Lines: - * 0 - PS_GTR_LAN_SEL0 - * 1 - PS_GTR_LAN_SEL1 - * 2 - PS_GTR_LAN_SEL2 - * 3 - PS_GTR_LAN_SEL3 - * 4 - PCI_CLK_DIR_SEL - * 5 - IIC_MUX_RESET_B - * 6 - GEM3_EXP_RESET_B - * 7, 10 - 17 - not connected - */ - + gpio-line-names = "PS_GTR_LAN_SEL0", "PS_GTR_LAN_SEL1", "PS_GTR_LAN_SEL2", "PS_GTR_LAN_SEL3", + "PCI_CLK_DIR_SEL", "IIC_MUX_RESET_B", "GEM3_EXP_RESET_B", + "", "", "", "", "", "", "", "", ""; gtr-sel0 { gpio-hog; gpios = <0 0>;
@@ -169,27 +159,12 @@ gtr-sel3 { tca6416_u61: gpio@21 { compatible = "ti,tca6416"; reg = <0x21>; - gpio-controller; + gpio-controller; /* IRQ not connected */ #gpio-cells = <2>; - /* - * IRQ not connected - * Lines: - * 0 - VCCPSPLL_EN - * 1 - MGTRAVCC_EN - * 2 - MGTRAVTT_EN - * 3 - VCCPSDDRPLL_EN - * 4 - MIO26_PMU_INPUT_LS - * 5 - PL_PMBUS_ALERT - * 6 - PS_PMBUS_ALERT - * 7 - MAXIM_PMBUS_ALERT - * 10 - PL_DDR4_VTERM_EN - * 11 - PL_DDR4_VPP_2V5_EN - * 12 - PS_DIMM_VDDQ_TO_PSVCCO_ON - * 13 - PS_DIMM_SUSPEND_EN - * 14 - PS_DDR4_VTERM_EN - * 15 - PS_DDR4_VPP_2V5_EN - * 16 - 17 - not connected - */ + gpio-line-names = "VCCPSPLL_EN", "MGTRAVCC_EN", "MGTRAVTT_EN", "VCCPSDDRPLL_EN", "MIO26_PMU_INPUT_LS", + "PL_PMBUS_ALERT", "PS_PMBUS_ALERT", "MAXIM_PMBUS_ALERT", "PL_DDR4_VTERM_EN", + "PL_DDR4_VPP_2V5_EN", "PS_DIMM_VDDQ_TO_PSVCCO_ON", "PS_DIMM_SUSPEND_EN", + "PS_DDR4_VTERM_EN", "PS_DDR4_VPP_2V5_EN", "", ""; }; i2c-mux@75 { /* u60 */
Signature · 1 line
2.24.0
PATCH v2 5/8 arm64: zynqmp: Setup clock-output-names for si570 chips
In reply to Michal SimekIf there are more instances of si570 clock-output-names property should be used for differentiation of clock output.
The patch is adding this optional properties for all zynqmp boards with si570 chip.
---
Changes in v2: None
arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 2 ++ arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts | 2 ++ arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 2 ++ 3 files changed, 6 insertions(+)
arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts +2 -0
@@ -389,6 +389,7 @@ si570_1: clock-generator@5d { /* USER SI570 - u42 */ temperature-stability = <50>; factory-fout = <300000000>; clock-frequency = <300000000>; + clock-output-names = "si570_user"; }; }; i2c@3 {
@@ -402,6 +403,7 @@ si570_2: clock-generator@5d { /* USER MGT SI570 - u56 */ temperature-stability = <50>; /* copy from zc702 */ factory-fout = <156250000>; clock-frequency = <148500000>; + clock-output-names = "si570_mgt"; }; }; i2c@4 {
arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts +2 -0
@@ -388,6 +388,7 @@ si570_1: clock-generator@5d { /* USER SI570 - u42 */ temperature-stability = <50>; factory-fout = <300000000>; clock-frequency = <300000000>; + clock-output-names = "si570_user"; }; }; i2c@3 {
@@ -401,6 +402,7 @@ si570_2: clock-generator@5d { /* USER MGT SI570 - u56 */ temperature-stability = <50>; /* copy from zc702 */ factory-fout = <156250000>; clock-frequency = <148500000>; + clock-output-names = "si570_mgt"; }; }; i2c@4 {
arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts +2 -0
@@ -304,6 +304,7 @@ si570_1: clock-generator@5d { /* USER SI570 - u47 */ temperature-stability = <50>; factory-fout = <300000000>; clock-frequency = <300000000>; + clock-output-names = "si570_user"; }; }; i2c@3 {
@@ -317,6 +318,7 @@ si570_2: clock-generator@5d { /* USER MGT SI570 - u49 */ temperature-stability = <50>; factory-fout = <156250000>; clock-frequency = <148500000>; + clock-output-names = "si570_mgt"; }; }; i2c@4 {
Signature · 1 line
2.24.0
PATCH v2 6/8 arm64: zynqmp: Fix the si570 clock frequency on zcu111
In reply to Michal SimekFrom: Venkatesh Yadav Abbarapu <[email protected]>
The si570 clock frequency should be 156.25MHz as per datasheet.
---
Changes in v2: None
arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts +1 -1
@@ -317,7 +317,7 @@ si570_2: clock-generator@5d { /* USER MGT SI570 - u49 */ reg = <0x5d>; temperature-stability = <50>; factory-fout = <156250000>; - clock-frequency = <148500000>; + clock-frequency = <156250000>; clock-output-names = "si570_mgt"; }; };
Signature · 1 line
2.24.0
PATCH v2 7/8 arm64: zynqmp: Remove broken-cd from zcu100-revC
In reply to Michal SimekCard detect bit was broken on revA and it is working fine with revC board that's why this property can be removed.
---
Changes in v2: None
arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts | 1 - 1 file changed, 1 deletion(-)
arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts +0 -1
@@ -226,7 +226,6 @@ &rtc { &sdhci0 { status = "okay"; no-1-8-v; - broken-cd; /* CD has to be enabled by default */ disable-wp; };
Signature · 1 line
2.24.0
PATCH v2 8/8 arm64: zynqmp: Setup default number of chipselects for zcu100
In reply to Michal SimekThere is only one chipselect on each connector. Define it directly in board dts file.
There should be an option to use more chipselects via gpios.
---
Changes in v2: None
arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts +2 -0
@@ -250,11 +250,13 @@ wlcore: wifi@2 { &spi0 { /* Low Speed connector */ status = "okay"; label = "LS-SPI0"; + num-cs = <1>; }; &spi1 { /* High Speed connector */ status = "okay"; label = "HS-SPI1"; + num-cs = <1>; }; &uart0 {
Signature · 1 line
2.24.0
čt 9. 1. 2020 v 14:52 odesílatel Michal Simek <[email protected]> napsal:
Quoted 39 lines
Hi,
I am sending various DT fixes which have been found over the xilinx release.
1-2 patches are fixing reported description issues
3-8 patches are actual fixes.Thanks,
MichalChanges in v2:
- Add missing patch
- Add missing patchMichal Simek (7):
arm64: zynqmp: Use ethernet-phy as node name for ethernet phys
arm64: zynqmp: Remove addition number in node name
arm64: zynqmp: Fix address fortca6416_u97chip on zcu104
arm64: zynqmp: Turn comment to gpio-line-names
arm64: zynqmp: Setup clock-output-names for si570 chips
arm64: zynqmp: Remove broken-cd from zcu100-revC
arm64: zynqmp: Setup default number of chipselects for zcu100Venkatesh Yadav Abbarapu (1):
arm64: zynqmp: Fix the si570 clock frequency on zcu111.../dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 2 +- .../dts/xilinx/zynqmp-zc1751-xm016-dc2.dts | 6 +-- .../dts/xilinx/zynqmp-zc1751-xm017-dc3.dts | 2 +- .../dts/xilinx/zynqmp-zc1751-xm019-dc5.dts | 2 +- .../boot/dts/xilinx/zynqmp-zcu100-revC.dts | 3 +- .../boot/dts/xilinx/zynqmp-zcu102-revA.dts | 47 +++++-------------- .../boot/dts/xilinx/zynqmp-zcu102-revB.dts | 4 +- .../boot/dts/xilinx/zynqmp-zcu104-revA.dts | 6 +-- .../boot/dts/xilinx/zynqmp-zcu106-revA.dts | 4 +- .../boot/dts/xilinx/zynqmp-zcu111-revA.dts | 6 ++- 10 files changed, 32 insertions(+), 50 deletions(-)
Quoted 3 lines
--
2.24.0
Applied all.
Thanks,
Michal
Signature · 5 lines
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/Versal SoCs