Merge branch 'kprobes-test-fixes' of git://git.linaro.org/people/tixy/kernel into fixes (cda390bb) · Commits · e / devices / android_kernel_xiaomi_markw

Documentation/DocBook/media/Makefile

+2 −2

Original line number	Diff line number	Diff line
		@@ -202,8 +202,8 @@ $(MEDIA_OBJ_DIR)/%: $(MEDIA_SRC_DIR)/%.b64

		$(MEDIA_OBJ_DIR)/v4l2.xml: $(OBJIMGFILES)
		@$($(quiet)gen_xml)
		@(ln -sf $(MEDIA_SRC_DIR)/v4l/*xml $(MEDIA_OBJ_DIR)/)
		@(ln -sf $(MEDIA_SRC_DIR)/dvb/*xml $(MEDIA_OBJ_DIR)/)
		@(ln -sf `cd $(MEDIA_SRC_DIR) && /bin/pwd`/v4l/*xml $(MEDIA_OBJ_DIR)/)
		@(ln -sf `cd $(MEDIA_SRC_DIR) && /bin/pwd`/dvb/*xml $(MEDIA_OBJ_DIR)/)

		$(MEDIA_OBJ_DIR)/videodev2.h.xml: $(srctree)/include/uapi/linux/videodev2.h $(MEDIA_OBJ_DIR)/v4l2.xml
		@$($(quiet)gen_xml)

Documentation/devicetree/bindings/i2c/i2c-rk3x.txt

0 → 100644

+42 −0

Original line number	Diff line number	Diff line
		* Rockchip RK3xxx I2C controller

		This driver interfaces with the native I2C controller present in Rockchip
		RK3xxx SoCs.

		Required properties :

		- reg : Offset and length of the register set for the device
		- compatible : should be "rockchip,rk3066-i2c", "rockchip,rk3188-i2c" or
		"rockchip,rk3288-i2c".
		- interrupts : interrupt number
		- clocks : parent clock

		Required on RK3066, RK3188 :

		- rockchip,grf : the phandle of the syscon node for the general register
		file (GRF)
		- on those SoCs an alias with the correct I2C bus ID (bit offset in the GRF)
		is also required.

		Optional properties :

		- clock-frequency : SCL frequency to use (in Hz). If omitted, 100kHz is used.

		Example:

		aliases {
		i2c0 = &i2c0;
		}

		i2c0: i2c@2002d000 {
		compatible = "rockchip,rk3188-i2c";
		reg = <0x2002d000 0x1000>;
		interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
		#address-cells = <1>;
		#size-cells = <0>;

		rockchip,grf = <&grf>;

		clock-names = "i2c";
		clocks = <&cru PCLK_I2C0>;
		};

Documentation/devicetree/bindings/i2c/i2c-sunxi-p2wi.txt

0 → 100644

+41 −0

Original line number	Diff line number	Diff line

		* Allwinner P2WI (Push/Pull 2 Wire Interface) controller

		Required properties :

		- reg : Offset and length of the register set for the device.
		- compatible : Should one of the following:
		- "allwinner,sun6i-a31-p2wi"
		- interrupts : The interrupt line connected to the P2WI peripheral.
		- clocks : The gate clk connected to the P2WI peripheral.
		- resets : The reset line connected to the P2WI peripheral.

		Optional properties :

		- clock-frequency : Desired P2WI bus clock frequency in Hz. If not set the
		default frequency is 100kHz

		A P2WI may contain one child node encoding a P2WI slave device.

		Slave device properties:
		Required properties:
		- reg : the I2C slave address used during the initialization
		process to switch from I2C to P2WI mode

		Example:

		p2wi@01f03400 {
		compatible = "allwinner,sun6i-a31-p2wi";
		reg = <0x01f03400 0x400>;
		interrupts = <0 39 4>;
		clocks = <&apb0_gates 3>;
		clock-frequency = <6000000>;
		resets = <&apb0_rst 3>;

		axp221: pmic@68 {
		compatible = "x-powers,axp221";
		reg = <0x68>;

		/* ... */
		};
		};

Documentation/kbuild/makefiles.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -1171,7 +1171,7 @@ When kbuild executes, the following steps are followed (roughly):
		obvious reason.

		dtc
		Create flattend device tree blob object suitable for linking
		Create flattened device tree blob object suitable for linking
		into vmlinux. Device tree blobs linked into vmlinux are placed
		in an init section in the image. Platform code must copy the
		blob to non-init memory prior to calling unflatten_device_tree().

Documentation/kernel-parameters.txt

+10 −4

Original line number	Diff line number	Diff line
		@@ -1474,6 +1474,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
		js= [HW,JOY] Analog joystick
		See Documentation/input/joystick.txt.

		kaslr/nokaslr [X86]
		Enable/disable kernel and module base offset ASLR
		(Address Space Layout Randomization) if built into
		the kernel. When CONFIG_HIBERNATION is selected,
		kASLR is disabled by default. When kASLR is enabled,
		hibernation will be disabled.

		keepinitrd [HW,ARM]

		kernelcore=nn[KMG] [KNL,X86,IA-64,PPC] This parameter
		@@ -2110,10 +2117,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
		noapic [SMP,APIC] Tells the kernel to not make use of any
		IOAPICs that may be present in the system.

		nokaslr [X86]
		Disable kernel and module base offset ASLR (Address
		Space Layout Randomization) if built into the kernel.

		noautogroup Disable scheduler automatic task group creation.

		nobats [PPC] Do not use BATs for mapping kernel lowmem
		@@ -2184,6 +2187,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
		in certain environments such as networked servers or
		real-time systems.

		nohibernate [HIBERNATION] Disable hibernation and resume.

		nohz= [KNL] Boottime enable/disable dynamic ticks
		Valid arguments: on, off
		Default: on
		@@ -2980,6 +2985,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
		noresume Don't check if there's a hibernation image
		present during boot.
		nocompress Don't compress/decompress hibernation images.
		no Disable hibernation and resume.

		retain_initrd [RAM] Keep initrd memory after extraction