From patchwork Fri Mar 25 14:46:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 64490 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp208047lbc; Fri, 25 Mar 2016 07:46:38 -0700 (PDT) X-Received: by 10.98.10.20 with SMTP id s20mr21920290pfi.109.1458917198214; Fri, 25 Mar 2016 07:46:38 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u22si19979882pfa.245.2016.03.25.07.46.38; Fri, 25 Mar 2016 07:46:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752855AbcCYOqg (ORCPT + 3 others); Fri, 25 Mar 2016 10:46:36 -0400 Received: from mail-wm0-f45.google.com ([74.125.82.45]:36649 "EHLO mail-wm0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751091AbcCYOqf (ORCPT ); Fri, 25 Mar 2016 10:46:35 -0400 Received: by mail-wm0-f45.google.com with SMTP id u125so20900410wmg.1 for ; Fri, 25 Mar 2016 07:46:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=FXdAeb6sd0g7xYxo/I3xGb/QIFVmNu4K3krcF1bECYc=; b=AdfGQDCzf3rgfU5zkyXu30STT8iA+xTh2DtXj9HgDcSiZQg84Ytt9YTf/4lQszwNcr UQguPE6DWhDVx2+9UsEKgJt/5AOKTMJ8JlpSK092jKf5gw1rZXogy+kk5KXi8D/GCQC2 gRpwlDprX/nmw3eFIlKsHSOsG6uGMxg35qn2E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=FXdAeb6sd0g7xYxo/I3xGb/QIFVmNu4K3krcF1bECYc=; b=MwVwStqXPClzJVSlx4RF4dt7I9GEDvIyP9pMaa/4SU5OovCNsHB8guQraJFwpSGKLz kj74fqpBNZgh9Igt9Mhf9B4DCacnoPdRryk70rTpBVNJNAK2YZA3EoCB89lYor+IDJ2a dqmgmaXVe3l5Xi2bXrco8MPOv7PPfqsnvKlz1qmpASJelC3fHBveFt6vFv0LG4CMcuox YwEC5GcU60ADLMcxE2A1XmXx8WP9S9NCYWhhgI/UXF0WBkdH/I/+K/YBMuJu+Ea0RNtW 0EWgZ9gl1Nt2Uob1pxakB2CL41p5HTfhdX/wNd0Y7giO7z2OWZNl6LZ5L0Er8OSCBp0q R72w== X-Gm-Message-State: AD7BkJJkpwPIgKCMSy0mycpqvjBI411qv05okgyo//toeYLxE/KgLtJUGwhTDZZQRQfO9h1Q X-Received: by 10.194.122.138 with SMTP id ls10mr15403196wjb.51.1458917194379; Fri, 25 Mar 2016 07:46:34 -0700 (PDT) Received: from localhost.localdomain (cpc84787-aztw28-2-0-cust15.18-1.cable.virginm.net. [82.37.140.16]) by smtp.gmail.com with ESMTPSA id jf6sm12265761wjb.2.2016.03.25.07.46.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 25 Mar 2016 07:46:33 -0700 (PDT) From: Peter Griffin To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, mathias.nyman@intel.com, gregkh@linuxfoundation.org Cc: peter.griffin@linaro.org, lee.jones@linaro.org, balbi@kernel.org, linux-usb@vger.kernel.org, maxime.coquelin@st.com, patrice.chotard@st.com, stable@vger.kernel.org, gregory.clement@free-electrons.com, yoshihiro.shimoda.uh@renesas.com Subject: [PATCH] usb: host: xhci-plat: Make enum xhci_plat_type start at a non zero value Date: Fri, 25 Mar 2016 14:46:28 +0000 Message-Id: <1458917188-28452-1-git-send-email-peter.griffin@linaro.org> X-Mailer: git-send-email 1.9.1 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Otherwise generic-xhci and xhci-platform which have no data get wrongly detected as XHCI_PLAT_TYPE_MARVELL_ARMADA by xhci_plat_type_is(). This fixes a regression in v4.5 for STiH407 family SoC's which use the synopsis dwc3 IP, whereby the disable_clk error path gets taken due to wrongly being detected as XHCI_PLAT_TYPE_MARVELL_ARMADA and the hcd never gets added. I suspect this will also fix other dwc3 DT platforms such as Exynos, although I've only tested on STih410 SoC. Fixes: 4efb2f694114 ("usb: host: xhci-plat: add struct xhci_plat_priv") Cc: stable@vger.kernel.org Cc: gregory.clement@free-electrons.com Cc: yoshihiro.shimoda.uh@renesas.com Signed-off-by: Peter Griffin --- drivers/usb/host/xhci-plat.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Acked-by: Lee Jones diff --git a/drivers/usb/host/xhci-plat.h b/drivers/usb/host/xhci-plat.h index 5a2e2e3..529c3c4 100644 --- a/drivers/usb/host/xhci-plat.h +++ b/drivers/usb/host/xhci-plat.h @@ -14,7 +14,7 @@ #include "xhci.h" /* for hcd_to_xhci() */ enum xhci_plat_type { - XHCI_PLAT_TYPE_MARVELL_ARMADA, + XHCI_PLAT_TYPE_MARVELL_ARMADA = 1, XHCI_PLAT_TYPE_RENESAS_RCAR_GEN2, XHCI_PLAT_TYPE_RENESAS_RCAR_GEN3, };