Commit d53e181c authored by Doug Ledford's avatar Doug Ledford
Browse files

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into testing/4.6
parents d29c9ab1 b75a2bf8

Documentation/devicetree/bindings/arm/cpus.txt

+0 −1
Original line number Diff line number Diff line
@@ -192,7 +192,6 @@ nodes to be present and contain the properties described below. 
			  can be one of:

			    "allwinner,sun6i-a31"

			    "allwinner,sun8i-a23"

			    "arm,psci"

			    "arm,realview-smp"

			    "brcm,bcm-nsp-smp"

			    "brcm,brahma-b15"

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

+2 −2
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ 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".

 - compatible : should be "rockchip,rk3066-i2c", "rockchip,rk3188-i2c",

		"rockchip,rk3228-i2c" or "rockchip,rk3288-i2c".

 - interrupts : interrupt number

 - clocks : parent clock

Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt

+11 −7
Original line number Diff line number Diff line
@@ -8,15 +8,19 @@ Required properties: 
	of memory mapped region.

- clock-names: from common clock binding:

	Required elements: "24m"

- rockchip,grf: phandle to the syscon managing the "general register files"

- #phy-cells : from the generic PHY bindings, must be 0;



Example:



grf: syscon@ff770000 {

	compatible = "rockchip,rk3288-grf", "syscon", "simple-mfd";



...



	edp_phy: edp-phy {

		compatible = "rockchip,rk3288-dp-phy";

	rockchip,grf = <&grf>;

		clocks = <&cru SCLK_EDP_24M>;

		clock-names = "24m";

		#phy-cells = <0>;

	};

};

Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt

+14 −8
Original line number Diff line number Diff line
@@ -3,17 +3,23 @@ Rockchip EMMC PHY 


Required properties:

 - compatible: rockchip,rk3399-emmc-phy

 - rockchip,grf : phandle to the syscon managing the "general

   register files"

 - #phy-cells: must be 0

 - reg: PHY configure reg address offset in "general

 - reg: PHY register address offset and length in "general

   register files"



Example:



emmcphy: phy {



grf: syscon@ff770000 {

	compatible = "rockchip,rk3399-grf", "syscon", "simple-mfd";

	#address-cells = <1>;

	#size-cells = <1>;



...



	emmcphy: phy@f780 {

		compatible = "rockchip,rk3399-emmc-phy";

	rockchip,grf = <&grf>;

	reg = <0xf780>;

		reg = <0xf780 0x20>;

		#phy-cells = <0>;

	};

};

Documentation/input/event-codes.txt

+4 −0
Original line number Diff line number Diff line
@@ -173,6 +173,10 @@ A few EV_ABS codes have special meanings: 
    proximity of the device and while the value of the BTN_TOUCH code is 0. If

    the input device may be used freely in three dimensions, consider ABS_Z

    instead.

  - BTN_TOOL_<name> should be set to 1 when the tool comes into detectable

    proximity and set to 0 when the tool leaves detectable proximity.

    BTN_TOOL_<name> signals the type of tool that is currently detected by the

    hardware and is otherwise independent of ABS_DISTANCE and/or BTN_TOUCH.



* ABS_MT_<name>:

  - Used to describe multitouch input events. Please see