From patchwork Fri Sep 21 10:35:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ramon Fried X-Patchwork-Id: 973137 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="buLyyQYw"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42GqlW0nYVz9s4V for ; Fri, 21 Sep 2018 20:36:39 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 6602DC21E42; Fri, 21 Sep 2018 10:36:35 +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 110B2C21C4A; Fri, 21 Sep 2018 10:36:33 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4E407C21C38; Fri, 21 Sep 2018 10:36:31 +0000 (UTC) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by lists.denx.de (Postfix) with ESMTPS id ECE43C21BE5 for ; Fri, 21 Sep 2018 10:36:30 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id v16-v6so12347466wro.11 for ; Fri, 21 Sep 2018 03:36:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZgemdbtnPeF9dAAwj+Z9Kkn8JlpDqJTnUlFHNm8U7Y4=; b=buLyyQYwHs+8ig546BVJ4qEjREQGmM9xEE1X2ev4OYw+GGIuDmNBSrUP7v+W0bdgDR gIN8V3mZ6gyl6EYuoOkY5YNgZjeuf6/i4H9VoVuGiVKpov4F/hR1u4byqP3mYrZRlez6 Od3TMOQNonwK/w0hiUwjIvDH8F/H6o2QqK1dHe4pvETrSrNzMb3m6wcxDi6MDkfLuTTJ 4MzLq01t2J7cH/D9wGDgdNsbWbBllGlL9kdV8jzgWiv6EDaL8oIxIvXYhf7YRJeN2grf 1oHaMrHp+D6JMTQSVlpPS21u6o3r1/Y4nHICdu+hKfWgo3R6vZ7d+O2fnPeaGQO7dPko CjzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZgemdbtnPeF9dAAwj+Z9Kkn8JlpDqJTnUlFHNm8U7Y4=; b=t/ckErP5RZxQBBPH9Q09VowxhK6JqK1DrJD3JO/gY4MIor4onQZM09pEXhwFSERDmO RHbBgCGVZ8tlawH/ztKtO9gjoUJC1G1hc14e4Q+0PKjlkt97xU9OrK3El4P6qSJOCjHn QiWo1+wcdp2y2XzTmLugkcUJ8c6/t7W1F4lM6Vdd1+8CqZ9sd63KkrVBruHkSUWVueeC 05aBJiayJ8PzlJN8RccsrUm33HxxIwPEAFwLezi8FMidhngOpczE69ReRum3I/uL5ykX N7qu92Emytu81zlHvQK6CwlLW7I3lxs/eT1jDZO0NIIw3PB1MTjanTzDuxl5ESx+IPB3 wKTw== X-Gm-Message-State: APzg51BfLlWO6ouJHPhBqFS1biu0GlllOCV37oA5sAUk6uXNGwg0Vaxs MfWtmG5/d6c6nUy1alT/+DyVIzHyH+mZhQ== X-Google-Smtp-Source: ANB0Vda2iOMBL6MkncLwUK62qa63tsdL6S/I0+bcmKF2qUdFlkbBEfKUJqVB0IR4VjgmXiI9dUXCqw== X-Received: by 2002:a5d:5450:: with SMTP id w16-v6mr39174715wrv.4.1537526190266; Fri, 21 Sep 2018 03:36:30 -0700 (PDT) Received: from localhost.localdomain ([5.102.238.49]) by smtp.gmail.com with ESMTPSA id 204-v6sm6770843wmh.25.2018.09.21.03.36.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Sep 2018 03:36:29 -0700 (PDT) From: Ramon Fried To: u-boot@lists.denx.de Date: Fri, 21 Sep 2018 13:35:43 +0300 Message-Id: <20180921103555.16240-2-ramon.fried@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180921103555.16240-1-ramon.fried@gmail.com> References: <20180921103555.16240-1-ramon.fried@gmail.com> Cc: Marek Vasut Subject: [U-Boot] [PATCH v2 01/14] ehci: Replace board_prepare_usb with board_usb_init 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" Use standard board_usb_init() instead of the specific board_prepare_usb. Signed-off-by: Ramon Fried --- Changes in v2: None board/qualcomm/dragonboard410c/dragonboard410c.c | 4 ++-- drivers/usb/host/ehci-msm.c | 9 ++------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/board/qualcomm/dragonboard410c/dragonboard410c.c b/board/qualcomm/dragonboard410c/dragonboard410c.c index 53e231e55a..e8a3ed0450 100644 --- a/board/qualcomm/dragonboard410c/dragonboard410c.c +++ b/board/qualcomm/dragonboard410c/dragonboard410c.c @@ -44,7 +44,7 @@ int dram_init_banksize(void) return 0; } -int board_prepare_usb(enum usb_init_type type) +int board_usb_init(int index, enum usb_init_type init) { static struct udevice *pmic_gpio; static struct gpio_desc hub_reset, usb_sel; @@ -93,7 +93,7 @@ int board_prepare_usb(enum usb_init_type type) } } - if (type == USB_INIT_HOST) { + if (init == USB_INIT_HOST) { /* Start USB Hub */ dm_gpio_set_dir_flags(&hub_reset, GPIOD_IS_OUT | GPIOD_IS_OUT_ACTIVE); diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c index 17bfa7c02f..db982624dc 100644 --- a/drivers/usb/host/ehci-msm.c +++ b/drivers/usb/host/ehci-msm.c @@ -38,11 +38,6 @@ struct msm_ehci_priv { struct ulpi_viewport ulpi_vp; /* ULPI Viewport */ }; -int __weak board_prepare_usb(enum usb_init_type type) -{ - return 0; -} - static void setup_usb_phy(struct msm_ehci_priv *priv) { /* Select and enable external configuration with USB PHY */ @@ -102,7 +97,7 @@ static int ehci_usb_probe(struct udevice *dev) hcor = (struct ehci_hcor *)((phys_addr_t)hccr + HC_LENGTH(ehci_readl(&(hccr)->cr_capbase))); - ret = board_prepare_usb(USB_INIT_HOST); + ret = board_usb_init(0, USB_INIT_HOST); if (ret < 0) return ret; @@ -124,7 +119,7 @@ static int ehci_usb_remove(struct udevice *dev) reset_usb_phy(p); - ret = board_prepare_usb(USB_INIT_DEVICE); /* Board specific hook */ + ret = board_usb_init(0, USB_INIT_DEVICE); /* Board specific hook */ if (ret < 0) return ret;