From patchwork Wed Apr 3 02:45:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 1075258 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=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="Lk7ZWYj+"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44Yr706NH1z9sSG for ; Wed, 3 Apr 2019 13:46:04 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 88073C21E0B; Wed, 3 Apr 2019 02:46:00 +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 58CD2C21C93; Wed, 3 Apr 2019 02:45:58 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 60083C21C93; Wed, 3 Apr 2019 02:45:56 +0000 (UTC) Received: from mail-yb1-f195.google.com (mail-yb1-f195.google.com [209.85.219.195]) by lists.denx.de (Postfix) with ESMTPS id DC109C21C4A for ; Wed, 3 Apr 2019 02:45:55 +0000 (UTC) Received: by mail-yb1-f195.google.com with SMTP id e12so4401713ybq.2 for ; Tue, 02 Apr 2019 19:45:55 -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=Ut2L7BdpS9Z8j62vHvC6cVn8Kv74JA4Bk8wrkgD5/VQ=; b=Lk7ZWYj+6U72Xlf7OkZBSbhv7Hi2LZigbGxlWRVjIExXxY7fuATOJ1MtF68rHjeDCq HJHEZlySxl9HdytVRqcj9m8wSsQU6D8hO1Yz8Ch6PpzHy4V7lV+UrmSi2K/p2CUFFRFE MO+oEgWmuIwkYLlwIIauJxqnMhIeJkbhItH+lg8ApAjnCMxnT71j3jDOQt0B5equ/oci JHZNlJLA/G1vjgEaI9TsMDl1z5E8K0Iyz0hHlHFYoechbh+ylQwYKpmA2tM3gsw8nOK1 FN6KQ5AiZnHqu5ElXhYy7NLpI48AS0EhvtDP//BI3sAUbcdLHwK3PHjma0ByZTbwlHMy Xjvg== 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=Ut2L7BdpS9Z8j62vHvC6cVn8Kv74JA4Bk8wrkgD5/VQ=; b=g5qiURatVwaLZjCcf6R598fXEwdUaJ99NIHdLlj3LFLTq4lZ5/Y+A0qi/vhcy9qXuZ 7S8yVvB3r3Q2M3N2Y8y0ykoE/hHriib/VQ9oUJtAwFjE5GWRn7mrZcCxhTiMcmJBnL7C RqjuFfsN3YwWBF68XkxO9GkVeaZBKgbaSCk/rERxqcpmY3N+4pNB0ZhQz7we95KurVfR nZqHgSezIKK+sDKpzgwua3aRRjADS9Hn/VVFkqBPb6Cm3o3RZmsFTxhxlHS7WppWGZNT 9EPkhnOJJgnUKf2z69xnttD4AhpDU4EhRtPbx4ZimOx373qX9pdYU9pAOX05C2T+VNih s+xA== X-Gm-Message-State: APjAAAVgg9IwoIBevZlI+JrlW26UhBsod3uve6KQhYG1QA2xKsE0rfFr MU8K/wtiPgVjS+FwDQuIAcdTdL/iEYY= X-Google-Smtp-Source: APXvYqxJX0NqqL2YvMowxZa8nZchQyIqfLiPt08m+5y4d6sd2VwUYORFYPtlW6EsQ/0fCVXlHrfFag== X-Received: by 2002:a25:2144:: with SMTP id h65mr62644382ybh.255.1554259554086; Tue, 02 Apr 2019 19:45:54 -0700 (PDT) Received: from localhost.localdomain (c-73-37-219-234.hsd1.mn.comcast.net. [73.37.219.234]) by smtp.gmail.com with ESMTPSA id p75sm6137060ywg.36.2019.04.02.19.45.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Apr 2019 19:45:53 -0700 (PDT) From: Adam Ford To: u-boot@lists.denx.de Date: Tue, 2 Apr 2019 21:45:38 -0500 Message-Id: <20190403024538.2157-1-aford173@gmail.com> X-Mailer: git-send-email 2.17.1 Cc: Marek Vasut , adam.ford@logicpd.com Subject: [U-Boot] [PATCH] usb: ehci-mx6: Use common code to extract dr_mode 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" There exists code in drivers/common/common.c to read the dr_mode from the device tree. This patch converts this driver to use that function to initialize the driver. Signed-off-by: Adam Ford diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c index 948394709f..e24f5ad14a 100644 --- a/drivers/usb/host/ehci-mx6.c +++ b/drivers/usb/host/ehci-mx6.c @@ -18,6 +18,7 @@ #include #include #include +#include #include "ehci.h" @@ -483,23 +484,24 @@ static int ehci_usb_phy_mode(struct udevice *dev) static int ehci_usb_ofdata_to_platdata(struct udevice *dev) { struct usb_platdata *plat = dev_get_platdata(dev); - const char *mode; + enum usb_dr_mode dr_mode; - mode = fdt_getprop(gd->fdt_blob, dev_of_offset(dev), "dr_mode", NULL); - if (mode) { - if (strcmp(mode, "peripheral") == 0) - plat->init_type = USB_INIT_DEVICE; - else if (strcmp(mode, "host") == 0) - plat->init_type = USB_INIT_HOST; - else if (strcmp(mode, "otg") == 0) - return ehci_usb_phy_mode(dev); - else - return -EINVAL; + dr_mode = usb_get_dr_mode(dev_of_offset(dev)); - return 0; - } + switch (dr_mode) { + case USB_DR_MODE_HOST: + plat->init_type = USB_INIT_HOST; + break; + case USB_DR_MODE_UNKNOWN: + return -EINVAL; + case USB_DR_MODE_PERIPHERAL: + plat->init_type = USB_INIT_DEVICE; + break; + case USB_DR_MODE_OTG: + return ehci_usb_phy_mode(dev); + }; - return ehci_usb_phy_mode(dev); + return 0; } static int ehci_usb_probe(struct udevice *dev)