From patchwork Sat Apr 13 14:37:51 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: 1085136 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="BsstghjI"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44hHSW2l8Dz9s8m for ; Sun, 14 Apr 2019 00:38:34 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id B8A46C21E12; Sat, 13 Apr 2019 14:38:31 +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 D1550C21C93; Sat, 13 Apr 2019 14:38:29 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C4E87C21C93; Sat, 13 Apr 2019 14:38:28 +0000 (UTC) Received: from koncepto.io (koncepto.io [195.154.119.111]) by lists.denx.de (Postfix) with ESMTPS id 70359C21C4A for ; Sat, 13 Apr 2019 14:38:28 +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 D051760046; Sat, 13 Apr 2019 16:38:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=koncepto.io; s=default; t=1555166308; bh=5Ijg+taMMVSZ0wZUBnROiC/CfeAnDHYG6i4RNzeg5b4=; h=From:To:Cc:Subject:Date:From; b=BsstghjIPdl7sfGbKobVwOtvlb00KV0r80ZhYRBhgIRFibEkK06YYjMzAp0Am2U+d DKFCyBxHvizulpoA9U/Lb3gXpCFl6y8LSRJOjYivT0CF/AYA7f/jTndGqY9b0/Fp5f HvFdHEXhZ4JXW1Fn25qGEmLnKRoEA8xQXKfvBr81lRW5Hm9XQQOoGJ+UmfVoeFFpJj 3/FZh08PbOWPu8RisyxeufsZKR5wtzi86H+Fm/eLMDPgVqt4n3y/8u2dzraL4o2qde ARtUGbc6DeGRxNAq3+whHldCWBWhnFByfyiVgNXoQ4RTtzN8NxTNZNU1+uQ1+bW8gz JgwM/TJ3SbNag== From: Pierre-Jean Texier To: u-boot@lists.denx.de Date: Sat, 13 Apr 2019 16:37:51 +0200 Message-Id: <1555166271-29847-1-git-send-email-pjtexier@koncepto.io> X-Mailer: git-send-email 2.7.4 Cc: fabio.estevam@nxp.com Subject: [U-Boot] [PATCH] warp7: defconfig: Switch to DM for USB and 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 USB and SERIAL for warp7 and warp7_bl33 defconfigs. Signed-off-by: Pierre-Jean Texier Signed-off-by: Joris Offouga --- arch/arm/dts/imx7s-warp.dts | 5 +++++ board/warp7/warp7.c | 5 ----- configs/warp7_bl33_defconfig | 2 ++ configs/warp7_defconfig | 2 ++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/arch/arm/dts/imx7s-warp.dts b/arch/arm/dts/imx7s-warp.dts index d28b7ec..db5ef67 100644 --- a/arch/arm/dts/imx7s-warp.dts +++ b/arch/arm/dts/imx7s-warp.dts @@ -19,6 +19,11 @@ aliases { mmc0 = &usdhc3; + usb0 = &usbotg1; + }; + + chosen { + stdout-path = &uart1; }; gpio-keys { diff --git a/board/warp7/warp7.c b/board/warp7/warp7.c index 2882dc9..797e09c 100644 --- a/board/warp7/warp7.c +++ b/board/warp7/warp7.c @@ -128,11 +128,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 6eaf152..4308c64 100644 --- a/configs/warp7_bl33_defconfig +++ b/configs/warp7_bl33_defconfig @@ -38,7 +38,9 @@ CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_PFUZE100=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=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 28aa06f..3f7863b 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -47,8 +47,10 @@ CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_PFUZE100=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=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