diff options
| author | Mike Turquette <mturquette@linaro.org> | 2014-02-24 18:15:25 -0500 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2014-02-24 18:15:25 -0500 |
| commit | 624009a7f34669233ea3376796ee674ae9416245 (patch) | |
| tree | 3c09266700856e4b39d15a11995b46db30865091 /include/dt-bindings/clock/tegra124-car.h | |
| parent | 7364001478597759fc5e00536bbe926ec9c25db0 (diff) | |
| parent | c7fbd4158433c1c910c62850247728cb05a94e42 (diff) | |
Merge branch 'clk-tegra-more-fixes-3.14' of git://nv-tegra.nvidia.com/user/pdeschrijver/linux into clk-fixes
Fixes stray access to undefined registers, use of wrong clock parents &
running clocks at wrong rates. All of these issues cause regressions in
the form of boards that are unable to boot or crash and die horrible
deaths.
Diffstat (limited to 'include/dt-bindings/clock/tegra124-car.h')
| -rw-r--r-- | include/dt-bindings/clock/tegra124-car.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/dt-bindings/clock/tegra124-car.h b/include/dt-bindings/clock/tegra124-car.h index a1116a3b54ef..8c1603b10665 100644 --- a/include/dt-bindings/clock/tegra124-car.h +++ b/include/dt-bindings/clock/tegra124-car.h | |||
| @@ -36,10 +36,10 @@ | |||
| 36 | #define TEGRA124_CLK_PWM 17 | 36 | #define TEGRA124_CLK_PWM 17 |
| 37 | #define TEGRA124_CLK_I2S2 18 | 37 | #define TEGRA124_CLK_I2S2 18 |
| 38 | /* 20 (register bit affects vi and vi_sensor) */ | 38 | /* 20 (register bit affects vi and vi_sensor) */ |
| 39 | #define TEGRA124_CLK_GR_2D 21 | 39 | /* 21 */ |
| 40 | #define TEGRA124_CLK_USBD 22 | 40 | #define TEGRA124_CLK_USBD 22 |
| 41 | #define TEGRA124_CLK_ISP 23 | 41 | #define TEGRA124_CLK_ISP 23 |
| 42 | #define TEGRA124_CLK_GR_3D 24 | 42 | /* 26 */ |
| 43 | /* 25 */ | 43 | /* 25 */ |
| 44 | #define TEGRA124_CLK_DISP2 26 | 44 | #define TEGRA124_CLK_DISP2 26 |
| 45 | #define TEGRA124_CLK_DISP1 27 | 45 | #define TEGRA124_CLK_DISP1 27 |