hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ahci: qoriq: enable acpi support in qoriq ahci driver 

This patch enables ACPI support in qoriq ahci driver.

Signed-off-by: Udit Kumar <udit.kumar@nxp.com>
Signed-off-by: Yuantian Tang <andy.tang@nxp.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Yuantian Tang 2020-08-17 16:22:04 +08:00 committed by Jens Axboe
parent 6cd32a44f0
commit 564a7eed3f
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/ata/ahci_qoriq.c
View File

@ -6,6 +6,7 @@
* Tang Yuantian <Yuantian.Tang@freescale.com> * Tang Yuantian <Yuantian.Tang@freescale.com>
*/ */
#include <linux/acpi.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/pm.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); 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, static int ahci_qoriq_hardreset(struct ata_link *link, unsigned int *class,
unsigned long deadline) 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) static int ahci_qoriq_probe(struct platform_device *pdev)
{ {
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
const struct acpi_device_id *acpi_id;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct ahci_host_priv *hpriv; struct ahci_host_priv *hpriv;
struct ahci_qoriq_priv *qoriq_priv; struct ahci_qoriq_priv *qoriq_priv;
@ -267,14 +275,18 @@ static int ahci_qoriq_probe(struct platform_device *pdev)
return PTR_ERR(hpriv); return PTR_ERR(hpriv);
of_id = of_match_node(ahci_qoriq_of_match, np); 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; return -ENODEV;
qoriq_priv = devm_kzalloc(dev, sizeof(*qoriq_priv), GFP_KERNEL); qoriq_priv = devm_kzalloc(dev, sizeof(*qoriq_priv), GFP_KERNEL);
if (!qoriq_priv) if (!qoriq_priv)
return -ENOMEM; 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)) { if (unlikely(!ecc_initialized)) {
res = platform_get_resource_byname(pdev, 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); rc = ahci_platform_enable_resources(hpriv);
if (rc) if (rc)
@ -354,6 +367,7 @@ static struct platform_driver ahci_qoriq_driver = {
.driver = { .driver = {
.name = DRV_NAME, .name = DRV_NAME,
.of_match_table = ahci_qoriq_of_match, .of_match_table = ahci_qoriq_of_match,
.acpi_match_table = ahci_qoriq_acpi_match,
.pm = &ahci_qoriq_pm_ops, .pm = &ahci_qoriq_pm_ops,
}, },
}; };