From patchwork Tue May 28 02:19:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Derald D. Woods" X-Patchwork-Id: 1106017 X-Patchwork-Delegate: trini@ti.com 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=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Y1OOjHW+"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45CcxT2vlFz9s3l for ; Tue, 28 May 2019 12:19:55 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 45DC0C22066; Tue, 28 May 2019 02:19:47 +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=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, 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 977B7C21C4A; Tue, 28 May 2019 02:19:45 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 42852C21C4A; Tue, 28 May 2019 02:19:44 +0000 (UTC) Received: from mail-it1-f194.google.com (mail-it1-f194.google.com [209.85.166.194]) by lists.denx.de (Postfix) with ESMTPS id BCD61C21C3F for ; Tue, 28 May 2019 02:19:43 +0000 (UTC) Received: by mail-it1-f194.google.com with SMTP id m140so1616939itg.2 for ; Mon, 27 May 2019 19:19:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=j1S00lDUC5oyfyVTs+7lTmw22N5A10tfsg2/Zv1352g=; b=Y1OOjHW+FNP9GlxD4ScjqLQ3kF0u8733qCTJD2NnS+sOsVbFi7YFpp0UkuvQDpS0s+ 45TGHkpQ4v8UHnNhWYtJWGfq3PLaP39q4FmdzZmiHY4EnyON4ArxtU2FS0zawG8SyEcD hF4QwL/Qbe0ehfAiOFNwSpwbmQ/LsjCmailbZEz+OXJdXgh0q5IhAn1CQBNmAWwb2UmR BCj6CBJVl/9M9H/ikift0ahgZlywLmscrh9ANchQyMnLwGbMDUVLBeChQldYMkwbS/wR bdipq8jzCxtLPX6Zkkmkv83rBwVQFtNVjkBeo1tmEsX9neKbM2KWpzQGMLxm6cnBccas pl/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=j1S00lDUC5oyfyVTs+7lTmw22N5A10tfsg2/Zv1352g=; b=iA4dRwB6XB6ukMqGx6angwBQFUKv1raAfTxvWlJkKmM1CNT6pS2O1mylrFMvKwTkxW AnNzG8vi+w1yk7duUrUzDanR07IGDBbd7RY9QEUfi6O/LACeJfO5MG/IVwcHrJ/fsn9k QOV4Du3NGax89OO0NncRzWzL8J51BRbkcMRgob3Xh+SQgDdXh0jlIe0CSwk3yieVsEhV T2RqX1VIBdzrcYmLWAACNrYXbo0FdymFwV5hau1JhYFYe06IL0qJJxACZM0FZrciPf0a x/JFlwVAHxvzYceoKJtdVd0ZHxv3pX9Y7indhtpyaYxrucKE2/1KDz+RqoaMXOrRZhK7 vwKg== X-Gm-Message-State: APjAAAWBQaUy94n1eG3x9Cy9R+OZ/MZTNKFBD3VCCcWngS6g4Uq+EwuV q1C0T+k+q/0bGKgWmM6vwowOwVxD X-Google-Smtp-Source: APXvYqztbJM3f1oaujecej1EITwLlWo8feqM6MfOAvtOsYERCAy5Y5TfnX+EC2tpYENVkq6DGjfA0Q== X-Received: by 2002:a02:1006:: with SMTP id 6mr81781526jay.47.1559009981930; Mon, 27 May 2019 19:19:41 -0700 (PDT) Received: from ethiopia (c-73-176-50-185.hsd1.il.comcast.net. [73.176.50.185]) by smtp.gmail.com with ESMTPSA id a130sm605498itb.14.2019.05.27.19.19.41 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 27 May 2019 19:19:41 -0700 (PDT) Date: Mon, 27 May 2019 21:19:38 -0500 From: "Derald D. Woods" To: u-boot@lists.denx.de Message-ID: <20190528021938.GA14617@ethiopia> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.12.0 (2019-05-25) Cc: trini@konsulko.com Subject: [U-Boot] [PATCH 1/3] ARM: dts: omap3-evm: Sync dts(i) files from Linux 5.1.5 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: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Signed-off-by: Derald D. Woods --- arch/arm/dts/omap3-evm-37xx.dts | 8 ++++---- arch/arm/dts/omap3-evm-common.dtsi | 7 +++++-- arch/arm/dts/omap3-evm-processor-common.dtsi | 10 +++++++++- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/arch/arm/dts/omap3-evm-37xx.dts b/arch/arm/dts/omap3-evm-37xx.dts index 5a4ba0aea4..a14303b09a 100644 --- a/arch/arm/dts/omap3-evm-37xx.dts +++ b/arch/arm/dts/omap3-evm-37xx.dts @@ -90,19 +90,19 @@ label = "X-Loader"; reg = <0 0x80000>; }; - partition@0x80000 { + partition@80000 { label = "U-Boot"; reg = <0x80000 0x1c0000>; }; - partition@0x1c0000 { + partition@1c0000 { label = "Environment"; reg = <0x240000 0x40000>; }; - partition@0x280000 { + partition@280000 { label = "Kernel"; reg = <0x280000 0x500000>; }; - partition@0x780000 { + partition@780000 { label = "Filesystem"; reg = <0x780000 0x1f880000>; }; diff --git a/arch/arm/dts/omap3-evm-common.dtsi b/arch/arm/dts/omap3-evm-common.dtsi index ee64191e41..17c89df6ce 100644 --- a/arch/arm/dts/omap3-evm-common.dtsi +++ b/arch/arm/dts/omap3-evm-common.dtsi @@ -122,6 +122,7 @@ }; &mmc2 { + interrupts-extended = <&intc 86 &omap3_pmx_core 0x12e>; vmmc-supply = <&wl12xx_vmmc>; non-removable; bus-width = <4>; @@ -132,8 +133,10 @@ wlcore: wlcore@2 { compatible = "ti,wl1271"; reg = <2>; - interrupt-parent = <&gpio5>; - interrupts = <21 IRQ_TYPE_LEVEL_HIGH>; /* gpio 149 */ + /* gpio_149 with uart1_rts pad as wakeirq */ + interrupts-extended = <&gpio5 21 IRQ_TYPE_EDGE_RISING>, + <&omap3_pmx_core 0x14e>; + interrupt-names = "irq", "wakeup"; ref-clock-frequency = <38400000>; }; }; diff --git a/arch/arm/dts/omap3-evm-processor-common.dtsi b/arch/arm/dts/omap3-evm-processor-common.dtsi index ce7f42f944..b4109f48ec 100644 --- a/arch/arm/dts/omap3-evm-processor-common.dtsi +++ b/arch/arm/dts/omap3-evm-processor-common.dtsi @@ -86,6 +86,10 @@ OMAP3_CORE1_IOPAD(0x215e, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat1.sdmmc2_dat1 */ OMAP3_CORE1_IOPAD(0x2160, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat2.sdmmc2_dat2 */ OMAP3_CORE1_IOPAD(0x2162, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat3.sdmmc2_dat3 */ + OMAP3_CORE1_IOPAD(0x2164, PIN_OUTPUT | MUX_MODE1) /* sdmmc2_dat4.sdmmc2_dir_dat0 */ + OMAP3_CORE1_IOPAD(0x2166, PIN_OUTPUT | MUX_MODE1) /* sdmmc2_dat5.sdmmc2_dir_dat1 */ + OMAP3_CORE1_IOPAD(0x2168, PIN_OUTPUT | MUX_MODE1) /* sdmmc2_dat6.sdmmc2_dir_cmd */ + OMAP3_CORE1_IOPAD(0x216a, PIN_INPUT | MUX_MODE1) /* sdmmc2_dat7.sdmmc2_clkin */ >; }; @@ -127,9 +131,13 @@ >; }; + /* + * Note that gpio_150 pulled high with internal pull to prevent wlcore + * reset on return from off mode in idle. + */ wl12xx_gpio: pinmux_wl12xx_gpio { pinctrl-single,pins = < - OMAP3_CORE1_IOPAD(0x2180, PIN_OUTPUT | MUX_MODE4) /* uart1_cts.gpio_150 */ + OMAP3_CORE1_IOPAD(0x2180, PIN_INPUT_PULLUP | MUX_MODE7) /* uart1_cts.gpio_150 */ OMAP3_CORE1_IOPAD(0x217e, PIN_INPUT | MUX_MODE4) /* uart1_rts.gpio_149 */ >; }; From patchwork Tue May 28 02:20:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Derald D. Woods" X-Patchwork-Id: 1106018 X-Patchwork-Delegate: trini@ti.com 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=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="a3taT94k"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45Ccyj2gP9z9s3l for ; Tue, 28 May 2019 12:21:01 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id E0524C220A7; Tue, 28 May 2019 02:20:57 +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=FREEMAIL_FROM, 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 6C2BEC21C4A; Tue, 28 May 2019 02:20:56 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4B792C22006; Tue, 28 May 2019 02:20:55 +0000 (UTC) Received: from mail-io1-f67.google.com (mail-io1-f67.google.com [209.85.166.67]) by lists.denx.de (Postfix) with ESMTPS id AFCD3C21C3F for ; Tue, 28 May 2019 02:20:54 +0000 (UTC) Received: by mail-io1-f67.google.com with SMTP id u13so5801280iop.0 for ; Mon, 27 May 2019 19:20:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=Spg6WJTgsP10mOhT8j6iZLRK2Mq3zaCERCCG31eZFvE=; b=a3taT94kFo4pyHnGQNjMtStYHFAXktQI3LpDvLo2Sx3FN+3onb9yLSmVuy4JQcdzps WGR8QItXmRcfX6tZ6zXfra7vQFVvXtiiYBCAPqMLKY4NuZDdCWrBO3tNVs1N3Viq+iq+ luL/907gqIyCueVOLafUCYrxHkPdj2e72DF3aJ4xIz9hnkGTzEWxWrBMUVW4SCYnkxGH 8Wv3YQ4PTSwIk0gOftJM3V4CdMiA7VTOIEFISHIMW8fOUgeRmsdyqYk1lxtdfkqLPtfT zLseKpXi6DXM3p3UxQdApHpCcLtyEaXWizqYgyAozzLoDfULNnh8ciB1fz9x2aW1i0gM bOZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=Spg6WJTgsP10mOhT8j6iZLRK2Mq3zaCERCCG31eZFvE=; b=r90dwIAOsjK0Uqln7GpDlLtnZ+MsG0Dtlm0dZYeHCO8alAa/lnz8Ka4po90WeFrQrR xmw1qFMLmlj7dm11VvoWKjSNzzG9QFgImIuB0cz/og4WXRQ+eAkD+1h5iL/ymvwbfKdw DRk0v7nWO/1uhKq8Vkx0EDjTRSJwzRA6iwxAmutw/l9joPOlbRFCsx2W6pGtaFI4L5ba JY6bcBbx5TGdOLQAfJIqZuV88VCgEJ/xy58tzf6IRwddOOAhfQqQAzHGp2uE1TEw1NQO L8UZaq9dVVvRTqIlv4c0b6x9wQbdBbwlCK8qv4MqscQQbk5UDSnJ3mzDFWFDt1tEGBMo j/nQ== X-Gm-Message-State: APjAAAVjLtCfQ/YDwaFD+mqaBL+OwQ7jVJNhI5erYPcZoGNqbxoRH1s/ hUrR2GnF+bS2znsob05LlzgIxcUk X-Google-Smtp-Source: APXvYqx3HzQ9lnH6wgEc0cn6OqiPzYagLUbp6wrzn/s3wGLVz6YnPQNt6DRjtTtgD/K5NWm/VQofhA== X-Received: by 2002:a6b:8f82:: with SMTP id r124mr3248256iod.270.1559010053182; Mon, 27 May 2019 19:20:53 -0700 (PDT) Received: from ethiopia (c-73-176-50-185.hsd1.il.comcast.net. [73.176.50.185]) by smtp.gmail.com with ESMTPSA id b196sm648965itb.30.2019.05.27.19.20.52 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 27 May 2019 19:20:52 -0700 (PDT) Date: Mon, 27 May 2019 21:20:50 -0500 From: "Derald D. Woods" To: u-boot@lists.denx.de Message-ID: <20190528022050.GA14745@ethiopia> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.12.0 (2019-05-25) Cc: trini@konsulko.com Subject: [U-Boot] [PATCH 2/3] ARM: omap3: evm: Enable DM_USB in defconfig 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: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This addresses the following warning message: ===================== WARNING ====================== This board does not use CONFIG_DM_USB. Please update the board to use CONFIG_DM_USB before the v2019.07 release. Failure to update by the deadline may result in board removal. See doc/driver-model/MIGRATION.txt for more info. ==================================================== As USB support for older OMAP3 SoC's improves, OMAP3 EVM can be readily adapted. There is some additional 'gpio-hog' support needed to fully setup USB in a similar manner to Linux. Signed-off-by: Derald D. Woods --- board/ti/evm/evm.c | 31 ------------------------------- configs/omap3_evm_defconfig | 3 +++ include/configs/omap3_evm.h | 2 -- 3 files changed, 3 insertions(+), 33 deletions(-) diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c index daecb4af3e..93408047b2 100644 --- a/board/ti/evm/evm.c +++ b/board/ti/evm/evm.c @@ -30,11 +30,6 @@ #include #include "evm.h" -#ifdef CONFIG_USB_EHCI_HCD -#include -#include -#endif - #define OMAP3EVM_GPIO_ETH_RST_GEN1 64 #define OMAP3EVM_GPIO_ETH_RST_GEN2 7 @@ -307,32 +302,6 @@ void board_mmc_power_init(void) } #endif /* CONFIG_MMC */ -#if defined(CONFIG_USB_EHCI_HCD) && !defined(CONFIG_SPL_BUILD) -/* Call usb_stop() before starting the kernel */ -void show_boot_progress(int val) -{ - if (val == BOOTSTAGE_ID_RUN_OS) - usb_stop(); -} - -static struct omap_usbhs_board_data usbhs_bdata = { - .port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED, - .port_mode[1] = OMAP_EHCI_PORT_MODE_PHY, - .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED -}; - -int ehci_hcd_init(int index, enum usb_init_type init, - struct ehci_hccr **hccr, struct ehci_hcor **hcor) -{ - return omap_ehci_hcd_init(index, &usbhs_bdata, hccr, hcor); -} - -int ehci_hcd_stop(int index) -{ - return omap_ehci_hcd_stop(); -} -#endif /* CONFIG_USB_EHCI_HCD */ - #if defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET) && !defined(CONFIG_CMD_NET) int board_eth_init(bd_t *bis) { diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig index a3b662db2b..26d0e65589 100644 --- a/configs/omap3_evm_defconfig +++ b/configs/omap3_evm_defconfig @@ -66,7 +66,10 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_OMAP3_SPI=y CONFIG_USB=y +CONFIG_DM_USB=y +# CONFIG_SPL_DM_USB is not set CONFIG_USB_EHCI_HCD=y +CONFIG_USB_OMAP3=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_MUSB_OMAP2PLUS=y CONFIG_USB_GADGET=y diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index 5b9d8a57e3..082a4edb2b 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -56,8 +56,6 @@ /* Environment */ #define CONFIG_ENV_SIZE SZ_128K -#define CONFIG_PREBOOT "usb start" - #define MEM_LAYOUT_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV From patchwork Tue May 28 02:22:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Derald D. Woods" X-Patchwork-Id: 1106019 X-Patchwork-Delegate: trini@ti.com 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=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bPXUT5mI"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45Cd026wLfz9s3l for ; Tue, 28 May 2019 12:22:10 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 810ACC22075; Tue, 28 May 2019 02:22: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=FREEMAIL_FROM, 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 4CE83C21C4A; Tue, 28 May 2019 02:22:07 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 34F3CC21C4A; Tue, 28 May 2019 02:22:05 +0000 (UTC) Received: from mail-io1-f67.google.com (mail-io1-f67.google.com [209.85.166.67]) by lists.denx.de (Postfix) with ESMTPS id B0CE0C21C3F for ; Tue, 28 May 2019 02:22:04 +0000 (UTC) Received: by mail-io1-f67.google.com with SMTP id g16so14482532iom.9 for ; Mon, 27 May 2019 19:22:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :content-transfer-encoding:user-agent; bh=9twlOcYGge0/JW0JvLNp/FXfgNWG+Rr0tqPcG4xBPA4=; b=bPXUT5mITTz4VOlFgdXcqQSoZtcX80ipjIEYmKRtdw845wDRS6gfJzGCIkefGzuzRd s//QoeACH3pQTLHQSamak/7HTjtA/7+DF4nSyPK95a/hmZC8aLgYiwWzVNzVLPQsT64Z lrww54r1nqwK2bdhFlrjkR4StHNdTknHu2DTPHWNMxk2npTSBWC3waB5S4FakVG39u+b /p70O8GMjoPagnpphZxr3r9w3ZwrGSrXS3v8LrP+C2WFd9nsmhlDqqu+1BVElm2AConv o9fPCTsbqYwaBSflXxFOqm81LAKEUGXuQkFB9yFmHXT/arg/8mSMGeGv0EecCO65tFea rDpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:content-transfer-encoding:user-agent; bh=9twlOcYGge0/JW0JvLNp/FXfgNWG+Rr0tqPcG4xBPA4=; b=DfeYnWSJI0VsmZhL+RG+75s6Fo3jUhXv+bOf5q3Aa21/0gY29hoFfFB9i2r2Uy/Cns 5p1tTcr/aannvCA9EZcqMprvUgpr9nTC8+E2P/jeh+SSPFTsuLHxu6eHVdGNklYj3xnm n874mc8Uxox1mKHVzrmCKryGmVj+sj5YrEjkme3rHUWGAM3HRCWkC/iwYn2O1DNQM2gT c0BePLkEpk8Vju8r/W+Dzr71PiM4JmKzudpT+Wz5HYTFqWvASEFdZZAVQw8gVBRrQ8ef CPK9TwFcEljHcs323EDTBZFHxq4ZsijoQpUv6/i7mlXNh8t+B8j/lZc9j7UxgmhAg9Sa oBxA== X-Gm-Message-State: APjAAAUZHlWtmKCHrZOjbOeQuTw558Tklrqze3P9NHG1zpRVUedxXZfb 2uLzwi/Pn5a+q79lqo2TRDDev47b X-Google-Smtp-Source: APXvYqxbymiBkVnSgmvrFaVKySehK2YmCR6n/XuqhI2G4Xd/T+40OHZmeIYubzXkzQsnINyQEY1QQQ== X-Received: by 2002:a6b:740a:: with SMTP id s10mr23844643iog.99.1559010123422; Mon, 27 May 2019 19:22:03 -0700 (PDT) Received: from ethiopia (c-73-176-50-185.hsd1.il.comcast.net. [73.176.50.185]) by smtp.gmail.com with ESMTPSA id l136sm737813itc.23.2019.05.27.19.22.02 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 27 May 2019 19:22:02 -0700 (PDT) Date: Mon, 27 May 2019 21:22:00 -0500 From: "Derald D. Woods" To: u-boot@lists.denx.de Message-ID: <20190528022200.GA14816@ethiopia> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.12.0 (2019-05-25) Cc: trini@konsulko.com Subject: [U-Boot] [PATCH 3/3] usb: musb-new: omap2430: Fix compilation warning with USB_MUSB_GADGET 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: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This commit addresses the following warning, when _NOT_ USB_MUSB_HOST: [...] CC drivers/usb/gadget/f_mass_storage.o CC drivers/usb/musb-new/omap2430.o CC drivers/usb/gadget/f_fastboot.o CC env/common.o CC env/env.o /src/etinker/software/u-boot-master/drivers/usb/musb-new/omap2430.c: In function ‘omap2430_musb_probe’: /src/etinker/software/u-boot-master/drivers/usb/musb-new/omap2430.c:239:6: warning: assignment to ‘int’ from ‘struct musb *’ makes integer from pointer without a cast [-Wint-conversion] ret = musb_register(&platdata->plat, ^ LD drivers/usb/host/built-in.o CC drivers/usb/gadget/f_sdp.o CC fs/ext4/ext4fs.o [...] Signed-off-by: Derald D. Woods --- drivers/usb/musb-new/omap2430.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/usb/musb-new/omap2430.c b/drivers/usb/musb-new/omap2430.c index 32743aa72c..cca1653f1e 100644 --- a/drivers/usb/musb-new/omap2430.c +++ b/drivers/usb/musb-new/omap2430.c @@ -215,11 +215,13 @@ static int omap2430_musb_probe(struct udevice *dev) { #ifdef CONFIG_USB_MUSB_HOST struct musb_host_data *host = dev_get_priv(dev); +#else + struct musb *musbp; #endif struct omap2430_musb_platdata *platdata = dev_get_platdata(dev); struct usb_bus_priv *priv = dev_get_uclass_priv(dev); struct omap_musb_board_data *otg_board_data; - int ret; + int ret = 0; void *base = dev_read_addr_ptr(dev); priv->desc_before_addr = true; @@ -236,9 +238,11 @@ static int omap2430_musb_probe(struct udevice *dev) ret = musb_lowlevel_init(host); #else - ret = musb_register(&platdata->plat, + musbp = musb_register(&platdata->plat, (struct device *)otg_board_data, platdata->base); + if (IS_ERR_OR_NULL(musbp)) + return -EINVAL; #endif return ret; }