Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62ad6449 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes-for-grant' of git://sources.calxeda.com/kernel/linux 

Pull DT fixes from Rob Herring:
 "Mainly some documentation updates and 2 fixes:

   - An export symbol fix for of_platform_populate from Stephen W.
   - A fix for the order compatible entries are matched to ensure the
     first compatible string is matched when there are multiple matches."

Normally these would go through Grant Likely (thus the "fixes-for-grant"
branch name), but Grant is in the middle of moving to Scotland, and is
practically offline until sometime in August. So pull directly from Rob.

* 'fixes-for-grant' of git://sources.calxeda.com/kernel/linux:
  of: match by compatible property first
  dt: mc13xxx.txt: Fix gpio number assignment
  dt: fsl-fec.txt: Fix gpio number assignment
  dt: fsl-mma8450.txt: Add missing 'reg' description
  dt: fsl-imx-esdhc.txt: Fix gpio number assignment
  dt: fsl-imx-cspi.txt: Fix comment about GPIOs used for chip selects
  of: Add Avionic Design vendor prefix
  of: export of_platform_populate()
parents 9e85a6f9 107a84e6

Documentation/devicetree/bindings/input/fsl-mma8450.txt

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


Required properties:

- compatible : "fsl,mma8450".

- reg: the I2C address of MMA8450



Example:

Documentation/devicetree/bindings/mfd/mc13xxx.txt

+2 −2
Original line number Diff line number Diff line
@@ -46,8 +46,8 @@ Examples: 


ecspi@70010000 { /* ECSPI1 */

	fsl,spi-num-chipselects = <2>;

	cs-gpios = <&gpio3 24 0>, /* GPIO4_24 */

		   <&gpio3 25 0>; /* GPIO4_25 */

	cs-gpios = <&gpio4 24 0>, /* GPIO4_24 */

		   <&gpio4 25 0>; /* GPIO4_25 */

	status = "okay";



	pmic: mc13892@0 {

Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt

+2 −2
Original line number Diff line number Diff line
@@ -29,6 +29,6 @@ esdhc@70008000 { 
	compatible = "fsl,imx51-esdhc";

	reg = <0x70008000 0x4000>;

	interrupts = <2>;

	cd-gpios = <&gpio0 6 0>; /* GPIO1_6 */

	wp-gpios = <&gpio0 5 0>; /* GPIO1_5 */

	cd-gpios = <&gpio1 6 0>; /* GPIO1_6 */

	wp-gpios = <&gpio1 5 0>; /* GPIO1_5 */

};

Documentation/devicetree/bindings/net/fsl-fec.txt

+1 −1
Original line number Diff line number Diff line
@@ -19,6 +19,6 @@ ethernet@83fec000 { 
	reg = <0x83fec000 0x4000>;

	interrupts = <87>;

	phy-mode = "mii";

	phy-reset-gpios = <&gpio1 14 0>; /* GPIO2_14 */

	phy-reset-gpios = <&gpio2 14 0>; /* GPIO2_14 */

	local-mac-address = [00 04 9F 01 1B B9];

};

Documentation/devicetree/bindings/spi/fsl-imx-cspi.txt

+2 −2
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ ecspi@70010000 { 
	reg = <0x70010000 0x4000>;

	interrupts = <36>;

	fsl,spi-num-chipselects = <2>;

	cs-gpios = <&gpio3 24 0>, /* GPIO4_24 */

		   <&gpio3 25 0>; /* GPIO4_25 */

	cs-gpios = <&gpio3 24 0>, /* GPIO3_24 */

		   <&gpio3 25 0>; /* GPIO3_25 */

};