diff options
| author | Siddarth Gore <gores@marvell.com> | 2009-06-09 14:41:02 +0530 | 
|---|---|---|
| committer | Nicolas Pitre <nico@cam.org> | 2009-08-10 18:03:59 -0400 | 
| commit | aec1bad326a99a8b0860fa9d518985ee388c9391 (patch) | |
| tree | 8b54e180ba6bcfa066652d97719aaff5b5b20c06 | |
| parent | 8f2208601f81b505710b0d13dbd80b687ccbca60 (diff) | |
[ARM] Kirkwood: Add support for 6281-A1
Signed-off-by: Siddarth Gore <gores@marvell.com>
Signed-off-by: Nicolas Pitre <nico@marvell.com>
| -rw-r--r-- | arch/arm/mach-kirkwood/common.c | 5 | ||||
| -rw-r--r-- | arch/arm/mach-kirkwood/include/mach/kirkwood.h | 1 | 
2 files changed, 5 insertions, 1 deletions
| diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c index 0f6919838011..0acb61f3c10b 100644 --- a/arch/arm/mach-kirkwood/common.c +++ b/arch/arm/mach-kirkwood/common.c @@ -838,7 +838,8 @@ int __init kirkwood_find_tclk(void)  	u32 dev, rev;  	kirkwood_pcie_id(&dev, &rev); -	if (dev == MV88F6281_DEV_ID && rev == MV88F6281_REV_A0) +	if (dev == MV88F6281_DEV_ID && (rev == MV88F6281_REV_A0 || +					rev == MV88F6281_REV_A1))  		return 200000000;  	return 166666667; @@ -872,6 +873,8 @@ static char * __init kirkwood_id(void)  			return "MV88F6281-Z0";  		else if (rev == MV88F6281_REV_A0)  			return "MV88F6281-A0"; +		else if (rev == MV88F6281_REV_A1) +			return "MV88F6281-A1";  		else  			return "MV88F6281-Rev-Unsupported";  	} else if (dev == MV88F6192_DEV_ID) { diff --git a/arch/arm/mach-kirkwood/include/mach/kirkwood.h b/arch/arm/mach-kirkwood/include/mach/kirkwood.h index 07af858814a0..54c132731d2d 100644 --- a/arch/arm/mach-kirkwood/include/mach/kirkwood.h +++ b/arch/arm/mach-kirkwood/include/mach/kirkwood.h @@ -101,6 +101,7 @@  #define MV88F6281_DEV_ID	0x6281  #define MV88F6281_REV_Z0	0  #define MV88F6281_REV_A0	2 +#define MV88F6281_REV_A1	3  #define MV88F6192_DEV_ID	0x6192  #define MV88F6192_REV_Z0	0 | 
