diff options
| author | Tom Rini <trini@konsulko.com> | 2023-11-06 09:47:13 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-11-06 09:47:13 -0500 |
| commit | 274f41c653b0ca3be1bf66b7b8e3e9c47d73e3e4 (patch) | |
| tree | f42964b7e6219173aa649d5346c2c32f6c6cc4d6 | |
| parent | fd0d7d7efecd22d5a9cc77cb7589c4f144a1c506 (diff) | |
| parent | c550e81171940932664a85bda315a6a073aae23c (diff) | |
| download | u-boot-274f41c653b0ca3be1bf66b7b8e3e9c47d73e3e4.zip u-boot-274f41c653b0ca3be1bf66b7b8e3e9c47d73e3e4.tar.gz u-boot-274f41c653b0ca3be1bf66b7b8e3e9c47d73e3e4.tar.bz2 | |
Merge tag 'u-boot-amlogic-20231106' of https://source.denx.de/u-boot/custodians/u-boot-amlogic
- fixup to also enabled DFU RAM boot for libretech-ac
- sm fix to bind child sm devices in the device tree
- add missing A1 clocks for USB stack
| -rw-r--r-- | drivers/clk/meson/a1.c | 6 | ||||
| -rw-r--r-- | drivers/sm/meson-sm.c | 1 | ||||
| -rw-r--r-- | include/configs/libretech-ac.h | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/drivers/clk/meson/a1.c b/drivers/clk/meson/a1.c index 1075ba7..d0f5bb3 100644 --- a/drivers/clk/meson/a1.c +++ b/drivers/clk/meson/a1.c @@ -241,6 +241,12 @@ static const struct meson_clk_info *meson_clocks[] = { [CLKID_USB_PHY_IN] = CLK_GATE("usb_phy_in", A1_SYS_OSCIN_CTRL, 2, EXTERNAL_XTAL ), + [CLKID_USB_CTRL_IN] = CLK_GATE("usb_ctrl_in", A1_SYS_OSCIN_CTRL, 3, + EXTERNAL_XTAL + ), + [CLKID_USB_CTRL] = CLK_GATE("usb_ctrl", A1_SYS_CLK_EN0, 28, + CLKID_SYS + ), [CLKID_USB_PHY] = CLK_GATE("usb_phy", A1_SYS_CLK_EN0, 27, CLKID_SYS ), diff --git a/drivers/sm/meson-sm.c b/drivers/sm/meson-sm.c index 25adaf4..15b3b0e 100644 --- a/drivers/sm/meson-sm.c +++ b/drivers/sm/meson-sm.c @@ -193,6 +193,7 @@ U_BOOT_DRIVER(meson_sm) = { .id = UCLASS_SM, .of_match = meson_sm_ids, .probe = meson_sm_probe, + .bind = dm_scan_fdt_dev, .priv_auto = sizeof(struct meson_sm_priv), .ops = &sm_ops, }; diff --git a/include/configs/libretech-ac.h b/include/configs/libretech-ac.h index bf20d31..16239f2 100644 --- a/include/configs/libretech-ac.h +++ b/include/configs/libretech-ac.h @@ -11,6 +11,7 @@ #define BOOT_TARGET_DEVICES(func) \ func(ROMUSB, romusb, na) \ + func(USB_DFU, usbdfu, na) \ func(MMC, mmc, 0) \ BOOT_TARGET_DEVICES_USB(func) \ func(PXE, pxe, na) \ |