diff options
| author | Lennert Buytenhek | 2008-03-27 19:51:39 +0100 |
|---|---|---|
| committer | Nicolas Pitre | 2008-03-27 19:51:39 +0100 |
| commit | 15a32632d94011911497052a96cdbf3b905b325d (patch) | |
| tree | 75d5d0c378157f19ccd12a1615a83c6aa2226689 /arch/arm/mach-orion/common.c | |
| parent | ehci-orion: mbus decode window support (diff) | |
| download | kernel-qcow2-linux-15a32632d94011911497052a96cdbf3b905b325d.tar.gz kernel-qcow2-linux-15a32632d94011911497052a96cdbf3b905b325d.tar.xz kernel-qcow2-linux-15a32632d94011911497052a96cdbf3b905b325d.zip | |
sata_mv: mbus decode window support
Make it possible to pass mbus_dram_target_info to the sata_mv
driver via the platform data, make the sata_mv driver program
the window registers based on this data if it is passed in, and
make the Orion platform setup code use this method instead of
programming the SATA mbus window registers by hand.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Reviewed-by: Tzachi Perelstein <tzachi@marvell.com>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Nicolas Pitre <nico@marvell.com>
Diffstat (limited to 'arch/arm/mach-orion/common.c')
| -rw-r--r-- | arch/arm/mach-orion/common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-orion/common.c b/arch/arm/mach-orion/common.c index d33c01dfc3f2..a32fe8e108bc 100644 --- a/arch/arm/mach-orion/common.c +++ b/arch/arm/mach-orion/common.c @@ -17,6 +17,7 @@ #include <linux/mbus.h> #include <linux/mv643xx_eth.h> #include <linux/mv643xx_i2c.h> +#include <linux/ata_platform.h> #include <asm/page.h> #include <asm/setup.h> #include <asm/timex.h> @@ -289,6 +290,7 @@ static struct platform_device orion_sata = { void __init orion_sata_init(struct mv_sata_platform_data *sata_data) { + sata_data->dram = &orion_mbus_dram_info; orion_sata.dev.platform_data = sata_data; platform_device_register(&orion_sata); } @@ -342,8 +344,6 @@ void __init orion_init(void) */ orion_setup_cpu_wins(); orion_setup_eth_wins(); - if (dev == MV88F5182_DEV_ID) - orion_setup_sata_wins(); /* * REgister devices |