diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-03-01 16:33:53 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-03-01 16:33:53 -0800 |
| commit | 7b05d3b37437f8d50a75545a0fd56ee585c58821 (patch) | |
| tree | 6fcc08874c05fa3d8b274d2569c0fe620f790360 /drivers/usb/chipidea/core.c | |
| parent | 71e41bbb43794e0fe4ce3b766d713e222ccfb5ea (diff) | |
| parent | d3d8425a21ed1b14bc896f827ee495e06bff2504 (diff) | |
| download | linux-7b05d3b37437f8d50a75545a0fd56ee585c58821.tar.gz linux-7b05d3b37437f8d50a75545a0fd56ee585c58821.tar.bz2 linux-7b05d3b37437f8d50a75545a0fd56ee585c58821.zip | |
Merge tag 'usb-ci-v4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-next
Peter writes:
- Add platform interface to choose ttctrl.ttha
- Some tiny improvements
Diffstat (limited to 'drivers/usb/chipidea/core.c')
| -rw-r--r-- | drivers/usb/chipidea/core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c index 7404064b9bbc..69426e644d17 100644 --- a/drivers/usb/chipidea/core.c +++ b/drivers/usb/chipidea/core.c @@ -721,6 +721,9 @@ static int ci_get_platdata(struct device *dev, return ret; } + if (of_find_property(dev->of_node, "non-zero-ttctrl-ttha", NULL)) + platdata->flags |= CI_HDRC_SET_NON_ZERO_TTHA; + ext_id = ERR_PTR(-ENODEV); ext_vbus = ERR_PTR(-ENODEV); if (of_property_read_bool(dev->of_node, "extcon")) { |