mirror of
https://github.com/torvalds/linux.git
synced 2024-11-13 23:51:39 +00:00
a7d7a143d0
Pull DRM updates from Dave Airlie: "Like all good pull reqs this ends with a revert, so it must mean we tested it, [ Ed. That's _one_ way of looking at it ] This pull is missing nouveau, Ben has been stuck trying to track down a very longstanding bug that revealed itself due to some other changes. I've asked him to send you a direct pull request for nouveau once he cleans things up. I'm away until Monday so don't want to delay things, you can make a decision on that when he sends it, I have my phone so I can ack things just not really merge much. It has one trivial conflict with your tree in armada_drv.c, and also the pull request contains some component changes that are already in your tree, the base tree from Russell went via Greg's tree already, but some stuff still shows up in here that doesn't when I merge my tree into yours. Otherwise all pretty standard graphics fare, one new driver and changes all over the place. New drivers: - sti kms driver for STMicroelectronics chipsets stih416 and stih407. core: - lots of cleanups to the drm core - DP MST helper code merged - universal cursor planes. - render nodes enabled by default panel: - better panel interfaces - new panel support - non-continuous cock advertising ability ttm: - shrinker fixes i915: - hopefully ditched UMS support - runtime pm fixes - psr tracking and locking - now enabled by default - userptr fixes - backlight brightness fixes - MST support merged - runtime PM for dpms - primary planes locking fixes - gen8 hw semaphore support - fbc fixes - runtime PM on SOix sleep state hw. - mmio base page flipping - lots of vlv/chv fixes. - universal cursor planes radeon: - Hawaii fixes - display scalar support for non-fixed mode displays - new firmware format support - dpm on more asics by default - GPUVM improvements - uncached and wc GTT buffers - BOs > visible VRAM exynos: - i80 interface support - module auto-loading - ipp driver consolidated. armada: - irq handling in crtc layer only - crtc renumbering - add component support - DT interaction changes. tegra: - load as module fixes - eDP bpp and sync polarity fixed - DSI non-continuous clock mode support - better support for importing buffers from nouveau msm: - mdp5/adq8084 v1.3 hw enablement - devicetree clk changse - ifc6410 board working tda998x: - component support - DT documentation update vmwgfx: - fix compat shader namespace" * 'drm-next' of git://people.freedesktop.org/~airlied/linux: (551 commits) Revert "drm: drop redundant drm_file->is_master" drm/panel: simple: Use devm_gpiod_get_optional() drm/dsi: Replace upcasting macro by function drm/panel: ld9040: Replace upcasting macro by function drm/exynos: dp: Modify driver to support drm_panel drm/exynos: Move DP setup into commit() drm/panel: simple: Add AUO B133HTN01 panel support drm/panel: simple: Support delays in panel functions drm/panel: simple: Add proper definition for prepare and unprepare drm/panel: s6e8aa0: Add proper definition for prepare and unprepare drm/panel: ld9040: Add proper definition for prepare and unprepare drm/tegra: Add support for panel prepare and unprepare routines drm/exynos: dsi: Add support for panel prepare and unprepare routines drm/exynos: dpi: Add support for panel prepare and unprepare routines drm/panel: simple: Add dummy prepare and unprepare routines drm/panel: s6e8aa0: Add dummy prepare and unprepare routines drm/panel: ld9040: Add dummy prepare and unprepare routines drm/panel: Provide convenience wrapper for .get_modes() drm/panel: add .prepare() and .unprepare() functions drm/panel: simple: Remove simple-panel compatible ...
111 lines
2.7 KiB
Plaintext
111 lines
2.7 KiB
Plaintext
/*
|
|
* Samsung's Exynos5 SoC series common device tree source
|
|
*
|
|
* Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
|
|
* http://www.samsung.com
|
|
*
|
|
* Samsung's Exynos5 SoC series device nodes are listed in this file. Particular
|
|
* SoCs from Exynos5 series can include this file and provide values for SoCs
|
|
* specfic bindings.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#include "skeleton.dtsi"
|
|
|
|
/ {
|
|
interrupt-parent = <&gic>;
|
|
|
|
aliases {
|
|
serial0 = &serial_0;
|
|
serial1 = &serial_1;
|
|
serial2 = &serial_2;
|
|
serial3 = &serial_3;
|
|
};
|
|
|
|
chipid@10000000 {
|
|
compatible = "samsung,exynos4210-chipid";
|
|
reg = <0x10000000 0x100>;
|
|
};
|
|
|
|
combiner: interrupt-controller@10440000 {
|
|
compatible = "samsung,exynos4210-combiner";
|
|
#interrupt-cells = <2>;
|
|
interrupt-controller;
|
|
samsung,combiner-nr = <32>;
|
|
reg = <0x10440000 0x1000>;
|
|
interrupts = <0 0 0>, <0 1 0>, <0 2 0>, <0 3 0>,
|
|
<0 4 0>, <0 5 0>, <0 6 0>, <0 7 0>,
|
|
<0 8 0>, <0 9 0>, <0 10 0>, <0 11 0>,
|
|
<0 12 0>, <0 13 0>, <0 14 0>, <0 15 0>,
|
|
<0 16 0>, <0 17 0>, <0 18 0>, <0 19 0>,
|
|
<0 20 0>, <0 21 0>, <0 22 0>, <0 23 0>,
|
|
<0 24 0>, <0 25 0>, <0 26 0>, <0 27 0>,
|
|
<0 28 0>, <0 29 0>, <0 30 0>, <0 31 0>;
|
|
};
|
|
|
|
gic: interrupt-controller@10481000 {
|
|
compatible = "arm,cortex-a15-gic", "arm,cortex-a9-gic";
|
|
#interrupt-cells = <3>;
|
|
interrupt-controller;
|
|
reg = <0x10481000 0x1000>,
|
|
<0x10482000 0x1000>,
|
|
<0x10484000 0x2000>,
|
|
<0x10486000 0x2000>;
|
|
interrupts = <1 9 0xf04>;
|
|
};
|
|
|
|
serial_0: serial@12C00000 {
|
|
compatible = "samsung,exynos4210-uart";
|
|
reg = <0x12C00000 0x100>;
|
|
interrupts = <0 51 0>;
|
|
};
|
|
|
|
serial_1: serial@12C10000 {
|
|
compatible = "samsung,exynos4210-uart";
|
|
reg = <0x12C10000 0x100>;
|
|
interrupts = <0 52 0>;
|
|
};
|
|
|
|
serial_2: serial@12C20000 {
|
|
compatible = "samsung,exynos4210-uart";
|
|
reg = <0x12C20000 0x100>;
|
|
interrupts = <0 53 0>;
|
|
};
|
|
|
|
serial_3: serial@12C30000 {
|
|
compatible = "samsung,exynos4210-uart";
|
|
reg = <0x12C30000 0x100>;
|
|
interrupts = <0 54 0>;
|
|
};
|
|
|
|
rtc@101E0000 {
|
|
compatible = "samsung,s3c6410-rtc";
|
|
reg = <0x101E0000 0x100>;
|
|
interrupts = <0 43 0>, <0 44 0>;
|
|
status = "disabled";
|
|
};
|
|
|
|
fimd@14400000 {
|
|
compatible = "samsung,exynos5250-fimd";
|
|
interrupt-parent = <&combiner>;
|
|
reg = <0x14400000 0x40000>;
|
|
interrupt-names = "fifo", "vsync", "lcd_sys";
|
|
interrupts = <18 4>, <18 5>, <18 6>;
|
|
samsung,sysreg = <&sysreg_system_controller>;
|
|
status = "disabled";
|
|
};
|
|
|
|
dp-controller@145B0000 {
|
|
compatible = "samsung,exynos5-dp";
|
|
reg = <0x145B0000 0x1000>;
|
|
interrupts = <10 3>;
|
|
interrupt-parent = <&combiner>;
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
status = "disabled";
|
|
};
|
|
};
|