3.3-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Brian Norris <[email protected]>

commit d408e2b14fba4fa214fa5bc24b7baae8a55e563c upstream.

Some platforms need to make use of the AHCI_HFLAG_DELAY_ENGINE flag.

Signed-off-by: Brian Norris <[email protected]>
Signed-off-by: Jeff Garzik <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
 drivers/ata/ahci_platform.c |   11 +++++++++++
 1 file changed, 11 insertions(+)

--- a/drivers/ata/ahci_platform.c
+++ b/drivers/ata/ahci_platform.c
@@ -26,6 +26,7 @@
 enum ahci_type {
        AHCI,           /* standard platform ahci */
        IMX53_AHCI,     /* ahci on i.mx53 */
+       STRICT_AHCI,    /* delayed DMA engine start */
 };
 
 static struct platform_device_id ahci_devtype[] = {
@@ -36,6 +37,9 @@ static struct platform_device_id ahci_de
                .name = "imx53-ahci",
                .driver_data = IMX53_AHCI,
        }, {
+               .name = "strict-ahci",
+               .driver_data = STRICT_AHCI,
+       }, {
                /* sentinel */
        }
 };
@@ -56,6 +60,13 @@ static const struct ata_port_info ahci_p
                .udma_mask      = ATA_UDMA6,
                .port_ops       = &ahci_pmp_retry_srst_ops,
        },
+       [STRICT_AHCI] = {
+               AHCI_HFLAGS     (AHCI_HFLAG_DELAY_ENGINE),
+               .flags          = AHCI_FLAG_COMMON,
+               .pio_mask       = ATA_PIO4,
+               .udma_mask      = ATA_UDMA6,
+               .port_ops       = &ahci_ops,
+       },
 };
 
 static struct scsi_host_template ahci_platform_sht = {


--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to