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

Commit a2af9789 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'mvebu-dt-fixes-3.15' of git://git.infradead.org/linux-mvebu into fixes 

From Jason Cooper:
mvebu DT fixes for v3.15

 - mvebu
    - fix NOR bus width on Armada XP boards
    - use qsgmii on Armada XP GP board
    - add i2c bus freq for Armada 370 DB board
    - add SATA interface for Armada 375 DB

 - kirkwood
    - fix double probe of audio codec for T5325

* tag 'mvebu-dt-fixes-3.15' of git://git.infradead.org/linux-mvebu

:
  ARM: Kirkwood: T5325: Fix double probe of Codec
  ARM: mvebu: enable the SATA interface on Armada 375 DB
  ARM: mvebu: specify I2C bus frequency on Armada 370 DB
  ARM: mvebu: use qsgmii phy-mode for Armada XP GP interfaces
  ARM: mvebu: fix NOR bus-width in Armada XP OpenBlocks AX3 Device Tree
  ARM: mvebu: fix NOR bus-width in Armada XP DB Device Tree
  ARM: mvebu: fix NOR bus-width in Armada XP GP Device Tree

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 1270f063 e2476860

arch/arm/boot/dts/armada-370-db.dts

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ 
			i2c@11000 {

				pinctrl-0 = <&i2c0_pins>;

				pinctrl-names = "default";

				clock-frequency = <100000>;

				status = "okay";

				audio_codec: audio-codec@4a {

					compatible = "cirrus,cs42l51";

arch/arm/boot/dts/armada-375-db.dts

+5 −0
Original line number Diff line number Diff line
@@ -79,6 +79,11 @@ 
				};

			};



			sata@a0000 {

				status = "okay";

				nr-ports = <2>;

			};



			nand: nand@d0000 {

				pinctrl-0 = <&nand_pins>;

				pinctrl-names = "default";

arch/arm/boot/dts/armada-xp-db.dts

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
			/* Device Bus parameters are required */



			/* Read parameters */

			devbus,bus-width    = <8>;

			devbus,bus-width    = <16>;

			devbus,turn-off-ps  = <60000>;

			devbus,badr-skew-ps = <0>;

			devbus,acc-first-ps = <124000>;

arch/arm/boot/dts/armada-xp-gp.dts

+5 −5
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
			/* Device Bus parameters are required */



			/* Read parameters */

			devbus,bus-width    = <8>;

			devbus,bus-width    = <16>;

			devbus,turn-off-ps  = <60000>;

			devbus,badr-skew-ps = <0>;

			devbus,acc-first-ps = <124000>;
@@ -146,22 +146,22 @@ 
			ethernet@70000 {

				status = "okay";

				phy = <&phy0>;

				phy-mode = "rgmii-id";

				phy-mode = "qsgmii";

			};

			ethernet@74000 {

				status = "okay";

				phy = <&phy1>;

				phy-mode = "rgmii-id";

				phy-mode = "qsgmii";

			};

			ethernet@30000 {

				status = "okay";

				phy = <&phy2>;

				phy-mode = "rgmii-id";

				phy-mode = "qsgmii";

			};

			ethernet@34000 {

				status = "okay";

				phy = <&phy3>;

				phy-mode = "rgmii-id";

				phy-mode = "qsgmii";

			};



			/* Front-side USB slot */

arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
			/* Device Bus parameters are required */



			/* Read parameters */

			devbus,bus-width    = <8>;

			devbus,bus-width    = <16>;

			devbus,turn-off-ps  = <60000>;

			devbus,badr-skew-ps = <0>;

			devbus,acc-first-ps = <124000>;