mirror of
https://github.com/torvalds/linux
synced 2024-10-23 03:37:40 +00:00
f9a85f6e61
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: 4efb2f6941 ("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 <peter.griffin@linaro.org>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
40 lines
945 B
C
40 lines
945 B
C
/*
|
|
* xhci-plat.h - xHCI host controller driver platform Bus Glue.
|
|
*
|
|
* Copyright (C) 2015 Renesas Electronics Corporation
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* version 2 as published by the Free Software Foundation.
|
|
*/
|
|
|
|
#ifndef _XHCI_PLAT_H
|
|
#define _XHCI_PLAT_H
|
|
|
|
#include "xhci.h" /* for hcd_to_xhci() */
|
|
|
|
enum xhci_plat_type {
|
|
XHCI_PLAT_TYPE_MARVELL_ARMADA = 1,
|
|
XHCI_PLAT_TYPE_RENESAS_RCAR_GEN2,
|
|
XHCI_PLAT_TYPE_RENESAS_RCAR_GEN3,
|
|
};
|
|
|
|
struct xhci_plat_priv {
|
|
enum xhci_plat_type type;
|
|
const char *firmware_name;
|
|
};
|
|
|
|
#define hcd_to_xhci_priv(h) ((struct xhci_plat_priv *)hcd_to_xhci(h)->priv)
|
|
|
|
static inline bool xhci_plat_type_is(struct usb_hcd *hcd,
|
|
enum xhci_plat_type type)
|
|
{
|
|
struct xhci_plat_priv *priv = hcd_to_xhci_priv(hcd);
|
|
|
|
if (priv && priv->type == type)
|
|
return true;
|
|
else
|
|
return false;
|
|
}
|
|
#endif /* _XHCI_PLAT_H */
|