ahci_qoriq: enable acpi support in qoriq ahci driver
PATCH 1/1 ahci_qoriq: enable acpi support in qoriq ahci driver
From: Udit Kumar <[email protected]>
This patch enables ACPI support in qoriq ahci driver.
Signed-off-by Udit Kumar <[email protected]>
Signed-off-by Peng Ma <[email protected]>
--- drivers/ata/ahci_qoriq.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-)
drivers/ata/ahci_qoriq.c +18 -6
@@ -6,6 +6,7 @@* Tang Yuantian <[email protected]> */ +#include <linux/acpi.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/pm.h>
@@ -80,6 +81,12 @@ static const struct of_device_id ahci_qoriq_of_match[] = { };MODULE_DEVICE_TABLE (of, ahci_qoriq_of_match); +static const struct acpi_device_id ahci_qoriq_acpi_match[] = { + {"NXP0004" , .driver_data = (kernel_ulong_t )AHCI_LX2160A }, + { } +}; +MODULE_DEVICE_TABLE (acpi, ahci_qoriq_acpi_match); +static int ahci_qoriq_hardreset (struct ata_link *link,unsigned int *class,unsigned long deadline) {
@@ -261,25 +268,28 @@ static int ahci_qoriq_probe(struct platform_device *pdev)const struct of_device_id *of_id;struct resource *res;int rc; +const struct acpi_device_id *acpi_id; hpriv =ahci_platform_get_resources (pdev,0 );if (IS_ERR (hpriv))return PTR_ERR (hpriv); of_id =of_match_node (ahci_qoriq_of_match, np); -if (!of_id) + acpi_id =acpi_match_device (ahci_qoriq_acpi_match, &pdev->dev); +if (!(of_id || acpi_id))return -ENODEV ; qoriq_priv =devm_kzalloc (dev,sizeof (*qoriq_priv),GFP_KERNEL );if (!qoriq_priv)return -ENOMEM ; - qoriq_priv->type = (enum ahci_qoriq_type )of_id->data; +if (of_id) + qoriq_priv->type = (enum ahci_qoriq_type )of_id->data; +else + qoriq_priv->type = (enum ahci_qoriq_type )acpi_id->driver_data;if (unlikely (!ecc_initialized)) { - res =platform_get_resource_byname (pdev, -IORESOURCE_MEM , -"sata-ecc" ); + res =platform_get_resource (pdev,IORESOURCE_MEM ,1 );if (res) { qoriq_priv->ecc_addr =devm_ioremap_resource (dev, res);
@@ -288,7 +298,8 @@ static int ahci_qoriq_probe(struct platform_device *pdev) } } - qoriq_priv->is_dmacoherent =of_dma_is_coherent (np); +if (device_get_dma_attr (&pdev->dev) ==DEV_DMA_COHERENT ) + qoriq_priv->is_dmacoherent = true; rc =ahci_platform_enable_resources (hpriv);if (rc)
@@ -354,6 +365,7 @@ static struct platform_driver ahci_qoriq_driver = { .driver = { .name = DRV_NAME, .of_match_table = ahci_qoriq_of_match, + .acpi_match_table = ahci_qoriq_acpi_match, .pm = &ahci_qoriq_pm_ops, }, };
Signature · 1 line
2.9.5