diff options
| author | Thierry Reding <[email protected]> | 2017-10-19 16:35:35 +0200 |
|---|---|---|
| committer | Thierry Reding <[email protected]> | 2017-10-19 16:35:35 +0200 |
| commit | 388c422ed581ed4a460cd9d0e29d084ee2d80d08 (patch) | |
| tree | ce4bf06f90b3bfc0ca938e3bf26abe7d8e5984e3 /include | |
| parent | 2bd6bf03f4c1c59381d62c61d03f6cc3fe71f66e (diff) | |
| parent | 3e09b155d58e44e33a699650128f8c6c833cb320 (diff) | |
Merge branch 'for-4.15/dt-bindings' into for-4.15/arm64/dt
Diffstat (limited to 'include')
| -rw-r--r-- | include/dt-bindings/clock/tegra210-car.h | 1 | ||||
| -rw-r--r-- | include/dt-bindings/thermal/tegra186-bpmp-thermal.h | 14 |
2 files changed, 15 insertions, 0 deletions
diff --git a/include/dt-bindings/clock/tegra210-car.h b/include/dt-bindings/clock/tegra210-car.h index 46689cd3750b..43c4a8407333 100644 --- a/include/dt-bindings/clock/tegra210-car.h +++ b/include/dt-bindings/clock/tegra210-car.h @@ -309,6 +309,7 @@ #define TEGRA210_CLK_BLINK 280 /* 281 */ #define TEGRA210_CLK_SOR1_SRC 282 +#define TEGRA210_CLK_SOR1_OUT 282 /* 283 */ #define TEGRA210_CLK_XUSB_HOST_SRC 284 #define TEGRA210_CLK_XUSB_FALCON_SRC 285 diff --git a/include/dt-bindings/thermal/tegra186-bpmp-thermal.h b/include/dt-bindings/thermal/tegra186-bpmp-thermal.h new file mode 100644 index 000000000000..a96b8fa31aab --- /dev/null +++ b/include/dt-bindings/thermal/tegra186-bpmp-thermal.h @@ -0,0 +1,14 @@ +/* + * This header provides constants for binding nvidia,tegra186-bpmp-thermal. + */ + +#ifndef _DT_BINDINGS_THERMAL_TEGRA186_BPMP_THERMAL_H +#define _DT_BINDINGS_THERMAL_TEGRA186_BPMP_THERMAL_H + +#define TEGRA186_BPMP_THERMAL_ZONE_CPU 2 +#define TEGRA186_BPMP_THERMAL_ZONE_GPU 3 +#define TEGRA186_BPMP_THERMAL_ZONE_AUX 4 +#define TEGRA186_BPMP_THERMAL_ZONE_PLLX 5 +#define TEGRA186_BPMP_THERMAL_ZONE_AO 6 + +#endif |