diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-06-23 08:31:49 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-06-23 14:01:53 +0200 |
| commit | 0b076ecdf343b029c4c2c3a94ffd0199d97aa46c (patch) | |
| tree | 38407c97a7f90cb46a9e8c487676a65ce2ed9209 /arch | |
| parent | drm/i915/gen8: Add WaFlushCoherentL3CacheLinesAtContextSwitch workaround (diff) | |
| parent | drm/dp/mst: take lock around looking up the branch device on hpd irq (diff) | |
| download | linux-0b076ecdf343b029c4c2c3a94ffd0199d97aa46c.tar.xz linux-0b076ecdf343b029c4c2c3a94ffd0199d97aa46c.zip | |
Merge remote-tracking branch 'airlied/drm-next' into HEAD
Backmerge drm-next because the conflict between Ander's atomic fixes
for 4.2 and Maartens future work are getting to unwielding to handle.
Conflicts:
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_ringbuffer.h
Just always take ours, same as git merge -X ours, but done by hand
because I didn't trust git: It's confusing that it doesn't show any
conflicts in the merge diff at all.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/exynos4.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi index e20cdc24c3bb..1538d7ae7b86 100644 --- a/arch/arm/boot/dts/exynos4.dtsi +++ b/arch/arm/boot/dts/exynos4.dtsi @@ -167,7 +167,7 @@ phys = <&mipi_phy 1>; phy-names = "dsim"; clocks = <&clock CLK_DSIM0>, <&clock CLK_SCLK_MIPI0>; - clock-names = "bus_clk", "pll_clk"; + clock-names = "bus_clk", "sclk_mipi"; status = "disabled"; #address-cells = <1>; #size-cells = <0>; |