Skip to contentSkip to conversation

Convert WaRP7 to DM_USB and DM_SERIAL

PATCH New Pierre-Jean Texier 3 participants 7 messages Apr 19, 2019 – Apr 26, 2019

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

v2 cover Convert WaRP7 to DM_USB and DM_SERIAL

This series convert the WaRP7 to the following DM:
-CONFIG_DM_USB
-CONFIG_DM_SERIAL

Change in v2:
- Now split in two distinct patches (DM_USB & DM_SERIAL)

Pierre-Jean Texier (2):
warp7: Switch to DM Serial
warp7: Switch to DM USB

 arch/arm/dts/imx7s-warp.dts  | 5 +++++
 board/warp7/warp7.c          | 6 ------
 configs/warp7_bl33_defconfig | 3 +++
 configs/warp7_defconfig      | 3 +++
 include/configs/warp7.h      | 2 --
 5 files changed, 11 insertions(+), 8 deletions(-)
Signature · 1 line
2.7.4
#1 lore raw

PATCH v2 1/2 warp7: Switch to DM Serial

This commit switches to DM SERIAL for warp7 and warp7_bl33 defconfigs.

---

Changes in v2:
- Split patch
- Removed CONFIG_MXC_UART_BASE from config file

 arch/arm/dts/imx7s-warp.dts  | 4 ++++
 configs/warp7_bl33_defconfig | 2 ++
 configs/warp7_defconfig      | 2 ++
 include/configs/warp7.h      | 2 --
 4 files changed, 8 insertions(+), 2 deletions(-)
arch/arm/dts/imx7s-warp.dts +4 -0
index d28b7ec..4d87348 100644
@@ -21,6 +21,10 @@
 		mmc0 = &usdhc3;
 	};
 
+	chosen {
+		stdout-path = &uart1;
+	};
+
 	gpio-keys {
 		compatible = "gpio-keys";
 		pinctrl-0 = <&pinctrl_gpio>;
configs/warp7_bl33_defconfig +2 -0
index 6eaf152..d34f76b 100644
@@ -38,6 +38,8 @@ CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_PFUZE100=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
+CONFIG_DM_SERIAL=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_MXC_USB_OTG_HACTIVE=y
configs/warp7_defconfig +2 -0
index 28aa06f..ae424ab 100644
@@ -47,6 +47,8 @@ CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_PFUZE100=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
+CONFIG_DM_SERIAL=y
 CONFIG_OPTEE=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
include/configs/warp7.h +0 -2
index 043f286..2bbf691 100644
@@ -24,8 +24,6 @@
 #endif
 #endif
 
-#define CONFIG_MXC_UART_BASE		UART1_IPS_BASE_ADDR
-
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN		(35 * SZ_1M)
 
Signature · 1 line
2.7.4
#3 lore raw

PATCH v2 1/2 warp7: Switch to DM Serial

In reply to Pierre-Jean Texier
Quoted 4 lines

This commit switches to DM SERIAL for warp7 and warp7_bl33 defconfigs.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#4 lore raw

PATCH v2 2/2 warp7: Switch to DM USB

In reply to Pierre-Jean Texier

This commit switches to DM USB for warp7 and warp7_bl33 defconfigs.

---

Changes in v2:
- Split patch
- Removed unused header file <usb.h>

 arch/arm/dts/imx7s-warp.dts  | 1 +
 board/warp7/warp7.c          | 6 ------
 configs/warp7_bl33_defconfig | 1 +
 configs/warp7_defconfig      | 1 +
 4 files changed, 3 insertions(+), 6 deletions(-)
arch/arm/dts/imx7s-warp.dts +1 -0
index 4d87348..db5ef67 100644
@@ -19,6 +19,7 @@
 
 	aliases {
 		mmc0 = &usdhc3;
+		usb0 = &usbotg1;
 	};
 
 	chosen {
board/warp7/warp7.c +0 -6
index 2882dc9..134a6c9 100644
@@ -14,7 +14,6 @@
 #include <asm/io.h>
 #include <common.h>
 #include <asm/arch/crm_regs.h>
-#include <usb.h>
 #include <netdev.h>
 #include <power/pmic.h>
 #include <power/pfuze3000_pmic.h>
@@ -128,11 +127,6 @@ int checkboard(void)
 	return 0;
 }
 
-int board_usb_phy_mode(int port)
-{
-	return USB_INIT_DEVICE;
-}
-
 int board_late_init(void)
 {
 	struct wdog_regs *wdog = (struct wdog_regs *)WDOG1_BASE_ADDR;
configs/warp7_bl33_defconfig +1 -0
index d34f76b..300dc38 100644
@@ -41,6 +41,7 @@ CONFIG_DM_REGULATOR_GPIO=y
 CONFIG_SPECIFY_CONSOLE_INDEX=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_MXC_USB_OTG_HACTIVE=y
 CONFIG_USB_GADGET=y
configs/warp7_defconfig +1 -0
index ae424ab..cabddad 100644
@@ -51,6 +51,7 @@ CONFIG_SPECIFY_CONSOLE_INDEX=y
 CONFIG_DM_SERIAL=y
 CONFIG_OPTEE=y
 CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_MXC_USB_OTG_HACTIVE=y
 CONFIG_USB_GADGET=y
Signature · 1 line
2.7.4
#6 lore raw

PATCH v2 2/2 warp7: Switch to DM USB

In reply to Pierre-Jean Texier
Quoted 4 lines

This commit switches to DM USB for warp7 and warp7_bl33 defconfigs.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================