diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-05-09 10:18:37 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-05-09 10:18:37 -0400 |
| commit | 4ace926172a7d93182381a3c7a2d05acb2dd91a4 (patch) | |
| tree | 8718330c15c8dbffd5612d56cd4ff62f741affda /include/soc | |
| parent | f0653f6768ee9d66e25b2476facb74c9c2d88118 (diff) | |
| parent | 87d66f280672800c9c2ad1ce3b7a993ce1e04769 (diff) | |
Merge tag 'tegra-for-4.7-phy' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/drivers
Merge "phy: tegra: Changes for v4.7-rc1" from Thierry Reding:
This set of patches adds support for the Tegra XUSB pad controller. The
controller provides a set of pads (lanes) that are used for I/O by other
IP blocks within Tegra SoCs (PCIe, SATA and XUSB).
* tag 'tegra-for-4.7-phy' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
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
Diffstat (limited to 'include/soc')
| -rw-r--r-- | include/soc/tegra/fuse.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/soc/tegra/fuse.h b/include/soc/tegra/fuse.h index 961b821b6a46..b4c9219e7f95 100644 --- a/include/soc/tegra/fuse.h +++ b/include/soc/tegra/fuse.h | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | 26 | ||
| 27 | #define TEGRA_FUSE_SKU_CALIB_0 0xf0 | 27 | #define TEGRA_FUSE_SKU_CALIB_0 0xf0 |
| 28 | #define TEGRA30_FUSE_SATA_CALIB 0x124 | 28 | #define TEGRA30_FUSE_SATA_CALIB 0x124 |
| 29 | #define TEGRA_FUSE_USB_CALIB_EXT_0 0x250 | ||
| 29 | 30 | ||
| 30 | #ifndef __ASSEMBLY__ | 31 | #ifndef __ASSEMBLY__ |
| 31 | 32 | ||