Commit a1a8ba2d authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into ras/core, to pick up fixes 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents b2f9d678 e2857b8f

Documentation/DocBook/media/v4l/media-types.xml

+0 −4
Original line number Diff line number Diff line
@@ -56,10 +56,6 @@ 
	    <entry><constant>MEDIA_ENT_F_CONN_COMPOSITE</constant></entry>

	    <entry>Connector for a RGB composite signal.</entry>

	  </row>

	  <row>

	    <entry><constant>MEDIA_ENT_F_CONN_TEST</constant></entry>

	    <entry>Connector for a test generator.</entry>

	  </row>

	  <row>

	    <entry><constant>MEDIA_ENT_F_CAM_SENSOR</constant></entry>

	    <entry>Camera video sensor entity.</entry>

Documentation/devicetree/bindings/clock/rockchip,rk3036-cru.txt

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ that they are defined using standard clock bindings with following 
clock-output-names:

 - "xin24m" - crystal input - required,

 - "ext_i2s" - external I2S clock - optional,

 - "ext_gmac" - external GMAC clock - optional

 - "rmii_clkin" - external EMAC clock - optional



Example: Clock controller node:

Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt

+2 −3
Original line number Diff line number Diff line
@@ -24,9 +24,8 @@ Main node required properties: 
		1 = edge triggered

		4 = level triggered



  Cells 4 and beyond are reserved for future use. When the 1st cell

  has a value of 0 or 1, cells 4 and beyond act as padding, and may be

  ignored. It is recommended that padding cells have a value of 0.

  Cells 4 and beyond are reserved for future use and must have a value

  of 0 if present.



- reg : Specifies base physical address(s) and size of the GIC

  registers, in the following order:

Documentation/devicetree/bindings/net/renesas,ravb.txt

+2 −2
Original line number Diff line number Diff line
@@ -82,8 +82,8 @@ Example: 
				  "ch16", "ch17", "ch18", "ch19",

				  "ch20", "ch21", "ch22", "ch23",

				  "ch24";

		clocks = <&mstp8_clks R8A7795_CLK_ETHERAVB>;

		power-domains = <&cpg_clocks>;

		clocks = <&cpg CPG_MOD 812>;

		power-domains = <&cpg>;

		phy-mode = "rgmii-id";

		phy-handle = <&phy0>;

Documentation/devicetree/bindings/regulator/tps65217.txt

+0 −10
Original line number Diff line number Diff line
@@ -26,11 +26,7 @@ Example: 
		ti,pmic-shutdown-controller;



		regulators {

			#address-cells = <1>;

			#size-cells = <0>;



			dcdc1_reg: dcdc1 {

				reg = <0>;

				regulator-min-microvolt = <900000>;

				regulator-max-microvolt = <1800000>;

				regulator-boot-on;
@@ -38,7 +34,6 @@ Example: 
			};



			dcdc2_reg: dcdc2 {

				reg = <1>;

				regulator-min-microvolt = <900000>;

				regulator-max-microvolt = <3300000>;

				regulator-boot-on;
@@ -46,7 +41,6 @@ Example: 
			};



			dcdc3_reg: dcc3 {

				reg = <2>;

				regulator-min-microvolt = <900000>;

				regulator-max-microvolt = <1500000>;

				regulator-boot-on;
@@ -54,7 +48,6 @@ Example: 
			};



			ldo1_reg: ldo1 {

				reg = <3>;

				regulator-min-microvolt = <1000000>;

				regulator-max-microvolt = <3300000>;

				regulator-boot-on;
@@ -62,7 +55,6 @@ Example: 
			};



			ldo2_reg: ldo2 {

				reg = <4>;

				regulator-min-microvolt = <900000>;

				regulator-max-microvolt = <3300000>;

				regulator-boot-on;
@@ -70,7 +62,6 @@ Example: 
			};



			ldo3_reg: ldo3 {

				reg = <5>;

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <3300000>;

				regulator-boot-on;
@@ -78,7 +69,6 @@ Example: 
			};



			ldo4_reg: ldo4 {

				reg = <6>;

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <3300000>;

				regulator-boot-on;