diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-05-09 16:25:12 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2016-05-09 16:25:12 +0200 |
commit | 43419b0939b8d8c5d4942a7ebaebd8d483a2cc14 (patch) | |
tree | f694fe63eb0a7464531f0103e137887f493a6348 | |
parent | 783fb3c393b17237aa504c6a5f9b2f5bce3d7a28 (diff) | |
parent | 6fe7c187e026c8b610df9dda7d9befc70cbfd169 (diff) | |
parent | ab065e969640d9afd3967266eb3193fb3ac298bd (diff) |
Merge branches 'tegra/pci' and 'tegra/usb' into next/late
This is a prerequisite for enabling the Tegra XUSB, all the
branches should be merged already at the time we get here.
* tegra/pci:
PCI: tegra: Support per-lane PHYs
dt-bindings: pci: tegra: Update for per-lane PHYs
phy: tegra: Add Tegra210 support
phy: Add Tegra XUSB pad controller support
dt-bindings: phy: tegra-xusb-padctl: Add Tegra210 support
dt-bindings: phy: Add NVIDIA Tegra XUSB pad controller binding
phy: core: Allow children node to be overridden
clk: tegra: Add interface to enable hardware control of SATA/XUSB PLLs
* tegra/usb:
usb: xhci: tegra: Add Tegra210 support
usb: xhci: Add NVIDIA Tegra XUSB controller driver
dt-bindings: usb: xhci-tegra: Add Tegra210 XUSB controller support
dt-bindings: usb: Add NVIDIA Tegra XUSB controller binding
phy: tegra: Add Tegra210 support
phy: Add Tegra XUSB pad controller support
dt-bindings: phy: tegra-xusb-padctl: Add Tegra210 support
dt-bindings: phy: Add NVIDIA Tegra XUSB pad controller binding
phy: core: Allow children node to be overridden
clk: tegra: Add interface to enable hardware control of SATA/XUSB PLLs