ARM: zynq: Sync DTs with U-Boot
Subsystems (2)
Michal Simek
maintainerPATCH 1/15 ARM: zynq: Replace 'io-standard' with 'power-source' property
In reply to Michal SimekFrom: Sai Krishna Potthuri <[email protected]>
Replace 'io-standard' property with 'power-source' property in all zynq dts files to be in sync with Zynq Pinctrl driver.
---
arch/arm/boot/dts/xilinx/zynq-zc702.dts | 22 +++++++++++----------- arch/arm/boot/dts/xilinx/zynq-zc706.dts | 18 +++++++++--------- 2 files changed, 20 insertions(+), 20 deletions(-)
arch/arm/boot/dts/xilinx/zynq-zc702.dts +11 -11
@@ -210,7 +210,7 @@ mux { conf { groups = "can0_9_grp"; slew-rate = <0>; - io-standard = <1>; + power-source = <1>; }; conf-rx {
@@ -233,7 +233,7 @@ mux { conf { groups = "ethernet0_0_grp"; slew-rate = <0>; - io-standard = <4>; + power-source = <4>; }; conf-rx {
@@ -256,7 +256,7 @@ mux-mdio { conf-mdio { groups = "mdio0_0_grp"; slew-rate = <0>; - io-standard = <1>; + power-source = <1>; bias-disable; }; };
@@ -274,7 +274,7 @@ conf { "gpio0_10_grp", "gpio0_11_grp", "gpio0_12_grp", "gpio0_13_grp", "gpio0_14_grp"; slew-rate = <0>; - io-standard = <1>; + power-source = <1>; }; conf-pull-up {
@@ -298,7 +298,7 @@ conf { groups = "i2c0_10_grp"; bias-pull-up; slew-rate = <0>; - io-standard = <1>; + power-source = <1>; }; };
@@ -311,7 +311,7 @@ mux { conf { groups = "gpio0_50_grp", "gpio0_51_grp"; slew-rate = <0>; - io-standard = <1>; + power-source = <1>; }; };
@@ -324,7 +324,7 @@ mux { conf { groups = "sdio0_2_grp"; slew-rate = <0>; - io-standard = <1>; + power-source = <1>; bias-disable; };
@@ -338,7 +338,7 @@ conf-cd { bias-high-impedance; bias-pull-up; slew-rate = <0>; - io-standard = <1>; + power-source = <1>; }; mux-wp {
@@ -351,7 +351,7 @@ conf-wp { bias-high-impedance; bias-pull-up; slew-rate = <0>; - io-standard = <1>; + power-source = <1>; }; };
@@ -364,7 +364,7 @@ mux { conf { groups = "uart1_10_grp"; slew-rate = <0>; - io-standard = <1>; + power-source = <1>; }; conf-rx {
@@ -387,7 +387,7 @@ mux { conf { groups = "usb0_0_grp"; slew-rate = <0>; - io-standard = <1>; + power-source = <1>; }; conf-rx {
arch/arm/boot/dts/xilinx/zynq-zc706.dts +9 -9
@@ -150,7 +150,7 @@ mux { conf { groups = "ethernet0_0_grp"; slew-rate = <0>; - io-standard = <4>; + power-source = <4>; }; conf-rx {
@@ -173,7 +173,7 @@ mux-mdio { conf-mdio { groups = "mdio0_0_grp"; slew-rate = <0>; - io-standard = <1>; + power-source = <1>; bias-disable; }; };
@@ -187,7 +187,7 @@ mux { conf { groups = "gpio0_7_grp", "gpio0_46_grp", "gpio0_47_grp"; slew-rate = <0>; - io-standard = <1>; + power-source = <1>; }; conf-pull-up {
@@ -211,7 +211,7 @@ conf { groups = "i2c0_10_grp"; bias-pull-up; slew-rate = <0>; - io-standard = <1>; + power-source = <1>; }; };
@@ -224,7 +224,7 @@ mux { conf { groups = "sdio0_2_grp"; slew-rate = <0>; - io-standard = <1>; + power-source = <1>; bias-disable; };
@@ -238,7 +238,7 @@ conf-cd { bias-high-impedance; bias-pull-up; slew-rate = <0>; - io-standard = <1>; + power-source = <1>; }; mux-wp {
@@ -251,7 +251,7 @@ conf-wp { bias-high-impedance; bias-pull-up; slew-rate = <0>; - io-standard = <1>; + power-source = <1>; }; };
@@ -264,7 +264,7 @@ mux { conf { groups = "uart1_10_grp"; slew-rate = <0>; - io-standard = <1>; + power-source = <1>; }; conf-rx {
@@ -287,7 +287,7 @@ mux { conf { groups = "usb0_0_grp"; slew-rate = <0>; - io-standard = <1>; + power-source = <1>; }; conf-rx {
Signature · 1 line
2.43.0
Michal Simek
maintainercover ARM: zynq: Sync DTs with U-Boot
Hi,
over years there were some changes pushed to U-Boot which were never merged back to Linux. U-Boot introduced new option OF_UPSTREAM and start to sync up DTs from Linux back to U-Boot.
This series is addressing differences.
There are still 3 more differences but they should be addressed separately.
Thanks,
Michal
Michal Simek (14):
ARM: zynq: Remove deprecated device_type property
ARM: zynq: DT: List OCM memory for all platforms
ARM: zynq: Mark boot-phase-specific device nodes
ARM: zynq: Do not define address/size-cells for nand-controller
ARM: zynq: Wire smcc with nand/nor memories on zc770 platform
ARM: zynq: Add ethernet phy reset information to DT(zc702)
ARM: zynq: Define u-boot bootscrip addr via DT
ARM: zynq: Point via nvmem0 alias to eeprom on zc702/zc706
ARM: zynq: Define rtc alias on zc702/zc706
ARM: zynq: Rename i2c?-gpio to i2c?-gpio-grp
ARM: zynq: Fix fpga region DT nodes name
ARM: zynq: Enable QSPIs on platforms
ARM: zynq: Add sdhci to alias node
ARM: zynq: Remove ethernet0 alias from Microzed
Sai Krishna Potthuri (1):
ARM: zynq: Replace 'io-standard' with 'power-source' property
arch/arm/boot/dts/xilinx/zynq-7000.dtsi | 33 ++++++- arch/arm/boot/dts/xilinx/zynq-cc108.dts | 41 ++++++++- arch/arm/boot/dts/xilinx/zynq-microzed.dts | 10 ++- arch/arm/boot/dts/xilinx/zynq-parallella.dts | 1 - arch/arm/boot/dts/xilinx/zynq-zc702.dts | 87 +++++++++++++------ arch/arm/boot/dts/xilinx/zynq-zc706.dts | 67 +++++++++++--- arch/arm/boot/dts/xilinx/zynq-zc770-xm010.dts | 39 ++++++++- arch/arm/boot/dts/xilinx/zynq-zc770-xm011.dts | 31 +++++++ arch/arm/boot/dts/xilinx/zynq-zc770-xm012.dts | 35 ++++++++ arch/arm/boot/dts/xilinx/zynq-zc770-xm013.dts | 41 ++++++++- arch/arm/boot/dts/xilinx/zynq-zed.dts | 43 ++++++++- .../boot/dts/xilinx/zynq-zturn-common.dtsi | 8 ++ arch/arm/boot/dts/xilinx/zynq-zybo-z7.dts | 10 ++- arch/arm/boot/dts/xilinx/zynq-zybo.dts | 9 +- 14 files changed, 404 insertions(+), 51 deletions(-)
Signature · 1 line
2.43.0
Michal Simek
maintainerPATCH 2/15 ARM: zynq: Remove deprecated device_type property
Based on DT specification device_type property is deprecated and should be used only for cpu and memory nodes. That's why remove other usage. In this case ethernet phy.
---
arch/arm/boot/dts/xilinx/zynq-cc108.dts | 1 - arch/arm/boot/dts/xilinx/zynq-parallella.dts | 1 - arch/arm/boot/dts/xilinx/zynq-zc702.dts | 1 - arch/arm/boot/dts/xilinx/zynq-zc706.dts | 1 - arch/arm/boot/dts/xilinx/zynq-zc770-xm010.dts | 1 - arch/arm/boot/dts/xilinx/zynq-zc770-xm013.dts | 1 - arch/arm/boot/dts/xilinx/zynq-zed.dts | 1 - arch/arm/boot/dts/xilinx/zynq-zybo-z7.dts | 1 - arch/arm/boot/dts/xilinx/zynq-zybo.dts | 1 - 9 files changed, 9 deletions(-)
arch/arm/boot/dts/xilinx/zynq-cc108.dts +0 -1
@@ -48,7 +48,6 @@ &gem0 { ethernet_phy: ethernet-phy@1 { reg = <1>; - device_type = "ethernet-phy"; }; };
arch/arm/boot/dts/xilinx/zynq-parallella.dts +0 -1
@@ -46,7 +46,6 @@ ethernet_phy: ethernet-phy@0 { compatible = "ethernet-phy-id0141.0e90", "ethernet-phy-ieee802.3-c22"; reg = <0>; - device_type = "ethernet-phy"; marvell,reg-init = <0x3 0x10 0xff00 0x1e>, <0x3 0x11 0xfff0 0xa>; };
arch/arm/boot/dts/xilinx/zynq-zc702.dts +0 -1
@@ -95,7 +95,6 @@ &gem0 { ethernet_phy: ethernet-phy@7 { reg = <7>; - device_type = "ethernet-phy"; }; };
arch/arm/boot/dts/xilinx/zynq-zc706.dts +0 -1
@@ -46,7 +46,6 @@ &gem0 { ethernet_phy: ethernet-phy@7 { reg = <7>; - device_type = "ethernet-phy"; }; };
arch/arm/boot/dts/xilinx/zynq-zc770-xm010.dts +0 -1
@@ -45,7 +45,6 @@ &gem0 { ethernet_phy: ethernet-phy@7 { reg = <7>; - device_type = "ethernet-phy"; }; };
arch/arm/boot/dts/xilinx/zynq-zc770-xm013.dts +0 -1
@@ -40,7 +40,6 @@ &gem1 { ethernet_phy: ethernet-phy@7 { reg = <7>; - device_type = "ethernet-phy"; }; };
arch/arm/boot/dts/xilinx/zynq-zed.dts +0 -1
@@ -43,7 +43,6 @@ &gem0 { ethernet_phy: ethernet-phy@0 { reg = <0>; - device_type = "ethernet-phy"; }; };
arch/arm/boot/dts/xilinx/zynq-zybo-z7.dts +0 -1
@@ -49,7 +49,6 @@ &gem0 { ethernet_phy: ethernet-phy@0 { reg = <0>; - device_type = "ethernet-phy"; }; };
arch/arm/boot/dts/xilinx/zynq-zybo.dts +0 -1
@@ -44,7 +44,6 @@ &gem0 { ethernet_phy: ethernet-phy@0 { reg = <0>; - device_type = "ethernet-phy"; }; };
Signature · 1 line
2.43.0
Michal Simek
maintainerPATCH 3/15 ARM: zynq: DT: List OCM memory for all platforms
In reply to Michal SimekMove OCM description from zc702 to all zynq boards.
---
arch/arm/boot/dts/xilinx/zynq-7000.dtsi | 11 +++++++++++ arch/arm/boot/dts/xilinx/zynq-zc702.dts | 13 ------------- 2 files changed, 11 insertions(+), 13 deletions(-)
arch/arm/boot/dts/xilinx/zynq-7000.dtsi +11 -0
@@ -190,6 +190,17 @@ mc: memory-controller@f8006000 { reg = <0xf8006000 0x1000>; }; + ocm: sram@fffc0000 { + compatible = "mmio-sram"; + reg = <0xfffc0000 0x10000>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0xfffc0000 0x10000>; + ocm-sram@0 { + reg = <0x0 0x10000>; + }; + }; + uart0: serial@e0000000 { compatible = "xlnx,xuartps", "cdns,uart-r1p8"; status = "disabled";
arch/arm/boot/dts/xilinx/zynq-zc702.dts +0 -13
@@ -63,19 +63,6 @@ usb_phy0: phy0 { }; }; -&amba { - ocm: sram@fffc0000 { - compatible = "mmio-sram"; - reg = <0xfffc0000 0x10000>; - #address-cells = <1>; - #size-cells = <1>; - ranges = <0 0xfffc0000 0x10000>; - ocm-sram@0 { - reg = <0x0 0x10000>; - }; - }; -}; - &can0 { status = "okay"; pinctrl-names = "default";
Signature · 1 line
2.43.0
Michal Simek
maintainerPATCH 4/15 ARM: zynq: Mark boot-phase-specific device nodes
In reply to Michal SimekTag boot specific device nodes which are required for booting. In our case this is sync up with U-Boot project where all these IPs are already tagged and tested.
---
arch/arm/boot/dts/xilinx/zynq-7000.dtsi | 4 ++++ arch/arm/boot/dts/xilinx/zynq-cc108.dts | 1 + arch/arm/boot/dts/xilinx/zynq-microzed.dts | 2 ++ arch/arm/boot/dts/xilinx/zynq-zc702.dts | 2 ++ arch/arm/boot/dts/xilinx/zynq-zc706.dts | 2 ++ arch/arm/boot/dts/xilinx/zynq-zc770-xm010.dts | 1 + arch/arm/boot/dts/xilinx/zynq-zc770-xm011.dts | 1 + arch/arm/boot/dts/xilinx/zynq-zc770-xm012.dts | 1 + arch/arm/boot/dts/xilinx/zynq-zc770-xm013.dts | 1 + arch/arm/boot/dts/xilinx/zynq-zed.dts | 2 ++ arch/arm/boot/dts/xilinx/zynq-zturn-common.dtsi | 3 +++ arch/arm/boot/dts/xilinx/zynq-zybo-z7.dts | 2 ++ arch/arm/boot/dts/xilinx/zynq-zybo.dts | 2 ++ 13 files changed, 24 insertions(+)
arch/arm/boot/dts/xilinx/zynq-7000.dtsi +4 -0
@@ -93,6 +93,7 @@ replicator_in_port0: endpoint { }; amba: axi { + bootph-all; compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>;
@@ -319,12 +320,14 @@ sdhci1: mmc@e0101000 { }; slcr: slcr@f8000000 { + bootph-all; #address-cells = <1>; #size-cells = <1>; compatible = "xlnx,zynq-slcr", "syscon", "simple-mfd"; reg = <0xF8000000 0x1000>; ranges; clkc: clkc@100 { + bootph-all; #clock-cells = <1>; compatible = "xlnx,ps7-clkc"; fclk-enable = <0>;
@@ -409,6 +412,7 @@ ttc1: timer@f8002000 { }; scutimer: timer@f8f00600 { + bootph-all; interrupt-parent = <&intc>; interrupts = <1 13 0x301>; compatible = "arm,cortex-a9-twd-timer";
arch/arm/boot/dts/xilinx/zynq-cc108.dts +1 -0
@@ -58,6 +58,7 @@ &sdhci1 { }; &uart0 { + bootph-all; status = "okay"; };
arch/arm/boot/dts/xilinx/zynq-microzed.dts +2 -0
@@ -46,10 +46,12 @@ ethernet_phy: ethernet-phy@0 { }; &sdhci0 { + bootph-all; status = "okay"; }; &uart1 { + bootph-all; status = "okay"; };
arch/arm/boot/dts/xilinx/zynq-zc702.dts +2 -0
@@ -390,12 +390,14 @@ conf-tx { }; &sdhci0 { + bootph-all; status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_sdhci0_default>; }; &uart1 { + bootph-all; status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart1_default>;
arch/arm/boot/dts/xilinx/zynq-zc706.dts +2 -0
@@ -303,12 +303,14 @@ conf-tx { }; &sdhci0 { + bootph-all; status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_sdhci0_default>; }; &uart1 { + bootph-all; status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart1_default>;
arch/arm/boot/dts/xilinx/zynq-zc770-xm010.dts +1 -0
@@ -84,6 +84,7 @@ partition@0 { }; &uart1 { + bootph-all; status = "okay"; };
arch/arm/boot/dts/xilinx/zynq-zc770-xm011.dts +1 -0
@@ -54,6 +54,7 @@ &spi0 { }; &uart1 { + bootph-all; status = "okay"; };
arch/arm/boot/dts/xilinx/zynq-zc770-xm012.dts +1 -0
@@ -60,5 +60,6 @@ &spi1 { }; &uart1 { + bootph-all; status = "okay"; };
arch/arm/boot/dts/xilinx/zynq-zc770-xm013.dts +1 -0
@@ -72,5 +72,6 @@ eeprom: eeprom@2 { }; &uart0 { + bootph-all; status = "okay"; };
arch/arm/boot/dts/xilinx/zynq-zed.dts +2 -0
@@ -47,10 +47,12 @@ ethernet_phy: ethernet-phy@0 { }; &sdhci0 { + bootph-all; status = "okay"; }; &uart1 { + bootph-all; status = "okay"; };
arch/arm/boot/dts/xilinx/zynq-zturn-common.dtsi +3 -0
@@ -73,14 +73,17 @@ ethernet_phy: ethernet-phy@0 { }; &sdhci0 { + bootph-all; status = "okay"; }; &uart0 { + bootph-all; status = "okay"; }; &uart1 { + bootph-all; status = "okay"; };
arch/arm/boot/dts/xilinx/zynq-zybo-z7.dts +2 -0
@@ -53,10 +53,12 @@ ethernet_phy: ethernet-phy@0 { }; &sdhci0 { + bootph-all; status = "okay"; }; &uart1 { + bootph-all; status = "okay"; };
arch/arm/boot/dts/xilinx/zynq-zybo.dts +2 -0
@@ -48,10 +48,12 @@ ethernet_phy: ethernet-phy@0 { }; &sdhci0 { + bootph-all; status = "okay"; }; &uart1 { + bootph-all; status = "okay"; };
Signature · 1 line
2.43.0
Michal Simek
maintainerPATCH 5/15 ARM: zynq: Do not define address/size-cells for nand-controller
In reply to Michal SimekThere is no reason to define address/size-cells without defining child nodes. That's why remove them.
---
arch/arm/boot/dts/xilinx/zynq-7000.dtsi | 2 -- 1 file changed, 2 deletions(-)
arch/arm/boot/dts/xilinx/zynq-7000.dtsi +0 -2
@@ -294,8 +294,6 @@ nfc0: nand-controller@0,0 { compatible = "arm,pl353-nand-r2p1"; reg = <0 0 0x1000000>; status = "disabled"; - #address-cells = <1>; - #size-cells = <0>; }; };
Signature · 1 line
2.43.0
Michal Simek
maintainerPATCH 6/15 ARM: zynq: Wire smcc with nand/nor memories on zc770 platform
In reply to Michal SimekDescribe nor child flash node under smcc and enable it for xm012 extension card. And also describe nand flash memory for xm011 card.
---
arch/arm/boot/dts/xilinx/zynq-7000.dtsi | 7 ++++ arch/arm/boot/dts/xilinx/zynq-zc770-xm011.dts | 30 ++++++++++++++++ arch/arm/boot/dts/xilinx/zynq-zc770-xm012.dts | 34 +++++++++++++++++++ 3 files changed, 71 insertions(+)
arch/arm/boot/dts/xilinx/zynq-7000.dtsi +7 -0
@@ -289,12 +289,19 @@ smcc: memory-controller@e000e000 { 0x2 0x0 0xe4000000 0x2000000>; /* SRAM/NOR CS1 region */ #address-cells = <2>; #size-cells = <1>; + interrupt-parent = <&intc>; + interrupts = <0 18 4>; nfc0: nand-controller@0,0 { compatible = "arm,pl353-nand-r2p1"; reg = <0 0 0x1000000>; status = "disabled"; }; + nor0: flash@1,0 { + status = "disabled"; + compatible = "cfi-flash"; + reg = <1 0 0x2000000>; + }; }; sdhci0: mmc@e0100000 {
arch/arm/boot/dts/xilinx/zynq-zc770-xm011.dts +30 -0
@@ -47,6 +47,36 @@ eeprom: eeprom@52 { }; }; +&nfc0 { + status = "okay"; + #address-cells = <1>; + #size-cells = <0>; + nand@0 { + reg = <0>; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + partition@0 { + label = "nand-fsbl-uboot"; + reg = <0x0 0x1000000>; + }; + partition@1000000 { + label = "nand-linux"; + reg = <0x1000000 0x2000000>; + }; + partition@3000000 { + label = "nand-rootfs"; + reg = <0x3000000 0x200000>; + }; + }; + }; +}; + +&smcc { + status = "okay"; +}; + &spi0 { status = "okay"; num-cs = <4>;
arch/arm/boot/dts/xilinx/zynq-zc770-xm012.dts +34 -0
@@ -53,6 +53,40 @@ eeprom1: eeprom@52 { }; }; +&nor0 { + status = "okay"; + bank-width = <1>; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + partition@0 { + label = "nor-fsbl-uboot"; + reg = <0x0 0x100000>; + }; + partition@100000 { + label = "nor-linux"; + reg = <0x100000 0x500000>; + }; + partition@600000 { + label = "nor-device-tree"; + reg = <0x600000 0x20000>; + }; + partition@620000 { + label = "nor-rootfs"; + reg = <0x620000 0x5e0000>; + }; + partition@c00000 { + label = "nor-bitstream"; + reg = <0xc00000 0x400000>; + }; + }; +}; + +&smcc { + status = "okay"; +}; + &spi1 { status = "okay"; num-cs = <4>;
Signature · 1 line
2.43.0
Michal Simek
maintainerPATCH 7/15 ARM: zynq: Add ethernet phy reset information to DT(zc702)
In reply to Michal SimekAdded phy reset gpio information for gem0.
---
arch/arm/boot/dts/xilinx/zynq-zc702.dts | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/boot/dts/xilinx/zynq-zc702.dts +2 -0
@@ -79,6 +79,8 @@ &gem0 { phy-handle = <ðernet_phy>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gem0_default>; + phy-reset-gpio = <&gpio0 11 0>; + phy-reset-active-low; ethernet_phy: ethernet-phy@7 { reg = <7>;
Signature · 1 line
2.43.0
Michal Simek
maintainerPATCH 8/15 ARM: zynq: Define u-boot bootscrip addr via DT
In reply to Michal SimekDefine bootscript address in RAM via DT property. Adding default value to common DTSI. Platform DT description can remove this property or rewrite it.
---
bootscr-address is documented in dt-schema already.
--- arch/arm/boot/dts/xilinx/zynq-7000.dtsi | 7 +++++++ 1 file changed, 7 insertions(+)
arch/arm/boot/dts/xilinx/zynq-7000.dtsi +7 -0
@@ -8,6 +8,13 @@ / { #size-cells = <1>; compatible = "xlnx,zynq-7000"; + options { + u-boot { + compatible = "u-boot,config"; + bootscr-address = /bits/ 64 <0x3000000>; + }; + }; + cpus { #address-cells = <1>; #size-cells = <0>;
Signature · 1 line
2.43.0
Michal Simek
maintainerPATCH 9/15 ARM: zynq: Point via nvmem0 alias to eeprom on zc702/zc706
In reply to Michal SimekEEPROM stores identification information about board like a board name, revision, serial number and ethernet MAC address. U-Boot is capable to read nvmemX aliases and read/display provided information when nvmem alias link is described.
---
arch/arm/boot/dts/xilinx/zynq-zc702.dts | 3 ++- arch/arm/boot/dts/xilinx/zynq-zc706.dts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
arch/arm/boot/dts/xilinx/zynq-zc702.dts +2 -1
@@ -16,6 +16,7 @@ aliases { i2c0 = &i2c0; serial0 = &uart1; mmc0 = &sdhci0; + nvmem0 = &eeprom; }; memory@0 {
@@ -140,7 +141,7 @@ i2c@2 { #address-cells = <1>; #size-cells = <0>; reg = <2>; - eeprom@54 { + eeprom: eeprom@54 { compatible = "atmel,24c08"; reg = <0x54>; };
arch/arm/boot/dts/xilinx/zynq-zc706.dts +2 -1
@@ -15,6 +15,7 @@ aliases { i2c0 = &i2c0; serial0 = &uart1; mmc0 = &sdhci0; + nvmem0 = &eeprom; }; memory@0 {
@@ -99,7 +100,7 @@ i2c@2 { #address-cells = <1>; #size-cells = <0>; reg = <2>; - eeprom@54 { + eeprom: eeprom@54 { compatible = "atmel,24c08"; reg = <0x54>; };
Signature · 1 line
2.43.0
Michal Simek
maintainerPATCH 10/15 ARM: zynq: Define rtc alias on zc702/zc706
In reply to Michal SimekDefine rtc alias on zc702/zc706 boards.
---
arch/arm/boot/dts/xilinx/zynq-zc702.dts | 3 ++- arch/arm/boot/dts/xilinx/zynq-zc706.dts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
arch/arm/boot/dts/xilinx/zynq-zc702.dts +2 -1
@@ -17,6 +17,7 @@ aliases { serial0 = &uart1; mmc0 = &sdhci0; nvmem0 = &eeprom; + rtc0 = &rtc; }; memory@0 {
@@ -163,7 +164,7 @@ i2c@4 { #address-cells = <1>; #size-cells = <0>; reg = <4>; - rtc@51 { + rtc: rtc@51 { compatible = "nxp,pcf8563"; reg = <0x51>; };
arch/arm/boot/dts/xilinx/zynq-zc706.dts +2 -1
@@ -16,6 +16,7 @@ aliases { serial0 = &uart1; mmc0 = &sdhci0; nvmem0 = &eeprom; + rtc0 = &rtc; }; memory@0 {
@@ -122,7 +123,7 @@ i2c@4 { #address-cells = <1>; #size-cells = <0>; reg = <4>; - rtc@51 { + rtc: rtc@51 { compatible = "nxp,pcf8563"; reg = <0x51>; };
Signature · 1 line
2.43.0
Michal Simek
maintainerPATCH 11/15 ARM: zynq: Rename i2c?-gpio to i2c?-gpio-grp
In reply to Michal SimekAnything ending with gpio/gpios is taken as gpio phande/description which is reported as the issue coming from gpio-consumer.yaml schema. That's why rename the gpio suffix to gpio-grp to avoid name collision.
---
arch/arm/boot/dts/xilinx/zynq-zc702.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/xilinx/zynq-zc702.dts +1 -1
@@ -292,7 +292,7 @@ conf { }; }; - pinctrl_i2c0_gpio: i2c0-gpio { + pinctrl_i2c0_gpio: i2c0-gpio-grp { mux { groups = "gpio0_50_grp", "gpio0_51_grp"; function = "gpio0";
Signature · 1 line
2.43.0
Michal Simek
maintainerPATCH 12/15 ARM: zynq: Fix fpga region DT nodes name
In reply to Michal Simekfpga-full is not aligned with the latest dt-schema. Generic name fpga-region should be used.
---
arch/arm/boot/dts/xilinx/zynq-7000.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/xilinx/zynq-7000.dtsi +1 -1
@@ -41,7 +41,7 @@ cpu1: cpu@1 { }; }; - fpga_full: fpga-full { + fpga_full: fpga-region { compatible = "fpga-region"; fpga-mgr = <&devcfg>; #address-cells = <1>;
Signature · 1 line
2.43.0
Michal Simek
maintainerPATCH 13/15 ARM: zynq: Enable QSPIs on platforms
In reply to Michal SimekEnable QSPIs with default MTD layout used for testing.
Zybos, Microzed and Zturn are only enabling controller without specifying MTD map.
---
arch/arm/boot/dts/xilinx/zynq-cc108.dts | 39 ++++++++++++++++++ arch/arm/boot/dts/xilinx/zynq-microzed.dts | 6 +++ arch/arm/boot/dts/xilinx/zynq-zc702.dts | 39 ++++++++++++++++++ arch/arm/boot/dts/xilinx/zynq-zc706.dts | 40 +++++++++++++++++++ arch/arm/boot/dts/xilinx/zynq-zc770-xm010.dts | 37 +++++++++++++++++ arch/arm/boot/dts/xilinx/zynq-zc770-xm013.dts | 39 ++++++++++++++++++ arch/arm/boot/dts/xilinx/zynq-zed.dts | 40 +++++++++++++++++++ .../boot/dts/xilinx/zynq-zturn-common.dtsi | 5 +++ arch/arm/boot/dts/xilinx/zynq-zybo-z7.dts | 6 +++ arch/arm/boot/dts/xilinx/zynq-zybo.dts | 6 +++ 10 files changed, 257 insertions(+)
arch/arm/boot/dts/xilinx/zynq-cc108.dts +39 -0
@@ -18,6 +18,7 @@ / { aliases { ethernet0 = &gem0; serial0 = &uart0; + spi0 = &qspi; }; chosen {
@@ -51,6 +52,44 @@ ethernet_phy: ethernet-phy@1 { }; }; +&qspi { + status = "okay"; + num-cs = <1>; + flash@0 { /* 16 MB */ + compatible = "jedec,spi-nor"; + reg = <0x0>; + spi-max-frequency = <50000000>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <4>; + #address-cells = <1>; + #size-cells = <1>; + partition@0 { + label = "qspi-fsbl-uboot-bs"; + reg = <0x0 0x400000>; /* 4MB */ + }; + partition@400000 { + label = "qspi-linux"; + reg = <0x400000 0x400000>; /* 4MB */ + }; + partition@800000 { + label = "qspi-rootfs"; + reg = <0x800000 0x400000>; /* 4MB */ + }; + partition@c00000 { + label = "qspi-devicetree"; + reg = <0xc00000 0x100000>; /* 1MB */ + }; + partition@d00000 { + label = "qspi-scratch"; + reg = <0xd00000 0x200000>; /* 2MB */ + }; + partition@f00000 { + label = "qspi-uboot-env"; + reg = <0xf00000 0x100000>; /* 1MB */ + }; + }; +}; + &sdhci1 { status = "okay"; broken-cd ;
arch/arm/boot/dts/xilinx/zynq-microzed.dts +6 -0
@@ -13,6 +13,7 @@ / { aliases { ethernet0 = &gem0; serial0 = &uart1; + spi0 = &qspi; }; memory@0 {
@@ -35,6 +36,11 @@ &clkc { ps-clk-frequency = <33333333>; }; +&qspi { + bootph-all; + status = "okay"; +}; + &gem0 { status = "okay"; phy-mode = "rgmii-id";
arch/arm/boot/dts/xilinx/zynq-zc702.dts +39 -0
@@ -15,6 +15,7 @@ aliases { ethernet0 = &gem0; i2c0 = &i2c0; serial0 = &uart1; + spi0 = &qspi; mmc0 = &sdhci0; nvmem0 = &eeprom; rtc0 = &rtc;
@@ -393,6 +394,44 @@ conf-tx { }; }; +&qspi { + bootph-all; + status = "okay"; + num-cs = <1>; + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0x0>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <4>; + spi-max-frequency = <50000000>; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + partition@0 { + label = "qspi-fsbl-uboot"; + reg = <0x0 0x100000>; + }; + partition@100000 { + label = "qspi-linux"; + reg = <0x100000 0x500000>; + }; + partition@600000 { + label = "qspi-device-tree"; + reg = <0x600000 0x20000>; + }; + partition@620000 { + label = "qspi-rootfs"; + reg = <0x620000 0x5e0000>; + }; + partition@c00000 { + label = "qspi-bitstream"; + reg = <0xc00000 0x400000>; + }; + }; + }; +}; + &sdhci0 { bootph-all; status = "okay";
arch/arm/boot/dts/xilinx/zynq-zc706.dts +40 -0
@@ -14,6 +14,7 @@ aliases { ethernet0 = &gem0; i2c0 = &i2c0; serial0 = &uart1; + spi0 = &qspi; mmc0 = &sdhci0; nvmem0 = &eeprom; rtc0 = &rtc;
@@ -304,6 +305,45 @@ conf-tx { }; }; +&qspi { + bootph-all; + status = "okay"; + num-cs = <2>; + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>, <1>; + parallel-memories = /bits/ 64 <0x1000000 0x1000000>; /* 16MB */ + spi-tx-bus-width = <1>; + spi-rx-bus-width = <4>; + spi-max-frequency = <50000000>; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + partition@0 { + label = "qspi-fsbl-uboot"; + reg = <0x0 0x100000>; + }; + partition@100000 { + label = "qspi-linux"; + reg = <0x100000 0x500000>; + }; + partition@600000 { + label = "qspi-device-tree"; + reg = <0x600000 0x20000>; + }; + partition@620000 { + label = "qspi-rootfs"; + reg = <0x620000 0x5e0000>; + }; + partition@c00000 { + label = "qspi-bitstream"; + reg = <0xc00000 0x400000>; + }; + }; + }; +}; + &sdhci0 { bootph-all; status = "okay";
arch/arm/boot/dts/xilinx/zynq-zc770-xm010.dts +37 -0
@@ -15,6 +15,7 @@ aliases { ethernet0 = &gem0; i2c0 = &i2c0; serial0 = &uart1; + spi0 = &qspi; spi1 = &spi1; };
@@ -56,7 +57,43 @@ eeprom: eeprom@52 { compatible = "atmel,24c02"; reg = <0x52>; }; +}; +&qspi { + status = "okay"; + num-cs = <1>; + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0x0>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <4>; + spi-max-frequency = <50000000>; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + partition@0 { + label = "qspi-fsbl-uboot"; + reg = <0x0 0x100000>; + }; + partition@100000 { + label = "qspi-linux"; + reg = <0x100000 0x500000>; + }; + partition@600000 { + label = "qspi-device-tree"; + reg = <0x600000 0x20000>; + }; + partition@620000 { + label = "qspi-rootfs"; + reg = <0x620000 0x5e0000>; + }; + partition@c00000 { + label = "qspi-bitstream"; + reg = <0xc00000 0x400000>; + }; + }; + }; }; &sdhci0 {
arch/arm/boot/dts/xilinx/zynq-zc770-xm013.dts +39 -0
@@ -15,6 +15,7 @@ aliases { ethernet0 = &gem1; i2c0 = &i2c1; serial0 = &uart0; + spi0 = &qspi; spi1 = &spi0; };
@@ -57,6 +58,44 @@ si570: clock-generator@55 { }; }; +&qspi { + status = "okay"; + num-cs = <2>; + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>, <1>; + parallel-memories = /bits/ 64 <0x1000000 0x1000000>; /* 16MB */ + spi-tx-bus-width = <1>; + spi-rx-bus-width = <4>; + spi-max-frequency = <50000000>; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + partition@0 { + label = "qspi-fsbl-uboot"; + reg = <0x0 0x100000>; + }; + partition@100000 { + label = "qspi-linux"; + reg = <0x100000 0x500000>; + }; + partition@600000 { + label = "qspi-device-tree"; + reg = <0x600000 0x20000>; + }; + partition@620000 { + label = "qspi-rootfs"; + reg = <0x620000 0x5e0000>; + }; + partition@c00000 { + label = "qspi-bitstream"; + reg = <0xc00000 0x400000>; + }; + }; + }; +}; + &spi0 { status = "okay"; num-cs = <4>;
arch/arm/boot/dts/xilinx/zynq-zed.dts +40 -0
@@ -13,6 +13,7 @@ / { aliases { ethernet0 = &gem0; serial0 = &uart1; + spi0 = &qspi; mmc0 = &sdhci0; };
@@ -46,6 +47,45 @@ ethernet_phy: ethernet-phy@0 { }; }; +&qspi { + bootph-all; + status = "okay"; + num-cs = <1>; + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <4>; + spi-max-frequency = <50000000>; + m25p,fast-read; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + partition@0 { + label = "qspi-fsbl-uboot"; + reg = <0x0 0x100000>; + }; + partition@100000 { + label = "qspi-linux"; + reg = <0x100000 0x500000>; + }; + partition@600000 { + label = "qspi-device-tree"; + reg = <0x600000 0x20000>; + }; + partition@620000 { + label = "qspi-rootfs"; + reg = <0x620000 0x5e0000>; + }; + partition@c00000 { + label = "qspi-bitstream"; + reg = <0xc00000 0x400000>; + }; + }; + }; +}; + &sdhci0 { bootph-all; status = "okay";
arch/arm/boot/dts/xilinx/zynq-zturn-common.dtsi +5 -0
@@ -63,6 +63,11 @@ &clkc { ps-clk-frequency = <33333333>; }; +&qspi { + bootph-all; + status = "okay"; +}; + &gem0 { status = "okay"; phy-mode = "rgmii-id";
arch/arm/boot/dts/xilinx/zynq-zybo-z7.dts +6 -0
@@ -10,6 +10,7 @@ / { aliases { ethernet0 = &gem0; serial0 = &uart1; + spi0 = &qspi; }; memory@0 {
@@ -52,6 +53,11 @@ ethernet_phy: ethernet-phy@0 { }; }; +&qspi { + bootph-all; + status = "okay"; +}; + &sdhci0 { bootph-all; status = "okay";
arch/arm/boot/dts/xilinx/zynq-zybo.dts +6 -0
@@ -13,6 +13,7 @@ / { aliases { ethernet0 = &gem0; serial0 = &uart1; + spi0 = &qspi; mmc0 = &sdhci0; };
@@ -47,6 +48,11 @@ ethernet_phy: ethernet-phy@0 { }; }; +&qspi { + bootph-all; + status = "okay"; +}; + &sdhci0 { bootph-all; status = "okay";
Signature · 1 line
2.43.0
Michal Simek
maintainerPATCH 14/15 ARM: zynq: Add sdhci to alias node
In reply to Michal SimekEnsure that controller will all the time use the same ID.
---
arch/arm/boot/dts/xilinx/zynq-microzed.dts | 1 + arch/arm/boot/dts/xilinx/zynq-zybo-z7.dts | 1 + 2 files changed, 2 insertions(+)
arch/arm/boot/dts/xilinx/zynq-microzed.dts +1 -0
@@ -14,6 +14,7 @@ aliases { ethernet0 = &gem0; serial0 = &uart1; spi0 = &qspi; + mmc0 = &sdhci0; }; memory@0 {
arch/arm/boot/dts/xilinx/zynq-zybo-z7.dts +1 -0
@@ -11,6 +11,7 @@ aliases { ethernet0 = &gem0; serial0 = &uart1; spi0 = &qspi; + mmc0 = &sdhci0; }; memory@0 {
Signature · 1 line
2.43.0
Michal Simek
maintainerPATCH 15/15 ARM: zynq: Remove ethernet0 alias from Microzed
In reply to Michal SimekEthernet is not using alias for ID assignment that's why alias is not needed and can be removed.
---
arch/arm/boot/dts/xilinx/zynq-microzed.dts | 1 - 1 file changed, 1 deletion(-)
arch/arm/boot/dts/xilinx/zynq-microzed.dts +0 -1
@@ -11,7 +11,6 @@ / { compatible = "avnet,zynq-microzed", "xlnx,zynq-microzed", "xlnx,zynq-7000"; aliases { - ethernet0 = &gem0; serial0 = &uart1; spi0 = &qspi; mmc0 = &sdhci0;
Signature · 1 line
2.43.0
Re: [PATCH 07/15] ARM: zynq: Add ethernet phy reset information to DT(zc702)
In reply to Michal SimekQuoted 13 lines · Michal Simek
Added phy reset gpio information for gem0.
Signed-off-by Michal Simek <[email protected]>---
arch/arm/boot/dts/xilinx/zynq-zc702.dts | 2 ++ 1 file changed, 2 insertions(+)arch/arm/boot/dts/xilinx/zynq-zc702.dts +0
-0
arch/arm/boot/dts/xilinx/zynq-zc702.dts &gem0 { · line 83
Quoted 5 lines
arch/arm/boot/dts/xilinx/zynq-zc702.dts +2
-0@@ -79,6 +79,8 @@ &gem0 { phy-handle = <ðernet_phy>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gem0_default>; + phy-reset-gpio = <&gpio0 11 0>; + phy-reset-active-low;
Hi Michal
Could you point me at code which actually implements these two properties.
What is more normal is a reset-gpios property in the PHY node, or a reset-gpios in the MDIO node.
Andrew
Michal Simek
maintainerRe: [PATCH 07/15] ARM: zynq: Add ethernet phy reset information to DT(zc702)
Hi Andrew,
Quoted 22 lines · Andrew Lunn
Quoted 13 lines · Michal Simek
Added phy reset gpio information for gem0.
Signed-off-by Michal Simek <[email protected]>---
arch/arm/boot/dts/xilinx/zynq-zc702.dts | 2 ++ 1 file changed, 2 insertions(+)arch/arm/boot/dts/xilinx/zynq-zc702.dts +0
-0arch/arm/boot/dts/xilinx/zynq-zc702.dts &gem0 { · line 83
Quoted 5 lines
arch/arm/boot/dts/xilinx/zynq-zc702.dts +2
-0@@ -79,6 +79,8 @@ &gem0 { phy-handle = <ðernet_phy>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gem0_default>; + phy-reset-gpio = <&gpio0 11 0>; + phy-reset-active-low;Hi Michal
Quoted 2 lines
Could you point me at code which actually implements these two properties.
I have tracked it down and it was only used from 2016 to 2018 in Xilinx downstream Linux repository. After that it was removed.
If you are interested
https://gitenterprise.xilinx.com/Linux/linux-xlnx/commit/6f43a25c416e532530eaed897acff6f5249907e4
Quoted 3 lines
What is more normal is a reset-gpios property in the PHY node, or a reset-gpios in the MDIO node.
Thanks for review. This patch should be dropped from this series.
Thanks,
Michal
Re: [PATCH 07/15] ARM: zynq: Add ethernet phy reset information to DT(zc702)
Quoted 25 lines · Michal Simek
Hi Andrew,
Quoted 22 lines · Andrew Lunn
Quoted 13 lines · Michal Simek
Added phy reset gpio information for gem0.
Signed-off-by Michal Simek <[email protected]>---
arch/arm/boot/dts/xilinx/zynq-zc702.dts | 2 ++ 1 file changed, 2 insertions(+)arch/arm/boot/dts/xilinx/zynq-zc702.dts +0
-0arch/arm/boot/dts/xilinx/zynq-zc702.dts &gem0 { · line 83
Quoted 5 lines
arch/arm/boot/dts/xilinx/zynq-zc702.dts +2
-0@@ -79,6 +79,8 @@ &gem0 { phy-handle = <ðernet_phy>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gem0_default>; + phy-reset-gpio = <&gpio0 11 0>; + phy-reset-active-low;Hi Michal
Quoted 5 lines
Quoted 2 lines
Could you point me at code which actually implements these two properties.
I have tracked it down and it was only used from 2016 to 2018 in Xilinx downstream Linux repository. After that it was removed.
O.K. So when you ran the DT lint tools to validate these DT changes, why did it not give errors pointing this out?
I wounder how many other such errors there are in this patchset?
Andrew
Michal Simek
maintainerRe: [PATCH 07/15] ARM: zynq: Add ethernet phy reset information to DT(zc702)
Quoted 29 lines · Andrew Lunn
Quoted 28 lines · Michal Simek
Hi Andrew,
Quoted 24 lines · Andrew Lunn
Quoted 13 lines · Michal Simek
Added phy reset gpio information for gem0.
Signed-off-by Michal Simek <[email protected]>---
arch/arm/boot/dts/xilinx/zynq-zc702.dts | 2 ++ 1 file changed, 2 insertions(+)arch/arm/boot/dts/xilinx/zynq-zc702.dts +0
-0arch/arm/boot/dts/xilinx/zynq-zc702.dts &gem0 { · line 83
Quoted 5 lines
arch/arm/boot/dts/xilinx/zynq-zc702.dts +2
-0@@ -79,6 +79,8 @@ &gem0 { phy-handle = <ðernet_phy>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gem0_default>; + phy-reset-gpio = <&gpio0 11 0>; + phy-reset-active-low;Hi Michal
Could you point me at code which actually implements these two properties.
Quoted 7 lines
Quoted 2 lines
I have tracked it down and it was only used from 2016 to 2018 in Xilinx downstream Linux repository. After that it was removed.
O.K. So when you ran the DT lint tools to validate these DT changes, why did it not give errors pointing this out?
I wounder how many other such errors there are in this patchset?
That's definitely valid concern.
I was running it but for all files there are a lot of other issues generated that I missed this one.
../linux/arch/arm/boot/dts/xilinx/zynq-zc702.dtb: ethernet@e000b000: Unevaluated properties are not allowed ('phy-reset-active-low', 'phy-reset-gpio' were unexpected)
Thanks,
Michal
Rob Herring (Arm)
maintainerQuoted 47 lines · Michal Simek
Hi,
over years there were some changes pushed to U-Boot which were never merged back to Linux. U-Boot introduced new option
OF_UPSTREAMand start to sync up DTs from Linux back to U-Boot.
This series is addressing differences.
There are still 3 more differences but they should be addressed separately.Thanks,
MichalMichal Simek (14):
ARM: zynq: Remove deprecateddevice_typeproperty
ARM: zynq: DT: List OCM memory for all platforms
ARM: zynq: Mark boot-phase-specific device nodes
ARM: zynq: Do not define address/size-cells for nand-controller
ARM: zynq: Wire smcc with nand/nor memories on zc770 platform
ARM: zynq: Add ethernet phy reset information to DT(zc702)
ARM: zynq: Define u-boot bootscrip addr via DT
ARM: zynq: Point via nvmem0 alias to eeprom on zc702/zc706
ARM: zynq: Define rtc alias on zc702/zc706
ARM: zynq: Rename i2c?-gpio to i2c?-gpio-grp
ARM: zynq: Fix fpga region DT nodes name
ARM: zynq: Enable QSPIs on platforms
ARM: zynq: Add sdhci to alias node
ARM: zynq: Remove ethernet0 alias from MicrozedSai Krishna Potthuri (1):
ARM: zynq: Replace 'io-standard' with 'power-source' propertyarch/arm/boot/dts/xilinx/zynq-7000.dtsi | 33 ++++++- arch/arm/boot/dts/xilinx/zynq-cc108.dts | 41 ++++++++- arch/arm/boot/dts/xilinx/zynq-microzed.dts | 10 ++- arch/arm/boot/dts/xilinx/zynq-parallella.dts | 1 - arch/arm/boot/dts/xilinx/zynq-zc702.dts | 87 +++++++++++++------ arch/arm/boot/dts/xilinx/zynq-zc706.dts | 67 +++++++++++--- arch/arm/boot/dts/xilinx/zynq-zc770-xm010.dts | 39 ++++++++- arch/arm/boot/dts/xilinx/zynq-zc770-xm011.dts | 31 +++++++ arch/arm/boot/dts/xilinx/zynq-zc770-xm012.dts | 35 ++++++++ arch/arm/boot/dts/xilinx/zynq-zc770-xm013.dts | 41 ++++++++- arch/arm/boot/dts/xilinx/zynq-zed.dts | 43 ++++++++- .../boot/dts/xilinx/zynq-zturn-common.dtsi | 8 ++ arch/arm/boot/dts/xilinx/zynq-zybo-z7.dts | 10 ++- arch/arm/boot/dts/xilinx/zynq-zybo.dts | 9 +- 14 files changed, 404 insertions(+), 51 deletions(-)
Quoted 5 lines
--
2.43.0
My bot found new DTB warnings on the .dts files added or changed in this series.
Some warnings may be from an existing SoC .dtsi. Or perhaps the warnings are fixed by another series. Ultimately, it is up to the platform maintainer whether these warnings are acceptable or not. No need to reply unless the platform maintainer has comments.
If you already ran DT checks and didn't see these error(s), then make sure dt-schema is up to date:
pip3 install dtschema --upgrade
New warnings running 'make CHECK_DTBS=y xilinx/zynq-cc108.dtb xilinx/zynq-microzed.dtb xilinx/zynq-parallella.dtb xilinx/zynq-zc702.dtb xilinx/zynq-zc706.dtb xilinx/zynq-zc770-xm010.dtb xilinx/zynq-zc770-xm011.dtb xilinx/zynq-zc770-xm012.dtb xilinx/zynq-zc770-xm013.dtb xilinx/zynq-zed.dtb xilinx/zynq-zybo-z7.dtb xilinx/zynq-zybo.dtb' for [email protected]:
arch/arm/boot/dts/xilinx/zynq-parallella.dtb: ethernet@e000b000: ethernet-phy@0: Unevaluated properties are not allowed ('marvell,reg-init' was unexpected)
from schema $id: http://devicetree.org/schemas/net/cdns,macb.yaml#arch/arm/boot/dts/xilinx/zynq-zc702.dtb: ethernet@e000b000: Unevaluated properties are not allowed ('phy-reset-active-low', 'phy-reset-gpio' were unexpected)
from schema $id: http://devicetree.org/schemas/net/cdns,macb.yaml#
Re: [PATCH 01/15] ARM: zynq: Replace 'io-standard' with 'power-source' property
In reply to Michal SimekQuoted 8 lines · Michal Simek
From: Sai Krishna Potthuri <[email protected]>
Replace 'io-standard' property with 'power-source' property in all zynq dts files to be in sync with Zynq Pinctrl driver.
Signed-off-by Sai Krishna Potthuri <[email protected]>Signed-off-by Michal Simek <[email protected]>Signed-off-by Michal Simek <[email protected]>
Review
Quoted 3 lines
slew-rate = <0>;(quoted diff) +1
-1- io-standard = <1>; + power-source = <1>;
It would be nice to replace those magic numbers with the corresponding IO_STANDARD_* defines for readability.
Signature · 1 line
Bye, Peter Korsgaard
Michal Simek
maintainerQuoted 67 lines · Rob Herring (Arm)
Quoted 47 lines · Michal Simek
Hi,
over years there were some changes pushed to U-Boot which were never merged back to Linux. U-Boot introduced new option
OF_UPSTREAMand start to sync up DTs from Linux back to U-Boot.
This series is addressing differences.
There are still 3 more differences but they should be addressed separately.Thanks,
MichalMichal Simek (14):
ARM: zynq: Remove deprecateddevice_typeproperty
ARM: zynq: DT: List OCM memory for all platforms
ARM: zynq: Mark boot-phase-specific device nodes
ARM: zynq: Do not define address/size-cells for nand-controller
ARM: zynq: Wire smcc with nand/nor memories on zc770 platform
ARM: zynq: Add ethernet phy reset information to DT(zc702)
ARM: zynq: Define u-boot bootscrip addr via DT
ARM: zynq: Point via nvmem0 alias to eeprom on zc702/zc706
ARM: zynq: Define rtc alias on zc702/zc706
ARM: zynq: Rename i2c?-gpio to i2c?-gpio-grp
ARM: zynq: Fix fpga region DT nodes name
ARM: zynq: Enable QSPIs on platforms
ARM: zynq: Add sdhci to alias node
ARM: zynq: Remove ethernet0 alias from MicrozedSai Krishna Potthuri (1):
ARM: zynq: Replace 'io-standard' with 'power-source' propertyarch/arm/boot/dts/xilinx/zynq-7000.dtsi | 33 ++++++- arch/arm/boot/dts/xilinx/zynq-cc108.dts | 41 ++++++++- arch/arm/boot/dts/xilinx/zynq-microzed.dts | 10 ++- arch/arm/boot/dts/xilinx/zynq-parallella.dts | 1 - arch/arm/boot/dts/xilinx/zynq-zc702.dts | 87 +++++++++++++------ arch/arm/boot/dts/xilinx/zynq-zc706.dts | 67 +++++++++++--- arch/arm/boot/dts/xilinx/zynq-zc770-xm010.dts | 39 ++++++++- arch/arm/boot/dts/xilinx/zynq-zc770-xm011.dts | 31 +++++++ arch/arm/boot/dts/xilinx/zynq-zc770-xm012.dts | 35 ++++++++ arch/arm/boot/dts/xilinx/zynq-zc770-xm013.dts | 41 ++++++++- arch/arm/boot/dts/xilinx/zynq-zed.dts | 43 ++++++++- .../boot/dts/xilinx/zynq-zturn-common.dtsi | 8 ++ arch/arm/boot/dts/xilinx/zynq-zybo-z7.dts | 10 ++- arch/arm/boot/dts/xilinx/zynq-zybo.dts | 9 +- 14 files changed, 404 insertions(+), 51 deletions(-)Quoted 5 lines
--
2.43.0My bot found new DTB warnings on the .dts files added or changed in this series.
Some warnings may be from an existing SoC .dtsi. Or perhaps the warnings are fixed by another series. Ultimately, it is up to the platform maintainer whether these warnings are acceptable or not. No need to reply unless the platform maintainer has comments.
If you already ran DT checks and didn't see these error(s), then make sure dt-schema is up to date:
Quoted 7 lines
pip3 install dtschema --upgradeNew warnings running 'make CHECK_DTBS=y xilinx/zynq-cc108.dtb xilinx/zynq-microzed.dtb xilinx/zynq-parallella.dtb xilinx/zynq-zc702.dtb xilinx/zynq-zc706.dtb xilinx/zynq-zc770-xm010.dtb xilinx/zynq-zc770-xm011.dtb xilinx/zynq-zc770-xm012.dtb xilinx/zynq-zc770-xm013.dtb xilinx/zynq-zed.dtb xilinx/zynq-zybo-z7.dtb xilinx/zynq-zybo.dtb' for [email protected]:
arch/arm/boot/dts/xilinx/zynq-parallella.dtb: ethernet@e000b000: ethernet-phy@0: Unevaluated properties are not allowed ('marvell,reg-init' was unexpected)
from schema $id: http://devicetree.org/schemas/net/cdns,macb.yaml#
This is not issue caused by this series.
Quoted 2 lines
arch/arm/boot/dts/xilinx/zynq-zc702.dtb: ethernet@e000b000: Unevaluated properties are not allowed ('phy-reset-active-low', 'phy-reset-gpio' were unexpected)
from schema $id: http://devicetree.org/schemas/net/cdns,macb.yaml#
This has been reported by Andrew already and the patch will be removed.
Thanks,
Michal
Michal Simek
maintainerQuoted 31 lines · Michal Simek
Hi,
over years there were some changes pushed to U-Boot which were never merged back to Linux. U-Boot introduced new option
OF_UPSTREAMand start to sync up DTs from Linux back to U-Boot.
This series is addressing differences.
There are still 3 more differences but they should be addressed separately.Thanks,
MichalMichal Simek (14):
ARM: zynq: Remove deprecateddevice_typeproperty
ARM: zynq: DT: List OCM memory for all platforms
ARM: zynq: Mark boot-phase-specific device nodes
ARM: zynq: Do not define address/size-cells for nand-controller
ARM: zynq: Wire smcc with nand/nor memories on zc770 platform
ARM: zynq: Add ethernet phy reset information to DT(zc702)
ARM: zynq: Define u-boot bootscrip addr via DT
ARM: zynq: Point via nvmem0 alias to eeprom on zc702/zc706
ARM: zynq: Define rtc alias on zc702/zc706
ARM: zynq: Rename i2c?-gpio to i2c?-gpio-grp
ARM: zynq: Fix fpga region DT nodes name
ARM: zynq: Enable QSPIs on platforms
ARM: zynq: Add sdhci to alias node
ARM: zynq: Remove ethernet0 alias from MicrozedSai Krishna Potthuri (1):
ARM: zynq: Replace 'io-standard' with 'power-source' property
Quoted 16 lines
arch/arm/boot/dts/xilinx/zynq-7000.dtsi | 33 ++++++- arch/arm/boot/dts/xilinx/zynq-cc108.dts | 41 ++++++++- arch/arm/boot/dts/xilinx/zynq-microzed.dts | 10 ++- arch/arm/boot/dts/xilinx/zynq-parallella.dts | 1 - arch/arm/boot/dts/xilinx/zynq-zc702.dts | 87 +++++++++++++------ arch/arm/boot/dts/xilinx/zynq-zc706.dts | 67 +++++++++++--- arch/arm/boot/dts/xilinx/zynq-zc770-xm010.dts | 39 ++++++++- arch/arm/boot/dts/xilinx/zynq-zc770-xm011.dts | 31 +++++++ arch/arm/boot/dts/xilinx/zynq-zc770-xm012.dts | 35 ++++++++ arch/arm/boot/dts/xilinx/zynq-zc770-xm013.dts | 41 ++++++++- arch/arm/boot/dts/xilinx/zynq-zed.dts | 43 ++++++++- .../boot/dts/xilinx/zynq-zturn-common.dtsi | 8 ++ arch/arm/boot/dts/xilinx/zynq-zybo-z7.dts | 10 ++- arch/arm/boot/dts/xilinx/zynq-zybo.dts | 9 +- 14 files changed, 404 insertions(+), 51 deletions(-)
Applied 1-6, 8-15.
Michal