Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 526a240f authored by Yoshihiro Shimoda's avatar Yoshihiro Shimoda Committed by Greg Kroah-Hartman
Browse files

usb: host: xhci-plat: add support for the R-Car H3 xHCI controllers 



The R-Car H3 has two xHCI controllers. This SoC is compatible with
R-Car Gen2 SoCs, however this SoC doesn't need some specific registers
setting, and need a new firmware.

Signed-off-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 82487b71

Documentation/devicetree/bindings/usb/usb-xhci.txt

+2 −2
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ USB xHCI controllers 
Required properties:

  - compatible: should be one of "generic-xhci",

    "marvell,armada-375-xhci", "marvell,armada-380-xhci",

    "renesas,xhci-r8a7790", "renesas,xhci-r8a7791", "renesas,xhci-r8a7793"

    (deprecated: "xhci-platform").

    "renesas,xhci-r8a7790", "renesas,xhci-r8a7791", "renesas,xhci-r8a7793",

    "renesas,xhci-r8a7795" (deprecated: "xhci-platform").

  - reg: should contain address and length of the standard XHCI

    register set for the device.

  - interrupts: one XHCI interrupt should be described here.

drivers/usb/host/xhci-plat.c

+12 −2
Original line number Diff line number Diff line
@@ -52,7 +52,8 @@ static int xhci_plat_setup(struct usb_hcd *hcd) 
{

	int ret;



	if (xhci_plat_type_is(hcd, XHCI_PLAT_TYPE_RENESAS_RCAR_GEN2)) {

	if (xhci_plat_type_is(hcd, XHCI_PLAT_TYPE_RENESAS_RCAR_GEN2) ||

	    xhci_plat_type_is(hcd, XHCI_PLAT_TYPE_RENESAS_RCAR_GEN3)) {

		ret = xhci_rcar_init_quirk(hcd);

		if (ret)

			return ret;
@@ -63,7 +64,8 @@ static int xhci_plat_setup(struct usb_hcd *hcd) 


static int xhci_plat_start(struct usb_hcd *hcd)

{

	if (xhci_plat_type_is(hcd, XHCI_PLAT_TYPE_RENESAS_RCAR_GEN2))

	if (xhci_plat_type_is(hcd, XHCI_PLAT_TYPE_RENESAS_RCAR_GEN2) ||

	    xhci_plat_type_is(hcd, XHCI_PLAT_TYPE_RENESAS_RCAR_GEN3))

		xhci_rcar_start(hcd);



	return xhci_run(hcd);
@@ -79,6 +81,11 @@ static const struct xhci_plat_priv xhci_plat_renesas_rcar_gen2 = { 
	.firmware_name = XHCI_RCAR_FIRMWARE_NAME_V1,

};



static const struct xhci_plat_priv xhci_plat_renesas_rcar_gen3 = {

	.type = XHCI_PLAT_TYPE_RENESAS_RCAR_GEN3,

	.firmware_name = XHCI_RCAR_FIRMWARE_NAME_V2,

};



static const struct of_device_id usb_xhci_of_match[] = {

	{

		.compatible = "generic-xhci",
@@ -99,6 +106,9 @@ static const struct of_device_id usb_xhci_of_match[] = { 
	}, {

		.compatible = "renesas,xhci-r8a7793",

		.data = &xhci_plat_renesas_rcar_gen2,

	}, {

		.compatible = "renesas,xhci-r8a7795",

		.data = &xhci_plat_renesas_rcar_gen3,

	}, {

	},

};

drivers/usb/host/xhci-plat.h

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
enum xhci_plat_type {

	XHCI_PLAT_TYPE_MARVELL_ARMADA,

	XHCI_PLAT_TYPE_RENESAS_RCAR_GEN2,

	XHCI_PLAT_TYPE_RENESAS_RCAR_GEN3,

};



struct xhci_plat_priv {

drivers/usb/host/xhci-rcar.c

+7 −0
Original line number Diff line number Diff line
@@ -17,7 +17,14 @@ 
#include "xhci-plat.h"

#include "xhci-rcar.h"



/*

* - The V2 firmware is possible to use on R-Car Gen2. However, the V2 causes

*   performance degradation. So, this driver continues to use the V1 if R-Car

*   Gen2.

* - The V1 firmware is impossible to use on R-Car Gen3.

*/

MODULE_FIRMWARE(XHCI_RCAR_FIRMWARE_NAME_V1);

MODULE_FIRMWARE(XHCI_RCAR_FIRMWARE_NAME_V2);



/*** Register Offset ***/

#define RCAR_USB3_INT_ENA	0x224	/* Interrupt Enable */

drivers/usb/host/xhci-rcar.h

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#define _XHCI_RCAR_H



#define XHCI_RCAR_FIRMWARE_NAME_V1	"r8a779x_usb3_v1.dlmem"

#define XHCI_RCAR_FIRMWARE_NAME_V2	"r8a779x_usb3_v2.dlmem"



#if IS_ENABLED(CONFIG_USB_XHCI_RCAR)

void xhci_rcar_start(struct usb_hcd *hcd);