From 8ec790399aa88bb8d0a02282e411f34584c74950 Mon Sep 17 00:00:00 2001 From: Alexey Romanov Date: Wed, 1 Nov 2023 17:04:56 +0300 Subject: [PATCH 1/3] clk: a1: add new clocks for USB stack Since we sync device tree with Linux, we have to add this clock definition for USB stack. Signed-off-by: Alexey Romanov Reviewed-by: Neil Armstrong Link: https://lore.kernel.org/r/20231101140500.9025-2-avromanov@salutedevices.com Signed-off-by: Neil Armstrong --- drivers/clk/meson/a1.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/clk/meson/a1.c b/drivers/clk/meson/a1.c index 1075ba73339..d0f5bb37530 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 ), From e9f4f7789cdcda342b2f7edb82a6141f82f4c7c2 Mon Sep 17 00:00:00 2001 From: Dmitry Rokosov Date: Wed, 1 Nov 2023 17:04:57 +0300 Subject: [PATCH 2/3] drivers: sm: bind child sm devices in the device tree One well-known sm child device that provides secure power control is the Secure Power Controller. This device utilizes SMC calls to communicate with power domains on the secure monitor side. Signed-off-by: Dmitry Rokosov Signed-off-by: Alexey Romanov Reviewed-by: Neil Armstrong Link: https://lore.kernel.org/r/20231101140500.9025-3-avromanov@salutedevices.com Signed-off-by: Neil Armstrong --- drivers/sm/meson-sm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/sm/meson-sm.c b/drivers/sm/meson-sm.c index 25adaf45607..15b3b0e2672 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, }; From c550e81171940932664a85bda315a6a073aae23c Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Thu, 2 Nov 2023 14:49:58 +0100 Subject: [PATCH 3/3] ARM: configs: libretech-ac: enable USB_DFU like in meson64.h USB_DFU was added in meson64.h but is missing in libretech-ac.h, fix this to enable DFU RAM boot for libretech-ac. Fixes 4aa027b3f8 ("configs: meson64: add alternate USB DFU boot target") Link: https://lore.kernel.org/r/20231102-libretech-ac-fix-dfu-v1-1-112379165028@linaro.org Signed-off-by: Neil Armstrong --- include/configs/libretech-ac.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/configs/libretech-ac.h b/include/configs/libretech-ac.h index bf20d315430..16239f25202 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) \