diff options
| author | Michael Turquette <mturquette@linaro.org> | 2015-04-10 18:06:55 -0700 |
|---|---|---|
| committer | Michael Turquette <mturquette@linaro.org> | 2015-04-10 18:06:55 -0700 |
| commit | c14deee398c344a5f93c8206fa91314388b4a8c2 (patch) | |
| tree | d19efa3a56ada1c538b15f0bc330308ded6fd298 /include/dt-bindings | |
| parent | 820ad9752c232239d3278eafe71c2c251ae233d3 (diff) | |
| parent | c1d676cec572544616273d5853cb7cc38fbaa62b (diff) | |
| download | linux-c14deee398c344a5f93c8206fa91314388b4a8c2.tar.gz linux-c14deee398c344a5f93c8206fa91314388b4a8c2.tar.bz2 linux-c14deee398c344a5f93c8206fa91314388b4a8c2.zip | |
Merge tag 'clk/for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into clk-next
clk/tegra: Changes for v4.1-rc1
These are mostly cleanups that I've been carrying in my local tree for
far too long. In addition to those, there are some preparatory patches
for the upcoming Tegra210 support and a patch to enable clocks needed
for HDMI audio support.
Diffstat (limited to 'include/dt-bindings')
| -rw-r--r-- | include/dt-bindings/clock/tegra124-car-common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/dt-bindings/clock/tegra124-car-common.h b/include/dt-bindings/clock/tegra124-car-common.h index ae2eb17a1658..a2156090563f 100644 --- a/include/dt-bindings/clock/tegra124-car-common.h +++ b/include/dt-bindings/clock/tegra124-car-common.h @@ -297,7 +297,7 @@ #define TEGRA124_CLK_PLL_C4 270 #define TEGRA124_CLK_PLL_DP 271 #define TEGRA124_CLK_PLL_E_MUX 272 -#define TEGRA124_CLK_PLLD_DSI 273 +#define TEGRA124_CLK_PLL_D_DSI_OUT 273 /* 274 */ /* 275 */ /* 276 */ |