[PATCH v2 0/7] arm: am335x: Switch to upstream devicetree

[PATCH v2 0/7] arm: am335x: Switch to upstream devicetree

[Markus Schneider-Pargmann (TI.com)]

The series is split into two logical groups:

- Patches 1-3: Fixes for am335x-evm to boot and support the LCD panel
  with the current u-boot devicetree.
- Patches 4-7: Make upstream devicetree working with uboot. This
  adds tick-timer, adds compatibility of the board code for different
  USB probing and updates the defconfig.

The series has been tested on am335x-evm. Note that I don't have all
other boards built with the am335x_evm_defconfig, so tests are
appreciated.

Dependencies:
  - clk: ti: Cleanup common functions and omap-cm
      https://lore.kernel.org/r/20251128-topic-am33-clk-regmap-dep-v2026-01-v1-0-d722c79506b2@baylibre.com
  - dm: core: Support same compatible in host/gadget musb drivers
      https://lore.kernel.org/r/20251126-topic-musb-probing-v2026-01-v1-0-ff8d8c487130@baylibre.com
  - simple-pm-bus: Make clocks optional
      https://lore.kernel.org/r/20251128-topic-simple-pm-bus-optional-clocks-v2026-01-v1-1-e38040c88b6d@baylibre.com
  - video: simple_panel support for am335x evm panel
      https://lore.kernel.org/r/20251128-topic-am33-evm-lcd-v2026-01-v1-0-ef75d4330d3d@baylibre.com
  - power: domain: Add ti-omap-prm stub
      https://lore.kernel.org/r/20251128-topic-omap-prm-v2026-01-v1-1-72c5cc4c7728@baylibre.com

Best,
Markus

Signed-off-by: Markus Schneider-Pargmann (TI.com) <msp@baylibre.com>
---
Changes in v2:
- Most of the independent patches were extracted in smaller series
- Added patch to add vidconsole for am335x-evm
- Add chosen tick-timer to all devicetrees that are used with the
  am335x_evm_defconfig
- Link to v1: https://lore.kernel.org/r/20251118-topic-am33-evm-oftree-v2026-01-v1-0-91ce13c661e2@baylibre.com

---
Markus Schneider-Pargmann (TI.com) (7):
      arm: dts: am335x-evm: Add backlight to the panel
      configs: am335x_evm_defconfig: Enable panel
      include: configs: am335x_evm: Enable vidconsole
      arm: dts: am335x-*-u-boot: Add chosen tick-timer
      am33xx: Fix comment about config symbols
      am33xx: Support upstream devicetree binding
      configs: am335x_evm_defconfig: Switch to upstream devicetree

 arch/arm/dts/am335x-bone-common-u-boot.dtsi           | 14 ++++++++++++++
 arch/arm/dts/am335x-bone-u-boot.dtsi                  |  6 ++++++
 arch/arm/dts/am335x-boneblack-u-boot.dtsi             |  6 ++++++
 arch/arm/dts/am335x-bonegreen-u-boot.dtsi             |  6 ++++++
 arch/arm/dts/am335x-evm-u-boot.dtsi                   |  6 ++++++
 arch/arm/dts/am335x-evm.dts                           |  3 ++-
 arch/arm/dts/am335x-evmsk-u-boot.dtsi                 |  6 ++++++
 arch/arm/dts/am335x-icev2-u-boot.dtsi                 |  4 ++++
 arch/arm/dts/am335x-pocketbeagle-u-boot.dtsi          |  6 ++++++
 .../dts/am335x-sancloud-bbe-extended-wifi-u-boot.dtsi |  6 ++++++
 arch/arm/mach-omap2/am33xx/board.c                    | 16 ++++++++++------
 configs/am335x_evm_defconfig                          | 19 +++++++++++++++++--
 include/configs/am335x_evm.h                          |  2 ++
 13 files changed, 91 insertions(+), 9 deletions(-)
---
base-commit: f4cc2a9f36bdc1b9731aa285cc305d76c48ec79c
change-id: 20251118-topic-am33-evm-oftree-v2026-01-ea701e03f8cf
prerequisite-change-id: 20251125-topic-am33-clk-regmap-dep-v2026-01-2682a39beeda:v2
prerequisite-patch-id: adc433677bb6413c278d00b9e1d6b04b12d4a825
prerequisite-patch-id: 949cc619ccbb8cca5b29ab30ac37377e45ae607f
prerequisite-change-id: 20251125-topic-musb-probing-v2026-01-1343fff8176b:v1
prerequisite-patch-id: b8514a3b43228ff9ef6812dc5fe5eb53e2f141ae
prerequisite-patch-id: abfdeaa1999e4cbf98229c4eeafa9dd8dac4509e
prerequisite-patch-id: c6cc3f7eba8b785fbb8ea91cea349517c7c364fe
prerequisite-patch-id: 37352dffe91e2aef085c2a08fcbc922723dae7c1
prerequisite-change-id: 20251128-topic-simple-pm-bus-optional-clocks-v2026-01-1cd38bd8d3d8:v1
prerequisite-patch-id: af032219347b46e51f58b7d26dac1f59de77fda9
prerequisite-change-id: 20251128-topic-am33-evm-lcd-v2026-01-004f74a2ccfc:v1
prerequisite-patch-id: e00071ea7e9f3cff3f91b320134fcf9164986449
prerequisite-patch-id: 65efd192958e9b5f852dc4bafb30afe526624649
prerequisite-change-id: 20251128-topic-omap-prm-v2026-01-c97c20cd5eaa:v1
prerequisite-patch-id: 92857feb9e8685fe0e68a0e8e18dcdb57df56634

