Merge remote-tracking branch 'origin/imx_v2022.04' into lf_v2022.04

* origin/imx_v2022.04:
  LFU-423: usb: cdns3: gadget: Avoid using usb_ss after null check
  MLK-26034 imx6: Disable LCDIF clock before jumping to kernel

6 files changed, 38 insertions, 1 deletions

diff --git a/board/freescale/mx6sllevk/mx6sllevk.c b/board/freescale/mx6sllevk/mx6sllevk.c
index 22e43dffe7..f6467d40fc 100644
--- a/board/freescale/mx6sllevk/mx6sllevk.c
+++ b/board/freescale/mx6sllevk/mx6sllevk.c
@@ -408,3 +408,10 @@ int checkboard(void)
 
 	return 0;
 }
+
+void board_quiesce_devices(void)
+{
+#if defined(CONFIG_VIDEO_MXS)
+	enable_lcdif_clock(MX6SLL_LCDIF_BASE_ADDR, 0);
+#endif
+}
diff --git a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
index 9c355e4e23..4460117380 100644
--- a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
+++ b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
@@ -458,3 +458,11 @@ int checkboard(void)
 
 	return 0;
 }
+
+void board_quiesce_devices(void)
+{
+#if defined(CONFIG_VIDEO_MXS)
+	enable_lcdif_clock(MX6SX_LCDIF1_BASE_ADDR, 0);
+	enable_lcdif_clock(LCDIF2_BASE_ADDR, 0);
+#endif
+}
diff --git a/board/freescale/mx6sxsabresd/mx6sxsabresd.c b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
index 7e1c538677..8e725ff882 100644
--- a/board/freescale/mx6sxsabresd/mx6sxsabresd.c
+++ b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
@@ -794,3 +794,11 @@ int checkboard(void)
 #endif
 	return 0;
 }
+
+void board_quiesce_devices(void)
+{
+#if defined(CONFIG_VIDEO_MXS)
+	enable_lcdif_clock(MX6SX_LCDIF1_BASE_ADDR, 0);
+	enable_lcdif_clock(LCDIF2_BASE_ADDR, 0);
+#endif
+}
diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
index 221a1ba791..96d40af5da 100644
--- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
+++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
@@ -446,6 +446,13 @@ void board_preboot_os(void)
 	gpio_set_value(IMX_GPIO_NR(5, 9), 0);
 }
 
+void board_quiesce_devices(void)
+{
+#if defined(CONFIG_VIDEO_MXS)
+	enable_lcdif_clock(LCDIF1_BASE_ADDR, 0);
+#endif
+}
+
 #ifdef CONFIG_SPL_BUILD
 #include <linux/libfdt.h>
 #include <spl.h>
diff --git a/board/freescale/mx6ullevk/mx6ullevk.c b/board/freescale/mx6ullevk/mx6ullevk.c
index 72e4898ae8..23dbc67107 100644
--- a/board/freescale/mx6ullevk/mx6ullevk.c
+++ b/board/freescale/mx6ullevk/mx6ullevk.c
@@ -367,3 +367,10 @@ int checkboard(void)
 
 	return 0;
 }
+
+void board_quiesce_devices(void)
+{
+#if defined(CONFIG_VIDEO_MXS)
+	enable_lcdif_clock(LCDIF1_BASE_ADDR, 0);
+#endif
+}
diff --git a/drivers/usb/cdns3/gadget.c b/drivers/usb/cdns3/gadget.c
index 5bd80cf986..730454c66e 100644
--- a/drivers/usb/cdns3/gadget.c
+++ b/drivers/usb/cdns3/gadget.c
@@ -55,7 +55,7 @@ static struct usb_request *next_request(struct list_head *list)
 static void select_ep(struct usb_ss_dev *usb_ss, u32 ep)
 {
 	if (!usb_ss || !usb_ss->regs) {
-		dev_err(&usb_ss->dev, "Failed to select endpoint!\n");
+		printf("Failed to select endpoint!\n");
 		return;
 	}