diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-11-23 03:04:05 -0500 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-11-23 03:04:05 -0500 |
| commit | 92907cbbef8625bb3998d1eb385fc88f23c97a3f (patch) | |
| tree | 15626ff9287e37c3cb81c7286d6db5a7fd77c854 /include/dt-bindings/clock/imx6sl-clock.h | |
| parent | 15fbfccfe92c62ae8d1ecc647c44157ed01ac02e (diff) | |
| parent | 1ec218373b8ebda821aec00bb156a9c94fad9cd4 (diff) | |
Merge tag 'v4.4-rc2' into drm-intel-next-queued
Linux 4.4-rc2
Backmerge to get at
commit 1b0e3a049efe471c399674fd954500ce97438d30
Author: Imre Deak <imre.deak@intel.com>
Date: Thu Nov 5 23:04:11 2015 +0200
drm/i915/skl: disable display side power well support for now
so that we can proplery re-eanble skl power wells in -next.
Conflicts are just adjacent lines changed, except for intel_fbdev.c
where we need to interleave the changs. Nothing nefarious.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'include/dt-bindings/clock/imx6sl-clock.h')
| -rw-r--r-- | include/dt-bindings/clock/imx6sl-clock.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/dt-bindings/clock/imx6sl-clock.h b/include/dt-bindings/clock/imx6sl-clock.h index 9ce4e421096f..e14573e293c5 100644 --- a/include/dt-bindings/clock/imx6sl-clock.h +++ b/include/dt-bindings/clock/imx6sl-clock.h | |||
| @@ -174,6 +174,7 @@ | |||
| 174 | #define IMX6SL_CLK_SSI1_IPG 161 | 174 | #define IMX6SL_CLK_SSI1_IPG 161 |
| 175 | #define IMX6SL_CLK_SSI2_IPG 162 | 175 | #define IMX6SL_CLK_SSI2_IPG 162 |
| 176 | #define IMX6SL_CLK_SSI3_IPG 163 | 176 | #define IMX6SL_CLK_SSI3_IPG 163 |
| 177 | #define IMX6SL_CLK_END 164 | 177 | #define IMX6SL_CLK_SPDIF_GCLK 164 |
| 178 | #define IMX6SL_CLK_END 165 | ||
| 178 | 179 | ||
| 179 | #endif /* __DT_BINDINGS_CLOCK_IMX6SL_H */ | 180 | #endif /* __DT_BINDINGS_CLOCK_IMX6SL_H */ |