diff options
author | Lennert Buytenhek <buytenh@wantstofly.org> | 2008-05-31 02:30:40 -0400 |
---|---|---|
committer | Lennert Buytenhek <buytenh@marvell.com> | 2008-06-22 16:44:51 -0400 |
commit | d2b2a6bbc020e5a9a244f318d28515081e922882 (patch) | |
tree | 978505712a336a4ee368019a962bbe570bac2187 | |
parent | 47e9cffde663eafd5f78987036429fc0994d90e8 (diff) |
[ARM] Orion: add 88F5181L (Orion-VoIP) support
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Acked-by: Russell King <linux@arm.linux.org.uk>
-rw-r--r-- | arch/arm/Kconfig | 3 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/common.c | 4 | ||||
-rw-r--r-- | include/asm-arm/arch-orion5x/orion5x.h | 6 |
3 files changed, 9 insertions, 4 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index a91b9ac9a0e5..4bdf598611d1 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -386,7 +386,8 @@ config ARCH_ORION5X | |||
386 | select PLAT_ORION | 386 | select PLAT_ORION |
387 | help | 387 | help |
388 | Support for the following Marvell Orion 5x series SoCs: | 388 | Support for the following Marvell Orion 5x series SoCs: |
389 | Orion-1 (5181), Orion-NAS (5182), Orion-2 (5281.) | 389 | Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182), |
390 | Orion-2 (5281). | ||
390 | 391 | ||
391 | config ARCH_PNX4008 | 392 | config ARCH_PNX4008 |
392 | bool "Philips Nexperia PNX4008 Mobile" | 393 | bool "Philips Nexperia PNX4008 Mobile" |
diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c index b2986717319e..faf4e3211918 100644 --- 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) | |||
394 | } else if (*dev == MV88F5181_DEV_ID) { | 394 | } else if (*dev == MV88F5181_DEV_ID) { |
395 | if (*rev == MV88F5181_REV_B1) { | 395 | if (*rev == MV88F5181_REV_B1) { |
396 | *dev_name = "MV88F5181-Rev-B1"; | 396 | *dev_name = "MV88F5181-Rev-B1"; |
397 | } else if (*rev == MV88F5181L_REV_A1) { | ||
398 | *dev_name = "MV88F5181L-Rev-A1"; | ||
397 | } else { | 399 | } else { |
398 | *dev_name = "MV88F5181-Rev-Unsupported"; | 400 | *dev_name = "MV88F5181(L)-Rev-Unsupported"; |
399 | } | 401 | } |
400 | } else { | 402 | } else { |
401 | *dev_name = "Device-Unknown"; | 403 | *dev_name = "Device-Unknown"; |
diff --git a/include/asm-arm/arch-orion5x/orion5x.h b/include/asm-arm/arch-orion5x/orion5x.h index 206ddd71e193..20f7b406a798 100644 --- a/include/asm-arm/arch-orion5x/orion5x.h +++ b/include/asm-arm/arch-orion5x/orion5x.h | |||
@@ -2,7 +2,7 @@ | |||
2 | * include/asm-arm/arch-orion5x/orion5x.h | 2 | * include/asm-arm/arch-orion5x/orion5x.h |
3 | * | 3 | * |
4 | * Generic definitions of Orion SoC flavors: | 4 | * Generic definitions of Orion SoC flavors: |
5 | * Orion-1, Orion-NAS, Orion-VoIP, and Orion-2. | 5 | * Orion-1, Orion-VoIP, Orion-NAS, and Orion-2. |
6 | * | 6 | * |
7 | * Maintainer: Tzachi Perelstein <tzachi@marvell.com> | 7 | * Maintainer: Tzachi Perelstein <tzachi@marvell.com> |
8 | * | 8 | * |
@@ -63,9 +63,11 @@ | |||
63 | /******************************************************************************* | 63 | /******************************************************************************* |
64 | * Supported Devices & Revisions | 64 | * Supported Devices & Revisions |
65 | ******************************************************************************/ | 65 | ******************************************************************************/ |
66 | /* Orion-1 (88F5181) */ | 66 | /* Orion-1 (88F5181) and Orion-VoIP (88F5181L) */ |
67 | #define MV88F5181_DEV_ID 0x5181 | 67 | #define MV88F5181_DEV_ID 0x5181 |
68 | #define MV88F5181_REV_B1 3 | 68 | #define MV88F5181_REV_B1 3 |
69 | #define MV88F5181L_REV_A0 8 | ||
70 | #define MV88F5181L_REV_A1 9 | ||
69 | /* Orion-NAS (88F5182) */ | 71 | /* Orion-NAS (88F5182) */ |
70 | #define MV88F5182_DEV_ID 0x5182 | 72 | #define MV88F5182_DEV_ID 0x5182 |
71 | #define MV88F5182_REV_A2 2 | 73 | #define MV88F5182_REV_A2 2 |