diff options
| author | Thierry Reding <treding@nvidia.com> | 2019-11-11 14:09:15 +0100 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2019-11-11 14:09:15 +0100 |
| commit | d1ee3173a139ed2eb8d87e06216f0426b16084d8 (patch) | |
| tree | a80f5b3cb7566450708d4aa5e25a14b5c4415c9a | |
| parent | 73616d0d7e48d564ee8e63ad845f86d69c566264 (diff) | |
| parent | cdc2d6685c13cc736b4c1c70b184638897c5c46f (diff) | |
Merge branch 'for-5.5/dt-bindings' into for-5.5/clk
| -rw-r--r-- | include/dt-bindings/clock/tegra124-car-common.h | 3 | ||||
| -rw-r--r-- | include/dt-bindings/clock/tegra210-car.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/dt-bindings/clock/tegra124-car-common.h b/include/dt-bindings/clock/tegra124-car-common.h index 4331f1df6ebe..0c4f5be0a742 100644 --- a/include/dt-bindings/clock/tegra124-car-common.h +++ b/include/dt-bindings/clock/tegra124-car-common.h @@ -337,7 +337,8 @@ #define TEGRA124_CLK_CLK_OUT_3_MUX 308 /* 309 */ /* 310 */ -#define TEGRA124_CLK_SOR0_LVDS 311 +#define TEGRA124_CLK_SOR0_LVDS 311 /* deprecated */ +#define TEGRA124_CLK_SOR0_OUT 311 #define TEGRA124_CLK_XUSB_SS_DIV2 312 #define TEGRA124_CLK_PLL_M_UD 313 diff --git a/include/dt-bindings/clock/tegra210-car.h b/include/dt-bindings/clock/tegra210-car.h index 6b77e721f6b1..0bfbfc912c68 100644 --- a/include/dt-bindings/clock/tegra210-car.h +++ b/include/dt-bindings/clock/tegra210-car.h @@ -391,7 +391,8 @@ #define TEGRA210_CLK_CLK_OUT_3_MUX 358 #define TEGRA210_CLK_DSIA_MUX 359 #define TEGRA210_CLK_DSIB_MUX 360 -#define TEGRA210_CLK_SOR0_LVDS 361 +#define TEGRA210_CLK_SOR0_LVDS 361 /* deprecated */ +#define TEGRA210_CLK_SOR0_OUT 361 #define TEGRA210_CLK_XUSB_SS_DIV2 362 #define TEGRA210_CLK_PLL_M_UD 363 |