Skip to contentSkip to conversation

ARM: zynq: Update DTs based on the latest YAML checking

PATCH New Michal Simek 1 participant 6 messages Nov 26, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover ARM: zynq: Update DTs based on the latest YAML checking

Hi,

several issues have been reported from binding check. The series is addressing most of them.
Patches are based on
https://github.com/Xilinx/linux-xlnx/tree/zynq/dt

Thanks,
Michal

Michal Simek (5):
ARM: zynq: Fix compatible string for adi,adxl345 chip
ARM: zynq: Rename bus to be align with simple-bus yaml
ARM: zynq: Fix leds subnode name for zc702/zybo-z7
ARM: zynq: Fix OCM mapping to be aligned with binding on zc702
ARM: zynq: Convert at25 binding to new description on zc770-xm013

 arch/arm/boot/dts/zynq-7000.dtsi         | 2 +-
 arch/arm/boot/dts/zynq-zc702.dts         | 8 +++++++-
 arch/arm/boot/dts/zynq-zc770-xm013.dts   | 7 +++----
 arch/arm/boot/dts/zynq-zturn-common.dtsi | 2 +-
 arch/arm/boot/dts/zynq-zybo-z7.dts       | 2 +-
 5 files changed, 13 insertions(+), 8 deletions(-)
Signature · 1 line
2.29.2
#2 lore raw

PATCH 2/5 ARM: zynq: Rename bus to be align with simple-bus yaml

Rename amba to AXI. Based on Xilinx Zynq TRM (Chapter 5) chip is "AXI point-to-point channels for communicating addresses, data, and response transactions between master and slave clients. This ARM AMBA 3.0..."

Issues are reported as:
.. amba: $nodename:0: 'amba' does not match '^([a-z][a-z0-9\\-]+-bus|bus|soc|axi|ahb|apb)(@[0-9a-f]+)?$' From schema:
../github.com/devicetree-org/dt-schema/dtschema/schemas/simple-bus.yaml

Similar change has been done for Xilinx ZynqMP SoC.

---

 arch/arm/boot/dts/zynq-7000.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/zynq-7000.dtsi +1 -1
index db3899b07992..df9ad831cf05 100644
@@ -92,7 +92,7 @@ replicator_in_port0: endpoint {
 		};
 	};
 
