From: Andrew Chew <[email protected]> Add code to try to get platform data information (register base, irq, modes, various tuning parameters) from device tree, if not present in board files.
Signed-off-by: Andrew Chew <[email protected]> Acked-by: Stephen Warren <[email protected]> --- Applied Grant Likely's comments: - Use hyphens instead of underscores for property names. - Using fsl usb bindings as a guide, changed type to phy-type and mode to dr-mode. - Changed power-down-on-bus-suspend to a boolean, so it defaults to off unless the property is present. - Prefixed utmi phy settings with "nvidia,". - Unconditionally include linux/of* headers. - Have a default value for each property (also documented in bindings). - Removed cast when calling of_property_read_u32. Instead, hold the value in a temporary u32, and if the call succeeds, use the value (otherwise, we fall back on the default). - Make empty version of tegra_ehci_parse_dt_node(), to simplify code in the probe method. - Get memory and irq resources from the usual place, rather than digging into the device tree node. .../devicetree/bindings/usb/tegra20-ehci.txt | 27 +++ drivers/usb/host/ehci-tegra.c | 187 ++++++++++++++++++++ 2 files changed, 214 insertions(+), 0 deletions(-) create mode 100644 Documentation/devicetree/bindings/usb/tegra20-ehci.txt diff --git a/Documentation/devicetree/bindings/usb/tegra20-ehci.txt b/Documentation/devicetree/bindings/usb/tegra20-ehci.txt new file mode 100644 index 0000000..315ea6e --- /dev/null +++ b/Documentation/devicetree/bindings/usb/tegra20-ehci.txt @@ -0,0 +1,27 @@ +NVIDIA Tegra20 SOC USB controllers + +The device node for a USB controller that is part of a Tegra20 +SOC is as described in the document "Open Firmware Recommended +Practice: Universal Serial Bus" with the following modifications +and additions: + +Required properties: + - compatible: Should be "nvidia,tegra20-ehci". + - phy-type: Should be one of "utmi" or "ulpi". Defaults to utmi. + - dr-mode: Should be one of "peripheral", "host", or "otg". Defaults to host. + - power-down-on-bus-suspend: For host mode only. If present, then + the USB phy will power down when the host is suspended. + +Required properties for phy-type = "utmi". These values are derived from +characterization by system engineering. + - nvidia,hssync-start-delay: Defaults to 9. + - nvidia,idle-wait-delay: Defaults to 17. + - nvidia,elastic-limit: Defaults to 16. + - nvidia,term-range-adj: Defaults to 6. + - nvidia,xcvr-setup: Defaults to 9. + - nvidia,xcvr-lsfslew: Defaults to 2. + - nvidia,xcvr-lsrslew: Defaults to 2. + +Required properties for phy-type = "ulpi": + - reset-gpio: The GPIO used to drive reset. Defaults to 169. + - clk: Defaults to "cdev2". diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c index 02b2bfd..67c16e5 100644 --- a/drivers/usb/host/ehci-tegra.c +++ b/drivers/usb/host/ehci-tegra.c @@ -21,10 +21,32 @@ #include <linux/platform_data/tegra_usb.h> #include <linux/irq.h> #include <linux/usb/otg.h> +#include <linux/of.h> +#include <linux/of_address.h> +#include <linux/of_irq.h> +#include <linux/of_platform.h> + #include <mach/usb_phy.h> #define TEGRA_USB_DMA_ALIGN 32 +static u64 tegra_ehci_dmamask = DMA_BIT_MASK(TEGRA_USB_DMA_ALIGN); + +static struct tegra_utmip_config utmi_default = { + .hssync_start_delay = 9, + .idle_wait_delay = 17, + .elastic_limit = 16, + .term_range_adj = 6, + .xcvr_setup = 9, + .xcvr_lsfslew = 2, + .xcvr_lsrslew = 2, +}; + +static struct tegra_ulpi_config ulpi_default = { + .reset_gpio = 169, + .clk = "cdev2", +}; + struct tegra_ehci_hcd { struct ehci_hcd *ehci; struct tegra_usb_phy *phy; @@ -574,9 +596,155 @@ static const struct hc_driver tegra_ehci_hc_driver = { .port_handed_over = ehci_port_handed_over, }; +#if defined(CONFIG_OF) +static int tegra_ehci_parse_dt_node_utmi(struct device_node *dn, + struct platform_device *pdev, + struct tegra_ehci_platform_data *pdata) +{ + struct device *dev = &pdev->dev; + struct tegra_utmip_config *phy_config; + u32 val; + + phy_config = devm_kzalloc(dev, sizeof(struct tegra_utmip_config), + GFP_KERNEL); + if (!phy_config) + return -ENOMEM; + + /* Copy default values. */ + memcpy(phy_config, &utmi_default, sizeof(struct tegra_utmip_config)); + + /* Values can be overridden from their defaults. */ + if (of_property_read_u32(dn, "nvidia,hssync-start-delay", &val) == 0) + phy_config->hssync_start_delay = val; + + if (of_property_read_u32(dn, "nvidia,elastic-limit", &val) == 0) + phy_config->elastic_limit = val; + + if (of_property_read_u32(dn, "nvidia,idle-wait-delay", &val) == 0) + phy_config->idle_wait_delay = val; + + if (of_property_read_u32(dn, "nvidia,term-range-adj", &val) == 0) + phy_config->term_range_adj = val; + + if (of_property_read_u32(dn, "nvidia,xcvr-setup", &val) == 0) + phy_config->xcvr_setup = val; + + if (of_property_read_u32(dn, "nvidia,xcvr-lsfslew", &val) == 0) + phy_config->xcvr_lsfslew = val; + + if (of_property_read_u32(dn, "nvidia,xcvr-lsrslew", &val) == 0) + phy_config->xcvr_lsrslew = val; + + pdata->phy_config = phy_config; + + return 0; +} + +static int tegra_ehci_parse_dt_node_ulpi(struct device_node *dn, + struct platform_device *pdev, + struct tegra_ehci_platform_data *pdata) +{ + struct device *dev = &pdev->dev; + struct tegra_ulpi_config *phy_config; + u32 val; + char *sval; + + phy_config = devm_kzalloc(dev, sizeof(struct tegra_ulpi_config), + GFP_KERNEL); + if (!phy_config) + return -ENOMEM; + + /* Copy default values. */ + memcpy(phy_config, &ulpi_default, sizeof(struct tegra_ulpi_config)); + + /* Values can be overridden from their defaults. */ + if (of_property_read_u32(dn, "reset-gpio", &val) == 0) + phy_config->reset_gpio = val; + + if (of_property_read_string(dn, "clk", &sval) == 0) + phy_config->clk = sval; + + pdata->phy_config = phy_config; + + return 0; +} + +static struct tegra_ehci_platform_data *tegra_ehci_parse_dt_node( + struct device_node *dn, + struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct tegra_ehci_platform_data *pdata; + char *mode; + char *type; + + pdata = devm_kzalloc(dev, sizeof(struct tegra_ehci_platform_data), + GFP_KERNEL); + if (!pdata) + return NULL; + + /* Default to host if this property is not present. */ + if (of_property_read_string(dn, "dr-mode", &mode) != 0) + pdata->operating_mode = TEGRA_USB_HOST; + else if (strcmp(mode, "peripheral") == 0) + pdata->operating_mode = TEGRA_USB_DEVICE; + else if (strcmp(mode, "host") == 0) + pdata->operating_mode = TEGRA_USB_HOST; + else if (strcmp(mode, "otg") == 0) + pdata->operating_mode = TEGRA_USB_OTG; + else { + dev_err(dev, "Invalid dt property \"dr-mode\" value %s\n", + mode); + goto fail; + } + + /* power-down-on-bus-suspend is only relevant if dr-mode is host. */ + if (of_find_property(dn, "power-down-on-bus-suspend", NULL) != 0) { + if (pdata->operating_mode != TEGRA_USB_HOST) { + dev_err(dev, "The dt property " + "\"power-down-on-bus-suspend\" " + "is only valid when dr-mode is " + "\"host\"\n"); + goto fail; + } + pdata->power_down_on_bus_suspend = 1; + } + + /* Default to utmi if this property is not present. */ + if (of_property_read_string(dn, "phy-type", &type) != 0) { + if (tegra_ehci_parse_dt_node_utmi(dn, pdev, pdata)) + goto fail; + } else if (strcmp(type, "utmi") == 0) { + if (tegra_ehci_parse_dt_node_utmi(dn, pdev, pdata)) + goto fail; + } else if (strcmp(type, "ulpi") == 0) { + if (tegra_ehci_parse_dt_node_ulpi(dn, pdev, pdata)) + goto fail; + } else { + dev_err(dev, "Invalid dt property \"type\" value %s\n", type); + goto fail; + } + + return pdata; + +fail: + devm_kfree(dev, pdata); + + return NULL; +} +#else +static struct tegra_ehci_platform_data *tegra_ehci_parse_dt_node( + struct device_node *dn, + struct platform_device *pdev) +{ + return NULL; +} +#endif /* defined(CONFIG_OF) */ + static int tegra_ehci_probe(struct platform_device *pdev) { struct resource *res; + struct device_node *dn = pdev->dev.of_node; struct usb_hcd *hcd; struct tegra_ehci_hcd *tegra; struct tegra_ehci_platform_data *pdata; @@ -584,8 +752,19 @@ static int tegra_ehci_probe(struct platform_device *pdev) int irq; int instance = pdev->id; + /* + * See if there's any platform data passed via board files. + * If there isn't, then allocate one and fill it by parsing + * device tree node. + */ pdata = pdev->dev.platform_data; if (!pdata) { + pdata = tegra_ehci_parse_dt_node(dn, pdev); + + pdev->dev.dma_mask = &tegra_ehci_dmamask; + pdev->dev.coherent_dma_mask = tegra_ehci_dmamask; + } + if (!pdata) { dev_err(&pdev->dev, "Platform data missing\n"); return -EINVAL; } @@ -773,6 +952,12 @@ static void tegra_ehci_hcd_shutdown(struct platform_device *pdev) hcd->driver->shutdown(hcd); } +static const struct of_device_id tegra_ehci_of_match[] = { + { .compatible = "nvidia,tegra20-ehci", }, + {}, +}; +MODULE_DEVICE_TABLE(of, tegra_ehci_of_match); + static struct platform_driver tegra_ehci_driver = { .probe = tegra_ehci_probe, .remove = tegra_ehci_remove, @@ -783,5 +968,7 @@ static struct platform_driver tegra_ehci_driver = { .shutdown = tegra_ehci_hcd_shutdown, .driver = { .name = "tegra-ehci", + .owner = THIS_MODULE, + .of_match_table = tegra_ehci_of_match, } }; -- 1.7.6 -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
