Merge commit 'gcl/next' into next (412a4ac5) · Commits · e / devices / android_kernel_sony_msm8998

Documentation/00-INDEX

+4 −2

Original line number	Diff line number	Diff line
		@@ -32,8 +32,6 @@ DocBook/
		- directory with DocBook templates etc. for kernel documentation.
		HOWTO
		- the process and procedures of how to do Linux kernel development.
		IO-mapping.txt
		- how to access I/O mapped memory from within device drivers.
		IPMI.txt
		- info on Linux Intelligent Platform Management Interface (IPMI) Driver.
		IRQ-affinity.txt
		@@ -84,6 +82,8 @@ blockdev/
		- info on block devices & drivers
		btmrvl.txt
		- info on Marvell Bluetooth driver usage.
		bus-virt-phys-mapping.txt
		- how to access I/O mapped memory from within device drivers.
		cachetlb.txt
		- describes the cache/TLB flushing interfaces Linux uses.
		cdrom/
		@@ -168,6 +168,8 @@ initrd.txt
		- how to use the RAM disk as an initial/temporary root filesystem.
		input/
		- info on Linux input device support.
		io-mapping.txt
		- description of io_mapping functions in linux/io-mapping.h
		io_ordering.txt
		- info on ordering I/O writes to memory-mapped addresses.
		ioctl/

+0 −0

File moved.

+1 −1

Original line number	Diff line number	Diff line
		@@ -1265,7 +1265,7 @@ and is between 256 and 4096 characters. It is defined in the file
		If there are multiple matching configurations changing
		the same attribute, the last one is used.

		lmb=debug [KNL] Enable lmb debug messages.
		memblock=debug [KNL] Enable memblock debug messages.

		load_ramdisk= [RAM] List of ramdisks to load from floppy
		See Documentation/blockdev/ramdisk.txt.

+18 −2

Original line number	Diff line number	Diff line
		@@ -4,10 +4,17 @@ The Freescale DIU is a LCD controller, with proper hardware, it can also
		drive DVI monitors.

		Required properties:
		- compatible : should be "fsl-diu".
		- compatible : should be "fsl,diu" or "fsl,mpc5121-diu".
		- reg : should contain at least address and length of the DIU register
		set.
		- Interrupts : one DIU interrupt should be describe here.
		- interrupts : one DIU interrupt should be described here.
		- interrupt-parent : the phandle for the interrupt controller that
		services interrupts for this device.

		Optional properties:
		- edid : verbatim EDID data block describing attached display.
		Data from the detailed timing descriptor will be used to
		program the display controller.

		Example (MPC8610HPCD):
		display@2c000 {
		@@ -16,3 +23,12 @@ Example (MPC8610HPCD):
		interrupts = <72 2>;
		interrupt-parent = <&mpic>;
		};

		Example for MPC5121:
		display@2100 {
		compatible = "fsl,mpc5121-diu";
		reg = <0x2100 0x100>;
		interrupts = <64 0x8>;
		interrupt-parent = <&ipic>;
		edid = [edid-data];
		};

+2 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ Recommended properties :
		- fsl,preserve-clocking : boolean; if defined, the clock settings
		from the bootloader are preserved (not touched).
		- clock-frequency : desired I2C bus clock frequency in Hz.
		- fsl,timeout : I2C bus timeout in microseconds.

		Examples :

		@@ -59,4 +60,5 @@ Examples :
		interrupts = <43 2>;
		interrupt-parent = <&mpic>;
		clock-frequency = <400000>;
		fsl,timeout = <10000>;
		};