From patchwork Sun May 20 19:04:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ramon Fried X-Patchwork-Id: 917260 X-Patchwork-Delegate: marek.vasut@gmail.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="sCqYGEbs"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40prtw27vTz9s3R for ; Mon, 21 May 2018 05:04:38 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 8A28AC21FC8; Sun, 20 May 2018 19:04:34 +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 90B0AC21E4E; Sun, 20 May 2018 19:04:31 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 364AAC21E4E; Sun, 20 May 2018 19:04:30 +0000 (UTC) Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by lists.denx.de (Postfix) with ESMTPS id D8CEEC21C2C for ; Sun, 20 May 2018 19:04:29 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id j1-v6so2940872wrm.1 for ; Sun, 20 May 2018 12:04:29 -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; bh=y2o8XPgqn+w8eo8hR19ne0SNDPoe/Ay0FPrZzTHyYW8=; b=sCqYGEbs5Ss5QSMAX5KZM8m3kZnKRcdoo+Tg/tMYuYkyrols+LVWmTLCbs++vMLQ2B nC9EJ1DtRZeMlfRp3s79aWZHxMlqi6XN0jB+nGgb4MfpJy5PcIJEGAgcZ+6kYL2rGFDK Qf6Gb3GWtH7XwFwOl556SosU6ex69AduZ3Teg3LlLDjUm/K1RAc5JEz9xAMQnyr1ndYl j2yWxA3ymqYdOR7BcJFfRj8HJzkkKrH1tGwNQse8jEj7yTzyza/2UfhP/kG745phuK1Z xkkWrloj0+AcB5DPKSJHyJLUVSA0gxULcl/p1Gc5q/s4z6vkqRTDYGUPHOaTPsjdCdTD RM5A== 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; bh=y2o8XPgqn+w8eo8hR19ne0SNDPoe/Ay0FPrZzTHyYW8=; b=nxC88JLcGJrNXhcd31IeEEbcP7SRdLF9HSzde6PldDb1AcddxQAai+XkHnZ9/q3okF N8K4r5tgB1TdRxhjThTSVhyDvs3hX/FVjteHcoOHmhcjOSK9hME05WcI5SKewB/9LwD/ VM352Sz4l+GMkP2DwUxwtT0cStGuutn7vMmmDJvmMyqyUx3ulIuZ2giU6bhzDZNr0/53 g6fbepzahlC1WDNAfT0kNB5BHtWT2P16uG1T6P6wVv2QCidUSGK8zswRY8uOWZy9q8c3 pe0o3epDpV7Pt/avqjFilO/kIAG42mjKyeLtbQE4QwbXOXjpnxDEDGyOQrUkV/OwP0v6 Ulyw== X-Gm-Message-State: ALKqPwc23N/M2ZmlvQJmEff2hawjZAtyG5HgpRkZIm00Jm+I0QC5S7kn Z04eOQR5eF00Eu+7YxSRJBU= X-Google-Smtp-Source: AB8JxZqOZXIE0qe6ZFv4SWhKeX7cUdlvHBQ7X5DibJRC0O8s7XL3TUYu9H/RMa6UEQmC1o3hmApPAg== X-Received: by 2002:adf:aeea:: with SMTP id y97-v6mr14169768wrc.32.1526843069400; Sun, 20 May 2018 12:04:29 -0700 (PDT) Received: from localhost.localdomain ([141.226.166.38]) by smtp.gmail.com with ESMTPSA id p189-v6sm12722057wmg.18.2018.05.20.12.04.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 20 May 2018 12:04:28 -0700 (PDT) From: Ramon Fried To: jramirez@baylibre.com, marex@denx.de, sjg@chromium.org, jagan@openedev.com, yamada.masahiro@socionext.com, noltari@gmail.com Date: Sun, 20 May 2018 22:04:16 +0300 Message-Id: <20180520190416.6473-1-ramon.fried@gmail.com> X-Mailer: git-send-email 2.17.0 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH] ehci: msm: 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 --- board/qualcomm/dragonboard410c/dragonboard410c.c | 4 ++-- drivers/usb/host/ehci-msm.c | 11 ++++------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/board/qualcomm/dragonboard410c/dragonboard410c.c b/board/qualcomm/dragonboard410c/dragonboard410c.c index e7ead57f0d..679eab759a 100644 --- a/board/qualcomm/dragonboard410c/dragonboard410c.c +++ b/board/qualcomm/dragonboard410c/dragonboard410c.c @@ -41,7 +41,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; @@ -90,7 +90,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..9ecd8d6732 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; @@ -150,6 +145,8 @@ static int ehci_usb_ofdata_to_platdata(struct udevice *dev) if (priv->ehci == (void *)FDT_ADDR_T_NONE) return -EINVAL; + dev->req_seq = 0; + /* Warning: this will not work if viewport address is > 64 bit due to * ULPI design. */