Merge "Merge remote-tracking branch 'tmp-44e63be' into 4.9" into msm-4.9 (5d93a9b8) · Commits · e / devices / android_kernel_fairphone_FP3

Documentation/devicetree/bindings/arm/arch_timer.txt

+5 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,11 @@ to deliver its interrupts via SPIs.
		architecturally-defined reset values. Only supported for 32-bit
		systems which follow the ARMv7 architected reset values.

		- arm,no-tick-in-suspend : The main counter does not tick when the system is in
		low-power system suspend on some SoCs. This behavior does not match the
		Architecture Reference Manual's specification that the system counter "must
		be implemented in an always-on power domain."


		Example:

Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt

+7 −1

Original line number	Diff line number	Diff line
		@@ -28,6 +28,8 @@ The TCON acts as a timing controller for RGB, LVDS and TV interfaces.
		Required properties:
		- compatible: value must be either:
		* allwinner,sun5i-a13-tcon
		* allwinner,sun6i-a31-tcon
		* allwinner,sun6i-a31s-tcon
		* allwinner,sun8i-a33-tcon
		- reg: base address and size of memory-mapped region
		- interrupts: interrupt associated to this IP
		@@ -50,7 +52,7 @@ Required properties:
		second the block connected to the TCON channel 1 (usually the TV
		encoder)

		On the A13, there is one more clock required:
		On SoCs other than the A33, there is one more clock required:
		- 'tcon-ch1': The clock driving the TCON channel 1

		DRC
		@@ -87,6 +89,7 @@ system.
		Required properties:
		- compatible: value must be one of:
		* allwinner,sun5i-a13-display-backend
		* allwinner,sun6i-a31-display-backend
		* allwinner,sun8i-a33-display-backend
		- reg: base address and size of the memory-mapped region.
		- clocks: phandles to the clocks feeding the frontend and backend
		@@ -117,6 +120,7 @@ deinterlacing and color space conversion.
		Required properties:
		- compatible: value must be one of:
		* allwinner,sun5i-a13-display-frontend
		* allwinner,sun6i-a31-display-frontend
		* allwinner,sun8i-a33-display-frontend
		- reg: base address and size of the memory-mapped region.
		- interrupts: interrupt associated to this IP
		@@ -142,6 +146,8 @@ extra node.
		Required properties:
		- compatible: value must be one of:
		* allwinner,sun5i-a13-display-engine
		* allwinner,sun6i-a31-display-engine
		* allwinner,sun6i-a31s-display-engine
		* allwinner,sun8i-a33-display-engine

		- allwinner,pipelines: list of phandle to the display engine

Documentation/devicetree/bindings/usb/usb-xhci.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ Required properties:
		Optional properties:
		- clocks: reference to a clock
		- usb3-lpm-capable: determines if platform is USB3 LPM capable
		- quirk-broken-port-ped: set if the controller has broken port disable mechanism

		Example:
		usb@f0931000 {

Documentation/devicetree/bindings/watchdog/samsung-wdt.txt

+5 −4

Original line number	Diff line number	Diff line
		@@ -6,10 +6,11 @@ occurred.

		Required properties:
		- compatible : should be one among the following
		(a) "samsung,s3c2410-wdt" for Exynos4 and previous SoCs
		(b) "samsung,exynos5250-wdt" for Exynos5250
		(c) "samsung,exynos5420-wdt" for Exynos5420
		(c) "samsung,exynos7-wdt" for Exynos7
		- "samsung,s3c2410-wdt" for S3C2410
		- "samsung,s3c6410-wdt" for S3C6410, S5PV210 and Exynos4
		- "samsung,exynos5250-wdt" for Exynos5250
		- "samsung,exynos5420-wdt" for Exynos5420
		- "samsung,exynos7-wdt" for Exynos7

		- reg : base physical address of the controller and length of memory mapped
		region.

Documentation/kernel-parameters.txt

+10 −0

Original line number	Diff line number	Diff line
		@@ -306,6 +306,16 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
		use by PCI
		Format: <irq>,<irq>...

		acpi_mask_gpe= [HW,ACPI]
		Due to the existence of _Lxx/_Exx, some GPEs triggered
		by unsupported hardware/firmware features can result in
		GPE floodings that cannot be automatically disabled by
		the GPE dispatcher.
		This facility can be used to prevent such uncontrolled
		GPE floodings.
		Format: <int>
		Support masking of GPEs numbered from 0x00 to 0x7f.

		acpi_no_auto_serialize [HW,ACPI]
		Disable auto-serialization of AML methods
		AML control methods that contain the opcodes to create