diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-12-04 19:20:02 +0300 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-12-04 19:20:02 +0300 |
commit | e58e501a9b3e0db722263b02d6c06f1656a5dee7 (patch) | |
tree | ba828148967f084f3301016d7215e0338cec1445 /include/dt-bindings/clock/tegra124-car.h | |
parent | a8afa2645ccf3525409c749c1dc4ec1cf95ff3f5 (diff) | |
parent | 8918465163171322c77a19d5258a95f56d89d2e4 (diff) | |
download | linux-e58e501a9b3e0db722263b02d6c06f1656a5dee7.tar.xz |
Merge tag 'tegra-for-3.19-iommu' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/drivers
Pull "ARM: tegra: IOMMU support for v3.19" from Thierry Reding:
This adds the driver pieces required for IOMMU support on Tegra30,
Tegra114 and Tegra124.
* tag 'tegra-for-3.19-iommu' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
memory: Add NVIDIA Tegra memory controller support
of: Add NVIDIA Tegra memory controller binding
ARM: tegra: Move AHB Kconfig to drivers/amba
amba: Add Kconfig file
clk: tegra: Implement memory-controller clock
powerpc/iommu: Rename iommu_[un]map_sg functions
iommu: Improve error handling when setting bus iommu
iommu: Do more input validation in iommu_map_sg()
iommu: Add iommu_map_sg() function
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/dt-bindings/clock/tegra124-car.h')
-rw-r--r-- | include/dt-bindings/clock/tegra124-car.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/dt-bindings/clock/tegra124-car.h b/include/dt-bindings/clock/tegra124-car.h index 6bac637fd635..af9bc9a3ddbc 100644 --- a/include/dt-bindings/clock/tegra124-car.h +++ b/include/dt-bindings/clock/tegra124-car.h @@ -48,7 +48,7 @@ #define TEGRA124_CLK_I2S0 30 /* 31 */ -/* 32 */ +#define TEGRA124_CLK_MC 32 /* 33 */ #define TEGRA124_CLK_APBDMA 34 /* 35 */ |