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

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
...@@ -6,5 +6,15 @@ following property: ...@@ -6,5 +6,15 @@ following property:
Required root node property: Required root node property:
- compatible: must contain either "marvell,armada380" or - compatible: must contain "marvell,armada380"
"marvell,armada385" depending on the variant of the SoC being used.
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";
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
/ { / {
model = "Marvell Armada 380 family SoC"; model = "Marvell Armada 380 family SoC";
compatible = "marvell,armada380", "marvell,armada38x"; compatible = "marvell,armada380";
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
/ { / {
model = "Marvell Armada 385 Development Board"; model = "Marvell Armada 385 Development Board";
compatible = "marvell,a385-db", "marvell,armada385", "marvell,armada38x"; compatible = "marvell,a385-db", "marvell,armada385", "marvell,armada380";
chosen { chosen {
bootargs = "console=ttyS0,115200 earlyprintk"; bootargs = "console=ttyS0,115200 earlyprintk";
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
/ { / {
model = "Marvell Armada 385 Reference Design"; model = "Marvell Armada 385 Reference Design";
compatible = "marvell,a385-rd", "marvell,armada385", "marvell,armada38x"; compatible = "marvell,a385-rd", "marvell,armada385", "marvell,armada380";
chosen { chosen {
bootargs = "console=ttyS0,115200 earlyprintk"; bootargs = "console=ttyS0,115200 earlyprintk";
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
/ { / {
model = "Marvell Armada 385 family SoC"; model = "Marvell Armada 385 family SoC";
compatible = "marvell,armada385", "marvell,armada38x"; compatible = "marvell,armada385", "marvell,armada380";
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
/ { / {
model = "Marvell Armada 38x family SoC"; model = "Marvell Armada 38x family SoC";
compatible = "marvell,armada38x"; compatible = "marvell,armada380";
aliases { aliases {
gpio0 = &gpio0; gpio0 = &gpio0;
......
...@@ -105,7 +105,6 @@ ethphy0: ethernet-phy@0 { ...@@ -105,7 +105,6 @@ ethphy0: ethernet-phy@0 {
compatible = "ethernet-phy-id0141.0cb0", compatible = "ethernet-phy-id0141.0cb0",
"ethernet-phy-ieee802.3-c22"; "ethernet-phy-ieee802.3-c22";
reg = <0>; reg = <0>;
phy-connection-type = "rgmii-id";
}; };
ethphy1: ethernet-phy@1 { ethphy1: ethernet-phy@1 {
...@@ -113,7 +112,6 @@ ethphy1: ethernet-phy@1 { ...@@ -113,7 +112,6 @@ ethphy1: ethernet-phy@1 {
compatible = "ethernet-phy-id0141.0cb0", compatible = "ethernet-phy-id0141.0cb0",
"ethernet-phy-ieee802.3-c22"; "ethernet-phy-ieee802.3-c22";
reg = <1>; reg = <1>;
phy-connection-type = "rgmii-id";
}; };
}; };
...@@ -121,6 +119,7 @@ &eth0 { ...@@ -121,6 +119,7 @@ &eth0 {
status = "okay"; status = "okay";
ethernet0-port@0 { ethernet0-port@0 {
phy-handle = <&ethphy0>; phy-handle = <&ethphy0>;
phy-connection-type = "rgmii-id";
}; };
}; };
...@@ -128,5 +127,6 @@ &eth1 { ...@@ -128,5 +127,6 @@ &eth1 {
status = "okay"; status = "okay";
ethernet1-port@0 { ethernet1-port@0 {
phy-handle = <&ethphy1>; phy-handle = <&ethphy1>;
phy-connection-type = "rgmii-id";
}; };
}; };
...@@ -10,6 +10,7 @@ menuconfig ARCH_MVEBU ...@@ -10,6 +10,7 @@ menuconfig ARCH_MVEBU
select ZONE_DMA if ARM_LPAE select ZONE_DMA if ARM_LPAE
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
select PCI_QUIRKS if PCI select PCI_QUIRKS if PCI
select OF_ADDRESS_PCI
if ARCH_MVEBU if ARCH_MVEBU
...@@ -17,6 +18,7 @@ config MACH_MVEBU_V7 ...@@ -17,6 +18,7 @@ config MACH_MVEBU_V7
bool bool
select ARMADA_370_XP_TIMER select ARMADA_370_XP_TIMER
select CACHE_L2X0 select CACHE_L2X0
select ARM_CPU_SUSPEND
config MACH_ARMADA_370 config MACH_ARMADA_370
bool "Marvell Armada 370 boards" if ARCH_MULTI_V7 bool "Marvell Armada 370 boards" if ARCH_MULTI_V7
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment