Merge tag 'usb-ci-v4.14-rc1' of... (17e15f6f) · Commits · e / devices / android_kernel_teracube_emerald

drivers/usb/chipidea/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -15,3 +15,4 @@ obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_zevio.o
		obj-$(CONFIG_USB_CHIPIDEA_PCI) += ci_hdrc_pci.o

		obj-$(CONFIG_USB_CHIPIDEA_OF) += usbmisc_imx.o ci_hdrc_imx.o
		obj-$(CONFIG_USB_CHIPIDEA_OF) += ci_hdrc_tegra.o

drivers/usb/chipidea/ci_hdrc_msm.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -251,7 +251,7 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev)
		if (ret)
		goto err_mux;

		ulpi_node = of_find_node_by_name(pdev->dev.of_node, "ulpi");
		ulpi_node = of_find_node_by_name(of_node_get(pdev->dev.of_node), "ulpi");
		if (ulpi_node) {
		phy_node = of_get_next_available_child(ulpi_node, NULL);
		ci->hsic = of_device_is_compatible(phy_node, "qcom,usb-hsic-phy");

drivers/usb/chipidea/ci_hdrc_tegra.c

0 → 100644

+155 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2016, NVIDIA Corporation
		*
		* This program is free software; you can redistribute it and/or modify it
		* under the terms and conditions of the GNU General Public License,
		* version 2, as published by the Free Software Foundation.
		*/

		#include <linux/clk.h>
		#include <linux/module.h>
		#include <linux/of_device.h>
		#include <linux/reset.h>

		#include <linux/usb/chipidea.h>

		#include "ci.h"

		struct tegra_udc {
		struct ci_hdrc_platform_data data;
		struct platform_device *dev;

		struct usb_phy *phy;
		struct clk *clk;
		};

		struct tegra_udc_soc_info {
		unsigned long flags;
		};

		static const struct tegra_udc_soc_info tegra20_udc_soc_info = {
		.flags = CI_HDRC_REQUIRES_ALIGNED_DMA,
		};

		static const struct tegra_udc_soc_info tegra30_udc_soc_info = {
		.flags = 0,
		};

		static const struct tegra_udc_soc_info tegra114_udc_soc_info = {
		.flags = 0,
		};

		static const struct tegra_udc_soc_info tegra124_udc_soc_info = {
		.flags = 0,
		};

		static const struct of_device_id tegra_udc_of_match[] = {
		{
		.compatible = "nvidia,tegra20-udc",
		.data = &tegra20_udc_soc_info,
		}, {
		.compatible = "nvidia,tegra30-udc",
		.data = &tegra30_udc_soc_info,
		}, {
		.compatible = "nvidia,tegra114-udc",
		.data = &tegra114_udc_soc_info,
		}, {
		.compatible = "nvidia,tegra124-udc",
		.data = &tegra124_udc_soc_info,
		}, {
		/* sentinel */
		}
		};
		MODULE_DEVICE_TABLE(of, tegra_udc_of_match);

		static int tegra_udc_probe(struct platform_device *pdev)
		{
		const struct tegra_udc_soc_info *soc;
		struct tegra_udc *udc;
		int err;

		udc = devm_kzalloc(&pdev->dev, sizeof(*udc), GFP_KERNEL);
		if (!udc)
		return -ENOMEM;

		soc = of_device_get_match_data(&pdev->dev);
		if (!soc) {
		dev_err(&pdev->dev, "failed to match OF data\n");
		return -EINVAL;
		}

		udc->phy = devm_usb_get_phy_by_phandle(&pdev->dev, "nvidia,phy", 0);
		if (IS_ERR(udc->phy)) {
		err = PTR_ERR(udc->phy);
		dev_err(&pdev->dev, "failed to get PHY: %d\n", err);
		return err;
		}

		udc->clk = devm_clk_get(&pdev->dev, NULL);
		if (IS_ERR(udc->clk)) {
		err = PTR_ERR(udc->clk);
		dev_err(&pdev->dev, "failed to get clock: %d\n", err);
		return err;
		}

		err = clk_prepare_enable(udc->clk);
		if (err < 0) {
		dev_err(&pdev->dev, "failed to enable clock: %d\n", err);
		return err;
		}

		/*
		* Tegra's USB PHY driver doesn't implement optional phy_init()
		* hook, so we have to power on UDC controller before ChipIdea
		* driver initialization kicks in.
		*/
		usb_phy_set_suspend(udc->phy, 0);

		/* setup and register ChipIdea HDRC device */
		udc->data.name = "tegra-udc";
		udc->data.flags = soc->flags;
		udc->data.usb_phy = udc->phy;
		udc->data.capoffset = DEF_CAPOFFSET;

		udc->dev = ci_hdrc_add_device(&pdev->dev, pdev->resource,
		pdev->num_resources, &udc->data);
		if (IS_ERR(udc->dev)) {
		err = PTR_ERR(udc->dev);
		dev_err(&pdev->dev, "failed to add HDRC device: %d\n", err);
		goto fail_power_off;
		}

		platform_set_drvdata(pdev, udc);

		return 0;

		fail_power_off:
		usb_phy_set_suspend(udc->phy, 1);
		clk_disable_unprepare(udc->clk);
		return err;
		}

		static int tegra_udc_remove(struct platform_device *pdev)
		{
		struct tegra_udc *udc = platform_get_drvdata(pdev);

		usb_phy_set_suspend(udc->phy, 1);
		clk_disable_unprepare(udc->clk);

		return 0;
		}

		static struct platform_driver tegra_udc_driver = {
		.driver = {
		.name = "tegra-udc",
		.of_match_table = tegra_udc_of_match,
		},
		.probe = tegra_udc_probe,
		.remove = tegra_udc_remove,
		};
		module_platform_driver(tegra_udc_driver);

		MODULE_DESCRIPTION("NVIDIA Tegra USB device mode driver");
		MODULE_AUTHOR("Thierry Reding <treding@nvidia.com>");
		MODULE_ALIAS("platform:tegra-udc");
		MODULE_LICENSE("GPL v2");

drivers/usb/chipidea/core.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -736,7 +736,7 @@ static int ci_extcon_register(struct ci_hdrc *ci)

		id = &ci->platdata->id_extcon;
		id->ci = ci;
		if (!IS_ERR(id->edev)) {
		if (!IS_ERR_OR_NULL(id->edev)) {
		ret = devm_extcon_register_notifier(ci->dev, id->edev,
		EXTCON_USB_HOST, &id->nb);
		if (ret < 0) {
		@@ -747,7 +747,7 @@ static int ci_extcon_register(struct ci_hdrc *ci)

		vbus = &ci->platdata->vbus_extcon;
		vbus->ci = ci;
		if (!IS_ERR(vbus->edev)) {
		if (!IS_ERR_OR_NULL(vbus->edev)) {
		ret = devm_extcon_register_notifier(ci->dev, vbus->edev,
		EXTCON_USB, &vbus->nb);
		if (ret < 0) {

drivers/usb/chipidea/udc.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -944,7 +944,6 @@ isr_setup_status_complete(struct usb_ep ep, struct usb_request req)
		*/
		static int isr_setup_status_phase(struct ci_hdrc *ci)
		{
		int retval;
		struct ci_hw_ep *hwep;

		/*
		@@ -960,9 +959,7 @@ static int isr_setup_status_phase(struct ci_hdrc *ci)
		ci->status->context = ci;
		ci->status->complete = isr_setup_status_complete;

		retval = _ep_queue(&hwep->ep, ci->status, GFP_ATOMIC);

		return retval;
		return _ep_queue(&hwep->ep, ci->status, GFP_ATOMIC);
		}

		/**
		@@ -1899,6 +1896,9 @@ static int udc_start(struct ci_hdrc *ci)
		ci->gadget.name = ci->platdata->name;
		ci->gadget.otg_caps = otg_caps;

		if (ci->platdata->flags & CI_HDRC_REQUIRES_ALIGNED_DMA)
		ci->gadget.quirk_avoids_skb_reserve = 1;

		if (ci->is_otg && (otg_caps->hnp_support \|\| otg_caps->srp_support \|\|
		otg_caps->adp_support))
		ci->gadget.is_otg = 1;