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 /arch/arm | |
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>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/Kconfig | 3 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/common.c | 4 |
2 files changed, 5 insertions, 2 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"; |