-	amba: amba {
+	amba: axi {
 		compatible = "simple-bus";
 		#address-cells = <1>;
 		#size-cells = <1>;
Signature · 1 line
2.29.2
#3 lore raw

PATCH 3/5 ARM: zynq: Fix leds subnode name for zc702/zybo-z7

In reply to Michal Simek

Fix the leds subnode names to match (^led-[0-9a-f]$|led).

Similar change has been also done by commit 9a19a39ee48b ("arm64: dts:
zynqmp: Fix leds subnode name for zcu100/ultra96 v1").

The patch is fixing these warnings:
.../zynq-zc702.dt.yaml: leds: 'ds23' does not match any of the regexes:
'(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
From schema: .../Documentation/devicetree/bindings/leds/leds-gpio.yaml .../zynq-zybo-z7.dt.yaml: gpio-leds: 'ld4' does not match any of the
regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
From schema: .../Documentation/devicetree/bindings/leds/leds-gpio.yaml

---

 arch/arm/boot/dts/zynq-zc702.dts   | 2 +-
 arch/arm/boot/dts/zynq-zybo-z7.dts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/zynq-zc702.dts +1 -1
index 27cd6cb52f1b..10a7d0b8cf8b 100644
@@ -49,7 +49,7 @@ sw13 {
 	leds {
 		compatible = "gpio-leds";
 
-		ds23 {
+		led-ds23 {
 			label = "ds23";
 			gpios = <&gpio0 10 0>;
 			linux,default-trigger = "heartbeat";
arch/arm/boot/dts/zynq-zybo-z7.dts +1 -1
index 357b78a5c11b..7b87e10d3953 100644
@@ -25,7 +25,7 @@ chosen {
 	gpio-leds {
 		compatible = "gpio-leds";
 
-		ld4 {
+		led-ld4 {
 			label = "zynq-zybo-z7:green:ld4";
 			gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
 		};
Signature · 1 line
2.29.2
#4 lore raw

PATCH 4/5 ARM: zynq: Fix OCM mapping to be aligned with binding on zc702

In reply to Michal Simek

The commit f69629919942 ("dt-bindings: sram: Convert SRAM bindings to json-schema") converted binding to yaml and some missing required properties started to be reported. Align binding based on it.

The patch is fixing these warnings:
.../zynq-zc702.dt.yaml: sram@fffc0000: '#address-cells' is a required property .../zynq-zc702.dt.yaml: sram@fffc0000: '#size-cells' is a required property .../zynq-zc702.dt.yaml: sram@fffc0000: 'ranges' is a required property From schema: .../Documentation/devicetree/bindings/sram/sram.yaml

---

 arch/arm/boot/dts/zynq-zc702.dts | 6 ++++++
 1 file changed, 6 insertions(+)
arch/arm/boot/dts/zynq-zc702.dts +6 -0
index 10a7d0b8cf8b..cf70aff26c66 100644
@@ -66,6 +66,12 @@ &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>;
+		};
 	};
 };
 
Signature · 1 line
2.29.2
#5 lore raw

PATCH 5/5 ARM: zynq: Convert at25 binding to new description on zc770-xm013

In reply to Michal Simek

The commit f8f79fa6bb25 ("dt-bindings: at25: convert the binding document to yaml") converted binding to yaml and 3 deprecated properties pop up.

The patch is fixing these warnings:
.../zynq-zc770-xm013.dt.yaml: eeprom@2: 'pagesize' is a required property .../zynq-zc770-xm013.dt.yaml: eeprom@2: 'size' is a required property .../zynq-zc770-xm013.dt.yaml: eeprom@2: 'address-width' is a required property From schema: .../Documentation/devicetree/bindings/eeprom/at25.yaml

by converting them to new binding.

---

 arch/arm/boot/dts/zynq-zc770-xm013.dts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
arch/arm/boot/dts/zynq-zc770-xm013.dts +3 -4
index 4ae2c85df3a0..38d96adc870c 100644
@@ -63,13 +63,12 @@ &spi0 {
 	num-cs = <4>;
 	is-decoded-cs = <0>;
 	eeprom: eeprom@2 {
-		at25,byte-len = <8192>;
-		at25,addr-mode = <2>;
-		at25,page-size = <32>;
-
 		compatible = "atmel,at25";
 		reg = <2>;
 		spi-max-frequency = <1000000>;
+		size = <8192>;
+		address-width = <16>;
+		pagesize = <32>;
 	};
 };
 
Signature · 1 line
2.29.2
#1 lore raw

PATCH 1/5 ARM: zynq: Fix compatible string for adi,adxl345 chip

In reply to Michal Simek

The commit e359a29225dd ("dt-bindings: iio: accel: adxl345: switch to YAML bindings") switched binding to yaml and the following error pop up:
../zynq-zturn-v5.dt.yaml: accelerometer@53: compatible: 'oneOf' conditional failed, one must be
fixed:
['adi,adxl345', 'adxl345', 'adi,adxl34x', 'adxl34x'] is too long Additional items are not allowed ('adi,adxl34x', 'adxl34x' were unexpected) Additional items are not allowed ('adxl345', 'adi,adxl34x', 'adxl34x' were unexpected)
'adi,adxl346' was expected
'adi,adxl345' was expected

Use only one compatible string to be aligned with the binding.

---

 arch/arm/boot/dts/zynq-zturn-common.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/zynq-zturn-common.dtsi +1 -1
index 84f3c85c5bab..bf5d1c4568b0 100644
@@ -104,7 +104,7 @@ stlm75@49 {
 	};
 
 	accelerometer@53 {
-		compatible = "adi,adxl345", "adxl345", "adi,adxl34x", "adxl34x";
+		compatible = "adi,adxl345";
 		reg = <0x53>;
 		interrupt-parent = <&intc>;
 		interrupts = <0x0 0x1e 0x4>;
Signature · 1 line
2.29.2