Skip to contentSkip to conversation

meson: axg: search dtb for meson-axg-usb-ctrl on board axg

PATCH In review Sergei Antonov 2 participants 3 messages May 9, 2022 – May 23, 2022

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

PATCH 1/1 meson: axg: search dtb for meson-axg-usb-ctrl on board axg

USB controller for AXG is described as meson-axg-usb-ctrl, see arch/arm/dts/meson-axg.dtsi
Look for that name instead of meson-gxl-usb-ctrl.

---
 arch/arm/mach-meson/board-axg.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-meson/board-axg.c +2 -2
index 71ac65c636..236ec81579 100644
@@ -106,7 +106,7 @@ int board_usb_init(int index, enum usb_init_type init)
 
 	/* find the usb glue node */
 	node = fdt_node_offset_by_compatible(blob, -1,
-					     "amlogic,meson-gxl-usb-ctrl");
+					     "amlogic,meson-axg-usb-ctrl");
 	if (node < 0) {
 		debug("Not found usb-control node\n");
 		return -ENODEV;
@@ -192,7 +192,7 @@ int board_usb_cleanup(int index, enum usb_init_type init)
 
 	/* find the usb glue node */
 	node = fdt_node_offset_by_compatible(blob, -1,
-					     "amlogic,meson-gxl-usb-ctrl");
+					     "amlogic,meson-axg-usb-ctrl");
 	if (node < 0) {
 		debug("Not found usb-control node\n");
 		return -ENODEV;
Signature · 1 line
2.32.0
Acked-by on v1 1/1
#1 lore raw

Hi Sergei,

Quoted 23 lines · Sergei Antonov

USB controller for AXG is described as meson-axg-usb-ctrl, see arch/arm/dts/meson-axg.dtsi
Look for that name instead of meson-gxl-usb-ctrl.

---
  arch/arm/mach-meson/board-axg.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-meson/board-axg.c +1 -1
index 71ac65c636..236ec81579 100644
@@ -106,7 +106,7 @@ int board_usb_init(int index, enum usb_init_type init)
 
  	/* find the usb glue node */
  	node = fdt_node_offset_by_compatible(blob, -1,
-					     "amlogic,meson-gxl-usb-ctrl");
+					     "amlogic,meson-axg-usb-ctrl");
  	if (node < 0) {
  		debug("Not found usb-control node\n");
  		return -ENODEV;

arch/arm/mach-meson/board-axg.c int board_usb_cleanup(int index, enum usb_init_type init) · line 198

Quoted 8 lines
arch/arm/mach-meson/board-axg.c +1 -1
@@ -192,7 +192,7 @@ int board_usb_cleanup(int index, enum usb_init_type init)
 
  	/* find the usb glue node */
  	node = fdt_node_offset_by_compatible(blob, -1,
-					     "amlogic,meson-gxl-usb-ctrl");
+					     "amlogic,meson-axg-usb-ctrl");
  	if (node < 0) {
  		debug("Not found usb-control node\n");
  		return -ENODEV;

Thanks, I missed this patch, please use get-maintainer to it gets send to the right mailing-lists the next time.

Neil

#2 lore raw
In reply to Sergei Antonov

Hi,

Quoted 5 lines · Sergei Antonov

USB controller for AXG is described as meson-axg-usb-ctrl, see arch/arm/dts/meson-axg.dtsi
Look for that name instead of meson-gxl-usb-ctrl.

Thanks, Applied to https://source.denx.de/u-boot/custodians/u-boot-amlogic (u-boot-amlogic-test)

[1/1] meson: axg: search dtb for meson-axg-usb-ctrl on board axg

      https://source.denx.de/u-boot/custodians/u-boot-amlogic/-/commit/fdc55a6ba8309b688c9db6c3cf3f70ad7034c147
Signature · 1 line
Neil