Commit 95315225 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge tag 'drm-for-v4.13' into drm-intel-next-queued 



Resync with the main drm-next pull request for 4.13. What we really
need is to fully resync with pending drm-misc, but that's not yet
possible due to the still ongoing merge window.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parents 6d6a8970 00fc2c26

Documentation/admin-guide/kernel-parameters.txt

+16 −0
Original line number Diff line number Diff line
@@ -866,6 +866,15 @@ 


	dscc4.setup=	[NET]



	dt_cpu_ftrs=	[PPC]

			Format: {"off" | "known"}

			Control how the dt_cpu_ftrs device-tree binding is

			used for CPU feature discovery and setup (if it

			exists).

			off: Do not use it, fall back to legacy cpu table.

			known: Do not pass through unknown features to guests

			or userspace, only those that the kernel is aware of.



	dump_apple_properties	[X86]

			Dump name and content of EFI device properties on

			x86 Macs.  Useful for driver authors to determine
@@ -3802,6 +3811,13 @@ 
			expediting.  Set to zero to disable automatic

			expediting.



	stack_guard_gap=	[MM]

			override the default stack gap protection. The value

			is in page units and it defines how many pages prior

			to (for stacks growing down) resp. after (for stacks

			growing up) the main stack are reserved for no other

			mapping. Default value is 256 pages.



	stacktrace	[FTRACE]

			Enabled the stack tracer on boot up.

Documentation/devicetree/bindings/clock/sunxi-ccu.txt

+4 −3
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ Required properties : 
- #clock-cells : must contain 1

- #reset-cells : must contain 1



For the PRCM CCUs on H3/A64, one more clock is needed:

For the PRCM CCUs on H3/A64, two more clocks are needed:

- "pll-periph": the SoC's peripheral PLL from the main CCU

- "iosc": the SoC's internal frequency oscillator



Example for generic CCU:
@@ -39,8 +40,8 @@ Example for PRCM CCU: 
r_ccu: clock@01f01400 {

	compatible = "allwinner,sun50i-a64-r-ccu";

	reg = <0x01f01400 0x100>;

	clocks = <&osc24M>, <&osc32k>, <&iosc>;

	clock-names = "hosc", "losc", "iosc";

	clocks = <&osc24M>, <&osc32k>, <&iosc>, <&ccu CLK_PLL_PERIPH0>;

	clock-names = "hosc", "losc", "iosc", "pll-periph";

	#clock-cells = <1>;

	#reset-cells = <1>;

};

Documentation/devicetree/bindings/display/exynos/exynos5433-decon.txt

+7 −6
Original line number Diff line number Diff line
@@ -8,12 +8,13 @@ Required properties: 
- compatible: value should be one of:

	"samsung,exynos5433-decon", "samsung,exynos5433-decon-tv";

- reg: physical base address and length of the DECON registers set.

- interrupts: should contain a list of all DECON IP block interrupts in the

	      order: VSYNC, LCD_SYSTEM. The interrupt specifier format

	      depends on the interrupt controller used.

- interrupt-names: should contain the interrupt names: "vsync", "lcd_sys"

		   in the same order as they were listed in the interrupts

		   property.

- interrupt-names: should contain the interrupt names depending on mode of work:

		video mode: "vsync",

		command mode: "lcd_sys",

		command mode with software trigger: "lcd_sys", "te".

- interrupts or interrupts-extended: list of interrupt specifiers corresponding

		to names privided in interrupt-names, as described in

		interrupt-controller/interrupts.txt

- clocks: must include clock specifiers corresponding to entries in the

	  clock-names property.

- clock-names: list of clock names sorted in the same order as the clocks

Documentation/devicetree/bindings/display/panel/auo,p320hvn03.txt

0 → 100644
+8 −0
Original line number Diff line number Diff line 
AU Optronics Corporation 31.5" FHD (1920x1080) TFT LCD panel



Required properties:

- compatible: should be "auo,p320hvn03"

- power-supply: as specified in the base binding



This binding is compatible with the simple-panel binding, which is specified

in simple-panel.txt in this directory.

Documentation/devicetree/bindings/display/panel/innolux,p079zca.txt

0 → 100644
+23 −0
Original line number Diff line number Diff line 
Innolux P079ZCA 7.85" 768x1024 TFT LCD panel



Required properties:

- compatible: should be "innolux,p079zca"

- reg: DSI virtual channel of the peripheral

- power-supply: phandle of the regulator that provides the supply voltage

- enable-gpios: panel enable gpio



Optional properties:

- backlight: phandle of the backlight device attached to the panel



Example:



	&mipi_dsi {

		panel {

			compatible = "innolux,p079zca";

			reg = <0>;

			power-supply = <...>;

			backlight = <&backlight>;

			enable-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;

			status = "okay";

		};

	};