Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11330a9f authored by Chuanhua Han's avatar Chuanhua Han Committed by Wolfram Sang
Browse files

i2c: imx: ACPI support for NXP i2c controller 



Enable NXP i2c controller to boot with ACPI.

Signed-off-by: default avatarMeenakshi Aggarwal <meenakshi.aggarwal@nxp.com>
Signed-off-by: default avatarUdit Kumar <udit.kumar@nxp.com>
Signed-off-by: default avatarChuanhua Han <chuanhua.han@nxp.com>
Signed-off-by: default avatarBiwen Li <biwen.li@nxp.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Acked-by: default avatarOleksij Rempel <o.rempel@pengutronix.de>
Tested-by: default avatarOleksij Rempel <o.rempel@pengutronix.de>
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 9ee7e72f

drivers/acpi/acpi_apd.c

+7 −0
Original line number Diff line number Diff line
@@ -160,11 +160,17 @@ static const struct apd_device_desc hip08_i2c_desc = { 
	.setup = acpi_apd_setup,

	.fixed_clk_rate = 250000000,

};



static const struct apd_device_desc thunderx2_i2c_desc = {

	.setup = acpi_apd_setup,

	.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 = {

	.setup = acpi_apd_setup,

	.fixed_clk_rate = 250000000,
@@ -238,6 +244,7 @@ static const struct acpi_device_id acpi_apd_device_ids[] = { 
	{ "HISI02A1", APD_ADDR(hip07_i2c_desc) },

	{ "HISI02A2", APD_ADDR(hip08_i2c_desc) },

	{ "HISI0173", APD_ADDR(hip08_spi_desc) },

	{ "NXP0001", APD_ADDR(nxp_i2c_desc) },

#endif

	{ }

};

drivers/i2c/busses/i2c-imx.c

+13 −4
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
 *

 */



#include <linux/acpi.h>

#include <linux/clk.h>

#include <linux/completion.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);



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)

{

	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)

{

	const struct of_device_id *of_id = of_match_device(i2c_imx_dt_ids,

							   &pdev->dev);

	struct imx_i2c_struct *i2c_imx;

	struct resource *res;

	struct imxi2c_platform_data *pdata = dev_get_platdata(&pdev->dev);

	void __iomem *base;

	int irq, ret;

	dma_addr_t phy_addr;

	const struct imx_i2c_hwdata *match;



	dev_dbg(&pdev->dev, "<%s>\n", __func__);
@@ -1077,8 +1083,9 @@ static int i2c_imx_probe(struct platform_device *pdev) 
	if (!i2c_imx)

		return -ENOMEM;



	if (of_id)

		i2c_imx->hwdata = of_id->data;

	match = device_get_match_data(&pdev->dev);

	if (match)

		i2c_imx->hwdata = match;

	else

		i2c_imx->hwdata = (struct imx_i2c_hwdata *)

				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.dev.of_node	= pdev->dev.of_node;

	i2c_imx->base			= base;

	ACPI_COMPANION_SET(&i2c_imx->adapter.dev, ACPI_COMPANION(&pdev->dev));



	/* Get I2C clock */

	i2c_imx->clk = devm_clk_get(&pdev->dev, NULL);
@@ -1253,6 +1261,7 @@ static struct platform_driver i2c_imx_driver = { 
		.name = DRIVER_NAME,

		.pm = &i2c_imx_pm_ops,

		.of_match_table = i2c_imx_dt_ids,

		.acpi_match_table = i2c_imx_acpi_ids,

	},

	.id_table = imx_i2c_devtype,

};