From patchwork Fri Apr 19 18:34:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Jean Texier X-Patchwork-Id: 1088117 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) header.from=koncepto.io Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=koncepto.io header.i=@koncepto.io header.b="gDO8COO6"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44m4RR3KQCz9s7T for ; Sat, 20 Apr 2019 04:35:47 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 2B901C21E07; Fri, 19 Apr 2019 18:35:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=SPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 9C1A5C21DD9; Fri, 19 Apr 2019 18:34:55 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 68F2CC21C8B; Fri, 19 Apr 2019 18:34:53 +0000 (UTC) Received: from koncepto.io (koncepto.io [195.154.119.111]) by lists.denx.de (Postfix) with ESMTPS id 1626BC21C50 for ; Fri, 19 Apr 2019 18:34:53 +0000 (UTC) Received: from localhost.localdomain (lfbn-1-8938-37.w193-250.abo.wanadoo.fr [193.250.79.37]) by koncepto.io (Postfix) with ESMTPSA id 8A2F56037E; Fri, 19 Apr 2019 20:34:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=koncepto.io; s=default; t=1555698892; bh=nd2B7XY0s4F0FItvywRXxxOLKPRjeArhfLvu50wvOQk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gDO8COO6hkp+Yyl0RXZTDatjYvvHswy2RLbC2uT1xF/5Wk/rYCPcFoodcPDPkDF1Q TPJvO5X59dx/Bu38eW3SW36vNWWTkiZmys0uPxZZbkb9lSwsSJ1vScpKrJXG0lhfvi UBKsxJblU+UMc+1qMbsyF7JoI1tnkkWbtf6t5XjuCRcELlop2TPEmE3x7/ycq3GVSm UaAx/XYtdgcPQao0HhxKTiKqB88NK0c+l9A5myJCSmG7A09pVeiHbBzBvrKHEJ8kBY ev0GB3iu5z2mKfDkI+2UsbSVQRP1qFt7XGdtqPB3pbmYFS2R2L4/O5+9c525iyw4Bg yylxRU++PrSUA== From: Pierre-Jean Texier To: u-boot@lists.denx.de Date: Fri, 19 Apr 2019 20:34:11 +0200 Message-Id: <1555698852-6645-2-git-send-email-pjtexier@koncepto.io> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1555698852-6645-1-git-send-email-pjtexier@koncepto.io> References: <1555698852-6645-1-git-send-email-pjtexier@koncepto.io> Cc: fabio.estevam@nxp.com Subject: [U-Boot] [PATCH v2 1/2] warp7: Switch to DM Serial X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This commit switches to DM SERIAL for warp7 and warp7_bl33 defconfigs. Signed-off-by: Pierre-Jean Texier Signed-off-by: Joris Offouga Reviewed-by: Fabio Estevam --- 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(-) diff --git a/arch/arm/dts/imx7s-warp.dts b/arch/arm/dts/imx7s-warp.dts index d28b7ec..4d87348 100644 --- a/arch/arm/dts/imx7s-warp.dts +++ b/arch/arm/dts/imx7s-warp.dts @@ -21,6 +21,10 @@ mmc0 = &usdhc3; }; + chosen { + stdout-path = &uart1; + }; + gpio-keys { compatible = "gpio-keys"; pinctrl-0 = <&pinctrl_gpio>; diff --git a/configs/warp7_bl33_defconfig b/configs/warp7_bl33_defconfig index 6eaf152..d34f76b 100644 --- a/configs/warp7_bl33_defconfig +++ b/configs/warp7_bl33_defconfig @@ -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 diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index 28aa06f..ae424ab 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -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 diff --git a/include/configs/warp7.h b/include/configs/warp7.h index 043f286..2bbf691 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -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) From patchwork Fri Apr 19 18:34:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Jean Texier X-Patchwork-Id: 1088118 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) header.from=koncepto.io Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=koncepto.io header.i=@koncepto.io header.b="gYWDGJ2U"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44m4Rk06y1z9s71 for ; Sat, 20 Apr 2019 04:36:01 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id B3DCDC21E13; Fri, 19 Apr 2019 18:35:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=SPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 38930C21E08; Fri, 19 Apr 2019 18:34:56 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 55C2FC21DA1; Fri, 19 Apr 2019 18:34:54 +0000 (UTC) Received: from koncepto.io (koncepto.io [195.154.119.111]) by lists.denx.de (Postfix) with ESMTPS id 07BE6C21C50 for ; Fri, 19 Apr 2019 18:34:54 +0000 (UTC) Received: from localhost.localdomain (lfbn-1-8938-37.w193-250.abo.wanadoo.fr [193.250.79.37]) by koncepto.io (Postfix) with ESMTPSA id 8E543603BD; Fri, 19 Apr 2019 20:34:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=koncepto.io; s=default; t=1555698893; bh=qyFfE3QCSxk4ecRNRSKx1wdjld0Nonu1CIctQMb3lps=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gYWDGJ2UTy3Xzxbt2mt/1pXjlDedk6BNhKERv7z+LCLDcMiE5L8hxRJxqO6AhU0// DfURQQOGRADbT0hAvUDvT5TDInbSD+hIHU8az+CqUNhAp6xD0+J6TmvrJtRfxCLeUq 0mW9vNg4WDwIODzCkDaCj0S8+OoBFIOhXm8dZULeojt+HTJICXBHmvtpKDkA+Nc7mO LLVbHG4i36aBUUOGCZWlPQUNx1OBQUAR/fBAJUkKEhy8MXWr2PAsAI8cIbD5tFIBRS uzyBNs144mEwUuz2alOeaKDLGCmQhYhef45P/Uh/74NSh/bLLMlcHNjcg0JiNzVlwm 8yIwQ9hFGsyaA== From: Pierre-Jean Texier To: u-boot@lists.denx.de Date: Fri, 19 Apr 2019 20:34:12 +0200 Message-Id: <1555698852-6645-3-git-send-email-pjtexier@koncepto.io> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1555698852-6645-1-git-send-email-pjtexier@koncepto.io> References: <1555698852-6645-1-git-send-email-pjtexier@koncepto.io> Cc: fabio.estevam@nxp.com Subject: [U-Boot] [PATCH v2 2/2] warp7: Switch to DM USB X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This commit switches to DM USB for warp7 and warp7_bl33 defconfigs. Signed-off-by: Pierre-Jean Texier Signed-off-by: Joris Offouga Reviewed-by: Fabio Estevam --- Changes in v2: - Split patch - Removed unused header file 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(-) diff --git a/arch/arm/dts/imx7s-warp.dts b/arch/arm/dts/imx7s-warp.dts index 4d87348..db5ef67 100644 --- a/arch/arm/dts/imx7s-warp.dts +++ b/arch/arm/dts/imx7s-warp.dts @@ -19,6 +19,7 @@ aliases { mmc0 = &usdhc3; + usb0 = &usbotg1; }; chosen { diff --git a/board/warp7/warp7.c b/board/warp7/warp7.c index 2882dc9..134a6c9 100644 --- a/board/warp7/warp7.c +++ b/board/warp7/warp7.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include @@ -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; diff --git a/configs/warp7_bl33_defconfig b/configs/warp7_bl33_defconfig index d34f76b..300dc38 100644 --- a/configs/warp7_bl33_defconfig +++ b/configs/warp7_bl33_defconfig @@ -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 diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index ae424ab..cabddad 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -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