diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-08-10 22:37:27 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-08-10 22:37:27 +0200 |
| commit | fe8d63c8c75acc87d398b2e181b9135d2ecfc05a (patch) | |
| tree | 4eec2967c157e11cbf54f41845fb1350d3cc772f /arch/arm | |
| parent | 9844d027b52cc89264f6bf7686e26d9dc50134fd (diff) | |
| parent | 86cf2ae492db316e73512a1786d57ece9b3a7624 (diff) | |
| download | u-boot-imx-fe8d63c8c75acc87d398b2e181b9135d2ecfc05a.zip u-boot-imx-fe8d63c8c75acc87d398b2e181b9135d2ecfc05a.tar.gz u-boot-imx-fe8d63c8c75acc87d398b2e181b9135d2ecfc05a.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-marvell
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/include/asm/arch-kirkwood/kirkwood.h | 5 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-orion5x/orion5x.h | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch-kirkwood/kirkwood.h b/arch/arm/include/asm/arch-kirkwood/kirkwood.h index 9edb0be..0104418 100644 --- a/arch/arm/include/asm/arch-kirkwood/kirkwood.h +++ b/arch/arm/include/asm/arch-kirkwood/kirkwood.h @@ -59,6 +59,11 @@ #define KW_USB20_BASE (KW_REGISTER(0x50000)) #define KW_EGIGA0_BASE (KW_REGISTER(0x72000)) #define KW_EGIGA1_BASE (KW_REGISTER(0x76000)) +#define KW_SATA_BASE (KW_REGISTER(0x80000)) + +/* Kirkwood Sata controller has two ports */ +#define KW_SATA_PORT0_OFFSET 0x2000 +#define KW_SATA_PORT1_OFFSET 0x4000 /* Kirkwood GbE controller has two ports */ #define MAX_MVGBE_DEVS 2 diff --git a/arch/arm/include/asm/arch-orion5x/orion5x.h b/arch/arm/include/asm/arch-orion5x/orion5x.h index d257b66..e3d3f76 100644 --- a/arch/arm/include/asm/arch-orion5x/orion5x.h +++ b/arch/arm/include/asm/arch-orion5x/orion5x.h @@ -55,6 +55,9 @@ #define ORION5X_USB20_PORT0_BASE (ORION5X_REGISTER(0x50000)) #define ORION5X_USB20_PORT1_BASE (ORION5X_REGISTER(0xA0000)) #define ORION5X_EGIGA_BASE (ORION5X_REGISTER(0x72000)) +#define ORION5X_SATA_BASE (ORION5X_REGISTER(0x80000)) +#define ORION5X_SATA_PORT0_OFFSET 0x2000 +#define ORION5X_SATA_PORT1_OFFSET 0x4000 /* Orion5x GbE controller has a single port */ #define MAX_MVGBE_DEVS 1 |