arm64: dts: iot2050: Fix R5 lock-step settings, add overlays
Subsystems (2)
v2 cover arm64: dts: iot2050: Fix R5 lock-step settings, add overlays
Changes in v2:
- build dtb with applied overlays
Trying to get our backlog closer to zero. See patches for details.
Jan
Jan Kiszka (1):
arm64: dts: ti: iot2050: Add overlays for M.2 used by firmware
Li Hua Qian (1):
arm64: dts: ti: iot2050: Disable lock-step for all iot2050 boards
arch/arm64/boot/dts/ti/Makefile | 6 +++ .../dts/ti/k3-am65-iot2050-common-pg2.dtsi | 5 -- .../boot/dts/ti/k3-am65-iot2050-common.dtsi | 5 ++ .../boot/dts/ti/k3-am6528-iot2050-basic.dts | 5 -- ...48-iot2050-advanced-m2-bkey-ekey-pcie.dtso | 27 +++++++++++ ...-am6548-iot2050-advanced-m2-bkey-usb3.dtso | 47 +++++++++++++++++++ 6 files changed, 85 insertions(+), 10 deletions(-) create mode 100644 arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-m2-bkey-ekey-pcie.dtso create mode 100644 arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-m2-bkey-usb3.dtso
Signature · 1 line
2.43.0
PATCH v2 1/2 arm64: dts: ti: iot2050: Disable lock-step for all iot2050 boards
From: Li Hua Qian <[email protected]>
The PG1 A variant of the iot2050 series has been identified which partially lacks support for lock-step mode. This implies that all iot2050 boards can't support this mode. As a result, lock-step mode has been disabled across all iot2050 boards for consistency and to avoid potential issues.
--- arch/arm64/boot/dts/ti/k3-am65-iot2050-common-pg2.dtsi | 5 ----- arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi | 5 +++++ arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic.dts | 5 ----- 3 files changed, 5 insertions(+), 10 deletions(-)
arch/arm64/boot/dts/ti/k3-am65-iot2050-common-pg2.dtsi +0 -5
@@ -9,11 +9,6 @@ * Common bits of the IOT2050 Basic and Advanced variants, PG2 */ -&mcu_r5fss0 { - /* lock-step mode not supported on PG2 boards */ - ti,cluster-mode = <0>; -}; - &main_pmx0 { cp2102n_reset_pin_default: cp2102n-reset-default-pins { pinctrl-single,pins = <
arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi +5 -0
@@ -635,3 +635,8 @@ icssg0_eth1_phy: ethernet-phy@1 { ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_4_B_NIB>; }; }; + +&mcu_r5fss0 { + /* lock-step mode not supported on iot2050 boards */ + ti,cluster-mode = <0>; +};
arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic.dts +0 -5
@@ -22,8 +22,3 @@ / { compatible = "siemens,iot2050-basic", "ti,am654"; model = "SIMATIC IOT2050 Basic"; }; - -&mcu_r5fss0 { - /* lock-step mode not supported on this board */ - ti,cluster-mode = <0>; -};
Signature · 1 line
2.43.0
PATCH v2 2/2 arm64: dts: ti: iot2050: Add overlays for M.2 used by firmware
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
To allow firmware to pick up all DTs from here, move the overlays that are normally applied during DT fixup to the kernel source as well. Hook then into the build nevertheless to ensure that regular checks are performed.
--- arch/arm64/boot/dts/ti/Makefile | 6 +++ ...48-iot2050-advanced-m2-bkey-ekey-pcie.dtso | 27 +++++++++++ ...-am6548-iot2050-advanced-m2-bkey-usb3.dtso | 47 +++++++++++++++++++ 3 files changed, 80 insertions(+) create mode 100644 arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-m2-bkey-ekey-pcie.dtso create mode 100644 arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-m2-bkey-usb3.dtso
arch/arm64/boot/dts/ti/Makefile +6 -0
@@ -73,10 +73,16 @@ k3-am654-gp-evm-dtbs := k3-am654-base-board.dtb \ k3-am654-pcie-usb3.dtbo k3-am654-evm-dtbs := k3-am654-base-board.dtb k3-am654-icssg2.dtbo k3-am654-idk-dtbs := k3-am654-evm.dtb k3-am654-idk.dtbo k3-am654-pcie-usb2.dtbo +k3-am6548-iot2050-advanced-m2-bkey-ekey-pcie-dtbs := k3-am6548-iot2050-advanced-m2.dtb \ + k3-am6548-iot2050-advanced-m2-bkey-ekey-pcie.dtbo +k3-am6548-iot2050-advanced-m2-bkey-usb3-dtbs := k3-am6548-iot2050-advanced-m2.dtb \ + k3-am6548-iot2050-advanced-m2-bkey-usb3.dtbo dtb-$(CONFIG_ARCH_K3) += k3-am6528-iot2050-basic.dtb dtb-$(CONFIG_ARCH_K3) += k3-am6528-iot2050-basic-pg2.dtb dtb-$(CONFIG_ARCH_K3) += k3-am6548-iot2050-advanced.dtb dtb-$(CONFIG_ARCH_K3) += k3-am6548-iot2050-advanced-m2.dtb +dtb-$(CONFIG_ARCH_K3) += k3-am6548-iot2050-advanced-m2-bkey-ekey-pcie.dtb +dtb-$(CONFIG_ARCH_K3) += k3-am6548-iot2050-advanced-m2-bkey-usb3.dtb dtb-$(CONFIG_ARCH_K3) += k3-am6548-iot2050-advanced-pg2.dtb dtb-$(CONFIG_ARCH_K3) += k3-am6548-iot2050-advanced-sm.dtb dtb-$(CONFIG_ARCH_K3) += k3-am654-base-board.dtb
arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-m2-bkey-ekey-pcie.dtso new file +27 -0
@@ -0,0 +1,27 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * IOT2050 M.2 variant, overlay for B-key PCIE0_LANE0 + E-key PCIE1_LANE0 + * Copyright (c) Siemens AG, 2022-2024 + * + * Authors: + * Chao Zeng <[email protected]> + * Jan Kiszka <[email protected]> + */ + +/dts-v1/; +/plugin/; + +#include <dt-bindings/phy/phy.h> +#include <dt-bindings/gpio/gpio.h> + +&pcie0_rc { + num-lanes = <1>; + phys = <&serdes0 PHY_TYPE_PCIE 1>; + phy-names = "pcie-phy0"; + reset-gpios = <&main_gpio1 15 GPIO_ACTIVE_HIGH>; + status = "okay"; +}; + +&pcie1_rc { + status = "okay"; +};
arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-m2-bkey-usb3.dtso new file +47 -0
47 lines not on this page · raw message
Signature · 1 line
2.43.0
Hi Jan Kiszka,
Quoted 8 lines · Jan Kiszka
Changes in v2:
- build dtb with applied overlaysTrying to get our backlog closer to zero. See patches for details.
Jan
[...]
I have applied the following to branch ti-k3-dts-next on [1]. Thank you!
[1/2] arm64: dts: ti: iot2050: Disable lock-step for all iot2050 boards
commit: e0133f883cf115d9e97e704169a9fb6003caefb2
[2/2] arm64: dts: ti: iot2050: Add overlays for M.2 used by firmware
commit: dba27d026fc841d28a0ed373f617cc84ec0e4504From what I see, this seems fine, and inline with the good stuff, but if folks feel it was a bit pre-mature to pick things up, I can drop it, but prefer to let it cook in next for a short while if possible.
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent up the chain during the next merge window (or sooner if it is a relevant bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D