summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/omap2430.dtsi
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2015-09-02 14:33:42 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-09-02 14:33:42 +0200
commite93c28f39375558409329a02a767d5cadfcc4a31 (patch)
tree9f1b4b5ce765b887b6002cded59fc934e6c9c012 /arch/arm/boot/dts/omap2430.dtsi
parentdrm/i915: Also record time difference if vblank evasion fails, v2. (diff)
parenti915: Set ddi_pll_sel in DP MST path (diff)
downloadlinux-e93c28f39375558409329a02a767d5cadfcc4a31.tar.xz
linux-e93c28f39375558409329a02a767d5cadfcc4a31.zip
Merge tag 'drm-intel-next-fixes-2015-09-02' into drm-intel-next-queued
Backmerge -fixes since there's more DDI-E related cleanups on top of the pile of -fixes for skl that just landed for 4.3. Conflicts: drivers/gpu/drm/i915/intel_display.c drivers/gpu/drm/i914/intel_dp.c drivers/gpu/drm/i915/intel_lrc.c Conflicts are all fairly harmless adjacent line stuff. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'arch/arm/boot/dts/omap2430.dtsi')
-rw-r--r--arch/arm/boot/dts/omap2430.dtsi3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap2430.dtsi b/arch/arm/boot/dts/omap2430.dtsi
index 11a7963be003..2390f387c271 100644
--- a/arch/arm/boot/dts/omap2430.dtsi
+++ b/arch/arm/boot/dts/omap2430.dtsi
@@ -51,7 +51,8 @@
};
scm_conf: scm_conf@270 {
- compatible = "syscon";
+ compatible = "syscon",
+ "simple-bus";
reg = <0x270 0x240>;
#address-cells = <1>;
#size-cells = <1>;