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

Commit 6d12e796 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Merge "mvebu fixes for v3.16" from Jason Cooper:

 - mvebu
    - Fix broken SoC ID detection
    - Select ARM_CPU_SUSPEND for v7
    - Remove armada38x compatible string (no users yet)

 - kirkwood
    - Fix phy-connection-type on GuruPlug board

* tag 'mvebu-fixes-3.16' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: Fix the improper use of the compatible string armada38x using a wildcard
  ARM: dts: kirkwood: fix phy-connection-type for Guruplug
  ARM: mvebu: select ARM_CPU_SUSPEND for Marvell EBU v7 platforms
  ARM: mvebu: Fix broken SoC ID detection
parents 11f9323a 8dbdb8e7

Documentation/devicetree/bindings/arm/armada-38x.txt

+12 −2
Original line number Diff line number Diff line
@@ -6,5 +6,15 @@ following property: 


Required root node property:



 - compatible: must contain either "marvell,armada380" or

   "marvell,armada385" depending on the variant of the SoC being used.
 
 - compatible: must contain "marvell,armada380"



In addition, boards using the Marvell Armada 385 SoC shall have the

following property before the previous one:



Required root node property:



compatible: must contain "marvell,armada385"



Example:



compatible = "marvell,a385-rd", "marvell,armada385", "marvell,armada380";

arch/arm/boot/dts/armada-380.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


/ {

	model = "Marvell Armada 380 family SoC";

	compatible = "marvell,armada380", "marvell,armada38x";

	compatible = "marvell,armada380";



	cpus {

		#address-cells = <1>;

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

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


/ {

	model = "Marvell Armada 385 Development Board";

	compatible = "marvell,a385-db", "marvell,armada385", "marvell,armada38x";

	compatible = "marvell,a385-db", "marvell,armada385", "marvell,armada380";



	chosen {

		bootargs = "console=ttyS0,115200 earlyprintk";

arch/arm/boot/dts/armada-385-rd.dts

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 


/ {

	model = "Marvell Armada 385 Reference Design";

	compatible = "marvell,a385-rd", "marvell,armada385", "marvell,armada38x";

	compatible = "marvell,a385-rd", "marvell,armada385", "marvell,armada380";



	chosen {

		bootargs = "console=ttyS0,115200 earlyprintk";

arch/arm/boot/dts/armada-385.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


/ {

	model = "Marvell Armada 385 family SoC";

	compatible = "marvell,armada385", "marvell,armada38x";

	compatible = "marvell,armada385", "marvell,armada380";



	cpus {

		#address-cells = <1>;