Unverified Commit b621a966 authored by Abdurrahman Hussain's avatar Abdurrahman Hussain Committed by Andi Shyti
Browse files

i2c: xiic: switch to generic device property accessors 



Use generic device property accessors making them work for ACPI
platforms.

Signed-off-by: default avatarAbdurrahman Hussain <abdurrahman@nexthop.ai>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@intel.com>
Signed-off-by: default avatarAndi Shyti <andi.shyti@kernel.org>
Link: https://lore.kernel.org/r/20260223-i2c-xiic-v12-3-b6c9ce4e4f3c@nexthop.ai
parent e1d98e42

drivers/i2c/busses/i2c-xiic.c

+7 −14
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <linux/platform_data/i2c-xiic.h>

#include <linux/io.h>

#include <linux/slab.h>

#include <linux/of.h>

#include <linux/clk.h>

#include <linux/pm_runtime.h>

#include <linux/iopoll.h>
@@ -1408,7 +1407,6 @@ static const struct i2c_adapter xiic_adapter = { 
	.algo = &xiic_algorithm,

};



#if defined(CONFIG_OF)

static const struct xiic_version_data xiic_2_00 = {

	.quirks = DYNAMIC_MODE_READ_BROKEN_BIT,

};
@@ -1419,14 +1417,14 @@ static const struct of_device_id xiic_of_match[] = { 
	{},

};

MODULE_DEVICE_TABLE(of, xiic_of_match);

#endif



static int xiic_i2c_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct fwnode_handle *fwnode = dev_fwnode(dev);

	struct xiic_i2c *i2c;

	struct xiic_i2c_platform_data *pdata;

	const struct of_device_id *match;

	const struct xiic_version_data *data;

	struct resource *res;

	int ret, irq;

	u8 i;
@@ -1436,12 +1434,9 @@ static int xiic_i2c_probe(struct platform_device *pdev) 
	if (!i2c)

		return -ENOMEM;



	match = of_match_node(xiic_of_match, pdev->dev.of_node);

	if (match && match->data) {

		const struct xiic_version_data *data = match->data;



	data = device_get_match_data(dev);

	if (data)

		i2c->quirks = data->quirks;

	}



	i2c->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);

	if (IS_ERR(i2c->base))
@@ -1458,7 +1453,7 @@ static int xiic_i2c_probe(struct platform_device *pdev) 
	i2c->adap = xiic_adapter;

	i2c_set_adapdata(&i2c->adap, i2c);

	i2c->adap.dev.parent = &pdev->dev;

	i2c->adap.dev.of_node = pdev->dev.of_node;

	device_set_node(&i2c->adap.dev, fwnode);

	snprintf(i2c->adap.name, sizeof(i2c->adap.name),

		 DRIVER_NAME " %s", pdev->name);
@@ -1482,8 +1477,7 @@ static int xiic_i2c_probe(struct platform_device *pdev) 


	/* SCL frequency configuration */

	i2c->input_clk = clk_get_rate(i2c->clk);

	ret = of_property_read_u32(pdev->dev.of_node, "clock-frequency",

				   &i2c->i2c_clk);

	ret = device_property_read_u32(dev, "clock-frequency", &i2c->i2c_clk);

	/* If clock-frequency not specified in DT, do not configure in SW */

	if (ret || i2c->i2c_clk > I2C_MAX_FAST_MODE_PLUS_FREQ)

		i2c->i2c_clk = 0;
@@ -1494,8 +1488,7 @@ static int xiic_i2c_probe(struct platform_device *pdev) 
	if (ret)

		return ret;



	i2c->singlemaster =

		of_property_read_bool(pdev->dev.of_node, "single-master");

	i2c->singlemaster = device_property_read_bool(dev, "single-master");



	/*

	 * Detect endianness