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
This commit is contained in:
@@ -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
|
||||
),
|
||||
|
@@ -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,
|
||||
};
|
||||
|
@@ -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) \
|
||||
|
Reference in New Issue
Block a user