Best regards,
-- 
Markus Schneider-Pargmann (TI.com) <msp@baylibre.com>

[PATCH v2 1/7] arm: dts: am335x-evm: Add backlight to the panel

[Markus Schneider-Pargmann (TI.com)]

Add backlight phandle reference to panel node. Without this reference,
the display driver cannot control backlight, leaving the panel dark.

Signed-off-by: Markus Schneider-Pargmann (TI.com) <msp@baylibre.com>
---
 arch/arm/dts/am335x-evm.dts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/dts/am335x-evm.dts b/arch/arm/dts/am335x-evm.dts
index 1b5b627006822a9bb4df1c6433ce7eff114dc029..52ca4ff6809ad24fafbdd515fbcde840715cf20f 100644
--- a/arch/arm/dts/am335x-evm.dts
+++ b/arch/arm/dts/am335x-evm.dts
@@ -94,7 +94,7 @@
 		};
 	};
 
-	backlight {
+	pwm_backlight: backlight {
 		compatible = "pwm-backlight";
 		pwms = <&ecap0 0 50000 0>;
 		brightness-levels = <0 51 53 56 62 75 101 152 255>;
@@ -106,6 +106,7 @@
 		status = "okay";
 		pinctrl-names = "default";
 		pinctrl-0 = <&lcd_pins_s0>;
+		backlight = <&pwm_backlight>;
 		panel-info {
 			ac-bias           = <255>;
 			ac-bias-intrpt    = <0>;

-- 
2.51.0

Re: [PATCH v2 1/7] arm: dts: am335x-evm: Add backlight to the panel

[Kory Maincent]

On Fri, 28 Nov 2025 21:46:31 +0100
"Markus Schneider-Pargmann (TI.com)" <msp@baylibre.com> wrote:

> Add backlight phandle reference to panel node. Without this reference,
> the display driver cannot control backlight, leaving the panel dark.
> 
> Signed-off-by: Markus Schneider-Pargmann (TI.com) <msp@baylibre.com>

Reviewed-by: Kory Maincent <kory.maincent@bootlin.com>

Thank you!
-- 
Köry Maincent, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com

[PATCH v2 2/7] configs: am335x_evm_defconfig: Enable panel

[Markus Schneider-Pargmann (TI.com)]

Enable LCD panel support on am335x-evm:
 - CLK_CCF and CLK_TI_* for display clock tree
 - DM_PWM and PWM_TI_ECAP for backlight control
 - VIDEO and AM335X_LCD for display controller

Signed-off-by: Markus Schneider-Pargmann (TI.com) <msp@baylibre.com>
---
 configs/am335x_evm_defconfig | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
index 5a3e0530a31663faf565e0afeede5765be16985b..bd188c252780fb541afbbe61a243bddaab79be93 100644
--- a/configs/am335x_evm_defconfig
+++ b/configs/am335x_evm_defconfig
@@ -60,8 +60,14 @@ CONFIG_NET_RETRY_COUNT=10
 CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_SYS_BOOTCOUNT_BE=y
+CONFIG_CLK=y
+CONFIG_CLK_CCF=y
 CONFIG_CLK_CDCE9XX=y
+CONFIG_CLK_TI_AM3_DPLL=y
 CONFIG_CLK_TI_CTRL=y
+CONFIG_CLK_TI_DIVIDER=y
+CONFIG_CLK_TI_GATE=y
+CONFIG_CLK_TI_MUX=y
 CONFIG_DFU_TFTP=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_NAND=y
@@ -71,6 +77,7 @@ CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_FLASH_MMC_DEV=1
 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
 CONFIG_DM_I2C=y
+CONFIG_MISC=y
 CONFIG_SYS_I2C_EEPROM_ADDR=0x50
 # CONFIG_MMC_HW_PARTITIONING is not set
 CONFIG_MMC_OMAP_HS=y
@@ -95,6 +102,8 @@ CONFIG_DM_PMIC=y
 # CONFIG_SPL_DM_PMIC is not set
 CONFIG_PMIC_TPS65217=y
 CONFIG_SPL_POWER_TPS65910=y
+CONFIG_DM_PWM=y
+CONFIG_PWM_TI_ECAP=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_OMAP3_SPI=y
@@ -113,6 +122,8 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0451
 CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
 CONFIG_USB_ETHER=y
 CONFIG_SPL_USB_ETHER=y
+CONFIG_VIDEO=y
+CONFIG_AM335X_LCD=y
 CONFIG_WDT=y
 # CONFIG_SPL_WDT is not set
 CONFIG_DYNAMIC_CRC_TABLE=y

-- 
2.51.0

Re: [PATCH v2 2/7] configs: am335x_evm_defconfig: Enable panel

[Kory Maincent]

On Fri, 28 Nov 2025 21:46:32 +0100
"Markus Schneider-Pargmann (TI.com)" <msp@baylibre.com> wrote:

> Enable LCD panel support on am335x-evm:
>  - CLK_CCF and CLK_TI_* for display clock tree
>  - DM_PWM and PWM_TI_ECAP for backlight control
>  - VIDEO and AM335X_LCD for display controller
> 
> Signed-off-by: Markus Schneider-Pargmann (TI.com) <msp@baylibre.com>

Reviewed-by: Kory Maincent <kory.maincent@bootlin.com>

Thank you!
-- 
Köry Maincent, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com

[PATCH v2 3/7] include: configs: am335x_evm: Enable vidconsole

[Markus Schneider-Pargmann (TI.com)]

Enable vidconsole for the am335x-evm board.

Signed-off-by: Markus Schneider-Pargmann (TI.com) <msp@baylibre.com>
---
 include/configs/am335x_evm.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index d2164b41d6d6e74c7da0554b966ad5ee1f78e8b2..babf065bc3ea8c63f562ecfb07080f471b489fcb 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -83,6 +83,8 @@
 	"fdtfile=undefined\0" \
 	"finduuid=part uuid mmc 0:2 uuid\0" \
 	"console=ttyO0,115200n8\0" \
+	"stdout=serial,vidconsole\0" \
+	"stderr=serial,vidconsole\0" \
 	"partitions=" \
 		"uuid_disk=${uuid_gpt_disk};" \
 		"name=bootloader,start=384K,size=1792K," \

-- 
2.51.0

Re: [PATCH v2 3/7] include: configs: am335x_evm: Enable vidconsole

[Kory Maincent]

On Fri, 28 Nov 2025 21:46:33 +0100
"Markus Schneider-Pargmann (TI.com)" <msp@baylibre.com> wrote:

> Enable vidconsole for the am335x-evm board.
> 
> Signed-off-by: Markus Schneider-Pargmann (TI.com) <msp@baylibre.com>

Reviewed-by: Kory Maincent <kory.maincent@bootlin.com>

Thank you!
-- 
Köry Maincent, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com

[PATCH v2 4/7] arm: dts: am335x-*-u-boot: Add chosen tick-timer

[Markus Schneider-Pargmann (TI.com)]

Upstream devicetrees do not have a binding for the tick-timer. Add it
for all boards built with the am335x_evm_defconfig.

Signed-off-by: Markus Schneider-Pargmann (TI.com) <msp@baylibre.com>
---
 arch/arm/dts/am335x-bone-common-u-boot.dtsi                | 14 ++++++++++++++
 arch/arm/dts/am335x-bone-u-boot.dtsi                       |  6 ++++++
 arch/arm/dts/am335x-boneblack-u-boot.dtsi                  |  6 ++++++
 arch/arm/dts/am335x-bonegreen-u-boot.dtsi                  |  6 ++++++
 arch/arm/dts/am335x-evm-u-boot.dtsi                        |  6 ++++++
 arch/arm/dts/am335x-evmsk-u-boot.dtsi                      |  6 ++++++
 arch/arm/dts/am335x-icev2-u-boot.dtsi                      |  4 ++++
 arch/arm/dts/am335x-pocketbeagle-u-boot.dtsi               |  6 ++++++
 arch/arm/dts/am335x-sancloud-bbe-extended-wifi-u-boot.dtsi |  6 ++++++
 9 files changed, 60 insertions(+)

diff --git a/arch/arm/dts/am335x-bone-common-u-boot.dtsi b/arch/arm/dts/am335x-bone-common-u-boot.dtsi
new file mode 100644
index 0000000000000000000000000000000000000000..0fa2a311514b7776631797bb99d0d7f299df04bd
--- /dev/null
+++ b/arch/arm/dts/am335x-bone-common-u-boot.dtsi
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * am335x-bone-common U-Boot Additions
+ *
+ * Common u-boot configuration for all BeagleBone variants
+ */
+
+#include "am33xx-u-boot.dtsi"
+
+/ {
+	chosen {
+		tick-timer = &timer2;
+	};
+};
diff --git a/arch/arm/dts/am335x-bone-u-boot.dtsi b/arch/arm/dts/am335x-bone-u-boot.dtsi
new file mode 100644
index 0000000000000000000000000000000000000000..11264707882b62749779aeb0a12e4471c8ace999
--- /dev/null
+++ b/arch/arm/dts/am335x-bone-u-boot.dtsi
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * am335x-bone U-Boot Additions
+ */
+
+#include "am335x-bone-common-u-boot.dtsi"
diff --git a/arch/arm/dts/am335x-boneblack-u-boot.dtsi b/arch/arm/dts/am335x-boneblack-u-boot.dtsi
new file mode 100644
index 0000000000000000000000000000000000000000..e2afc77d9edc539323c73dee03511a9cd62d8ca8
--- /dev/null
+++ b/arch/arm/dts/am335x-boneblack-u-boot.dtsi
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * am335x-boneblack U-Boot Additions
+ */
+
+#include "am335x-bone-common-u-boot.dtsi"
diff --git a/arch/arm/dts/am335x-bonegreen-u-boot.dtsi b/arch/arm/dts/am335x-bonegreen-u-boot.dtsi
new file mode 100644
index 0000000000000000000000000000000000000000..47e371a816faa4c0f9625d0313109fadafaf8459
--- /dev/null
+++ b/arch/arm/dts/am335x-bonegreen-u-boot.dtsi
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * am335x-bonegreen U-Boot Additions
+ */
+
+#include "am335x-bone-common-u-boot.dtsi"
diff --git a/arch/arm/dts/am335x-evm-u-boot.dtsi b/arch/arm/dts/am335x-evm-u-boot.dtsi
index 72402c82928a72abe3847bfcc0771dabc571d8e6..2ebf60bf7d6ce007e033b75a25a10c60a83e218e 100644
--- a/arch/arm/dts/am335x-evm-u-boot.dtsi
+++ b/arch/arm/dts/am335x-evm-u-boot.dtsi
@@ -5,6 +5,12 @@
 
 #include "am33xx-u-boot.dtsi"
 
+/ {
+	chosen {
+		tick-timer = &timer2;
+	};
+};
+
 &l4_per {
 	bootph-all;
 	segment@300000 {
diff --git a/arch/arm/dts/am335x-evmsk-u-boot.dtsi b/arch/arm/dts/am335x-evmsk-u-boot.dtsi
index 669cb6bf165575c7e688e49fe15732c97c9c0121..06ee1eb7c3ed68e6ccc8630d209b50add20e4d20 100644
--- a/arch/arm/dts/am335x-evmsk-u-boot.dtsi
+++ b/arch/arm/dts/am335x-evmsk-u-boot.dtsi
@@ -7,6 +7,12 @@
 
 #include "am33xx-u-boot.dtsi"
 
+/ {
+	chosen {
+		tick-timer = &timer2;
+	};
+};
+
 &l4_per {
 
 	segment@300000 {
diff --git a/arch/arm/dts/am335x-icev2-u-boot.dtsi b/arch/arm/dts/am335x-icev2-u-boot.dtsi
index ac1feaa9d9f69b79211f34c44af1008a5aed30ca..4ae100a3a7fb6bbb4b618849a15eb370a10dde2a 100644
--- a/arch/arm/dts/am335x-icev2-u-boot.dtsi
+++ b/arch/arm/dts/am335x-icev2-u-boot.dtsi
@@ -6,6 +6,10 @@
 #include "am33xx-u-boot.dtsi"
 
 / {
+	chosen {
+		tick-timer = &timer2;
+	};
+
 	xtal25mhz: xtal25mhz {
 		compatible = "fixed-clock";
 		#clock-cells = <0>;
diff --git a/arch/arm/dts/am335x-pocketbeagle-u-boot.dtsi b/arch/arm/dts/am335x-pocketbeagle-u-boot.dtsi
new file mode 100644
index 0000000000000000000000000000000000000000..52c4bc26e128b6f463659bba070de515e7997efe
--- /dev/null
+++ b/arch/arm/dts/am335x-pocketbeagle-u-boot.dtsi
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * am335x-pocketbeagle U-Boot Additions
+ */
+
+#include "am335x-bone-common-u-boot.dtsi"
diff --git a/arch/arm/dts/am335x-sancloud-bbe-extended-wifi-u-boot.dtsi b/arch/arm/dts/am335x-sancloud-bbe-extended-wifi-u-boot.dtsi
new file mode 100644
index 0000000000000000000000000000000000000000..17b86bdba3e43e7e9881e87a3ca0d3a36557c755
--- /dev/null
+++ b/arch/arm/dts/am335x-sancloud-bbe-extended-wifi-u-boot.dtsi
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * am335x-sancloud-bbe-extended-wifi U-Boot Additions
+ */
+
+#include "am335x-sancloud-bbe-u-boot.dtsi"

-- 
2.51.0

Re: [PATCH v2 4/7] arm: dts: am335x-*-u-boot: Add chosen tick-timer

[Kory Maincent]

On Fri, 28 Nov 2025 21:46:34 +0100
"Markus Schneider-Pargmann (TI.com)" <msp@baylibre.com> wrote:

> Upstream devicetrees do not have a binding for the tick-timer. Add it
> for all boards built with the am335x_evm_defconfig.
> 
> Signed-off-by: Markus Schneider-Pargmann (TI.com) <msp@baylibre.com>

Reviewed-by: Kory Maincent <kory.maincent@bootlin.com>

Thank you!
-- 
Köry Maincent, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com

[PATCH v2 5/7] am33xx: Fix comment about config symbols

[Markus Schneider-Pargmann (TI.com)]

Fix #else and #endif comments to match actual #if condition. Comments
incorrectly referenced CONFIG_USB_MUSB_* instead of CONFIG_AM335X_USB*
and CONFIG_XPL_BUILD.

Signed-off-by: Markus Schneider-Pargmann (TI.com) <msp@baylibre.com>
---
 arch/arm/mach-omap2/am33xx/board.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap2/am33xx/board.c b/arch/arm/mach-omap2/am33xx/board.c
index 4e9ad8935e3b5020c4ed1d022ae4846a2dc9486f..d7db260513308257f142ea70d5d5c643afc920c9 100644
--- a/arch/arm/mach-omap2/am33xx/board.c
+++ b/arch/arm/mach-omap2/am33xx/board.c
@@ -259,7 +259,7 @@ int arch_misc_init(void)
 {
 	return 0;
 }
-#else	/* CONFIG_USB_MUSB_* && CONFIG_AM335X_USB* && !CONFIG_DM_USB */
+#else /* CONFIG_AM335X_USB* && CONFIG_XPL_BUILD */
 
 int arch_misc_init(void)
 {
@@ -277,7 +277,7 @@ int arch_misc_init(void)
 	return 0;
 }
 
-#endif /* CONFIG_USB_MUSB_* && CONFIG_AM335X_USB* && !CONFIG_DM_USB */
+#endif /* CONFIG_AM335X_USB* && CONFIG_XPL_BUILD */
 
 #if !CONFIG_IS_ENABLED(SKIP_LOWLEVEL_INIT)
 

-- 
2.51.0

Re: [PATCH v2 5/7] am33xx: Fix comment about config symbols

[Kory Maincent]

On Fri, 28 Nov 2025 21:46:35 +0100
"Markus Schneider-Pargmann (TI.com)" <msp@baylibre.com> wrote:

> Fix #else and #endif comments to match actual #if condition. Comments
> incorrectly referenced CONFIG_USB_MUSB_* instead of CONFIG_AM335X_USB*
> and CONFIG_XPL_BUILD.
> 
> Signed-off-by: Markus Schneider-Pargmann (TI.com) <msp@baylibre.com>

Reviewed-by: Kory Maincent <kory.maincent@bootlin.com>

Thank you!
-- 
Köry Maincent, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com

[PATCH v2 6/7] am33xx: Support upstream devicetree binding

[Markus Schneider-Pargmann (TI.com)]

Support musb being probed by ti,musb-am33xx. The non-upstream DT probing
used a wrapper driver that probed ti-musb-peripheral and ti-musb-host.
This wrapper registered as UCLASS_MISC, which is why it is requested in
this board.c file.

With the new devicetree the wrapper that registers as UCLASS_MISC is
gone, instead the UCLASS_USB and UCLASS_USB_GADGET_GENERIC have to be
requested.

Also don't fail if the USB devices are not available.

Signed-off-by: Markus Schneider-Pargmann (TI.com) <msp@baylibre.com>
---
 arch/arm/mach-omap2/am33xx/board.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-omap2/am33xx/board.c b/arch/arm/mach-omap2/am33xx/board.c
index d7db260513308257f142ea70d5d5c643afc920c9..4bfdb55b2dd5c66cd58bce360cf1c69fb7a00cd6 100644
--- a/arch/arm/mach-omap2/am33xx/board.c
+++ b/arch/arm/mach-omap2/am33xx/board.c
@@ -266,12 +266,16 @@ int arch_misc_init(void)
 	struct udevice *dev;
 	int ret;
 
-	ret = uclass_first_device_err(UCLASS_MISC, &dev);
-	if (ret)
-		return ret;
+	if (IS_ENABLED(CONFIG_OF_UPSTREAM)) {
+		uclass_first_device_err(UCLASS_USB, &dev);
+		ret = uclass_first_device_err(UCLASS_USB_GADGET_GENERIC, &dev);
+	} else {
+		ret = uclass_first_device_err(UCLASS_MISC, &dev);
+	}
 
 #if defined(CONFIG_DM_ETH) && defined(CONFIG_USB_ETHER)
-	usb_ether_init();
+	if (!ret)
+		usb_ether_init();
 #endif
 
 	return 0;

-- 
2.51.0

Re: [PATCH v2 6/7] am33xx: Support upstream devicetree binding

[Kory Maincent]

On Fri, 28 Nov 2025 21:46:36 +0100
"Markus Schneider-Pargmann (TI.com)" <msp@baylibre.com> wrote:

> Support musb being probed by ti,musb-am33xx. The non-upstream DT probing
> used a wrapper driver that probed ti-musb-peripheral and ti-musb-host.
> This wrapper registered as UCLASS_MISC, which is why it is requested in
> this board.c file.
> 
> With the new devicetree the wrapper that registers as UCLASS_MISC is
> gone, instead the UCLASS_USB and UCLASS_USB_GADGET_GENERIC have to be
> requested.
> 
> Also don't fail if the USB devices are not available.
> 
> Signed-off-by: Markus Schneider-Pargmann (TI.com) <msp@baylibre.com>
> ---
>  arch/arm/mach-omap2/am33xx/board.c | 12 ++++++++----
>  1 file changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/am33xx/board.c
> b/arch/arm/mach-omap2/am33xx/board.c index
> d7db260513308257f142ea70d5d5c643afc920c9..4bfdb55b2dd5c66cd58bce360cf1c69fb7a00cd6
> 100644 --- a/arch/arm/mach-omap2/am33xx/board.c +++
> b/arch/arm/mach-omap2/am33xx/board.c @@ -266,12 +266,16 @@ int
> arch_misc_init(void) struct udevice *dev;
>  	int ret;
>  
> -	ret = uclass_first_device_err(UCLASS_MISC, &dev);
> -	if (ret)
> -		return ret;
> +	if (IS_ENABLED(CONFIG_OF_UPSTREAM)) {
> +		uclass_first_device_err(UCLASS_USB, &dev);
> +		ret = uclass_first_device_err(UCLASS_USB_GADGET_GENERIC,
> &dev);
> +	} else {
> +		ret = uclass_first_device_err(UCLASS_MISC, &dev);
> +	}
>  
>  #if defined(CONFIG_DM_ETH) && defined(CONFIG_USB_ETHER)
> -	usb_ether_init();
> +	if (!ret)
> +		usb_ether_init();
>  #endif
>  
>  	return 0;

You are losing the error return value here.

Regards,
-- 
Köry Maincent, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com

Re: [PATCH v2 6/7] am33xx: Support upstream devicetree binding

[Markus Schneider-Pargmann]

[-- Attachment #1: Type: text/plain, Size: 2204 bytes --]

Hi Kory,

On Mon Dec 1, 2025 at 2:14 PM CET, Kory Maincent wrote:
> On Fri, 28 Nov 2025 21:46:36 +0100
> "Markus Schneider-Pargmann (TI.com)" <msp@baylibre.com> wrote:
>
>> Support musb being probed by ti,musb-am33xx. The non-upstream DT probing
>> used a wrapper driver that probed ti-musb-peripheral and ti-musb-host.
>> This wrapper registered as UCLASS_MISC, which is why it is requested in
>> this board.c file.
>> 
>> With the new devicetree the wrapper that registers as UCLASS_MISC is
>> gone, instead the UCLASS_USB and UCLASS_USB_GADGET_GENERIC have to be
>> requested.
>> 
>> Also don't fail if the USB devices are not available.
>> 
>> Signed-off-by: Markus Schneider-Pargmann (TI.com) <msp@baylibre.com>
>> ---
>>  arch/arm/mach-omap2/am33xx/board.c | 12 ++++++++----
>>  1 file changed, 8 insertions(+), 4 deletions(-)
>> 
>> diff --git a/arch/arm/mach-omap2/am33xx/board.c
>> b/arch/arm/mach-omap2/am33xx/board.c index
>> d7db260513308257f142ea70d5d5c643afc920c9..4bfdb55b2dd5c66cd58bce360cf1c69fb7a00cd6
>> 100644 --- a/arch/arm/mach-omap2/am33xx/board.c +++
>> b/arch/arm/mach-omap2/am33xx/board.c @@ -266,12 +266,16 @@ int
>> arch_misc_init(void) struct udevice *dev;
>>  	int ret;
>>  
>> -	ret = uclass_first_device_err(UCLASS_MISC, &dev);
>> -	if (ret)
>> -		return ret;
>> +	if (IS_ENABLED(CONFIG_OF_UPSTREAM)) {
>> +		uclass_first_device_err(UCLASS_USB, &dev);
>> +		ret = uclass_first_device_err(UCLASS_USB_GADGET_GENERIC,
>> &dev);
>> +	} else {
>> +		ret = uclass_first_device_err(UCLASS_MISC, &dev);
>> +	}
>>  
>>  #if defined(CONFIG_DM_ETH) && defined(CONFIG_USB_ETHER)
>> -	usb_ether_init();
>> +	if (!ret)
>> +		usb_ether_init();
>>  #endif
>>  
>>  	return 0;
>
> You are losing the error return value here.

Yes, on purpose. During my work on using the upstream devicetree I
didn't have a working USB yet but u-boot wouldn't start because
arch_misc_init failed. I don't see why u-boot shouldn't start a console
if something USB related is broken. That's why I did not return the USB
error code here.

Also if you do need USB for booting you notice it really quick.

Thanks for all your reviews.

Best
Markus

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 289 bytes --]

Re: [PATCH v2 6/7] am33xx: Support upstream devicetree binding

[Kory Maincent]

On Tue, 02 Dec 2025 16:50:03 +0100
"Markus Schneider-Pargmann" <msp@baylibre.com> wrote:

> Hi Kory,
> 
> On Mon Dec 1, 2025 at 2:14 PM CET, Kory Maincent wrote:
> > On Fri, 28 Nov 2025 21:46:36 +0100
> > "Markus Schneider-Pargmann (TI.com)" <msp@baylibre.com> wrote:
> >  
> >> Support musb being probed by ti,musb-am33xx. The non-upstream DT probing
> >> used a wrapper driver that probed ti-musb-peripheral and ti-musb-host.
> >> This wrapper registered as UCLASS_MISC, which is why it is requested in
> >> this board.c file.
> >> 
> >> With the new devicetree the wrapper that registers as UCLASS_MISC is
> >> gone, instead the UCLASS_USB and UCLASS_USB_GADGET_GENERIC have to be
> >> requested.
> >> 
> >> Also don't fail if the USB devices are not available.
> >> 
> >> Signed-off-by: Markus Schneider-Pargmann (TI.com) <msp@baylibre.com>
> >> ---
> >>  arch/arm/mach-omap2/am33xx/board.c | 12 ++++++++----
> >>  1 file changed, 8 insertions(+), 4 deletions(-)
> >> 
> >> diff --git a/arch/arm/mach-omap2/am33xx/board.c
> >> b/arch/arm/mach-omap2/am33xx/board.c index
> >> d7db260513308257f142ea70d5d5c643afc920c9..4bfdb55b2dd5c66cd58bce360cf1c69fb7a00cd6
> >> 100644 --- a/arch/arm/mach-omap2/am33xx/board.c +++
> >> b/arch/arm/mach-omap2/am33xx/board.c @@ -266,12 +266,16 @@ int
> >> arch_misc_init(void) struct udevice *dev;
> >>  	int ret;
> >>  
> >> -	ret = uclass_first_device_err(UCLASS_MISC, &dev);
> >> -	if (ret)
> >> -		return ret;
> >> +	if (IS_ENABLED(CONFIG_OF_UPSTREAM)) {
> >> +		uclass_first_device_err(UCLASS_USB, &dev);
> >> +		ret = uclass_first_device_err(UCLASS_USB_GADGET_GENERIC,
> >> &dev);
> >> +	} else {
> >> +		ret = uclass_first_device_err(UCLASS_MISC, &dev);
> >> +	}
> >>  
> >>  #if defined(CONFIG_DM_ETH) && defined(CONFIG_USB_ETHER)
> >> -	usb_ether_init();
> >> +	if (!ret)
> >> +		usb_ether_init();
> >>  #endif
> >>  
> >>  	return 0;  
> >
> > You are losing the error return value here.  
> 
> Yes, on purpose. During my work on using the upstream devicetree I
> didn't have a working USB yet but u-boot wouldn't start because
> arch_misc_init failed. I don't see why u-boot shouldn't start a console
> if something USB related is broken. That's why I did not return the USB
> error code here.

Indeed I missed it from the last line of your commit message.
Maybe it should be in a separate patch as this change current boot behavior and
it is unrelated to you UCLASS USB change.
Also I have noticed that your patch subject is a bit vague, you don't talk
about USB at all. 

Regards,
-- 
Köry Maincent, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com

[PATCH v2 7/7] configs: am335x_evm_defconfig: Switch to upstream devicetree

[Markus Schneider-Pargmann (TI.com)]

The upstream devicetree uses simple-pm-bus, so CONFIG_POWER_DOMAIN is
required now. CONFIG_POWER_DOMAIN enables probing power domains, the PRM
power domain driver is requierd as well now.

Signed-off-by: Markus Schneider-Pargmann (TI.com) <msp@baylibre.com>
---
 configs/am335x_evm_defconfig | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
index bd188c252780fb541afbbe61a243bddaab79be93..5826562988c674cc05f45e3d8ee8e131adcba069 100644
--- a/configs/am335x_evm_defconfig
+++ b/configs/am335x_evm_defconfig
@@ -3,7 +3,10 @@ CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_OMAP2PLUS=y
 CONFIG_TI_COMMON_CMD_OPTIONS=y
 CONFIG_SF_DEFAULT_SPEED=24000000
-CONFIG_DEFAULT_DEVICE_TREE="am335x-evm"
+CONFIG_DEFAULT_DEVICE_TREE="ti/omap/am335x-evm"
+CONFIG_POWER_DOMAIN=y
+CONFIG_TI_OMAP_PRM_POWER_DOMAIN=y
+CONFIG_SIMPLE_PM_BUS=y
 CONFIG_AM33XX=y
 CONFIG_CLOCK_SYNTHESIZER=y
 CONFIG_AM335X_USB0=y
@@ -50,7 +53,8 @@ CONFIG_MTDIDS_DEFAULT="nand0=nand.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND.SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k(NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND.kernel),-(NAND.file-system)"
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_OF_CONTROL=y
-CONFIG_OF_LIST="am335x-evm am335x-bone am335x-sancloud-bbe am335x-sancloud-bbe-lite am335x-sancloud-bbe-extended-wifi am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2 am335x-pocketbeagle am335x-bonegreen-eco"
+CONFIG_OF_LIST="ti/omap/am335x-evm ti/omap/am335x-bone ti/omap/am335x-sancloud-bbe ti/omap/am335x-sancloud-bbe-lite ti/omap/am335x-sancloud-bbe-extended-wifi ti/omap/am335x-boneblack ti/omap/am335x-evmsk ti/omap/am335x-bonegreen ti/omap/am335x-icev2 ti/omap/am335x-pocketbeagle ti/omap/am335x-bonegreen-eco"
+CONFIG_OF_UPSTREAM=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y

-- 
2.51.0

Re: [PATCH v2 7/7] configs: am335x_evm_defconfig: Switch to upstream devicetree

[Kory Maincent]

On Fri, 28 Nov 2025 21:46:37 +0100
"Markus Schneider-Pargmann (TI.com)" <msp@baylibre.com> wrote:

> The upstream devicetree uses simple-pm-bus, so CONFIG_POWER_DOMAIN is
> required now. CONFIG_POWER_DOMAIN enables probing power domains, the PRM
> power domain driver is requierd as well now.
> 
> Signed-off-by: Markus Schneider-Pargmann (TI.com) <msp@baylibre.com>

Seems ok to me.
Reviewed-by: Kory Maincent <kory.maincent@bootlin.com>

Thank you!

> ---
>  configs/am335x_evm_defconfig | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
> index
> bd188c252780fb541afbbe61a243bddaab79be93..5826562988c674cc05f45e3d8ee8e131adcba069
> 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig
> @@ -3,7 +3,10 @@ CONFIG_ARCH_CPU_INIT=y
>  CONFIG_ARCH_OMAP2PLUS=y
>  CONFIG_TI_COMMON_CMD_OPTIONS=y
>  CONFIG_SF_DEFAULT_SPEED=24000000
> -CONFIG_DEFAULT_DEVICE_TREE="am335x-evm"
> +CONFIG_DEFAULT_DEVICE_TREE="ti/omap/am335x-evm"
> +CONFIG_POWER_DOMAIN=y
> +CONFIG_TI_OMAP_PRM_POWER_DOMAIN=y
> +CONFIG_SIMPLE_PM_BUS=y
>  CONFIG_AM33XX=y
>  CONFIG_CLOCK_SYNTHESIZER=y
>  CONFIG_AM335X_USB0=y
> @@ -50,7 +53,8 @@ CONFIG_MTDIDS_DEFAULT="nand0=nand.0"
>  CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND.SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k(NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND.kernel),-(NAND.file-system)"
>  # CONFIG_SPL_EFI_PARTITION is not set
>  CONFIG_OF_CONTROL=y
> -CONFIG_OF_LIST="am335x-evm am335x-bone am335x-sancloud-bbe
> am335x-sancloud-bbe-lite am335x-sancloud-bbe-extended-wifi am335x-boneblack
> am335x-evmsk am335x-bonegreen am335x-icev2 am335x-pocketbeagle
> am335x-bonegreen-eco" +CONFIG_OF_LIST="ti/omap/am335x-evm ti/omap/am335x-bone
> ti/omap/am335x-sancloud-bbe ti/omap/am335x-sancloud-bbe-lite
> ti/omap/am335x-sancloud-bbe-extended-wifi ti/omap/am335x-boneblack
> ti/omap/am335x-evmsk ti/omap/am335x-bonegreen ti/omap/am335x-icev2
> ti/omap/am335x-pocketbeagle ti/omap/am335x-bonegreen-eco"
> +CONFIG_OF_UPSTREAM=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_RELOC_GD_ENV_ADDR=y
> CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
> 



-- 
Köry Maincent, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com

Re: [PATCH v2 7/7] configs: am335x_evm_defconfig: Switch to upstream devicetree

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 803 bytes --]

On Fri, Nov 28, 2025 at 09:46:37PM +0100, Markus Schneider-Pargmann (TI.com) wrote:

> The upstream devicetree uses simple-pm-bus, so CONFIG_POWER_DOMAIN is
> required now. CONFIG_POWER_DOMAIN enables probing power domains, the PRM
> power domain driver is requierd as well now.
> 
> Signed-off-by: Markus Schneider-Pargmann (TI.com) <msp@baylibre.com>
> ---
>  configs/am335x_evm_defconfig | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)

We probably need to, somewhere within this series, change
configs/am335x_*evm_* to make use of #include because am335x_evm_spiboot
isn't updated nor any of the hs_evm variants. Also, after this series
do all of the other am335x based platforms build still? And then are any
of them trivial conversions to OF_UPSTREAM ?

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

Re: [PATCH v2 7/7] configs: am335x_evm_defconfig: Switch to upstream devicetree

[Markus Schneider-Pargmann]

[-- Attachment #1: Type: text/plain, Size: 1261 bytes --]

On Mon Dec 1, 2025 at 5:17 PM CET, Tom Rini wrote:
> On Fri, Nov 28, 2025 at 09:46:37PM +0100, Markus Schneider-Pargmann (TI.com) wrote:
>
>> The upstream devicetree uses simple-pm-bus, so CONFIG_POWER_DOMAIN is
>> required now. CONFIG_POWER_DOMAIN enables probing power domains, the PRM
>> power domain driver is requierd as well now.
>> 
>> Signed-off-by: Markus Schneider-Pargmann (TI.com) <msp@baylibre.com>
>> ---
>>  configs/am335x_evm_defconfig | 8 ++++++--
>>  1 file changed, 6 insertions(+), 2 deletions(-)
>
> We probably need to, somewhere within this series, change
> configs/am335x_*evm_* to make use of #include because am335x_evm_spiboot
> isn't updated nor any of the hs_evm variants. Also, after this series
> do all of the other am335x based platforms build still? And then are any
> of them trivial conversions to OF_UPSTREAM ?

I tried to keep everything backwards compatible. During development I
tested both configs (OF_UPSTREAM enabled/disabled) with all the patches.
I will try to build for all other variants, but I think all these
changes shouldn't break them.

Thanks, I can update the other evm defconfigs and give a quick look at
the other am335x and if they would require a lot of work.

Best
Markus


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 289 bytes --]