[ARM] Orion: add 88F5181L (Orion-VoIP) support

Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Acked-by: Russell King <linux@arm.linux.org.uk>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index a91b9ac9a0e5f1b9d45dad833847da1c34d1b1e3..4bdf598611d152b5b1e207a97d275040db82835c 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -386,7 +386,8 @@ config ARCH_ORION5X
        select PLAT_ORION
        help
          Support for the following Marvell Orion 5x series SoCs:
-         Orion-1 (5181), Orion-NAS (5182), Orion-2 (5281.)
+         Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182),
+         Orion-2 (5281).
 
 config ARCH_PNX4008
        bool "Philips Nexperia PNX4008 Mobile"

diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c
index b2986717319ea0313e1e14d02feedc86ec10afb3..faf4e32119180563718b7f8a9751e760c429a703 100644 (file)
--- a/arch/arm/mach-orion5x/common.c
+++ b/arch/arm/mach-orion5x/common.c
@@ -394,8 +394,10 @@ static void __init orion5x_id(u32 *dev, u32 *rev, char **dev_name)
        } else if (*dev == MV88F5181_DEV_ID) {
                if (*rev == MV88F5181_REV_B1) {
                        *dev_name = "MV88F5181-Rev-B1";
+               } else if (*rev == MV88F5181L_REV_A1) {
+                       *dev_name = "MV88F5181L-Rev-A1";
                } else {
-                       *dev_name = "MV88F5181-Rev-Unsupported";
+                       *dev_name = "MV88F5181(L)-Rev-Unsupported";
                }
        } else {
                *dev_name = "Device-Unknown";

diff --git a/include/asm-arm/arch-orion5x/orion5x.h b/include/asm-arm/arch-orion5x/orion5x.h
index 206ddd71e19384aaf87e4d3a98f79a70e3cd4c9c..20f7b406a798d716e721f4cde8d597e20b1b466d 100644 (file)
--- a/include/asm-arm/arch-orion5x/orion5x.h
+++ b/include/asm-arm/arch-orion5x/orion5x.h
@@ -2,7 +2,7 @@
  * include/asm-arm/arch-orion5x/orion5x.h
  *
  * Generic definitions of Orion SoC flavors:
- *  Orion-1, Orion-NAS, Orion-VoIP, and Orion-2.
+ *  Orion-1, Orion-VoIP, Orion-NAS, and Orion-2.
  *
  * Maintainer: Tzachi Perelstein <tzachi@marvell.com>
  *
@@ -63,9 +63,11 @@
 /*******************************************************************************
  * Supported Devices & Revisions
  ******************************************************************************/
-/* Orion-1 (88F5181) */
+/* Orion-1 (88F5181) and Orion-VoIP (88F5181L) */
 #define MV88F5181_DEV_ID       0x5181
 #define MV88F5181_REV_B1       3
+#define MV88F5181L_REV_A0      8
+#define MV88F5181L_REV_A1      9
 /* Orion-NAS (88F5182) */
 #define MV88F5182_DEV_ID       0x5182
 #define MV88F5182_REV_A2       2