diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-01-25 00:44:53 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-01-25 00:45:00 +0300 |
| commit | f0e7ce1eef5854584dfb59b3824a67edee37580f (patch) | |
| tree | 45d622c2588a7bd42430d7e7590617f13341670d /Documentation | |
| parent | 7325e4bd06b02c3aa14fb1066164aefcdee73115 (diff) | |
| parent | a840f690d3c6f2f27425ca7e7bd2d635cdec07d7 (diff) | |
| download | linux-f0e7ce1eef5854584dfb59b3824a67edee37580f.tar.xz | |
Merge tag 'drm-msm-fixes-2019-01-24' of git://people.freedesktop.org/~robclark/linux into drm-fixes
A few fixes for v5.0.. the opp-level fix and removal of hard-coded irq
name is partially to make things smoother in v5.1 merge window to
avoid dependency on drm vs dt trees, but are otherwise sane changes.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Rob Clark <robdclark@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CAF6AEGsAEHd2tGRQxRTs+A-8y_tthPs2iUgCCCEwR5vDMXab4A@mail.gmail.com
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/display/msm/gpu.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/display/msm/gpu.txt b/Documentation/devicetree/bindings/display/msm/gpu.txt index ac8df3b871f9..f8759145ce1a 100644 --- a/Documentation/devicetree/bindings/display/msm/gpu.txt +++ b/Documentation/devicetree/bindings/display/msm/gpu.txt @@ -27,7 +27,6 @@ Example: reg = <0x04300000 0x20000>; reg-names = "kgsl_3d0_reg_memory"; interrupts = <GIC_SPI 80 0>; - interrupt-names = "kgsl_3d0_irq"; clock-names = "core", "iface", |