Commit 564a7eed authored by Yuantian Tang's avatar Yuantian Tang Committed by Jens Axboe
Browse files

ahci: qoriq: enable acpi support in qoriq ahci driver 



This patch enables ACPI support in qoriq ahci driver.

Signed-off-by: default avatarUdit Kumar <udit.kumar@nxp.com>
Signed-off-by: default avatarYuantian Tang <andy.tang@nxp.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 6cd32a44

drivers/ata/ahci_qoriq.c

+17 −3
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
 *   Tang Yuantian <Yuantian.Tang@freescale.com>

 */



#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)

{
@@ -255,6 +262,7 @@ static int ahci_qoriq_phy_init(struct ahci_host_priv *hpriv) 
static int ahci_qoriq_probe(struct platform_device *pdev)

{

	struct device_node *np = pdev->dev.of_node;

	const struct acpi_device_id *acpi_id;

	struct device *dev = &pdev->dev;

	struct ahci_host_priv *hpriv;

	struct ahci_qoriq_priv *qoriq_priv;
@@ -267,14 +275,18 @@ static int ahci_qoriq_probe(struct platform_device *pdev) 
		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;



	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,
@@ -288,7 +300,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 +367,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,

	},

};