summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Perez de Heredia <pedro.perez@digi.com>2012-02-18 20:35:58 +0100
committerPedro Perez de Heredia <pedro.perez@digi.com>2012-02-18 20:44:24 +0100
commite7c418c1a6744be7d346f7c38d2551d4c6701664 (patch)
tree635f96db77f949cecf5433ef8273962220a3d87f
parent031314888262cf6b0a5a32f3193ddf022b6ab8a0 (diff)
ccxmx53: add preliminary SATA support
Signed-off-by: Pedro Perez de Heredia <pedro.perez@digi.com>
-rw-r--r--arch/arm/mach-mx5/devices_ccwmx53.c11
-rw-r--r--arch/arm/mach-mx5/devices_ccwmx53.h1
-rw-r--r--arch/arm/mach-mx5/mx53_ccwmx53js.c1
3 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/mach-mx5/devices_ccwmx53.c b/arch/arm/mach-mx5/devices_ccwmx53.c
index 22161d76874b..b863447f07b7 100644
--- a/arch/arm/mach-mx5/devices_ccwmx53.c
+++ b/arch/arm/mach-mx5/devices_ccwmx53.c
@@ -1235,6 +1235,17 @@ void ccwmx53_register_can(int interface)
void ccwmx53_register_can(int interface) {}
#endif /* CONFIG_CAN_FLEXCAN */
+#if defined(CONFIG_SATA_AHCI_PLATFORM)
+void ccxmx53_register_sata(void)
+{
+ /* SATA uses dedicated pins so, no special IOMUX configuration needed.
+ * Just, register the device */
+ mxc_register_device(&ahci_fsl_device, &sata_data);
+}
+#else
+void ccxmx53_register_sata(void) {}
+#endif /* CONFIG_SATA_AHCI_PLATFORM */
+
#ifdef CONFIG_CCWMX5X_FUSION_MULTITOUCH
struct i2c_board_info ccwmx53_fusion_ts[] __initdata = {
{
diff --git a/arch/arm/mach-mx5/devices_ccwmx53.h b/arch/arm/mach-mx5/devices_ccwmx53.h
index 88e3b3dca34c..335240e030fd 100644
--- a/arch/arm/mach-mx5/devices_ccwmx53.h
+++ b/arch/arm/mach-mx5/devices_ccwmx53.h
@@ -37,6 +37,7 @@ void ccwmx53_register_can(int interface);
int __init ccwmx5x_init_fb(void);
int __init ccwmx53_init_i2c_devices(void);
extern void ccwmx53_init_spidevices(void);
+void ccxmx53_register_sata(void);
void ccwmx53_register_fusion_touch(void);
void gpio_smsc911x_active(void);
diff --git a/arch/arm/mach-mx5/mx53_ccwmx53js.c b/arch/arm/mach-mx5/mx53_ccwmx53js.c
index 84b2b889a04d..74626cd518c1 100644
--- a/arch/arm/mach-mx5/mx53_ccwmx53js.c
+++ b/arch/arm/mach-mx5/mx53_ccwmx53js.c
@@ -338,6 +338,7 @@ static void __init mxc_board_init(void)
ccwmx53_register_sdio(4);
#endif
ccwmx53_register_nand();
+ ccxmx53_register_sata();
ccwmx53_register_fec();
ccwmx53_register_ext_eth();
ccwmx53_register_sgtl5000();