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

Commit 327d8b42 authored by Tuomas Tynkkynen's avatar Tuomas Tynkkynen Committed by Felipe Balbi
Browse files

usb: host: tegra: Tegra30 support 



The Tegra30 EHCI controller is mostly compatible with the Tegra20
controller, except Tegra30 includes the HOSTPC register extension.
The has_hostpc capability bit must be set in the ehci_hcd structure if
the controller has such extensions. The new tegra_ehci_soc_config
structure is added to describe the differences between the SoCs.

Signed-off-by: default avatarTuomas Tynkkynen <ttynkkynen@nvidia.com>
Tested-by: default avatarStephen Warren <swarren@nvidia.com>
Reviewed-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent e497a24d

drivers/usb/host/ehci-tegra.c

+29 −5
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/irq.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/of_gpio.h>

#include <linux/platform_device.h>

#include <linux/pm_runtime.h>
@@ -50,6 +51,10 @@ 


static struct hc_driver __read_mostly tegra_ehci_hc_driver;



struct tegra_ehci_soc_config {

	bool has_hostpc;

};



static int (*orig_hub_control)(struct usb_hcd *hcd,

				u16 typeReq, u16 wValue, u16 wIndex,

				char *buf, u16 wLength);
@@ -320,8 +325,24 @@ static void tegra_ehci_unmap_urb_for_dma(struct usb_hcd *hcd, struct urb *urb) 
	free_dma_aligned_buffer(urb);

}



static const struct tegra_ehci_soc_config tegra30_soc_config = {

	.has_hostpc = true,

};



static const struct tegra_ehci_soc_config tegra20_soc_config = {

	.has_hostpc = false,

};



static struct of_device_id tegra_ehci_of_match[] = {

	{ .compatible = "nvidia,tegra30-ehci", .data = &tegra30_soc_config },

	{ .compatible = "nvidia,tegra20-ehci", .data = &tegra20_soc_config },

	{ },

};



static int tegra_ehci_probe(struct platform_device *pdev)

{

	const struct of_device_id *match;

	const struct tegra_ehci_soc_config *soc_config;

	struct resource *res;

	struct usb_hcd *hcd;

	struct ehci_hcd *ehci;
@@ -330,6 +351,13 @@ static int tegra_ehci_probe(struct platform_device *pdev) 
	int irq;

	struct usb_phy *u_phy;



	match = of_match_device(tegra_ehci_of_match, &pdev->dev);

	if (!match) {

		dev_err(&pdev->dev, "Error: No device match found\n");

		return -ENODEV;

	}

	soc_config = match->data;



	/* Right now device-tree probed devices don't get dma_mask set.

	 * Since shared usb code relies on it, set it here for now.

	 * Once we have dma capability bindings this can go away.
@@ -391,6 +419,7 @@ static int tegra_ehci_probe(struct platform_device *pdev) 
		goto cleanup_clk_en;

	}

	ehci->caps = hcd->regs + 0x100;

	ehci->has_hostpc = soc_config->has_hostpc;



	err = usb_phy_init(hcd->phy);

	if (err) {
@@ -468,11 +497,6 @@ static void tegra_ehci_hcd_shutdown(struct platform_device *pdev) 
		hcd->driver->shutdown(hcd);

}



static struct of_device_id tegra_ehci_of_match[] = {

	{ .compatible = "nvidia,tegra20-ehci", },

	{ },

};



static struct platform_driver tegra_ehci_driver = {

	.probe		= tegra_ehci_probe,

	.remove		= tegra_ehci_remove,