arm64: zynqmp: Extend board description
Subsystems (2)
v2 cover arm64: zynqmp: Extend board description
Hi,
over years couple of drivers were upstream and it is time to sync it up. On the top of it also adding new Kria boards which are using new overlay infrastructure which check if that overlays can be applied to base DT file.
Thanks,
Michal
Changes in v2:
- Add reviewed-by from Laurent
- New patch in the series
- New patch in the series
- Use sugar syntax - reported by Geert
- Update copyright years
- Fix SD3.0 comment alignment
- Remove one newline from Makefile
Amit Kumar Mahapatra (1):
arm64: zynqmp: Do not duplicate flash partition label property
Michal Simek (29):
arm64: zynqmp: Disable CCI by default
arm64: zynqmp: Enable fpd_dma for zcu104 platforms
arm64: zynqmp: Fix irps5401 device nodes
arm64: zynqmp: Add pinctrl description for all boards
arm64: zynqmp: Correct zcu111 psgtr description
arm64: zynqmp: Wire psgtr for zc1751-xm015
arm64: zynqmp: Correct psgtr description for zcu100-revC
arm64: zynqmp: Add phy description for usb3.0
arm64: zynqmp: Disable WP on zcu111
arm64: zynqmp: Add missing mio-bank properties to dc1 and dc5
arm64: zynqmp: Wire DP and DPDMA for dc1/dc4
arm64: zynqmp: Enable nand driver for dc2 and dc3
arm64: zynqmp: Remove additional newline
arm64: zynqmp: Move clock node to zynqmp-clk-ccf.dtsi
arm64: zynqmp: Add nvmem alises for eeproms
arm64: zynqmp: List reset property for ethernet phy
arm64: zynqmp: Remove can aliases from zc1751
arm64: zynqmp: Move DP nodes to the end of file on zcu106
arm64: zynqmp: Add note about UHS mode on some boards
arm64: zynqmp: Remove information about dma clock on zcu106
arm64: zynqmp: Wire qspi on multiple boards
arm64: zynqmp: Move rtc to different location on zcu104-revA
arm64: zynqmp: Add reset description for sata
arm64: zynqmp: Sync psgtr node location with zcu104-revA
arm64: zynqmp: Remove description for 8T49N287 and si5382 chips
arm64: zynqmp: Add support for zcu102-rev1.1 board
arm64: zynqmp: Enable xlnx,zynqmp-dwc3 driver for xilinx boards
arm64: zynqmp: Add psgtr description to zc1751 dc1 board
arm64: zynqmp: Add support for Xilinx Kria SOM board
Mounika Grace Akula (1):
arm64: zynqmp: Add reset-on-timeout to all boards and modify default
timeout value
Srinivas Neeli (1):
arm64: zynqmp: Update rtc calibration value
Stefano Stabellini (1):
arm64: zynqmp: Add missing SMID for pcie to zynqmp.dtsi
.../devicetree/bindings/arm/xilinx.yaml | 32 ++ arch/arm64/boot/dts/xilinx/Makefile | 11 + .../arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 13 +- .../boot/dts/xilinx/zynqmp-sck-kv-g-revA.dts | 335 +++++++++++++++++ .../boot/dts/xilinx/zynqmp-sck-kv-g-revB.dts | 318 ++++++++++++++++ .../boot/dts/xilinx/zynqmp-sm-k26-revA.dts | 289 +++++++++++++++ .../boot/dts/xilinx/zynqmp-smk-k26-revA.dts | 21 ++ .../boot/dts/xilinx/zynqmp-zc1232-revA.dts | 16 +- .../boot/dts/xilinx/zynqmp-zc1254-revA.dts | 16 +- .../dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 298 ++++++++++++++- .../dts/xilinx/zynqmp-zc1751-xm016-dc2.dts | 342 +++++++++++++++++- .../dts/xilinx/zynqmp-zc1751-xm017-dc3.dts | 23 +- .../dts/xilinx/zynqmp-zc1751-xm018-dc4.dts | 24 +- .../dts/xilinx/zynqmp-zc1751-xm019-dc5.dts | 330 ++++++++++++++++- .../boot/dts/xilinx/zynqmp-zcu100-revC.dts | 264 +++++++++++++- .../boot/dts/xilinx/zynqmp-zcu102-rev1.1.dts | 15 + .../boot/dts/xilinx/zynqmp-zcu102-revA.dts | 321 +++++++++++++++- .../boot/dts/xilinx/zynqmp-zcu102-revB.dts | 3 +- .../boot/dts/xilinx/zynqmp-zcu104-revA.dts | 292 ++++++++++++++- .../boot/dts/xilinx/zynqmp-zcu104-revC.dts | 250 ++++++++++++- .../boot/dts/xilinx/zynqmp-zcu106-revA.dts | 341 ++++++++++++++++- .../boot/dts/xilinx/zynqmp-zcu111-revA.dts | 275 +++++++++++++- arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 99 +++-- 23 files changed, 3833 insertions(+), 95 deletions(-) create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revA.dts create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revB.dts create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-smk-k26-revA.dts create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.1.dts
Signature · 1 line
2.32.0
PATCH v2 1/33 arm64: zynqmp: Disable CCI by default
There is no reason to have CCI no enabled by default. Enable it when your system configuration requires it. In Xilinx configuration flow this is work for Device Tree Generator which reads information from HW Design configuration.
---
Changes in v2: None
arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/xilinx/zynqmp.dtsi +1 -0
@@ -245,6 +245,7 @@ can1: can@ff070000 { cci: cci@fd6e0000 { compatible = "arm,cci-400"; + status = "disabled"; reg = <0x0 0xfd6e0000 0x0 0x9000>; ranges = <0x0 0x0 0xfd6e0000 0x10000>; #address-cells = <1>;
Signature · 1 line
2.32.0
PATCH v2 2/33 arm64: zynqmp: Do not duplicate flash partition label property
In reply to Michal SimekFrom: Amit Kumar Mahapatra <[email protected]>
In kernel 5.4, support has been added for reading MTD devices via the nvmem API.
For this the mtd devices are registered as read-only NVMEM providers under sysfs with the same name as the flash partition label property.
So if flash partition label property of multiple flash devices are identical then the second mtd device fails to get registered as a NVMEM provider.
This patch fixes the issue by having different label property for different flashes.
---
Changes in v2: None
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
@@ -131,7 +131,7 @@ spi0_flash0: flash@0 { reg = <0>; partition@0 { - label = "data"; + label = "spi0-data"; reg = <0x0 0x100000>; }; };
@@ -149,7 +149,7 @@ spi1_flash0: flash@0 { reg = <0>; partition@0 { - label = "data"; + label = "spi1-data"; reg = <0x0 0x84000>; }; };
Signature · 1 line
2.32.0
PATCH v2 3/33 arm64: zynqmp: Enable fpd_dma for zcu104 platforms
In reply to Michal SimekEnable fpd_dma for this board.
---
Changes in v2: None
.../boot/dts/xilinx/zynqmp-zcu104-revA.dts | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+)
arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts +32 -0
@@ -65,6 +65,38 @@ &dcc { status = "okay"; }; +&fpd_dma_chan1 { + status = "okay"; +}; + +&fpd_dma_chan2 { + status = "okay"; +}; + +&fpd_dma_chan3 { + status = "okay"; +}; + +&fpd_dma_chan4 { + status = "okay"; +}; + +&fpd_dma_chan5 { + status = "okay"; +}; + +&fpd_dma_chan6 { + status = "okay"; +}; + +&fpd_dma_chan7 { + status = "okay"; +}; + +&fpd_dma_chan8 { + status = "okay"; +}; + &gem3 { status = "okay"; phy-handle = <&phy0>;
Signature · 1 line
2.32.0
PATCH v2 4/33 arm64: zynqmp: Fix irps5401 device nodes
In reply to Michal Simek- Add compatible string for irps5401 chip.
- Do not use irps54012 as device node which is not correct.
- Fix addresses of irps5401/u180 on zcu104 revisions.
---
Changes in v2: None
arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts | 10 ++++++---- arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 9 ++++++--- 2 files changed, 12 insertions(+), 7 deletions(-)
arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts +6 -4
@@ -157,11 +157,13 @@ i2c@2 { #address-cells = <1>; #size-cells = <0>; reg = <2>; - irps5401_43: irps54012@43 { /* IRPS5401 - u175 */ - reg = <0x43>; + irps5401_43: irps5401@43 { /* IRPS5401 - u175 */ + compatible = "infineon,irps5401"; + reg = <0x43>; /* pmbus / i2c 0x13 */ }; - irps5401_4d: irps54012@4d { /* IRPS5401 - u180 */ - reg = <0x4d>; + irps5401_44: irps5401@44 { /* IRPS5401 - u180 */ + compatible = "infineon,irps5401"; + reg = <0x44>; /* pmbus / i2c 0x14 */ }; };
arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts +6 -3
@@ -326,13 +326,16 @@ i2c@2 { #address-cells = <1>; #size-cells = <0>; reg = <2>; - irps5401_43: irps54012@43 { /* IRPS5401 - u53 check these */ + irps5401_43: irps5401@43 { /* IRPS5401 - u53 check these */ + compatible = "infineon,irps5401"; reg = <0x43>; }; - irps5401_44: irps54012@44 { /* IRPS5401 - u55 */ + irps5401_44: irps5401@44 { /* IRPS5401 - u55 */ + compatible = "infineon,irps5401"; reg = <0x44>; }; - irps5401_45: irps54012@45 { /* IRPS5401 - u57 */ + irps5401_45: irps5401@45 { /* IRPS5401 - u57 */ + compatible = "infineon,irps5401"; reg = <0x45>; }; /* u68 IR38064 +0 */
Signature · 1 line
2.32.0
PATCH v2 5/33 arm64: zynqmp: Add pinctrl description for all boards
In reply to Michal SimekThe commit 1dccb5ec0123 ("dt-bindings: pinctrl: Add binding for ZynqMP pinctrl driver") and commit 8b242ca700f8 ("pinctrl: Add Xilinx ZynqMP pinctrl driver support") add support for Xilinx ZynqMP pinctrl driver that's why describe pins configuration for current boards.
---
Changes in v2: None
.../dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 230 +++++++++++- .../dts/xilinx/zynqmp-zc1751-xm016-dc2.dts | 303 +++++++++++++++- .../dts/xilinx/zynqmp-zc1751-xm019-dc5.dts | 329 +++++++++++++++++- .../boot/dts/xilinx/zynqmp-zcu100-revC.dts | 241 ++++++++++++- .../boot/dts/xilinx/zynqmp-zcu102-revA.dts | 290 ++++++++++++++- .../boot/dts/xilinx/zynqmp-zcu104-revA.dts | 218 +++++++++++- .../boot/dts/xilinx/zynqmp-zcu104-revC.dts | 218 +++++++++++- .../boot/dts/xilinx/zynqmp-zcu106-revA.dts | 290 ++++++++++++++- .../boot/dts/xilinx/zynqmp-zcu111-revA.dts | 227 +++++++++++- arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 5 + 10 files changed, 2340 insertions(+), 11 deletions(-)
arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts +229 -1
@@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP zc1751-xm015-dc1 * - * (C) Copyright 2015 - 2019, Xilinx, Inc. + * (C) Copyright 2015 - 2021, Xilinx, Inc. * * Michal Simek <[email protected]> */
@@ -12,6 +12,7 @@ #include "zynqmp.dtsi" #include "zynqmp-clk-ccf.dtsi" #include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/pinctrl/pinctrl-zynqmp.h> / { model = "ZynqMP zc1751-xm015-dc1 RevA";
@@ -73,6 +74,8 @@ &gem3 { status = "okay"; phy-handle = <&phy0>; phy-mode = "rgmii-id"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gem3_default>; phy0: ethernet-phy@0 { reg = <0>; };
@@ -80,12 +83,19 @@ phy0: ethernet-phy@0 { &gpio { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpio_default>; }; &i2c1 { status = "okay"; clock-frequency = <400000>; + pinctrl-names = "default", "gpio"; + pinctrl-0 = <&pinctrl_i2c1_default>; + pinctrl-1 = <&pinctrl_i2c1_gpio>; + scl-gpios = <&gpio 36 GPIO_ACTIVE_HIGH>; + sda-gpios = <&gpio 37 GPIO_ACTIVE_HIGH>; eeprom: eeprom@55 { compatible = "atmel,24c64"; /* 24AA64 */
@@ -93,6 +103,216 @@ eeprom: eeprom@55 { }; }; +&pinctrl0 { + status = "okay"; + pinctrl_i2c1_default: i2c1-default { + mux { + groups = "i2c1_9_grp"; + function = "i2c1"; + }; + + conf { + groups = "i2c1_9_grp"; + bias-pull-up; + slew-rate = <SLEW_RATE_SLOW>; + power-source = <IO_STANDARD_LVCMOS18>; + }; + }; + + pinctrl_i2c1_gpio: i2c1-gpio { + mux { + groups = "gpio0_36_grp", "gpio0_37_grp"; + function = "gpio0"; + }; + + conf { + groups = "gpio0_36_grp", "gpio0_37_grp"; + slew-rate = <SLEW_RATE_SLOW>; + power-source = <IO_STANDARD_LVCMOS18>; + }; + }; + + pinctrl_uart0_default: uart0-default { + mux { + groups = "uart0_8_grp"; + function = "uart0"; + }; + + conf { + groups = "uart0_8_grp"; + slew-rate = <SLEW_RATE_SLOW>; + power-source = <IO_STANDARD_LVCMOS18>; + }; + + conf-rx { + pins = "MIO34"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO35"; + bias-disable; + }; + }; + + pinctrl_usb0_default: usb0-default { + mux { + groups = "usb0_0_grp"; + function = "usb0"; + }; + + conf { + groups = "usb0_0_grp"; + slew-rate = <SLEW_RATE_SLOW>; + power-source = <IO_STANDARD_LVCMOS18>; + }; + + conf-rx { + pins = "MIO52", "MIO53", "MIO55"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO54", "MIO56", "MIO57", "MIO58", "MIO59", + "MIO60", "MIO61", "MIO62", "MIO63"; + bias-disable; + }; + }; + + pinctrl_gem3_default: gem3-default { + mux { + function = "ethernet3"; + groups = "ethernet3_0_grp"; + }; + + conf { + groups = "ethernet3_0_grp"; + slew-rate = <SLEW_RATE_SLOW>; + power-source = <IO_STANDARD_LVCMOS18>; + }; + + conf-rx { + pins = "MIO70", "MIO71", "MIO72", "MIO73", "MIO74", + "MIO75"; + bias-high-impedance; + low-power-disable; + }; + + conf-tx { + pins = "MIO64", "MIO65", "MIO66", "MIO67", "MIO68", + "MIO69"; + bias-disable; + low-power-enable; + }; + + mux-mdio { + function = "mdio3"; + groups = "mdio3_0_grp"; + }; + + conf-mdio { + groups = "mdio3_0_grp"; + slew-rate = <SLEW_RATE_SLOW>; + power-source = <IO_STANDARD_LVCMOS18>; + bias-disable; + }; + }; + + pinctrl_sdhci0_default: sdhci0-default { + mux { + groups = "sdio0_0_grp"; + function = "sdio0"; + }; + + conf { + groups = "sdio0_0_grp"; + slew-rate = <SLEW_RATE_SLOW>; + power-source = <IO_STANDARD_LVCMOS18>; + bias-disable; + }; + + mux-cd { + groups = "sdio0_cd_0_grp"; + function = "sdio0_cd"; + }; + + conf-cd { + groups = "sdio0_cd_0_grp"; + bias-high-impedance; + bias-pull-up; + slew-rate = <SLEW_RATE_SLOW>; + power-source = <IO_STANDARD_LVCMOS18>; + }; + + mux-wp { + groups = "sdio0_wp_0_grp"; + function = "sdio0_wp"; + }; + + conf-wp { + groups = "sdio0_wp_0_grp"; + bias-high-impedance; + bias-pull-up; + slew-rate = <SLEW_RATE_SLOW>; + power-source = <IO_STANDARD_LVCMOS18>; + }; + }; + + pinctrl_sdhci1_default: sdhci1-default { + mux { + groups = "sdio1_0_grp"; + function = "sdio1"; + }; + + conf { + groups = "sdio1_0_grp"; + slew-rate = <SLEW_RATE_SLOW>; + power-source = <IO_STANDARD_LVCMOS18>; + bias-disable; + }; + + mux-cd { + groups = "sdio1_cd_0_grp"; + function = "sdio1_cd"; + }; + + conf-cd { + groups = "sdio1_cd_0_grp"; + bias-high-impedance; + bias-pull-up; + slew-rate = <SLEW_RATE_SLOW>; + power-source = <IO_STANDARD_LVCMOS18>; + }; + + mux-wp { + groups = "sdio1_wp_0_grp"; + function = "sdio1_wp"; + }; + + conf-wp { + groups = "sdio1_wp_0_grp"; + bias-high-impedance; + bias-pull-up; + slew-rate = <SLEW_RATE_SLOW>; + power-source = <IO_STANDARD_LVCMOS18>; + }; + }; + + pinctrl_gpio_default: gpio-default { + mux { + function = "gpio0"; + groups = "gpio0_38_grp"; + }; + + conf { + groups = "gpio0_38_grp"; + bias-disable; + slew-rate = <SLEW_RATE_SLOW>; + power-source = <IO_STANDARD_LVCMOS18>; + }; + }; +}; + &rtc { status = "okay"; };
@@ -113,20 +333,28 @@ &sata { /* eMMC */ &sdhci0 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sdhci0_default>; bus-width = <8>; }; /* SD1 with level shifter */ &sdhci1 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sdhci1_default>; }; &uart0 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart0_default>; }; /* ULPI SMSC USB3320 */ &usb0 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb0_default>; dr_mode = "host"; };
arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts +302 -1
368 lines not on this page · raw message
arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm019-dc5.dts +328 -1
388 lines not on this page · raw message
arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts +238 -3
311 lines not on this page · raw message
arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts +289 -1
357 lines not on this page · raw message
arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts +217 -1
275 lines not on this page · raw message
arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts +217 -1
275 lines not on this page · raw message
arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts +289 -1
357 lines not on this page · raw message
arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts +226 -1
285 lines not on this page · raw message
arch/arm64/boot/dts/xilinx/zynqmp.dtsi +5 -0
@@ -193,6 +193,11 @@ zynqmp_reset: reset-controller { compatible = "xlnx,zynqmp-reset"; #reset-cells = <1>; }; + + pinctrl0: pinctrl { + compatible = "xlnx,zynqmp-pinctrl"; + status = "disabled"; + }; }; };
Signature · 1 line
2.32.0
PATCH v2 6/33 arm64: zynqmp: Correct zcu111 psgtr description
In reply to Michal SimekDP and SATA psgtrs are swapped.
---
Changes in v2: None
arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts +3 -3
@@ -766,8 +766,8 @@ conf-pull-none { &psgtr { status = "okay"; - /* nc, sata, usb3, dp */ - clocks = <&si5341 0 3>, <&si5341 0 2>, <&si5341 0 0>; + /* nc, dp, usb3, sata */ + clocks = <&si5341 0 0>, <&si5341 0 2>, <&si5341 0 3>; clock-names = "ref1", "ref2", "ref3"; };
@@ -787,7 +787,7 @@ &sata { ceva,p1-burst-params = /bits/ 8 <0x13 0x08 0x4A 0x06>; ceva,p1-retry-params = /bits/ 16 <0x96A4 0x3FFC>; phy-names = "sata-phy"; - phys = <&psgtr 3 PHY_TYPE_SATA 1 1>; + phys = <&psgtr 3 PHY_TYPE_SATA 1 3>; }; /* SD1 with level shifter */
Signature · 1 line
2.32.0
PATCH v2 7/33 arm64: zynqmp: Wire psgtr for zc1751-xm015
In reply to Michal SimekAdd psgtr description for SATA and USB. Display Port could be also added but it wasn't tested yet.
---
Changes in v2: None
.../dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+)
arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts +31 -0
@@ -11,6 +11,7 @@ #include "zynqmp.dtsi" #include "zynqmp-clk-ccf.dtsi" +#include <dt-bindings/phy/phy.h> #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/pinctrl/pinctrl-zynqmp.h>
@@ -36,6 +37,31 @@ memory@0 { device_type = "memory"; reg = <0x0 0x0 0x0 0x80000000>, <0x8 0x00000000 0x0 0x80000000>; }; + + clock_si5338_0: clk27 { /* u55 SI5338-GM */ + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <27000000>; + }; + + clock_si5338_2: clk26 { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <26000000>; + }; + + clock_si5338_3: clk150 { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <150000000>; + }; +}; + +&psgtr { + status = "okay"; + /* dp, usb3, sata */ + clocks = <&clock_si5338_0>, <&clock_si5338_2>, <&clock_si5338_3>; + clock-names = "ref1", "ref2", "ref3"; }; &fpd_dma_chan1 {
@@ -328,6 +354,8 @@ &sata { ceva,p1-comwake-params = /bits/ 8 <0x06 0x19 0x08 0x0E>; ceva,p1-burst-params = /bits/ 8 <0x13 0x08 0x4A 0x06>; ceva,p1-retry-params = /bits/ 16 <0x96A4 0x3FFC>; + phy-names = "sata-phy"; + phys = <&psgtr 3 PHY_TYPE_SATA 1 3>; }; /* eMMC */
@@ -357,4 +385,7 @@ &usb0 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0_default>; dr_mode = "host"; + phy-names = "usb3-phy"; + phys = <&psgtr 2 PHY_TYPE_USB3 0 2>; + maximum-speed = "super-speed"; };
Signature · 1 line
2.32.0
PATCH v2 8/33 arm64: zynqmp: Correct psgtr description for zcu100-revC
In reply to Michal SimekEnable psgtr node and also fix clock names to be aligned with other zynqmp boards.
---
Changes in v2: None
arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts +5 -4
@@ -111,13 +111,13 @@ ina226 { io-channels = <&u35 0>, <&u35 1>, <&u35 2>, <&u35 3>; }; - si5335a_0: clk26 { + si5335_0: si5335_0 { /* clk0_usb - u23 */ compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <26000000>; }; - si5335a_1: clk27 { + si5335_1: si5335_1 { /* clk1_dp - u23 */ compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <27000000>;
@@ -459,8 +459,9 @@ conf-tx { }; &psgtr { - /* usb3, dps */ - clocks = <&si5335a_0>, <&si5335a_1>; + status = "okay"; + /* usb3, dp */ + clocks = <&si5335_0>, <&si5335_1>; clock-names = "ref0", "ref1"; };
Signature · 1 line
2.32.0
PATCH v2 9/33 arm64: zynqmp: Add phy description for usb3.0
In reply to Michal Simekusb3.0 requires serdes setting that's why also wire it up.
---
Changes in v2: None
arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts | 6 ++++++ arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 3 +++ arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts | 3 +++ arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts | 3 +++ arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts | 3 +++ arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 3 +++ 6 files changed, 21 insertions(+)
arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts +6 -0
@@ -538,6 +538,9 @@ &usb0 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0_default>; dr_mode = "peripheral"; + phy-names = "usb3-phy"; + phys = <&psgtr 2 PHY_TYPE_USB3 0 0>; + maximum-speed = "super-speed"; }; /* ULPI SMSC USB3320 */
@@ -546,6 +549,9 @@ &usb1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb1_default>; dr_mode = "host"; + phy-names = "usb3-phy"; + phys = <&psgtr 3 PHY_TYPE_USB3 1 0>; + maximum-speed = "super-speed"; }; &watchdog0 {
arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts +3 -0
@@ -979,6 +979,9 @@ &usb0 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0_default>; dr_mode = "host"; + phy-names = "usb3-phy"; + phys = <&psgtr 2 PHY_TYPE_USB3 0 2>; + maximum-speed = "super-speed"; }; &watchdog0 {
arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts +3 -0
@@ -469,6 +469,9 @@ &usb0 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0_default>; dr_mode = "host"; + phy-names = "usb3-phy"; + phys = <&psgtr 2 PHY_TYPE_USB3 0 2>; + maximum-speed = "super-speed"; }; &watchdog0 {
arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts +3 -0
@@ -491,6 +491,9 @@ &usb0 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0_default>; dr_mode = "host"; + phy-names = "usb3-phy"; + phys = <&psgtr 2 PHY_TYPE_USB3 0 2>; + maximum-speed = "super-speed"; }; &watchdog0 {
arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts +3 -0
@@ -985,6 +985,9 @@ &usb0 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0_default>; dr_mode = "host"; + phy-names = "usb3-phy"; + phys = <&psgtr 2 PHY_TYPE_USB3 0 2>; + maximum-speed = "super-speed"; }; &watchdog0 {
arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts +3 -0
@@ -811,6 +811,9 @@ &usb0 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0_default>; dr_mode = "host"; + phy-names = "usb3-phy"; + phys = <&psgtr 2 PHY_TYPE_USB3 0 2>; + maximum-speed = "super-speed"; }; &zynqmp_dpdma {
Signature · 1 line
2.32.0
PATCH v2 10/33 arm64: zynqmp: Disable WP on zcu111
In reply to Michal SimekOn this board there is SD slot without WP connected.
---
Changes in v2: None
arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts +1 -0
@@ -796,6 +796,7 @@ &sdhci1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_sdhci1_default>; no-1-8-v; + disable-wp; xlnx,mio-bank = <1>; };
Signature · 1 line
2.32.0
PATCH v2 11/33 arm64: zynqmp: Add missing SMID for pcie to zynqmp.dtsi
In reply to Michal SimekFrom: Stefano Stabellini <[email protected]>
The SMMU is disabled in device tree so this change has no impact. The benefit is that this way it is in sync with xen.dtsi. Xen enables the SMMU and makes use of it.
---
Changes in v2: None
arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/xilinx/zynqmp.dtsi +2 -0
@@ -636,6 +636,8 @@ pcie: pcie@fd0e0000 { <0x0 0x0 0x0 0x2 &pcie_intc 0x2>, <0x0 0x0 0x0 0x3 &pcie_intc 0x3>, <0x0 0x0 0x0 0x4 &pcie_intc 0x4>; + #stream-id-cells = <1>; + iommus = <&smmu 0x4d0>; power-domains = <&zynqmp_firmware PD_PCIE>; pcie_intc: legacy-interrupt-controller { interrupt-controller;
Signature · 1 line
2.32.0
PATCH v2 12/33 arm64: zynqmp: Add missing mio-bank properties to dc1 and dc5
In reply to Michal SimekAdd missing mio-bank properties to zc1751 dc1 and dc5 boards. The same change was done by commit 63481699d6e3 ("arm64: dts: zynqmp: Add missing mio-bank properties to sdhcis").
---
Changes in v2: None
arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 2 ++ arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm019-dc5.dts | 1 + 2 files changed, 3 insertions(+)
arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts +2 -0
@@ -364,6 +364,7 @@ &sdhci0 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_sdhci0_default>; bus-width = <8>; + xlnx,mio-bank = <0>; }; /* SD1 with level shifter */
@@ -371,6 +372,7 @@ &sdhci1 { status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_sdhci1_default>; + xlnx,mio-bank = <1>; }; &uart0 {
arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm019-dc5.dts +1 -0
@@ -407,6 +407,7 @@ &sdhci0 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_sdhci0_default>; no-1-8-v; + xlnx,mio-bank = <0>; }; &ttc0 {
Signature · 1 line
2.32.0
PATCH v2 13/33 arm64: zynqmp: Wire DP and DPDMA for dc1/dc4
In reply to Michal SimekEnable Display Port and Display Port DMA for zc1751 dc1 and dc4.
---
Changes in v2: None
arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 8 ++++++++ arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts | 10 +++++++++- 2 files changed, 17 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts +8 -0
@@ -391,3 +391,11 @@ &usb0 { phys = <&psgtr 2 PHY_TYPE_USB3 0 2>; maximum-speed = "super-speed"; }; + +&zynqmp_dpdma { + status = "okay"; +}; + +&zynqmp_dpsub { + status = "okay"; +};
arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts +9 -1
@@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP zc1751-xm018-dc4 * - * (C) Copyright 2015 - 2019, Xilinx, Inc. + * (C) Copyright 2015 - 2021, Xilinx, Inc. * * Michal Simek <[email protected]> */
@@ -176,3 +176,11 @@ &uart1 { &watchdog0 { status = "okay"; }; + +&zynqmp_dpdma { + status = "okay"; +}; + +&zynqmp_dpsub { + status = "okay"; +};
Signature · 1 line
2.32.0
PATCH v2 14/33 arm64: zynqmp: Enable nand driver for dc2 and dc3
In reply to Michal SimekAdd description for nand devices on zc1751 dc2 and dc3 boards.
---
Changes in v2: None
.../dts/xilinx/zynqmp-zc1751-xm016-dc2.dts | 26 +++++++++++++++++++ .../dts/xilinx/zynqmp-zc1751-xm017-dc3.dts | 9 ++++++- 2 files changed, 34 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts +26 -0
@@ -127,6 +127,32 @@ rtc@68 { }; }; +&nand0 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_nand0_default>; + arasan,has-mdma; + + nand@0 { + reg = <0x0>; + #address-cells = <0x2>; + #size-cells = <0x1>; + nand-ecc-mode = "soft"; + nand-ecc-algo = "bch"; + nand-rb = <0>; + label = "main-storage-0"; + }; + nand@1 { + reg = <0x1>; + #address-cells = <0x2>; + #size-cells = <0x1>; + nand-ecc-mode = "soft"; + nand-ecc-algo = "bch"; + nand-rb = <0>; + label = "main-storage-1"; + }; +}; + &pinctrl0 { status = "okay"; pinctrl_can0_default: can0-default {
arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm017-dc3.dts +8 -1
@@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP zc1751-xm017-dc3 * - * (C) Copyright 2016 - 2019, Xilinx, Inc. + * (C) Copyright 2016 - 2021, Xilinx, Inc. * * Michal Simek <[email protected]> */
@@ -107,6 +107,13 @@ &i2c1 { clock-frequency = <400000>; }; +/* MT29F64G08AECDBJ4-6 */ +&nand0 { + status = "okay"; + arasan,has-mdma; + num-cs = <2>; +}; + &rtc { status = "okay"; };
Signature · 1 line
2.32.0
PATCH v2 15/33 arm64: zynqmp: Remove additional newline
In reply to Michal SimekThis is sync between Linux and U-Boot. Trivial change.
---
Changes in v2: None
arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 1 - 1 file changed, 1 deletion(-)
arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts +0 -1
@@ -463,7 +463,6 @@ max15303@20 { /* u8 */ status = "disabled"; /* unreachable */ reg = <0x20>; }; - max20751@72 { /* u95 */ compatible = "maxim,max20751"; reg = <0x72>;
Signature · 1 line
2.32.0
PATCH v2 16/33 arm64: zynqmp: Move clock node to zynqmp-clk-ccf.dtsi
In reply to Michal SimekUsing clock firmware driver is not the only one option how to configure clock. In past fixed clocks were also used and that configuration is still valid that's why move clock firmware node to the same file where zynqmp_clk references are used.
---
Changes in v2: None
arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 13 ++++++++++++- arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 15 --------------- 2 files changed, 12 insertions(+), 16 deletions(-)
arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi +12 -1
@@ -2,7 +2,7 @@ /* * Clock specification for Xilinx ZynqMP * - * (C) Copyright 2017 - 2019, Xilinx, Inc. + * (C) Copyright 2017 - 2021, Xilinx, Inc. * * Michal Simek <[email protected]> */
@@ -40,6 +40,17 @@ aux_ref_clk: aux_ref_clk { }; }; +&zynqmp_firmware { + zynqmp_clk: clock-controller { + #clock-cells = <1>; + compatible = "xlnx,zynqmp-clk"; + clocks = <&pss_ref_clk>, <&video_clk>, <&pss_alt_ref_clk>, + <&aux_ref_clk>, <>_crx_ref_clk>; + clock-names = "pss_ref_clk", "video_clk", "pss_alt_ref_clk", + "aux_ref_clk", "gt_crx_ref_clk"; + }; +}; + &can0 { clocks = <&zynqmp_clk CAN0_REF>, <&zynqmp_clk LPD_LSBUS>; };
arch/arm64/boot/dts/xilinx/zynqmp.dtsi +0 -15
@@ -156,21 +156,6 @@ zynqmp_power: zynqmp-power { mbox-names = "tx", "rx"; }; - zynqmp_clk: clock-controller { - #clock-cells = <1>; - compatible = "xlnx,zynqmp-clk"; - clocks = <&pss_ref_clk>, - <&video_clk>, - <&pss_alt_ref_clk>, - <&aux_ref_clk>, - <>_crx_ref_clk>; - clock-names = "pss_ref_clk", - "video_clk", - "pss_alt_ref_clk", - "aux_ref_clk", - "gt_crx_ref_clk"; - }; - nvmem_firmware { compatible = "xlnx,zynqmp-nvmem-fw"; #address-cells = <1>;
Signature · 1 line
2.32.0
PATCH v2 17/33 arm64: zynqmp: Add nvmem alises for eeproms
In reply to Michal SimekUse nvmem alias to point to eeprom memory which contains information about board. The change is done based on discussion in the link below.
---
Changes in v2: None
arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 1 + arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts | 3 ++- arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts | 1 + arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts | 1 + arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 1 + 5 files changed, 6 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts +1 -0
@@ -25,6 +25,7 @@ aliases { i2c0 = &i2c0; i2c1 = &i2c1; mmc0 = &sdhci1; + nvmem0 = &eeprom; rtc0 = &rtc; serial0 = &uart0; serial1 = &uart1;
arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts +2 -1
@@ -23,6 +23,7 @@ aliases { ethernet0 = &gem3; i2c0 = &i2c1; mmc0 = &sdhci1; + nvmem0 = &eeprom; rtc0 = &rtc; serial0 = &uart0; serial1 = &uart1;
@@ -146,7 +147,7 @@ i2c@0 { * 512B - 768B address 0x56 * 768B - 1024B address 0x57 */ - eeprom@54 { /* u23 */ + eeprom: eeprom@54 { /* u23 */ compatible = "atmel,24c08"; reg = <0x54>; #address-cells = <1>;
arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts +1 -0
@@ -23,6 +23,7 @@ aliases { ethernet0 = &gem3; i2c0 = &i2c1; mmc0 = &sdhci1; + nvmem0 = &eeprom; rtc0 = &rtc; serial0 = &uart0; serial1 = &uart1;
arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts +1 -0
@@ -25,6 +25,7 @@ aliases { i2c0 = &i2c0; i2c1 = &i2c1; mmc0 = &sdhci1; + nvmem0 = &eeprom; rtc0 = &rtc; serial0 = &uart0; serial1 = &uart1;
arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts +1 -0
@@ -25,6 +25,7 @@ aliases { i2c0 = &i2c0; i2c1 = &i2c1; mmc0 = &sdhci1; + nvmem0 = &eeprom; rtc0 = &rtc; serial0 = &uart0; serial1 = &dcc;
Signature · 1 line
2.32.0
PATCH v2 18/33 arm64: zynqmp: List reset property for ethernet phy
In reply to Michal SimekAdd information about reset gpio for ethernet phy in case someone wants to use it.
---
Changes in v2: None
arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 1 + arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revB.dts | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts +1 -0
@@ -204,6 +204,7 @@ phy0: ethernet-phy@21 { ti,tx-internal-delay = <0xa>; ti,fifo-depth = <0x1>; ti,dp83867-rxctrl-strap-quirk; + /* reset-gpios = <&tca6416_u97 6 GPIO_ACTIVE_LOW>; */ }; };
arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revB.dts +2 -1
@@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP ZCU102 RevB * - * (C) Copyright 2016 - 2018, Xilinx, Inc. + * (C) Copyright 2016 - 2021, Xilinx, Inc. * * Michal Simek <[email protected]> */
@@ -22,6 +22,7 @@ phyc: ethernet-phy@c { ti,tx-internal-delay = <0xa>; ti,fifo-depth = <0x1>; ti,dp83867-rxctrl-strap-quirk; + /* reset-gpios = <&tca6416_u97 6 GPIO_ACTIVE_LOW>; */ }; /* Cleanup from RevA */ /delete-node/ ethernet-phy@21;
Signature · 1 line
2.32.0
PATCH v2 19/33 arm64: zynqmp: Add reset-on-timeout to all boards and modify default timeout value
In reply to Michal SimekFrom: Mounika Grace Akula <[email protected]>
This patch adds reset-on-timeout to FPD WDT which will trigger an interrupt to PMU when watchdog expiry happens and PMU takes the necessary action. If this property is not enabled, reason will not be known when watchdog expiry happens.
This patch also modifies the default timeout to 60 seconds. Reason is that if u-boot enables WDT, it will set the timeout to 10 seconds and this is not enough to boot till Linux and start the WDT application in Linux. 60 seconds is the maximum safest value to boot till Linux and start the WDT application.
Users need to change this timeout value to fit their needs.
---
Changes in v2: None
arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/xilinx/zynqmp.dtsi +2 -1
@@ -830,7 +830,8 @@ watchdog0: watchdog@fd4d0000 { interrupt-parent = <&gic>; interrupts = <0 113 1>; reg = <0x0 0xfd4d0000 0x0 0x1000>; - timeout-sec = <10>; + timeout-sec = <60>; + reset-on-timeout; }; lpd_watchdog: watchdog@ff150000 {
Signature · 1 line
2.32.0
PATCH v2 20/33 arm64: zynqmp: Remove can aliases from zc1751
In reply to Michal SimekNetworking subsystem is not using aliases that's why remove them for can devices. There is also no any other Xilinx ZynqMP DT file with them.
---
Changes in v2: None
arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts | 2 -- 1 file changed, 2 deletions(-)
arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts +0 -2
@@ -19,8 +19,6 @@ / { compatible = "xlnx,zynqmp-zc1751", "xlnx,zynqmp"; aliases { - can0 = &can0; - can1 = &can1; ethernet0 = &gem2; i2c0 = &i2c0; rtc0 = &rtc;
Signature · 1 line
2.32.0
PATCH v2 21/33 arm64: zynqmp: Move DP nodes to the end of file on zcu106
In reply to Michal SimekThis location is used by others DTs files that's why this move.
---
Changes in v2:
- Add reviewed-by from Laurent
.../boot/dts/xilinx/zynqmp-zcu106-revA.dts | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-)
arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts +11 -11
@@ -160,17 +160,6 @@ &dcc { status = "okay"; }; -&zynqmp_dpdma { - status = "okay"; -}; - -&zynqmp_dpsub { - status = "okay"; - phy-names = "dp-phy0", "dp-phy1"; - phys = <&psgtr 1 PHY_TYPE_DP 0 3>, - <&psgtr 0 PHY_TYPE_DP 1 3>; -}; - /* fpd_dma clk 667MHz, lpd_dma 500MHz */ &fpd_dma_chan1 { status = "okay";
@@ -994,3 +983,14 @@ &usb0 { &watchdog0 { status = "okay"; }; + +&zynqmp_dpdma { + status = "okay"; +}; + +&zynqmp_dpsub { + status = "okay"; + phy-names = "dp-phy0", "dp-phy1"; + phys = <&psgtr 1 PHY_TYPE_DP 0 3>, + <&psgtr 0 PHY_TYPE_DP 1 3>; +};
Signature · 1 line
2.32.0
PATCH v2 22/33 arm64: zynqmp: Add note about UHS mode on some boards
In reply to Michal SimekAdd note about UHS mode and add no-1-8-v property to zc1751-dc1 board.
---
Changes in v2: None
arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 4 ++++ arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 4 ++++ arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts | 3 +++ arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 5 ++++- 4 files changed, 15 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts +4 -0
@@ -370,6 +370,10 @@ &sdhci0 { /* SD1 with level shifter */ &sdhci1 { status = "okay"; + /* + * This property should be removed for supporting UHS mode + */ + no-1-8-v; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_sdhci1_default>; xlnx,mio-bank = <1>;
arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts +4 -0
@@ -956,6 +956,10 @@ &sata { /* SD1 with level shifter */ &sdhci1 { status = "okay"; + /* + * 1.0 revision has level shifter and this property should be + * removed for supporting UHS mode + */ no-1-8-v; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_sdhci1_default>;
arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts +3 -0
@@ -951,6 +951,9 @@ &sata { /* SD1 with level shifter */ &sdhci1 { status = "okay"; + /* + * This property should be removed for supporting UHS mode + */ no-1-8-v; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_sdhci1_default>;
arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts +4 -1
@@ -796,8 +796,11 @@ &sdhci1 { status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_sdhci1_default>; - no-1-8-v; disable-wp; + /* + * This property should be removed for supporting UHS mode + */ + no-1-8-v; xlnx,mio-bank = <1>; };
Signature · 1 line
2.32.0
PATCH v2 23/33 arm64: zynqmp: Update rtc calibration value
In reply to Michal SimekFrom: Srinivas Neeli <[email protected]>
As per the design specification
"The 16-bit Seconds Calibration Value represents the number of
Oscillator Ticks that are required to measure the largest time period that is less than or equal to 1 second.
For an oscillator that is 32.768 KHz, this value will be 0x7FFF."
---
Changes in v2: None
arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/xilinx/zynqmp.dtsi +1 -1
@@ -663,7 +663,7 @@ rtc: rtc@ffa60000 { interrupt-parent = <&gic>; interrupts = <0 26 4>, <0 27 4>; interrupt-names = "alarm", "sec"; - calibration = <0x8000>; + calibration = <0x7FFF>; }; sata: ahci@fd0c0000 {
Signature · 1 line
2.32.0
PATCH v2 24/33 arm64: zynqmp: Remove information about dma clock on zcu106
In reply to Michal SimekClock setting is not static anymore that's why it depends on firmware setup that's why remove this comment.
---
Changes in v2: None
arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts | 1 - 1 file changed, 1 deletion(-)
arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts +0 -1
@@ -160,7 +160,6 @@ &dcc { status = "okay"; }; -/* fpd_dma clk 667MHz, lpd_dma 500MHz */ &fpd_dma_chan1 { status = "okay"; };
Signature · 1 line
2.32.0
PATCH v2 25/33 arm64: zynqmp: Wire qspi on multiple boards
In reply to Michal SimekCouple of boards have qspi on the board that's why enable controller and describe them.
---
Changes in v2: None
.../arm64/boot/dts/xilinx/zynqmp-zc1232-revA.dts | 16 +++++++++++++++- .../arm64/boot/dts/xilinx/zynqmp-zc1254-revA.dts | 16 +++++++++++++++- .../boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 14 ++++++++++++++ .../boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts | 14 ++++++++++++++ .../arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 15 +++++++++++++++ .../arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts | 14 ++++++++++++++ .../arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts | 4 ++++ .../arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts | 15 +++++++++++++++ .../arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 15 +++++++++++++++ 9 files changed, 121 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/xilinx/zynqmp-zc1232-revA.dts +15 -1
@@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP ZC1232 * - * (C) Copyright 2017 - 2019, Xilinx, Inc. + * (C) Copyright 2017 - 2021, Xilinx, Inc. * * Michal Simek <[email protected]> */
@@ -19,6 +19,7 @@ / { aliases { serial0 = &uart0; serial1 = &dcc; + spi0 = &qspi; }; chosen {
@@ -36,6 +37,19 @@ &dcc { status = "okay"; }; +&qspi { + status = "okay"; + flash@0 { + compatible = "m25p80", "jedec,spi-nor"; /* 32MB */ + #address-cells = <1>; + #size-cells = <1>; + reg = <0x0>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <4>; + spi-max-frequency = <108000000>; /* Based on DC1 spec */ + }; +}; + &sata { status = "okay"; /* SATA OOB timing settings */
arch/arm64/boot/dts/xilinx/zynqmp-zc1254-revA.dts +15 -1
@@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP ZC1254 * - * (C) Copyright 2015 - 2019, Xilinx, Inc. + * (C) Copyright 2015 - 2021, Xilinx, Inc. * * Michal Simek <[email protected]> * Siva Durga Prasad Paladugu <[email protected]>
@@ -20,6 +20,7 @@ / { aliases { serial0 = &uart0; serial1 = &dcc; + spi0 = &qspi; }; chosen {
@@ -37,6 +38,19 @@ &dcc { status = "okay"; }; +&qspi { + status = "okay"; + flash@0 { + compatible = "m25p80", "jedec,spi-nor"; /* 32MB */ + #address-cells = <1>; + #size-cells = <1>; + reg = <0x0>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <4>; /* FIXME also DUAL configuration possible */ + spi-max-frequency = <108000000>; /* Based on DC1 spec */ + }; +}; + &uart0 { status = "okay"; };
arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts +14 -0
@@ -26,6 +26,7 @@ aliases { mmc1 = &sdhci1; rtc0 = &rtc; serial0 = &uart0; + spi0 = &qspi; }; chosen {
@@ -339,6 +340,19 @@ conf { }; }; +&qspi { + status = "okay"; + flash@0 { + compatible = "m25p80", "jedec,spi-nor"; /* Micron MT25QU512ABB8ESF */ + #address-cells = <1>; + #size-cells = <1>; + reg = <0x0>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <4>; + spi-max-frequency = <108000000>; /* Based on DC1 spec */ + }; +}; + &rtc { status = "okay"; };
arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts +14 -0
@@ -26,6 +26,7 @@ aliases { rtc0 = &rtc; serial0 = &uart0; serial1 = &uart1; + spi0 = &qspi; }; chosen {
@@ -161,6 +162,19 @@ &i2c1 { status = "okay"; }; +&qspi { + status = "okay"; + flash@0 { + compatible = "m25p80", "jedec,spi-nor"; /* 32MB */ + #address-cells = <1>; + #size-cells = <1>; + reg = <0x0>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <4>; /* also DUAL configuration possible */ + spi-max-frequency = <108000000>; /* Based on DC1 spec */ + }; +}; + &rtc { status = "okay"; };
arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts +15 -0
@@ -30,6 +30,7 @@ aliases { serial0 = &uart0; serial1 = &uart1; serial2 = &dcc; + spi0 = &qspi; }; chosen {
@@ -934,6 +935,20 @@ &psgtr { clock-names = "ref0", "ref1", "ref2", "ref3"; }; +&qspi { + status = "okay"; + is-dual = <1>; + flash@0 { + compatible = "m25p80", "jedec,spi-nor"; /* 32MB */ + #address-cells = <1>; + #size-cells = <1>; + reg = <0x0>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <4>; /* FIXME also DUAL configuration possible */ + spi-max-frequency = <108000000>; /* Based on DC1 spec */ + }; +}; + &rtc { status = "okay"; };
arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts +14 -0
@@ -28,6 +28,7 @@ aliases { serial0 = &uart0; serial1 = &uart1; serial2 = &dcc; + spi0 = &qspi; }; chosen {
@@ -427,6 +428,19 @@ &psgtr { clock-names = "ref1", "ref2", "ref3"; }; +&qspi { + status = "okay"; + flash@0 { + compatible = "m25p80", "jedec,spi-nor"; /* n25q512a 128MiB */ + #address-cells = <1>; + #size-cells = <1>; + reg = <0x0>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <4>; + spi-max-frequency = <108000000>; /* Based on DC1 spec */ + }; +}; + &sata { status = "okay"; /* SATA OOB timing settings */
arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts +4 -0
@@ -28,6 +28,7 @@ aliases { serial0 = &uart0; serial1 = &uart1; serial2 = &dcc; + spi0 = &qspi; }; chosen {
@@ -435,6 +436,9 @@ flash@0 { #address-cells = <1>; #size-cells = <1>; reg = <0x0>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <4>; + spi-max-frequency = <108000000>; /* Based on DC1 spec */ }; };
arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts +15 -0
@@ -30,6 +30,7 @@ aliases { serial0 = &uart0; serial1 = &uart1; serial2 = &dcc; + spi0 = &qspi; }; chosen {
@@ -928,6 +929,20 @@ &psgtr { clock-names = "ref1", "ref2", "ref3"; }; +&qspi { + status = "okay"; + is-dual = <1>; + flash@0 { + compatible = "m25p80", "jedec,spi-nor"; /* 32MB */ + #address-cells = <1>; + #size-cells = <1>; + reg = <0x0>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <4>; /* FIXME also DUAL configuration possible */ + spi-max-frequency = <108000000>; /* Based on DC1 spec */ + }; +}; + &rtc { status = "okay"; };
arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts +15 -0
@@ -29,6 +29,7 @@ aliases { rtc0 = &rtc; serial0 = &uart0; serial1 = &dcc; + spi0 = &qspi; }; chosen {
@@ -772,6 +773,20 @@ &psgtr { clock-names = "ref1", "ref2", "ref3"; }; +&qspi { + status = "okay"; + is-dual = <1>; + flash@0 { + compatible = "m25p80", "jedec,spi-nor"; /* 32MB */ + #address-cells = <1>; + #size-cells = <1>; + reg = <0x0>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <4>; /* FIXME also DUAL configuration possible */ + spi-max-frequency = <108000000>; /* Based on DC1 spec */ + }; +}; + &rtc { status = "okay"; };
Signature · 1 line
2.32.0
PATCH v2 26/33 arm64: zynqmp: Move rtc to different location on zcu104-revA
In reply to Michal SimekMove it the same location as is on zcu104-revC for easier comparison.
---
Changes in v2: None
arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts +4 -4
@@ -417,10 +417,6 @@ conf-tx { }; }; -&rtc { - status = "okay"; -}; - &psgtr { status = "okay"; /* nc, sata, usb3, dp */
@@ -441,6 +437,10 @@ flash@0 { }; }; +&rtc { + status = "okay"; +}; + &sata { status = "okay"; /* SATA OOB timing settings */
Signature · 1 line
2.32.0
PATCH v2 27/33 arm64: zynqmp: Add reset description for sata
In reply to Michal SimekSata needs to get reset before configuration that's why add property for it there.
---
Changes in v2: None
arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/xilinx/zynqmp.dtsi +1 -0
@@ -673,6 +673,7 @@ sata: ahci@fd0c0000 { interrupt-parent = <&gic>; interrupts = <0 133 4>; power-domains = <&zynqmp_firmware PD_SATA>; + resets = <&zynqmp_reset ZYNQMP_RESET_SATA>; #stream-id-cells = <4>; iommus = <&smmu 0x4c0>, <&smmu 0x4c1>, <&smmu 0x4c2>, <&smmu 0x4c3>;
Signature · 1 line
2.32.0
PATCH v2 28/33 arm64: zynqmp: Sync psgtr node location with zcu104-revA
In reply to Michal Simekzcu104-revA has node below pinctrl which is not the same on revC. Sync location for easier comparison.
Also zc1751-dc1 is not using this position.
---
Changes in v2: None
.../boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 14 +++++++------- arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-)
arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts +7 -7
@@ -58,13 +58,6 @@ clock_si5338_3: clk150 { }; }; -&psgtr { - status = "okay"; - /* dp, usb3, sata */ - clocks = <&clock_si5338_0>, <&clock_si5338_2>, <&clock_si5338_3>; - clock-names = "ref1", "ref2", "ref3"; -}; - &fpd_dma_chan1 { status = "okay"; };
@@ -340,6 +333,13 @@ conf { }; }; +&psgtr { + status = "okay"; + /* dp, usb3, sata */ + clocks = <&clock_si5338_0>, <&clock_si5338_2>, <&clock_si5338_3>; + clock-names = "ref1", "ref2", "ref3"; +}; + &qspi { status = "okay"; flash@0 {
arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts +7 -7
@@ -429,6 +429,13 @@ conf-tx { }; }; +&psgtr { + status = "okay"; + /* nc, sata, usb3, dp */ + clocks = <&clock_8t49n287_5>, <&clock_8t49n287_2>, <&clock_8t49n287_3>; + clock-names = "ref1", "ref2", "ref3"; +}; + &qspi { status = "okay"; flash@0 {
@@ -446,13 +453,6 @@ &rtc { status = "okay"; }; -&psgtr { - status = "okay"; - /* nc, sata, usb3, dp */ - clocks = <&clock_8t49n287_5>, <&clock_8t49n287_2>, <&clock_8t49n287_3>; - clock-names = "ref1", "ref2", "ref3"; -}; - &sata { status = "okay"; /* SATA OOB timing settings */
Signature · 1 line
2.32.0
PATCH v2 29/33 arm64: zynqmp: Remove description for 8T49N287 and si5382 chips
In reply to Michal SimekBased on commit 73d677e9f379 ("arm64: dts: zynqmp: Remove si5328 device nodes") also remove description for clock chips which don't have Linux driver yet.
---
Changes in v2: None
arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts | 4 +--- arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts | 4 +--- arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-)
arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts +1 -3
@@ -160,9 +160,7 @@ i2c@1 { #address-cells = <1>; #size-cells = <0>; reg = <1>; - clock_8t49n287: clock-generator@6c { /* 8T49N287 - u182 */ - reg = <0x6c>; - }; + /* 8T49N287 - u182 */ }; i2c@2 {
arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts +1 -3
@@ -184,9 +184,7 @@ i2c@1 { #address-cells = <1>; #size-cells = <0>; reg = <1>; - clock_8t49n287: clock-generator@6c { /* 8T49N287 - u182 */ - reg = <0x6c>; - }; + /* 8T49N287 - u182 */ }; i2c@2 {
arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts +1 -3
@@ -475,9 +475,7 @@ i2c@4 { #address-cells = <1>; #size-cells = <0>; reg = <4>; - si5382: clock-generator@69 { /* SI5382 - u48 */ - reg = <0x69>; - }; + /* SI5382 - u48 */ }; i2c@5 { #address-cells = <1>;
Signature · 1 line
2.32.0
PATCH v2 30/33 arm64: zynqmp: Add support for zcu102-rev1.1 board
In reply to Michal Simekzcu102 rev1.1 compare to rev1.0 is using by default different DDR memory which requires different configuration. The reason for adding this file to Linux kernel is that U-Boot fdtfile variable is composed based on board revision (in eeprom) and dtb file should exist in standard distibutions for passing it to Linux kernel.
---
Changes in v2: None
Documentation/devicetree/bindings/arm/xilinx.yaml | 1 + arch/arm64/boot/dts/xilinx/Makefile | 1 + .../boot/dts/xilinx/zynqmp-zcu102-rev1.1.dts | 15 +++++++++++++++ 3 files changed, 17 insertions(+) create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.1.dts
Documentation/devicetree/bindings/arm/xilinx.yaml +1 -0
@@ -87,6 +87,7 @@ properties: - xlnx,zynqmp-zcu102-revA - xlnx,zynqmp-zcu102-revB - xlnx,zynqmp-zcu102-rev1.0 + - xlnx,zynqmp-zcu102-rev1.1 - const: xlnx,zynqmp-zcu102 - const: xlnx,zynqmp
arch/arm64/boot/dts/xilinx/Makefile +1 -0
@@ -12,6 +12,7 @@ dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu100-revC.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu102-revA.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu102-revB.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu102-rev1.0.dtb +dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu102-rev1.1.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu104-revA.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu104-revC.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu106-revA.dtb
arch/arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.1.dts new file +15 -0
@@ -0,0 +1,15 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * dts file for Xilinx ZynqMP ZCU102 Rev1.1 + * + * (C) Copyright 2016 - 2020, Xilinx, Inc. + * + * Michal Simek <[email protected]> + */ + +#include "zynqmp-zcu102-rev1.0.dts" + +/ { + model = "ZynqMP ZCU102 Rev1.1"; + compatible = "xlnx,zynqmp-zcu102-rev1.1", "xlnx,zynqmp-zcu102", "xlnx,zynqmp"; +};
Signature · 1 line
2.32.0
Re: [PATCH v2 30/33] arm64: zynqmp: Add support for zcu102-rev1.1 board
Quoted 9 lines · Michal Simek
zcu102 rev1.1 compare to rev1.0 is using by default different DDR memory which requires different configuration. The reason for adding this file to Linux kernel is that U-Boot fdtfile variable is composed based on board revision (in eeprom) and dtb file should exist in standard distibutions for passing it to Linux kernel.
Signed-off-by Michal Simek <[email protected]>---
Quoted 8 lines
Changes in v2: None
Documentation/devicetree/bindings/arm/xilinx.yaml | 1 + arch/arm64/boot/dts/xilinx/Makefile | 1 + .../boot/dts/xilinx/zynqmp-zcu102-rev1.1.dts | 15 +++++++++++++++ 3 files changed, 17 insertions(+) create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.1.dts
PATCH v2 31/33 arm64: zynqmp: Enable xlnx,zynqmp-dwc3 driver for xilinx boards
In reply to Michal SimekThe commit 84770f028fab ("usb: dwc3: Add driver for Xilinx platforms") finally add proper support for Xilinx dwc3 driver. This patch is adding DT description for it.
---
Changes in v2:
- New patch in the series
.../dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 6 ++ .../dts/xilinx/zynqmp-zc1751-xm016-dc2.dts | 7 ++ .../dts/xilinx/zynqmp-zc1751-xm017-dc3.dts | 14 ++++ .../boot/dts/xilinx/zynqmp-zcu100-revC.dts | 10 +++ .../boot/dts/xilinx/zynqmp-zcu102-revA.dts | 6 ++ .../boot/dts/xilinx/zynqmp-zcu104-revA.dts | 6 ++ .../boot/dts/xilinx/zynqmp-zcu104-revC.dts | 6 ++ .../boot/dts/xilinx/zynqmp-zcu106-revA.dts | 6 ++ .../boot/dts/xilinx/zynqmp-zcu111-revA.dts | 6 ++ arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 70 +++++++++++++++---- 10 files changed, 124 insertions(+), 13 deletions(-)
arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts +6 -0
@@ -27,6 +27,7 @@ aliases { rtc0 = &rtc; serial0 = &uart0; spi0 = &qspi; + usb0 = &usb0; }; chosen {
@@ -404,7 +405,12 @@ &usb0 { status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0_default>; +}; + +&dwc3_0 { + status = "okay"; dr_mode = "host"; + snps,usb3_lpm_capable; phy-names = "usb3-phy"; phys = <&psgtr 2 PHY_TYPE_USB3 0 2>; maximum-speed = "super-speed";
arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts +7 -0
@@ -26,6 +26,7 @@ aliases { serial1 = &uart1; spi0 = &spi0; spi1 = &spi1; + usb0 = &usb1; }; chosen {
@@ -479,7 +480,13 @@ &usb1 { status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb1_default>; +}; + +&dwc3_1 { + status = "okay"; dr_mode = "host"; + snps,usb3_lpm_capable; + maximum-speed = "super-speed"; }; &uart0 {
arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm017-dc3.dts +14 -0
@@ -24,6 +24,8 @@ aliases { rtc0 = &rtc; serial0 = &uart0; serial1 = &uart1; + usb0 = &usb0; + usb1 = &usb1; }; chosen {
@@ -147,11 +149,23 @@ &uart1 { &usb0 { status = "okay"; +}; + +&dwc3_0 { + status = "okay"; dr_mode = "host"; + snps,usb3_lpm_capable; + maximum-speed = "super-speed"; }; /* ULPI SMSC USB3320 */ &usb1 { status = "okay"; +}; + +&dwc3_1 { + status = "okay"; dr_mode = "host"; + snps,usb3_lpm_capable; + maximum-speed = "super-speed"; };
arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts +10 -0
@@ -30,6 +30,8 @@ aliases { serial2 = &dcc; spi0 = &spi0; spi1 = &spi1; + usb0 = &usb0; + usb1 = &usb1; mmc0 = &sdhci0; mmc1 = &sdhci1; };
@@ -537,6 +539,10 @@ &usb0 { status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0_default>; +}; + +&dwc3_0 { + status = "okay"; dr_mode = "peripheral"; phy-names = "usb3-phy"; phys = <&psgtr 2 PHY_TYPE_USB3 0 0>;
@@ -548,6 +554,10 @@ &usb1 { status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb1_default>; +}; + +&dwc3_1 { + status = "okay"; dr_mode = "host"; phy-names = "usb3-phy"; phys = <&psgtr 3 PHY_TYPE_USB3 1 0>;
arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts +6 -0
@@ -31,6 +31,7 @@ aliases { serial1 = &uart1; serial2 = &dcc; spi0 = &qspi; + usb0 = &usb0; }; chosen {
@@ -998,7 +999,12 @@ &usb0 { status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0_default>; +}; + +&dwc3_0 { + status = "okay"; dr_mode = "host"; + snps,usb3_lpm_capable; phy-names = "usb3-phy"; phys = <&psgtr 2 PHY_TYPE_USB3 0 2>; maximum-speed = "super-speed";
arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts +6 -0
@@ -29,6 +29,7 @@ aliases { serial1 = &uart1; serial2 = &dcc; spi0 = &qspi; + usb0 = &usb0; }; chosen {
@@ -481,7 +482,12 @@ &usb0 { status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0_default>; +}; + +&dwc3_0 { + status = "okay"; dr_mode = "host"; + snps,usb3_lpm_capable; phy-names = "usb3-phy"; phys = <&psgtr 2 PHY_TYPE_USB3 0 2>; maximum-speed = "super-speed";
arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts +6 -0
@@ -29,6 +29,7 @@ aliases { serial1 = &uart1; serial2 = &dcc; spi0 = &qspi; + usb0 = &usb0; }; chosen {
@@ -493,7 +494,12 @@ &usb0 { status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0_default>; +}; + +&dwc3_0 { + status = "okay"; dr_mode = "host"; + snps,usb3_lpm_capable; phy-names = "usb3-phy"; phys = <&psgtr 2 PHY_TYPE_USB3 0 2>; maximum-speed = "super-speed";
arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts +6 -0
@@ -31,6 +31,7 @@ aliases { serial1 = &uart1; serial2 = &dcc; spi0 = &qspi; + usb0 = &usb0; }; chosen {
@@ -991,7 +992,12 @@ &usb0 { status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0_default>; +}; + +&dwc3_0 { + status = "okay"; dr_mode = "host"; + snps,usb3_lpm_capable; phy-names = "usb3-phy"; phys = <&psgtr 2 PHY_TYPE_USB3 0 2>; maximum-speed = "super-speed";
arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts +6 -0
@@ -30,6 +30,7 @@ aliases { serial0 = &uart0; serial1 = &dcc; spi0 = &qspi; + usb0 = &usb0; }; chosen {
@@ -828,7 +829,12 @@ &usb0 { status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0_default>; +}; + +&dwc3_0 { + status = "okay"; dr_mode = "host"; + snps,usb3_lpm_capable; phy-names = "usb3-phy"; phys = <&psgtr 2 PHY_TYPE_USB3 0 2>; maximum-speed = "super-speed";
arch/arm64/boot/dts/xilinx/zynqmp.dtsi +57 -13
88 lines not on this page · raw message
Signature · 1 line
2.32.0
Re: [PATCH v2 31/33] arm64: zynqmp: Enable xlnx, zynqmp-dwc3 driver for xilinx boards
Quoted 284 lines · Michal Simek
The commit
84770f028fab("usb: dwc3: Add driver for Xilinx platforms") finally add proper support for Xilinx dwc3 driver. This patch is adding DT description for it.Signed-off-by Michal Simek <[email protected]>---
Changes in v2:
- New patch in the series.../dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 6 ++ .../dts/xilinx/zynqmp-zc1751-xm016-dc2.dts | 7 ++ .../dts/xilinx/zynqmp-zc1751-xm017-dc3.dts | 14 ++++ .../boot/dts/xilinx/zynqmp-zcu100-revC.dts | 10 +++ .../boot/dts/xilinx/zynqmp-zcu102-revA.dts | 6 ++ .../boot/dts/xilinx/zynqmp-zcu104-revA.dts | 6 ++ .../boot/dts/xilinx/zynqmp-zcu104-revC.dts | 6 ++ .../boot/dts/xilinx/zynqmp-zcu106-revA.dts | 6 ++ .../boot/dts/xilinx/zynqmp-zcu111-revA.dts | 6 ++ arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 70 +++++++++++++++---- 10 files changed, 124 insertions(+), 13 deletions(-)arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts +6
-0@@ -27,6 +27,7 @@ aliases { rtc0 = &rtc; serial0 = &uart0; spi0 = &qspi; + usb0 = &usb0; }; chosen {@@ -404,7 +405,12 @@ &usb0 { status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0_default>; +}; + +&dwc3_0 { + status = "okay"; dr_mode = "host"; + snps,usb3_lpm_capable; phy-names = "usb3-phy"; phys = <&psgtr 2 PHY_TYPE_USB3 0 2>; maximum-speed = "super-speed";arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts +7
-0@@ -26,6 +26,7 @@ aliases { serial1 = &uart1; spi0 = &spi0; spi1 = &spi1; + usb0 = &usb1; }; chosen {@@ -479,7 +480,13 @@ &usb1 { status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb1_default>; +}; + +&dwc3_1 { + status = "okay"; dr_mode = "host"; + snps,usb3_lpm_capable; + maximum-speed = "super-speed"; }; &uart0 {arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm017-dc3.dts +14
-0@@ -24,6 +24,8 @@ aliases { rtc0 = &rtc; serial0 = &uart0; serial1 = &uart1; + usb0 = &usb0; + usb1 = &usb1; }; chosen {@@ -147,11 +149,23 @@ &uart1 { &usb0 { status = "okay"; +}; + +&dwc3_0 { + status = "okay"; dr_mode = "host"; + snps,usb3_lpm_capable; + maximum-speed = "super-speed"; }; /* ULPI SMSC USB3320 */ &usb1 { status = "okay"; +}; + +&dwc3_1 { + status = "okay"; dr_mode = "host"; + snps,usb3_lpm_capable; + maximum-speed = "super-speed"; };arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts +10
-0@@ -30,6 +30,8 @@ aliases { serial2 = &dcc; spi0 = &spi0; spi1 = &spi1; + usb0 = &usb0; + usb1 = &usb1; mmc0 = &sdhci0; mmc1 = &sdhci1; };@@ -537,6 +539,10 @@ &usb0 { status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0_default>; +}; + +&dwc3_0 { + status = "okay"; dr_mode = "peripheral"; phy-names = "usb3-phy"; phys = <&psgtr 2 PHY_TYPE_USB3 0 0>;@@ -548,6 +554,10 @@ &usb1 { status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb1_default>; +}; + +&dwc3_1 { + status = "okay"; dr_mode = "host"; phy-names = "usb3-phy"; phys = <&psgtr 3 PHY_TYPE_USB3 1 0>;arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts +6
-0@@ -31,6 +31,7 @@ aliases { serial1 = &uart1; serial2 = &dcc; spi0 = &qspi; + usb0 = &usb0; }; chosen {@@ -998,7 +999,12 @@ &usb0 { status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0_default>; +}; + +&dwc3_0 { + status = "okay"; dr_mode = "host"; + snps,usb3_lpm_capable; phy-names = "usb3-phy"; phys = <&psgtr 2 PHY_TYPE_USB3 0 2>; maximum-speed = "super-speed";arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts +6
-0@@ -29,6 +29,7 @@ aliases { serial1 = &uart1; serial2 = &dcc; spi0 = &qspi; + usb0 = &usb0; }; chosen {@@ -481,7 +482,12 @@ &usb0 { status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0_default>; +}; + +&dwc3_0 { + status = "okay"; dr_mode = "host"; + snps,usb3_lpm_capable; phy-names = "usb3-phy"; phys = <&psgtr 2 PHY_TYPE_USB3 0 2>; maximum-speed = "super-speed";arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts +6
-0@@ -29,6 +29,7 @@ aliases { serial1 = &uart1; serial2 = &dcc; spi0 = &qspi; + usb0 = &usb0; }; chosen {@@ -493,7 +494,12 @@ &usb0 { status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0_default>; +}; + +&dwc3_0 { + status = "okay"; dr_mode = "host"; + snps,usb3_lpm_capable; phy-names = "usb3-phy"; phys = <&psgtr 2 PHY_TYPE_USB3 0 2>; maximum-speed = "super-speed";arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts +6
-0@@ -31,6 +31,7 @@ aliases { serial1 = &uart1; serial2 = &dcc; spi0 = &qspi; + usb0 = &usb0; }; chosen {@@ -991,7 +992,12 @@ &usb0 { status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0_default>; +}; + +&dwc3_0 { + status = "okay"; dr_mode = "host"; + snps,usb3_lpm_capable; phy-names = "usb3-phy"; phys = <&psgtr 2 PHY_TYPE_USB3 0 2>; maximum-speed = "super-speed";arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts +6
-0@@ -30,6 +30,7 @@ aliases { serial0 = &uart0; serial1 = &dcc; spi0 = &qspi; + usb0 = &usb0; }; chosen {@@ -828,7 +829,12 @@ &usb0 { status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0_default>; +}; + +&dwc3_0 { + status = "okay"; dr_mode = "host"; + snps,usb3_lpm_capable; phy-names = "usb3-phy"; phys = <&psgtr 2 PHY_TYPE_USB3 0 2>; maximum-speed = "super-speed";arch/arm64/boot/dts/xilinx/zynqmp.dtsi +1
-1@@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP * - * (C) Copyright 2014 - 2019, Xilinx, Inc. + * (C) Copyright 2014 - 2021, Xilinx, Inc. * * Michal Simek <[email protected]> *
arch/arm64/boot/dts/xilinx/zynqmp.dtsi uart1: serial@ff010000 { · line 808
Quoted 6 lines
arch/arm64/boot/dts/xilinx/zynqmp.dtsi +1
-2@@ -805,24 +805,68 @@ uart1: serial@ff010000 { power-domains = <&zynqmp_firmware PD_UART_1>; }; - usb0: usb@fe200000 { - compatible = "snps,dwc3"; + usb0: usb0@ff9d0000 {
usb@ff9d0000
Quoted 10 lines
arch/arm64/boot/dts/xilinx/zynqmp.dtsi +5
-4+ #address-cells = <2>; + #size-cells = <2>; status = "disabled"; - interrupt-parent = <&gic>; - interrupts = <0 65 4>; - reg = <0x0 0xfe200000 0x0 0x40000>; - clock-names = "clk_xin", "clk_ahb"; + compatible = "xlnx,zynqmp-dwc3"; + reg = <0x0 0xff9d0000 0x0 0x100>; + clock-names = "bus_clk", "ref_clk";
arch/arm64/boot/dts/xilinx/zynqmp.dtsi uart1: serial@ff010000 { · line 824
Quoted 10 lines
arch/arm64/boot/dts/xilinx/zynqmp.dtsi +9
-0power-domains = <&zynqmp_firmware PD_USB_0>; + resets = <&zynqmp_reset ZYNQMP_RESET_USB0_CORERESET>, + <&zynqmp_reset ZYNQMP_RESET_USB0_HIBERRESET>, + <&zynqmp_reset ZYNQMP_RESET_USB0_APB>; + reset-names = "usb_crst", "usb_hibrst", "usb_apbrst"; + ranges; + + dwc3_0: usb@fe200000 { + compatible = "snps,dwc3"; + status = "disabled";
I think it would be better to drop the status from dwc3_0, since it is a child node of the already disabled usb0 node. With the current change, the board dts has to enable usb0 and dwc3_0 to enable usb support, which is kind of unexpected.
arch/arm64/boot/dts/xilinx/zynqmp.dtsi uart1: serial@ff010000 { · line 835
Quoted 11 lines
arch/arm64/boot/dts/xilinx/zynqmp.dtsi +11
-0+ reg = <0x0 0xfe200000 0x0 0x40000>; + interrupt-parent = <&gic>; + interrupt-names = "dwc_usb3", "otg"; + interrupts = <0 65 4>, <0 69 4>; + #stream-id-cells = <1>; + iommus = <&smmu 0x860>; + snps,quirk-frame-length-adjustment = <0x20>; + snps,refclk_fladj; + snps,enable_guctl1_resume_quirk; + snps,enable_guctl1_ipd_quirk; + snps,xhci-stream-quirk;
The last four properties for snps are not documented (and not used by the driver).
arch/arm64/boot/dts/xilinx/zynqmp.dtsi uart1: serial@ff010000 { · line 840
Quoted 7 lines
arch/arm64/boot/dts/xilinx/zynqmp.dtsi +3
-2+ /* dma-coherent; */ + }; }; - usb1: usb@fe300000 { - compatible = "snps,dwc3"; + usb1: usb1@ff9e0000 {
usb@fe9e00000
Quoted 10 lines
arch/arm64/boot/dts/xilinx/zynqmp.dtsi +5
-4+ #address-cells = <2>; + #size-cells = <2>; status = "disabled"; - interrupt-parent = <&gic>; - interrupts = <0 70 4>; - reg = <0x0 0xfe300000 0x0 0x40000>; - clock-names = "clk_xin", "clk_ahb"; + compatible = "xlnx,zynqmp-dwc3"; + reg = <0x0 0xff9e0000 0x0 0x100>; + clock-names = "bus_clk", "ref_clk";
arch/arm64/boot/dts/xilinx/zynqmp.dtsi uart1: serial@ff010000 { · line 856
Quoted 10 lines
arch/arm64/boot/dts/xilinx/zynqmp.dtsi +9
-0power-domains = <&zynqmp_firmware PD_USB_1>; + resets = <&zynqmp_reset ZYNQMP_RESET_USB1_CORERESET>, + <&zynqmp_reset ZYNQMP_RESET_USB1_HIBERRESET>, + <&zynqmp_reset ZYNQMP_RESET_USB1_APB>; + reset-names = "usb_crst", "usb_hibrst", "usb_apbrst"; + ranges; + + dwc3_1: usb@fe300000 { + compatible = "snps,dwc3"; + status = "disabled";
Same as above.
arch/arm64/boot/dts/xilinx/zynqmp.dtsi uart1: serial@ff010000 { · line 867
Quoted 11 lines
arch/arm64/boot/dts/xilinx/zynqmp.dtsi +11
-0+ reg = <0x0 0xfe300000 0x0 0x40000>; + interrupt-parent = <&gic>; + interrupt-names = "dwc_usb3", "otg"; + interrupts = <0 70 4>, <0 74 4>; + #stream-id-cells = <1>; + iommus = <&smmu 0x861>; + snps,quirk-frame-length-adjustment = <0x20>; + snps,refclk_fladj; + snps,enable_guctl1_resume_quirk; + snps,enable_guctl1_ipd_quirk; + snps,xhci-stream-quirk;
Same as above.
Thanks,
Michael
Quoted 5 lines
arch/arm64/boot/dts/xilinx/zynqmp.dtsi +2
-0+ /* dma-coherent; */ + }; }; watchdog0: watchdog@fd4d0000 {
Re: [PATCH v2 31/33] arm64: zynqmp: Enable xlnx, zynqmp-dwc3 driver for xilinx boards
Quoted 288 lines · Michael Tretter
Quoted 287 lines · Michal Simek
The commit
84770f028fab("usb: dwc3: Add driver for Xilinx platforms") finally add proper support for Xilinx dwc3 driver. This patch is adding DT description for it.Signed-off-by Michal Simek <[email protected]>---
Changes in v2:
- New patch in the series.../dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 6 ++ .../dts/xilinx/zynqmp-zc1751-xm016-dc2.dts | 7 ++ .../dts/xilinx/zynqmp-zc1751-xm017-dc3.dts | 14 ++++ .../boot/dts/xilinx/zynqmp-zcu100-revC.dts | 10 +++ .../boot/dts/xilinx/zynqmp-zcu102-revA.dts | 6 ++ .../boot/dts/xilinx/zynqmp-zcu104-revA.dts | 6 ++ .../boot/dts/xilinx/zynqmp-zcu104-revC.dts | 6 ++ .../boot/dts/xilinx/zynqmp-zcu106-revA.dts | 6 ++ .../boot/dts/xilinx/zynqmp-zcu111-revA.dts | 6 ++ arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 70 +++++++++++++++---- 10 files changed, 124 insertions(+), 13 deletions(-)arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts +6
-0@@ -27,6 +27,7 @@ aliases { rtc0 = &rtc; serial0 = &uart0; spi0 = &qspi; + usb0 = &usb0; }; chosen {@@ -404,7 +405,12 @@ &usb0 { status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0_default>; +}; + +&dwc3_0 { + status = "okay"; dr_mode = "host"; + snps,usb3_lpm_capable; phy-names = "usb3-phy"; phys = <&psgtr 2 PHY_TYPE_USB3 0 2>; maximum-speed = "super-speed";arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts +7
-0@@ -26,6 +26,7 @@ aliases { serial1 = &uart1; spi0 = &spi0; spi1 = &spi1; + usb0 = &usb1; }; chosen {@@ -479,7 +480,13 @@ &usb1 { status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb1_default>; +}; + +&dwc3_1 { + status = "okay"; dr_mode = "host"; + snps,usb3_lpm_capable; + maximum-speed = "super-speed"; }; &uart0 {arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm017-dc3.dts +14
-0@@ -24,6 +24,8 @@ aliases { rtc0 = &rtc; serial0 = &uart0; serial1 = &uart1; + usb0 = &usb0; + usb1 = &usb1; }; chosen {@@ -147,11 +149,23 @@ &uart1 { &usb0 { status = "okay"; +}; + +&dwc3_0 { + status = "okay"; dr_mode = "host"; + snps,usb3_lpm_capable; + maximum-speed = "super-speed"; }; /* ULPI SMSC USB3320 */ &usb1 { status = "okay"; +}; + +&dwc3_1 { + status = "okay"; dr_mode = "host"; + snps,usb3_lpm_capable; + maximum-speed = "super-speed"; };arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts +10
-0@@ -30,6 +30,8 @@ aliases { serial2 = &dcc; spi0 = &spi0; spi1 = &spi1; + usb0 = &usb0; + usb1 = &usb1; mmc0 = &sdhci0; mmc1 = &sdhci1; };@@ -537,6 +539,10 @@ &usb0 { status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0_default>; +}; + +&dwc3_0 { + status = "okay"; dr_mode = "peripheral"; phy-names = "usb3-phy"; phys = <&psgtr 2 PHY_TYPE_USB3 0 0>;@@ -548,6 +554,10 @@ &usb1 { status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb1_default>; +}; + +&dwc3_1 { + status = "okay"; dr_mode = "host"; phy-names = "usb3-phy"; phys = <&psgtr 3 PHY_TYPE_USB3 1 0>;arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts +6
-0@@ -31,6 +31,7 @@ aliases { serial1 = &uart1; serial2 = &dcc; spi0 = &qspi; + usb0 = &usb0; }; chosen {@@ -998,7 +999,12 @@ &usb0 { status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0_default>; +}; + +&dwc3_0 { + status = "okay"; dr_mode = "host"; + snps,usb3_lpm_capable; phy-names = "usb3-phy"; phys = <&psgtr 2 PHY_TYPE_USB3 0 2>; maximum-speed = "super-speed";arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts +6
-0@@ -29,6 +29,7 @@ aliases { serial1 = &uart1; serial2 = &dcc; spi0 = &qspi; + usb0 = &usb0; }; chosen {@@ -481,7 +482,12 @@ &usb0 { status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0_default>; +}; + +&dwc3_0 { + status = "okay"; dr_mode = "host"; + snps,usb3_lpm_capable; phy-names = "usb3-phy"; phys = <&psgtr 2 PHY_TYPE_USB3 0 2>; maximum-speed = "super-speed";arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts +6
-0@@ -29,6 +29,7 @@ aliases { serial1 = &uart1; serial2 = &dcc; spi0 = &qspi; + usb0 = &usb0; }; chosen {@@ -493,7 +494,12 @@ &usb0 { status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0_default>; +}; + +&dwc3_0 { + status = "okay"; dr_mode = "host"; + snps,usb3_lpm_capable; phy-names = "usb3-phy"; phys = <&psgtr 2 PHY_TYPE_USB3 0 2>; maximum-speed = "super-speed";arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts +6
-0@@ -31,6 +31,7 @@ aliases { serial1 = &uart1; serial2 = &dcc; spi0 = &qspi; + usb0 = &usb0; }; chosen {@@ -991,7 +992,12 @@ &usb0 { status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0_default>; +}; + +&dwc3_0 { + status = "okay"; dr_mode = "host"; + snps,usb3_lpm_capable; phy-names = "usb3-phy"; phys = <&psgtr 2 PHY_TYPE_USB3 0 2>; maximum-speed = "super-speed";arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts +6
-0@@ -30,6 +30,7 @@ aliases { serial0 = &uart0; serial1 = &dcc; spi0 = &qspi; + usb0 = &usb0; }; chosen {@@ -828,7 +829,12 @@ &usb0 { status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0_default>; +}; + +&dwc3_0 { + status = "okay"; dr_mode = "host"; + snps,usb3_lpm_capable; phy-names = "usb3-phy"; phys = <&psgtr 2 PHY_TYPE_USB3 0 2>; maximum-speed = "super-speed";arch/arm64/boot/dts/xilinx/zynqmp.dtsi +1
-1@@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP * - * (C) Copyright 2014 - 2019, Xilinx, Inc. + * (C) Copyright 2014 - 2021, Xilinx, Inc. * * Michal Simek <[email protected]> *@@ -805,24 +805,68 @@ uart1: serial@ff010000 { power-domains = <&zynqmp_firmware PD_UART_1>; };
Quoted 5 lines
arch/arm64/boot/dts/xilinx/zynqmp.dtsi uart1: serial@ff010000 { · line 808
Quoted 3 lines
arch/arm64/boot/dts/xilinx/zynqmp.dtsi +1
-2- usb0: usb@fe200000 { - compatible = "snps,dwc3"; + usb0: usb0@ff9d0000 {usb@ff9d0000
I spot it myself too. Will fix in next version.
Quoted 18 lines
Quoted 18 lines
arch/arm64/boot/dts/xilinx/zynqmp.dtsi +11
-4+ #address-cells = <2>; + #size-cells = <2>; status = "disabled"; - interrupt-parent = <&gic>; - interrupts = <0 65 4>; - reg = <0x0 0xfe200000 0x0 0x40000>; - clock-names = "clk_xin", "clk_ahb"; + compatible = "xlnx,zynqmp-dwc3"; + reg = <0x0 0xff9d0000 0x0 0x100>; + clock-names = "bus_clk", "ref_clk"; power-domains = <&zynqmp_firmware PD_USB_0>; + resets = <&zynqmp_reset ZYNQMP_RESET_USB0_CORERESET>, + <&zynqmp_reset ZYNQMP_RESET_USB0_HIBERRESET>, + <&zynqmp_reset ZYNQMP_RESET_USB0_APB>; + reset-names = "usb_crst", "usb_hibrst", "usb_apbrst"; + ranges; +
Quoted 8 lines
arch/arm64/boot/dts/xilinx/zynqmp.dtsi uart1: serial@ff010000 { · line 824
Quoted 3 lines
arch/arm64/boot/dts/xilinx/zynqmp.dtsi +3
-0+ dwc3_0: usb@fe200000 { + compatible = "snps,dwc3"; + status = "disabled";I think it would be better to drop the status from
dwc3_0, since it is a child node of the already disabled usb0 node. With the current change, the board dts has to enable usb0 anddwc3_0to enable usb support, which is kind of unexpected.
I don't think we have a choice here. I know it is not the best but even when we remove this property from here you need to align board dts to match it.
You need to move for example dr_mode to &dwc3_0 and not keeping it in &usb0. Please correct me if I am wrong here.
Quoted 15 lines
arch/arm64/boot/dts/xilinx/zynqmp.dtsi uart1: serial@ff010000 { · line 835
Quoted 12 lines
arch/arm64/boot/dts/xilinx/zynqmp.dtsi +11
-0+ reg = <0x0 0xfe200000 0x0 0x40000>; + interrupt-parent = <&gic>; + interrupt-names = "dwc_usb3", "otg"; + interrupts = <0 65 4>, <0 69 4>; + #stream-id-cells = <1>; + iommus = <&smmu 0x860>; + snps,quirk-frame-length-adjustment = <0x20>; + snps,refclk_fladj; + snps,enable_guctl1_resume_quirk; + snps,enable_guctl1_ipd_quirk; + snps,xhci-stream-quirk;The last four properties for snps are not documented (and not used by the driver).
I missed this - will remove it also for second instance.
Thanks,
Michal
PATCH v2 32/33 arm64: zynqmp: Add psgtr description to zc1751 dc1 board
In reply to Michal SimekWire psgtr for zc1751 dc1 board.
---
Changes in v2:
- New patch in the series
arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 3 +++ 1 file changed, 3 insertions(+)
arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts +3 -0
@@ -422,4 +422,7 @@ &zynqmp_dpdma { &zynqmp_dpsub { status = "okay"; + phy-names = "dp-phy0", "dp-phy1"; + phys = <&psgtr 1 PHY_TYPE_DP 0 0>, + <&psgtr 0 PHY_TYPE_DP 1 1>; };
Signature · 1 line
2.32.0
PATCH v2 33/33 arm64: zynqmp: Add support for Xilinx Kria SOM board
In reply to Michal SimekThere are couple of revisions of SOMs (k26) and associated carrier cards (kv260).
SOM itself has two major versions:
sm-k26 - SOM with EMMC
smk-k26 - SOM without EMMC used on starter kit with preprogrammed firmware in QSPI.
SOMs are describing only devices available on the SOM or connections which are described in specification (for example UART, fwuen).
---
Changes in v2:
- Use sugar syntax - reported by Geert
- Update copyright years
- Fix SD3.0 comment alignment
- Remove one newline from Makefile
https://www.xilinx.com/products/som/kria.html
--- .../devicetree/bindings/arm/xilinx.yaml | 31 ++ arch/arm64/boot/dts/xilinx/Makefile | 10 + .../boot/dts/xilinx/zynqmp-sck-kv-g-revA.dts | 335 ++++++++++++++++++ .../boot/dts/xilinx/zynqmp-sck-kv-g-revB.dts | 318 +++++++++++++++++ .../boot/dts/xilinx/zynqmp-sm-k26-revA.dts | 289 +++++++++++++++ .../boot/dts/xilinx/zynqmp-smk-k26-revA.dts | 21 ++ 6 files changed, 1004 insertions(+) create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revA.dts create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revB.dts create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-smk-k26-revA.dts
Documentation/devicetree/bindings/arm/xilinx.yaml +31 -0
@@ -116,6 +116,37 @@ properties: - const: xlnx,zynqmp-zcu111 - const: xlnx,zynqmp + - description: Xilinx Kria SOMs + items: + - const: xlnx,zynqmp-sm-k26-rev1 + - const: xlnx,zynqmp-sm-k26-revB + - const: xlnx,zynqmp-sm-k26-revA + - const: xlnx,zynqmp-sm-k26 + - const: xlnx,zynqmp + + - description: Xilinx Kria SOMs (starter) + items: + - const: xlnx,zynqmp-smk-k26-rev1 + - const: xlnx,zynqmp-smk-k26-revB + - const: xlnx,zynqmp-smk-k26-revA + - const: xlnx,zynqmp-smk-k26 + - const: xlnx,zynqmp + + - description: Xilinx Kria Carrier Cards (revA/Y/Z) + items: + - const: xlnx,zynqmp-sk-kv260-revZ + - const: xlnx,zynqmp-sk-kv260-revY + - const: xlnx,zynqmp-sk-kv260-revA + - const: xlnx,zynqmp-sk-k260 + - const: xlnx,zynqmp + + - description: Xilinx Kria Carrier Cards (revB/1) + items: + - const: xlnx,zynqmp-sk-kv260-rev1 + - const: xlnx,zynqmp-sk-kv260-revB + - const: xlnx,zynqmp-sk-k260 + - const: xlnx,zynqmp + additionalProperties: true ...
arch/arm64/boot/dts/xilinx/Makefile +10 -0
@@ -17,3 +17,13 @@ dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu104-revA.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu104-revC.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu106-revA.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu111-revA.dtb + +dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sm-k26-revA.dtb +dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-smk-k26-revA.dtb + +som-AA-dtbs := zynqmp-sm-k26-revA.dtb zynqmp-sck-kv-g-revA.dtbo +som-AB-dtbs := zynqmp-sm-k26-revA.dtb zynqmp-sck-kv-g-revB.dtbo +starter-AA-dtbs := zynqmp-smk-k26-revA.dtb zynqmp-sck-kv-g-revA.dtbo +starter-AB-dtbs := zynqmp-smk-k26-revA.dtb zynqmp-sck-kv-g-revB.dtbo + +dtb-$(CONFIG_ARCH_ZYNQMP) += som-AA.dtb som-AB.dtb starter-AA.dtb starter-AB.dtb
arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revA.dts new file +335 -0
335 lines not on this page · raw message
arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revB.dts new file +318 -0
318 lines not on this page · raw message
arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts new file +289 -0
289 lines not on this page · raw message
arch/arm64/boot/dts/xilinx/zynqmp-smk-k26-revA.dts new file +21 -0
@@ -0,0 +1,21 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * dts file for Xilinx ZynqMP SMK-K26 rev1/B/A + * + * (C) Copyright 2020 - 2021, Xilinx, Inc. + * + * Michal Simek <[email protected]> + */ + +#include "zynqmp-sm-k26-revA.dts" + +/ { + model = "ZynqMP SMK-K26 Rev1/B/A"; + compatible = "xlnx,zynqmp-smk-k26-rev1", "xlnx,zynqmp-smk-k26-revB", + "xlnx,zynqmp-smk-k26-revA", "xlnx,zynqmp-smk-k26", + "xlnx,zynqmp"; +}; + +&sdhci0 { + status = "disabled"; +};
Signature · 1 line
2.32.0
Rob Herring
maintainerRe: [PATCH v2 33/33] arm64: zynqmp: Add support for Xilinx Kria SOM board
Quoted 19 lines · Michal Simek
There are couple of revisions of SOMs (k26) and associated carrier cards (kv260).
SOM itself has two major versions:
sm-k26 - SOM with EMMC
smk-k26 - SOM without EMMC used on starter kit with preprogrammed firmware in QSPI.SOMs are describing only devices available on the SOM or connections which are described in specification (for example UART, fwuen).
Signed-off-by Michal Simek <[email protected]>---
Changes in v2:
- Use sugar syntax - reported by Geert
- Update copyright years
- Fix SD3.0 comment alignment
- Remove one newline fromMakefile
Quoted 8 lines
https://www.xilinx.com/products/som/kria.html
--- .../devicetree/bindings/arm/xilinx.yaml | 31 ++ arch/arm64/boot/dts/xilinx/Makefile | 10 + .../boot/dts/xilinx/zynqmp-sck-kv-g-revA.dts | 335 ++++++++++++++++++ .../boot/dts/xilinx/zynqmp-sck-kv-g-revB.dts | 318 +++++++++++++++++ .../boot/dts/xilinx/zynqmp-sm-k26-revA.dts | 289 +++++++++++++++ .../boot/dts/xilinx/zynqmp-smk-k26-revA.dts | 21 ++
It does not appear to me that the schema matches the dts files. You did check that, right?
Quoted 11 lines
6 files changed, 1004 insertions(+) create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revA.dts create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revB.dts create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-smk-k26-revA.dtsDocumentation/devicetree/bindings/arm/xilinx.yaml +0
-0
Documentation/devicetree/bindings/arm/xilinx.yaml properties: · line 123
Quoted 8 lines
Documentation/devicetree/bindings/arm/xilinx.yaml +5
-0@@ -116,6 +116,37 @@ properties: - const: xlnx,zynqmp-zcu111 - const: xlnx,zynqmp + - description: Xilinx Kria SOMs + items: + - const: xlnx,zynqmp-sm-k26-rev1 + - const: xlnx,zynqmp-sm-k26-revB + - const: xlnx,zynqmp-sm-k26-revA
So rev1 is compatible with revB is compatible with revA, but revA and revB don't exist on their own?
Quoted 69 lines
Documentation/devicetree/bindings/arm/xilinx.yaml +26
-0+ - const: xlnx,zynqmp-sm-k26 + - const: xlnx,zynqmp + + - description: Xilinx Kria SOMs (starter) + items: + - const: xlnx,zynqmp-smk-k26-rev1 + - const: xlnx,zynqmp-smk-k26-revB + - const: xlnx,zynqmp-smk-k26-revA + - const: xlnx,zynqmp-smk-k26 + - const: xlnx,zynqmp + + - description: Xilinx Kria Carrier Cards (revA/Y/Z) + items: + - const: xlnx,zynqmp-sk-kv260-revZ + - const: xlnx,zynqmp-sk-kv260-revY + - const: xlnx,zynqmp-sk-kv260-revA + - const: xlnx,zynqmp-sk-k260 + - const: xlnx,zynqmp + + - description: Xilinx Kria Carrier Cards (revB/1) + items: + - const: xlnx,zynqmp-sk-kv260-rev1 + - const: xlnx,zynqmp-sk-kv260-revB + - const: xlnx,zynqmp-sk-k260 + - const: xlnx,zynqmp + additionalProperties: truearch/arm64/boot/dts/xilinx/Makefile +10
-0@@ -17,3 +17,13 @@ dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu104-revA.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu104-revC.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu106-revA.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu111-revA.dtb + +dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sm-k26-revA.dtb +dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-smk-k26-revA.dtb + +som-AA-dtbs := zynqmp-sm-k26-revA.dtb zynqmp-sck-kv-g-revA.dtbo +som-AB-dtbs := zynqmp-sm-k26-revA.dtb zynqmp-sck-kv-g-revB.dtbo +starter-AA-dtbs := zynqmp-smk-k26-revA.dtb zynqmp-sck-kv-g-revA.dtbo +starter-AB-dtbs := zynqmp-smk-k26-revA.dtb zynqmp-sck-kv-g-revB.dtbo + +dtb-$(CONFIG_ARCH_ZYNQMP) += som-AA.dtb som-AB.dtb starter-AA.dtb starter-AB.dtbarch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revA.dts new file +16
-0@@ -0,0 +1,335 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * dts file for KV260 revA Carrier Card + * + * (C) Copyright 2020 - 2021, Xilinx, Inc. + * + * SD level shifter: + * "A" – A01 board un-modified (NXP) + * "Y" – A01 board modified with legacy interposer (Nexperia) + * "Z" – A01 board modified with Diode interposer + * + * Michal Simek <[email protected]> + */ + + #include <dt-bindings/gpio/gpio.h> + #include <dt-bindings/net/ti-dp83867.h>
arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revA.dts line 26
Quoted 10 lines
arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revA.dts new file +10
-0+ #include <dt-bindings/phy/phy.h> + #include <dt-bindings/pinctrl/pinctrl-zynqmp.h> + +/dts-v1/; +/plugin/; + +&{/} { + compatible = "xlnx,zynqmp-sk-kv260-revA", + "xlnx,zynqmp-sk-kv260-revY", + "xlnx,zynqmp-sk-kv260-revZ",
The order above is Z, Y, A.
Quoted 2 lines
arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revA.dts new file +2
-0+ "xlnx,zynqmp-sk-kv260", "xlnx,zynqmp"; +};
Re: [PATCH v2 33/33] arm64: zynqmp: Add support for Xilinx Kria SOM board
Quoted 29 lines · Rob Herring
Quoted 19 lines · Michal Simek
There are couple of revisions of SOMs (k26) and associated carrier cards (kv260).
SOM itself has two major versions:
sm-k26 - SOM with EMMC
smk-k26 - SOM without EMMC used on starter kit with preprogrammed firmware in QSPI.SOMs are describing only devices available on the SOM or connections which are described in specification (for example UART, fwuen).
Signed-off-by Michal Simek <[email protected]>---
Changes in v2:
- Use sugar syntax - reported by Geert
- Update copyright years
- Fix SD3.0 comment alignment
- Remove one newline fromMakefileQuoted 8 lines
https://www.xilinx.com/products/som/kria.html
--- .../devicetree/bindings/arm/xilinx.yaml | 31 ++ arch/arm64/boot/dts/xilinx/Makefile | 10 + .../boot/dts/xilinx/zynqmp-sck-kv-g-revA.dts | 335 ++++++++++++++++++ .../boot/dts/xilinx/zynqmp-sck-kv-g-revB.dts | 318 +++++++++++++++++ .../boot/dts/xilinx/zynqmp-sm-k26-revA.dts | 289 +++++++++++++++ .../boot/dts/xilinx/zynqmp-smk-k26-revA.dts | 21 ++
Quoted 2 lines
It does not appear to me that the schema matches the dts files. You did check that, right?
I can double check but I have updated xilinx.yaml to match it.
Quoted 15 lines
Quoted 15 lines
6 files changed, 1004 insertions(+) create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revA.dts create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revB.dts create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-smk-k26-revA.dtsDocumentation/devicetree/bindings/arm/xilinx.yaml +0
-0@@ -116,6 +116,37 @@ properties: - const: xlnx,zynqmp-zcu111 - const: xlnx,zynqmp
Quoted 8 lines
Documentation/devicetree/bindings/arm/xilinx.yaml properties: · line 123
Quoted 5 lines
Documentation/devicetree/bindings/arm/xilinx.yaml +5
-0+ - description: Xilinx Kria SOMs + items: + - const: xlnx,zynqmp-sm-k26-rev1 + - const: xlnx,zynqmp-sm-k26-revB + - const: xlnx,zynqmp-sm-k26-revASo rev1 is compatible with revB is compatible with revA, but revA and revB don't exist on their own?
HW wise they of course exist.
revB(development version) is identical with rev1(production version). And there are some HW changes between revA and revB but without impact on SW. That's why all 3 are listed.
Board version is recorded in eeprom and based on it the right compatible dt should be taken.
Quoted 74 lines
Quoted 74 lines
Documentation/devicetree/bindings/arm/xilinx.yaml +26
-0+ - const: xlnx,zynqmp-sm-k26 + - const: xlnx,zynqmp + + - description: Xilinx Kria SOMs (starter) + items: + - const: xlnx,zynqmp-smk-k26-rev1 + - const: xlnx,zynqmp-smk-k26-revB + - const: xlnx,zynqmp-smk-k26-revA + - const: xlnx,zynqmp-smk-k26 + - const: xlnx,zynqmp + + - description: Xilinx Kria Carrier Cards (revA/Y/Z) + items: + - const: xlnx,zynqmp-sk-kv260-revZ + - const: xlnx,zynqmp-sk-kv260-revY + - const: xlnx,zynqmp-sk-kv260-revA + - const: xlnx,zynqmp-sk-k260 + - const: xlnx,zynqmp + + - description: Xilinx Kria Carrier Cards (revB/1) + items: + - const: xlnx,zynqmp-sk-kv260-rev1 + - const: xlnx,zynqmp-sk-kv260-revB + - const: xlnx,zynqmp-sk-k260 + - const: xlnx,zynqmp + additionalProperties: truearch/arm64/boot/dts/xilinx/Makefile +10
-0@@ -17,3 +17,13 @@ dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu104-revA.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu104-revC.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu106-revA.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu111-revA.dtb + +dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sm-k26-revA.dtb +dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-smk-k26-revA.dtb + +som-AA-dtbs := zynqmp-sm-k26-revA.dtb zynqmp-sck-kv-g-revA.dtbo +som-AB-dtbs := zynqmp-sm-k26-revA.dtb zynqmp-sck-kv-g-revB.dtbo +starter-AA-dtbs := zynqmp-smk-k26-revA.dtb zynqmp-sck-kv-g-revA.dtbo +starter-AB-dtbs := zynqmp-smk-k26-revA.dtb zynqmp-sck-kv-g-revB.dtbo + +dtb-$(CONFIG_ARCH_ZYNQMP) += som-AA.dtb som-AB.dtb starter-AA.dtb starter-AB.dtbarch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revA.dts new file +20
-0@@ -0,0 +1,335 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * dts file for KV260 revA Carrier Card + * + * (C) Copyright 2020 - 2021, Xilinx, Inc. + * + * SD level shifter: + * "A" – A01 board un-modified (NXP) + * "Y" – A01 board modified with legacy interposer (Nexperia) + * "Z" – A01 board modified with Diode interposer + * + * Michal Simek <[email protected]> + */ + + #include <dt-bindings/gpio/gpio.h> + #include <dt-bindings/net/ti-dp83867.h> + #include <dt-bindings/phy/phy.h> + #include <dt-bindings/pinctrl/pinctrl-zynqmp.h> + +/dts-v1/;
Quoted 8 lines
arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revA.dts line 26
Quoted 6 lines
arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revA.dts new file +6
-0+/plugin/; + +&{/} { + compatible = "xlnx,zynqmp-sk-kv260-revA", + "xlnx,zynqmp-sk-kv260-revY", + "xlnx,zynqmp-sk-kv260-revZ",The order above is Z, Y, A.
This is overlay which is not checked but I will fix the order to match it.
Thanks,
Michal
Quoted 83 lines · Michal Simek
Hi,
over years couple of drivers were upstream and it is time to sync it up. On the top of it also adding new Kria boards which are using new overlay infrastructure which check if that overlays can be applied to base DT file.
Thanks,
MichalChanges in v2:
- Add reviewed-by from Laurent
- New patch in the series
- New patch in the series
- Use sugar syntax - reported by Geert
- Update copyright years
- Fix SD3.0 comment alignment
- Remove one newline fromMakefileAmit Kumar Mahapatra (1):
arm64: zynqmp: Do not duplicate flash partition label propertyMichal Simek (29):
arm64: zynqmp: Disable CCI by default
arm64: zynqmp: Enablefpd_dmafor zcu104 platforms
arm64: zynqmp: Fix irps5401 device nodes
arm64: zynqmp: Add pinctrl description for all boards
arm64: zynqmp: Correct zcu111 psgtr description
arm64: zynqmp: Wire psgtr for zc1751-xm015
arm64: zynqmp: Correct psgtr description for zcu100-revC
arm64: zynqmp: Add phy description for usb3.0
arm64: zynqmp: Disable WP on zcu111
arm64: zynqmp: Add missing mio-bank properties to dc1 and dc5
arm64: zynqmp: Wire DP and DPDMA for dc1/dc4
arm64: zynqmp: Enable nand driver for dc2 and dc3
arm64: zynqmp: Remove additional newline
arm64: zynqmp: Move clock node tozynqmp-clk-ccf.dtsi
arm64: zynqmp: Add nvmem alises for eeproms
arm64: zynqmp: List reset property for ethernet phy
arm64: zynqmp: Remove can aliases from zc1751
arm64: zynqmp: Move DP nodes to the end of file on zcu106
arm64: zynqmp: Add note about UHS mode on some boards
arm64: zynqmp: Remove information about dma clock on zcu106
arm64: zynqmp: Wire qspi on multiple boards
arm64: zynqmp: Move rtc to different location on zcu104-revA
arm64: zynqmp: Add reset description for sata
arm64: zynqmp: Sync psgtr node location with zcu104-revA
arm64: zynqmp: Remove description for 8T49N287 and si5382 chips
arm64: zynqmp: Add support for zcu102-rev1.1 board
arm64: zynqmp: Enable xlnx,zynqmp-dwc3 driver for xilinx boards
arm64: zynqmp: Add psgtr description to zc1751 dc1 board
arm64: zynqmp: Add support for Xilinx Kria SOM boardMounika Grace Akula (1):
arm64: zynqmp: Add reset-on-timeout to all boards and modify default
timeout valueSrinivas Neeli (1):
arm64: zynqmp: Update rtc calibration valueStefano Stabellini (1):
arm64: zynqmp: Add missing SMID for pcie tozynqmp.dtsi.../devicetree/bindings/arm/xilinx.yaml | 32 ++ arch/arm64/boot/dts/xilinx/Makefile | 11 + .../arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 13 +- .../boot/dts/xilinx/zynqmp-sck-kv-g-revA.dts | 335 +++++++++++++++++ .../boot/dts/xilinx/zynqmp-sck-kv-g-revB.dts | 318 ++++++++++++++++ .../boot/dts/xilinx/zynqmp-sm-k26-revA.dts | 289 +++++++++++++++ .../boot/dts/xilinx/zynqmp-smk-k26-revA.dts | 21 ++ .../boot/dts/xilinx/zynqmp-zc1232-revA.dts | 16 +- .../boot/dts/xilinx/zynqmp-zc1254-revA.dts | 16 +- .../dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 298 ++++++++++++++- .../dts/xilinx/zynqmp-zc1751-xm016-dc2.dts | 342 +++++++++++++++++- .../dts/xilinx/zynqmp-zc1751-xm017-dc3.dts | 23 +- .../dts/xilinx/zynqmp-zc1751-xm018-dc4.dts | 24 +- .../dts/xilinx/zynqmp-zc1751-xm019-dc5.dts | 330 ++++++++++++++++- .../boot/dts/xilinx/zynqmp-zcu100-revC.dts | 264 +++++++++++++- .../boot/dts/xilinx/zynqmp-zcu102-rev1.1.dts | 15 + .../boot/dts/xilinx/zynqmp-zcu102-revA.dts | 321 +++++++++++++++- .../boot/dts/xilinx/zynqmp-zcu102-revB.dts | 3 +- .../boot/dts/xilinx/zynqmp-zcu104-revA.dts | 292 ++++++++++++++- .../boot/dts/xilinx/zynqmp-zcu104-revC.dts | 250 ++++++++++++- .../boot/dts/xilinx/zynqmp-zcu106-revA.dts | 341 ++++++++++++++++-
Quoted 9 lines
.../boot/dts/xilinx/zynqmp-zcu111-revA.dts | 275 +++++++++++++- arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 99 +++-- 23 files changed, 3833 insertions(+), 95 deletions(-) create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revA.dts create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revB.dts create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-smk-k26-revA.dts create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.1.dts
Applied 1-30, 32.
31 and 33 requires newer version.
Thanks,
Michal
Signature · 13 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 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel