tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arm64: dts: ti: k3-am642-hummingboard-t: Convert overlay to board dts

Browse Source 
[ Upstream commit e2b69180431968250bf3c0c581155f1b37d057c1 ]

SolidRun HummingBoard-T has two options for M.2 connector, supporting
either PCI-E or USB-3.1 Gen 1 - depending on configuration of a mux
on the serdes lane.
The required configurations in device-tree were modeled as overlays.

The USB-3.1 overlay uses /delete-property/ to unset a boolean property
on the usb controller limiting it to USB-2.0 by default.
Overlays can not delete a property from the base dtb, therefore this
overlay is at this time useless.

Convert both overlays into full dts by including the base board dts.
While the pcie overlay was functional, both are converted for a
consistent user experience when selecting between the two mutually
exclusive configurations.

Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Closes: https://lore.kernel.org/linux-devicetree/CAMuHMdXTgpTnJ9U7egC2XjFXXNZ5uiY1O+WxNd6LPJW5Rs5KTw@mail.gmail.com
Fixes: bbef42084c ("arm64: dts: ti: hummingboard-t: add overlays for m.2 pci-e and usb-3")
Signed-off-by: Josua Mayer <josua@solid-run.com>
Link: https://lore.kernel.org/r/20250101-am64-hb-fix-overlay-v2-1-78143f5da28c@solid-run.com
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Josua Mayer
2025-01-01 13:30:22 +01:00
committed by Greg Kroah-Hartman
parent a61cac5a61
commit e2cd277d71
3 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm64/boot/dts/ti/Makefile
-4
View File
@@ -41,10 +41,6 @@ dtb-$(CONFIG_ARCH_K3) += k3-am62x-sk-csi2-imx219.dtbo
dtb-$(CONFIG_ARCH_K3) += k3-am62x-sk-hdmi-audio.dtbo
# Boards with AM64x SoC
k3-am642-hummingboard-t-pcie-dtbs := \
k3-am642-hummingboard-t.dtb k3-am642-hummingboard-t-pcie.dtbo
k3-am642-hummingboard-t-usb3-dtbs := \
k3-am642-hummingboard-t.dtb k3-am642-hummingboard-t-usb3.dtbo
dtb-$(CONFIG_ARCH_K3) += k3-am642-evm.dtb
dtb-$(CONFIG_ARCH_K3) += k3-am642-evm-icssg1-dualemac.dtbo
dtb-$(CONFIG_ARCH_K3) += k3-am642-evm-icssg1-dualemac-mii.dtbo
arch/arm64/boot/dts/ti/k3-am642-hummingboard-t-pcie.dtso → arch/arm64/boot/dts/ti/k3-am642-hummingboard-t-pcie.dts
+8 -6
View File
@@ -2,17 +2,19 @@
/*
* Copyright (C) 2023 Josua Mayer <josua@solid-run.com>
*
* Overlay for SolidRun AM642 HummingBoard-T to enable PCI-E.
* DTS for SolidRun AM642 HummingBoard-T,
* running on Cortex A53, with PCI-E.
*
*/
/dts-v1/;
/plugin/;
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/phy/phy.h>
#include "k3-am642-hummingboard-t.dts"
#include "k3-serdes.h"
/ {
model = "SolidRun AM642 HummingBoard-T with PCI-E";
};
&pcie0_rc {
pinctrl-names = "default";
pinctrl-0 = <&pcie0_default_pins>;
arch/arm64/boot/dts/ti/k3-am642-hummingboard-t-usb3.dtso → arch/arm64/boot/dts/ti/k3-am642-hummingboard-t-usb3.dts
+8 -5
View File
@@ -2,16 +2,19 @@
/*
* Copyright (C) 2023 Josua Mayer <josua@solid-run.com>
*
* Overlay for SolidRun AM642 HummingBoard-T to enable USB-3.1.
* DTS for SolidRun AM642 HummingBoard-T,
* running on Cortex A53, with USB-3.1 Gen 1.
*
*/
/dts-v1/;
/plugin/;
#include <dt-bindings/phy/phy.h>
#include "k3-am642-hummingboard-t.dts"
#include "k3-serdes.h"
/ {
model = "SolidRun AM642 HummingBoard-T with USB-3.1 Gen 1";
};
&serdes0 {
#address-cells = <1>;
#size-cells = <0>;