Unverified Commit 2c7aa268 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Andi Shyti
Browse files

i2c: designware: Use device_is_compatible() instead of custom approach 



We use MODEL_MSCC_OCELOT effectively as a flag for comparing against
"compatible" property. Use device_is_compatible() directly to make it
clear.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarAndi Shyti <andi.shyti@kernel.org>
Link: https://lore.kernel.org/r/20260114081954.252160-3-andriy.shevchenko@linux.intel.com
parent fae88e03

drivers/i2c/busses/i2c-designware-common.c

+1 −5
Original line number Diff line number Diff line
@@ -243,14 +243,10 @@ static void i2c_dw_of_configure(struct device *device) 
	struct platform_device *pdev = to_platform_device(device);

	struct dw_i2c_dev *dev = dev_get_drvdata(device);



	switch (dev->flags & MODEL_MASK) {

	case MODEL_MSCC_OCELOT:

	if (device_is_compatible(dev->dev, "mscc,ocelot-i2c")) {

		dev->ext = devm_platform_ioremap_resource(pdev, 1);

		if (!IS_ERR(dev->ext))

			dev->set_sda_hold_time = mscc_twi_set_sda_hold_time;

		break;

	default:

		break;

	}

}

drivers/i2c/busses/i2c-designware-core.h

+0 −1
Original line number Diff line number Diff line
@@ -326,7 +326,6 @@ struct dw_i2c_dev { 
#define ARBITRATION_SEMAPHORE			BIT(2)

#define ACCESS_POLLING				BIT(3)



#define MODEL_MSCC_OCELOT			BIT(8)

#define MODEL_AMD_NAVI_GPU			BIT(10)

#define MODEL_WANGXUN_SP			BIT(11)

#define MODEL_MASK				GENMASK(11, 8)

drivers/i2c/busses/i2c-designware-platdrv.c

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ static void dw_i2c_plat_remove(struct platform_device *pdev) 
}



static const struct of_device_id dw_i2c_of_match[] = {

	{ .compatible = "mscc,ocelot-i2c", .data = (void *)MODEL_MSCC_OCELOT },

	{ .compatible = "mscc,ocelot-i2c" },

	{ .compatible = "snps,designware-i2c" },

	{}

};