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

Commit 191bcd81 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

mvebu DT fixes-non-critical (for v3.15-rc1)

 - kirkwood
    - add some missing vendor prefixes to keep checkpatch happy

 - mvebu
    - add clock ref to mdio node on 370/XP/38x

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

:
  ARM: mvebu: ensure the mdio node has a clock reference on Armada 38x
  ARM: mvebu: ensure the mdio node has a clock reference on Armada 370/XP
  ARM: Kirkwood: DT: Add missing vendor prefix
  ARM: Kirkwood: Fix Atmel vendor prefix

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents cab4d503 33faf20b

arch/arm/boot/dts/armada-370-xp.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -230,6 +230,7 @@ 
				#size-cells = <0>;

				compatible = "marvell,orion-mdio";

				reg = <0x72004 0x4>;

				clocks = <&gateclk 4>;

			};



			eth1: ethernet@74000 {

arch/arm/boot/dts/armada-38x.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -336,6 +336,7 @@ 
				#size-cells = <0>;

				compatible = "marvell,orion-mdio";

				reg = <0x72004 0x4>;

				clocks = <&gateclk 4>;

			};



			coredivclk: clock@e4250 {

arch/arm/boot/dts/kirkwood-b3.dts

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ 
			m25p16@0 {

				#address-cells = <1>;

				#size-cells = <1>;

				compatible = "m25p16";

				compatible = "st,m25p16";

				reg = <0>;

				spi-max-frequency = <40000000>;

				mode = <0>;

arch/arm/boot/dts/kirkwood-cloudbox.dts

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
			flash@0 {

				#address-cells = <1>;

				#size-cells = <1>;

				compatible = "mx25l4005a";

				compatible = "mxicy,mx25l4005a";

				reg = <0>;

				spi-max-frequency = <20000000>;

				mode = <0>;

arch/arm/boot/dts/kirkwood-dreamplug.dts

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
			m25p40@0 {

				#address-cells = <1>;

				#size-cells = <1>;

				compatible = "mx25l1606e";

				compatible = "mxicy,mx25l1606e";

				reg = <0>;

				spi-max-frequency = <50000000>;

				mode = <0>;