p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mvebu fixes for v3.16 

- 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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJTqsOqAAoJEP45WPkGe8Zn/2cQAK4hPQj3YADnmix9ViVQOysa
 2y5Y+bzWGX6iBWZZFrg/mjJcUGaFKl5RyiUyIHUXMva6QJn8qHPuS/E9L7ilG8oq
 KnwQzNv/taEJ3ysBh2X8zq9J1p00ho2UTKsjO/4M36OM4iME7Ro/neB8Y+EFvA74
 seKNYyN331OtQ/hvSzTvI3F+AS5/JWaD84i9vADDVPCK9kTqQvcK4LMefhJFhgAp
 +FDEtEYX6x9Pj0YOQNDAfvOckgF6THzn3Pjid0zeizHyZUd/l5lVf5DC0lanBFYW
 kJUElIdMFltECDt1GYDM1tusxde+PFIg/PcnS13LSfb44Vh2uDh+rsCv5pO45PCP
 jg7hCLBnOz28vuWfM7oAH1wgOBwucVwXbhOVLfYqjBampnvyO9GXix5wkw3ZpPDs
 cCY9eeKvBvTZKhBgi64zstjgJt7imi+fdA1UUQrAJdEQx3TtYOBGILaM720H42O/
 L+r5LVOZzGGejfWh2o3El+YzBrdH3VLPp7CZSdlq/AuhF8XUYRFTYkXt6KR6lng6
 hayfLY3QT0r6Cllnx6EBYG6SrmkPXhW+IhOmmCl9bfTaLY5kAH++961pCiuKRD0F
 NUWeDdxi0Od/gaFvQnQ9jaglKRsj4pUDZ/64+BsIfxB1iMCvi31JX175EBlNi2my
 JBHycAwNuCaikuHKwmYl
 =oA/r
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Arnd Bergmann 2014-06-25 15:34:00 +02:00
parent 11f9323a48 8dbdb8e704
commit 6d12e79698
8 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Documentation/devicetree/bindings/arm/armada-38x.txt
View File

@ -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";

2
arch/arm/boot/dts/armada-380.dtsi
View File

@ -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>;

2
arch/arm/boot/dts/armada-385-db.dts
View File

@ -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";

2
arch/arm/boot/dts/armada-385-rd.dts
View File

@ -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";

2
arch/arm/boot/dts/armada-385.dtsi
View File

@ -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>;

2
arch/arm/boot/dts/armada-38x.dtsi
View File

@ -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;

4
arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
View File

@ -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 {
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 {
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 {
status = "okay"; status = "okay";
ethernet1-port@0 { ethernet1-port@0 {
phy-handle = <&ethphy1>; phy-handle = <&ethphy1>;
phy-connection-type = "rgmii-id";
}; };
}; };

2
arch/arm/mach-mvebu/Kconfig
View File

@ -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
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