UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

i2c: imx: ACPI support for NXP i2c controller 

Enable NXP i2c controller to boot with ACPI.

Signed-off-by: Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>
Signed-off-by: Udit Kumar <udit.kumar@nxp.com>
Signed-off-by: Chuanhua Han <chuanhua.han@nxp.com>
Signed-off-by: Biwen Li <biwen.li@nxp.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Acked-by: Oleksij Rempel <o.rempel@pengutronix.de>
Tested-by: Oleksij Rempel <o.rempel@pengutronix.de>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
Chuanhua Han 2019-09-06 15:53:19 +08:00 committed by Wolfram Sang
parent 9ee7e72fbb
commit 11330a9fef
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/acpi/acpi_apd.c
View File

@ -160,11 +160,17 @@ static const struct apd_device_desc hip08_i2c_desc = {
.setup = acpi_apd_setup, .setup = acpi_apd_setup,
.fixed_clk_rate = 250000000, .fixed_clk_rate = 250000000,
}; };
static const struct apd_device_desc thunderx2_i2c_desc = { static const struct apd_device_desc thunderx2_i2c_desc = {
.setup = acpi_apd_setup, .setup = acpi_apd_setup,
.fixed_clk_rate = 125000000, .fixed_clk_rate = 125000000,
}; };
static const struct apd_device_desc nxp_i2c_desc = {
.setup = acpi_apd_setup,
.fixed_clk_rate = 350000000,
};
static const struct apd_device_desc hip08_spi_desc = { static const struct apd_device_desc hip08_spi_desc = {
.setup = acpi_apd_setup, .setup = acpi_apd_setup,
.fixed_clk_rate = 250000000, .fixed_clk_rate = 250000000,
@ -238,6 +244,7 @@ static const struct acpi_device_id acpi_apd_device_ids[] = {
{ "HISI02A1", APD_ADDR(hip07_i2c_desc) }, { "HISI02A1", APD_ADDR(hip07_i2c_desc) },
{ "HISI02A2", APD_ADDR(hip08_i2c_desc) }, { "HISI02A2", APD_ADDR(hip08_i2c_desc) },
{ "HISI0173", APD_ADDR(hip08_spi_desc) }, { "HISI0173", APD_ADDR(hip08_spi_desc) },
{ "NXP0001", APD_ADDR(nxp_i2c_desc) },
#endif #endif
{ } { }
}; };

17
drivers/i2c/busses/i2c-imx.c
View File

@ -20,6 +20,7 @@
* *
*/ */
#include <linux/acpi.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/completion.h> #include <linux/completion.h>
#include <linux/delay.h> #include <linux/delay.h>
@ -255,6 +256,12 @@ static const struct of_device_id i2c_imx_dt_ids[] = {
}; };
MODULE_DEVICE_TABLE(of, i2c_imx_dt_ids); MODULE_DEVICE_TABLE(of, i2c_imx_dt_ids);
static const struct acpi_device_id i2c_imx_acpi_ids[] = {
{"NXP0001", .driver_data = (kernel_ulong_t)&vf610_i2c_hwdata},
{ }
};
MODULE_DEVICE_TABLE(acpi, i2c_imx_acpi_ids);
static inline int is_imx1_i2c(struct imx_i2c_struct *i2c_imx) static inline int is_imx1_i2c(struct imx_i2c_struct *i2c_imx)
{ {
return i2c_imx->hwdata->devtype == IMX1_I2C; return i2c_imx->hwdata->devtype == IMX1_I2C;
@ -1050,14 +1057,13 @@ static const struct i2c_algorithm i2c_imx_algo = {
static int i2c_imx_probe(struct platform_device *pdev) static int i2c_imx_probe(struct platform_device *pdev)
{ {
const struct of_device_id *of_id = of_match_device(i2c_imx_dt_ids,
&pdev->dev);
struct imx_i2c_struct *i2c_imx; struct imx_i2c_struct *i2c_imx;
struct resource *res; struct resource *res;
struct imxi2c_platform_data *pdata = dev_get_platdata(&pdev->dev); struct imxi2c_platform_data *pdata = dev_get_platdata(&pdev->dev);
void __iomem *base; void __iomem *base;
int irq, ret; int irq, ret;
dma_addr_t phy_addr; dma_addr_t phy_addr;
const struct imx_i2c_hwdata *match;
dev_dbg(&pdev->dev, "<%s>\n", __func__); dev_dbg(&pdev->dev, "<%s>\n", __func__);
@ -1077,8 +1083,9 @@ static int i2c_imx_probe(struct platform_device *pdev)
if (!i2c_imx) if (!i2c_imx)
return -ENOMEM; return -ENOMEM;
if (of_id) match = device_get_match_data(&pdev->dev);
i2c_imx->hwdata = of_id->data; if (match)
i2c_imx->hwdata = match;
else else
i2c_imx->hwdata = (struct imx_i2c_hwdata *) i2c_imx->hwdata = (struct imx_i2c_hwdata *)
platform_get_device_id(pdev)->driver_data; platform_get_device_id(pdev)->driver_data;
@ -1091,6 +1098,7 @@ static int i2c_imx_probe(struct platform_device *pdev)
i2c_imx->adapter.nr = pdev->id; i2c_imx->adapter.nr = pdev->id;
i2c_imx->adapter.dev.of_node = pdev->dev.of_node; i2c_imx->adapter.dev.of_node = pdev->dev.of_node;
i2c_imx->base = base; i2c_imx->base = base;
ACPI_COMPANION_SET(&i2c_imx->adapter.dev, ACPI_COMPANION(&pdev->dev));
/* Get I2C clock */ /* Get I2C clock */
i2c_imx->clk = devm_clk_get(&pdev->dev, NULL); i2c_imx->clk = devm_clk_get(&pdev->dev, NULL);
@ -1253,6 +1261,7 @@ static struct platform_driver i2c_imx_driver = {
.name = DRIVER_NAME, .name = DRIVER_NAME,
.pm = &i2c_imx_pm_ops, .pm = &i2c_imx_pm_ops,
.of_match_table = i2c_imx_dt_ids, .of_match_table = i2c_imx_dt_ids,
.acpi_match_table = i2c_imx_acpi_ids,
}, },
.id_table = imx_i2c_devtype, .id_table = imx_i2c_devtype,
}; };