arm64: zynqmp: Minor DT changes
Subsystems (2)
Michal Simek
maintainercover arm64: zynqmp: Minor DT changes
Hi,
sending some small amount of patches to get in sync with U-Boot DTs to be able to switch U-Boot to OF_UPSTREAM.
The next step is going to be to add missing boards to Linux.
Thanks,
Michal
Michal Simek (2):
arm64: zynqmp: Describe ethernet controllers via aliases on SOM
arm64: zynqmp: Enable DP in kr260/kv260 revA
Quanyang Wang (1):
arm64: zynqmp: Disable coresight by default
Radhey Shyam Pandey (1):
arm64: zynqmp: Revert usb node drive strength and slew rate for zcu106
.../boot/dts/xilinx/zynqmp-sck-kr-g-revA.dtso | 17 +++++++++++++++ .../boot/dts/xilinx/zynqmp-sck-kr-g-revB.dtso | 5 +++++ .../boot/dts/xilinx/zynqmp-sck-kv-g-revA.dtso | 21 +++++++++++++++++++ .../boot/dts/xilinx/zynqmp-sck-kv-g-revB.dtso | 4 ++++ .../boot/dts/xilinx/zynqmp-zcu106-revA.dts | 4 ++-- arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 4 ++++ 6 files changed, 53 insertions(+), 2 deletions(-)
Signature · 3 lines
2.43.0 base-commit: 4f96c5db61f238e8a957df2b81d6343a5e38ca59
Michal Simek
maintainerPATCH 1/4 arm64: zynqmp: Disable coresight by default
From: Quanyang Wang <[email protected]>
When secure-boot mode of bootloader is enabled, the registers of coresight are not permitted to access that's why disable it by default.
---
arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm64/boot/dts/xilinx/zynqmp.dtsi +4 -0
@@ -550,6 +550,7 @@ cpu0_debug: debug@fec10000 { reg = <0x0 0xfec10000 0x0 0x1000>; clock-names = "apb_pclk"; cpu = <&cpu0>; + status = "disabled"; }; cpu1_debug: debug@fed10000 {
@@ -557,6 +558,7 @@ cpu1_debug: debug@fed10000 { reg = <0x0 0xfed10000 0x0 0x1000>; clock-names = "apb_pclk"; cpu = <&cpu1>; + status = "disabled"; }; cpu2_debug: debug@fee10000 {
@@ -564,6 +566,7 @@ cpu2_debug: debug@fee10000 { reg = <0x0 0xfee10000 0x0 0x1000>; clock-names = "apb_pclk"; cpu = <&cpu2>; + status = "disabled"; }; cpu3_debug: debug@fef10000 {
@@ -571,6 +574,7 @@ cpu3_debug: debug@fef10000 { reg = <0x0 0xfef10000 0x0 0x1000>; clock-names = "apb_pclk"; cpu = <&cpu3>; + status = "disabled"; }; /* GDMA */
Signature · 1 line
2.43.0
Michal Simek
maintainerPATCH 2/4 arm64: zynqmp: Revert usb node drive strength and slew rate for zcu106
In reply to Michal SimekFrom: Radhey Shyam Pandey <[email protected]>
On a few zcu106 boards USB devices (Dell MS116 USB Optical Mouse, Dell USB Entry Keyboard) are not enumerated on linux boot due to commit 'b8745e7eb488 ("arm64: zynqmp: Fix usb node drive strength and slew rate")'.
To fix it as a workaround revert to working version and then investigate at board level why drive strength from 12mA to 4mA and slew from fast to slow is not working.
---
arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts +2 -2
@@ -808,8 +808,8 @@ conf-tx { pins = "MIO54", "MIO56", "MIO57", "MIO58", "MIO59", "MIO60", "MIO61", "MIO62", "MIO63"; bias-disable; - drive-strength = <4>; - slew-rate = <SLEW_RATE_SLOW>; + drive-strength = <12>; + slew-rate = <SLEW_RATE_FAST>; }; };
Signature · 1 line
2.43.0
Michal Simek
maintainerPATCH 3/4 arm64: zynqmp: Describe ethernet controllers via aliases on SOM
In reply to Michal SimekAdd ethernet aliases to CC (Carrier card) description to create a connection which is used by U-BOOT (fdt_fixup_ethernet()) for updating local-mac-address in DT.
On Kria SOM MAC address is read from i2c eeprom at start and based on it environment variables are created. Without creating aliases U-Boot is not able to inject local-mac-address DT property and OS won't get the same MAC address unless another i2c read is happening in OS.
Also aliases are using string not phandle (because of dtso) that's why full path has to be provided but that shouldn't be a big issue because location of ethernet controller is fixed.
---
arch/arm64/boot/dts/xilinx/zynqmp-sck-kr-g-revB.dtso | 5 +++++ arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revA.dtso | 4 ++++ arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revB.dtso | 4 ++++ 3 files changed, 13 insertions(+)
arch/arm64/boot/dts/xilinx/zynqmp-sck-kr-g-revB.dtso +5 -0
@@ -20,6 +20,11 @@ "xlnx,zynqmp-sk-kr260", "xlnx,zynqmp"; model = "ZynqMP KR260 revB"; + aliases { + ethernet0 = "/axi/ethernet@ff0b0000"; /* &gem0 */ + ethernet1 = "/axi/ethernet@ff0c0000"; /* &gem1 */ + }; + ina260-u14 { compatible = "iio-hwmon"; io-channels = <&u14 0>, <&u14 1>, <&u14 2>;
arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revA.dtso +4 -0
@@ -28,6 +28,10 @@ "xlnx,zynqmp-sk-kv260", "xlnx,zynqmp"; model = "ZynqMP KV260 revA"; + aliases { + ethernet0 = "/axi/ethernet@ff0e0000"; /* &gem3 */ + }; + ina260-u14 { compatible = "iio-hwmon"; io-channels = <&u14 0>, <&u14 1>, <&u14 2>;
arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revB.dtso +4 -0
@@ -23,6 +23,10 @@ "xlnx,zynqmp-sk-kv260", "xlnx,zynqmp"; model = "ZynqMP KV260 revB"; + aliases { + ethernet0 = "/axi/ethernet@ff0e0000"; /* &gem3 */ + }; + ina260-u14 { compatible = "iio-hwmon"; io-channels = <&u14 0>, <&u14 1>, <&u14 2>;
Signature · 1 line
2.43.0
Michal Simek
maintainerPATCH 4/4 arm64: zynqmp: Enable DP in kr260/kv260 revA
In reply to Michal SimekEnable DP output in both CC (Carrier Cards).
---
.../boot/dts/xilinx/zynqmp-sck-kr-g-revA.dtso | 17 +++++++++++++++++ .../boot/dts/xilinx/zynqmp-sck-kv-g-revA.dtso | 17 +++++++++++++++++ 2 files changed, 34 insertions(+)
arch/arm64/boot/dts/xilinx/zynqmp-sck-kr-g-revA.dtso +17 -0
@@ -71,6 +71,17 @@ clk_25_1: si5332-4 { /* u17 - GEM3 */ #clock-cells = <0>; clock-frequency = <25000000>; }; + dpcon { + compatible = "dp-connector"; + label = "P11"; + type = "full-size"; + + port { + dpcon_in: endpoint { + remote-endpoint = <&dpsub_dp_out>; + }; + }; + }; }; &i2c1 { /* I2C_SCK C26/C27 - MIO from SOM */
@@ -145,6 +156,12 @@ &zynqmp_dpsub { assigned-clock-rates = <27000000>, <25000000>, <300000000>; }; +&out_dp { + dpsub_dp_out: endpoint { + remote-endpoint = <&dpcon_in>; + }; +}; + &zynqmp_dpdma { status = "okay"; assigned-clock-rates = <600000000>;
arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revA.dtso +17 -0
@@ -72,6 +72,17 @@ si5332_5: si5332-5 { /* u17 */ #clock-cells = <0>; clock-frequency = <27000000>; }; + dpcon { + compatible = "dp-connector"; + label = "P11"; + type = "full-size"; + + port { + dpcon_in: endpoint { + remote-endpoint = <&dpsub_dp_out>; + }; + }; + }; }; &i2c1 { /* I2C_SCK C23/C24 - MIO from SOM */
@@ -122,6 +133,12 @@ &zynqmp_dpsub { assigned-clock-rates = <27000000>, <25000000>, <300000000>; }; +&out_dp { + dpsub_dp_out: endpoint { + remote-endpoint = <&dpcon_in>; + }; +}; + &zynqmp_dpdma { status = "okay"; assigned-clock-rates = <600000000>;
Signature · 1 line
2.43.0
Quoted 20 lines · Michal Simek
Hi,
sending some small amount of patches to get in sync with U-Boot DTs to be able to switch U-Boot to
OF_UPSTREAM.
The next step is going to be to add missing boards to Linux.Thanks,
MichalMichal Simek (2):
arm64: zynqmp: Describe ethernet controllers via aliases on SOM
arm64: zynqmp: Enable DP in kr260/kv260 revAQuanyang Wang (1):
arm64: zynqmp: Disable coresight by defaultRadhey Shyam Pandey (1):
arm64: zynqmp: Revert usb node drive strength and slew rate for zcu106
Quoted 8 lines
.../boot/dts/xilinx/zynqmp-sck-kr-g-revA.dtso | 17 +++++++++++++++ .../boot/dts/xilinx/zynqmp-sck-kr-g-revB.dtso | 5 +++++ .../boot/dts/xilinx/zynqmp-sck-kv-g-revA.dtso | 21 +++++++++++++++++++ .../boot/dts/xilinx/zynqmp-sck-kv-g-revB.dtso | 4 ++++ .../boot/dts/xilinx/zynqmp-zcu106-revA.dts | 4 ++-- arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 4 ++++ 6 files changed, 53 insertions(+), 2 deletions(-)
Applied.
M