Commit f2330bfb authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Andi Shyti
Browse files

i2c: designware: Always provide device ID tables 



There is no need to have ugly ifdeffery and additional macros
for the device ID tables. Always provide them. Since we touch
the ACPI table, make it sorted by ID.

Reviewed-by: default avatarAndi Shyti <andi.shyti@kernel.org>
Reviewed-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Acked-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarAndi Shyti <andi.shyti@kernel.org>
parent 949e9cde

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

+31 −33
Original line number Diff line number Diff line
@@ -40,29 +40,6 @@ static u32 i2c_dw_get_clk_rate_khz(struct dw_i2c_dev *dev) 
	return clk_get_rate(dev->clk) / KILO;

}



#ifdef CONFIG_ACPI

static const struct acpi_device_id dw_i2c_acpi_match[] = {

	{ "INT33C2", 0 },

	{ "INT33C3", 0 },

	{ "INT3432", 0 },

	{ "INT3433", 0 },

	{ "INTC10EF", 0 },

	{ "80860F41", ACCESS_NO_IRQ_SUSPEND },

	{ "808622C1", ACCESS_NO_IRQ_SUSPEND },

	{ "AMD0010", ACCESS_INTR_MASK },

	{ "AMDI0010", ACCESS_INTR_MASK },

	{ "AMDI0019", ACCESS_INTR_MASK | ARBITRATION_SEMAPHORE },

	{ "AMDI0510", 0 },

	{ "APMC0D0F", 0 },

	{ "HISI02A1", 0 },

	{ "HISI02A2", 0 },

	{ "HISI02A3", 0 },

	{ "HYGO0010", ACCESS_INTR_MASK },

	{}

};

MODULE_DEVICE_TABLE(acpi, dw_i2c_acpi_match);

#endif



#ifdef CONFIG_OF

#define BT1_I2C_CTL			0x100

#define BT1_I2C_CTL_ADDR_MASK		GENMASK(7, 0)
@@ -149,14 +126,6 @@ static int dw_i2c_of_configure(struct platform_device *pdev) 


	return 0;

}



static const struct of_device_id dw_i2c_of_match[] = {

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

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

	{ .compatible = "baikal,bt1-sys-i2c", .data = (void *)MODEL_BAIKAL_BT1 },

	{}

};

MODULE_DEVICE_TABLE(of, dw_i2c_of_match);

#else

static int bt1_i2c_request_regs(struct dw_i2c_dev *dev)

{
@@ -477,6 +446,35 @@ static const struct dev_pm_ops dw_i2c_dev_pm_ops = { 
	RUNTIME_PM_OPS(dw_i2c_plat_runtime_suspend, dw_i2c_plat_runtime_resume, NULL)

};



static const struct of_device_id dw_i2c_of_match[] = {

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

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

	{ .compatible = "baikal,bt1-sys-i2c", .data = (void *)MODEL_BAIKAL_BT1 },

	{}

};

MODULE_DEVICE_TABLE(of, dw_i2c_of_match);



static const struct acpi_device_id dw_i2c_acpi_match[] = {

	{ "80860F41", ACCESS_NO_IRQ_SUSPEND },

	{ "808622C1", ACCESS_NO_IRQ_SUSPEND },

	{ "AMD0010", ACCESS_INTR_MASK },

	{ "AMDI0010", ACCESS_INTR_MASK },

	{ "AMDI0019", ACCESS_INTR_MASK | ARBITRATION_SEMAPHORE },

	{ "AMDI0510", 0 },

	{ "APMC0D0F", 0 },

	{ "HISI02A1", 0 },

	{ "HISI02A2", 0 },

	{ "HISI02A3", 0 },

	{ "HYGO0010", ACCESS_INTR_MASK },

	{ "INT33C2", 0 },

	{ "INT33C3", 0 },

	{ "INT3432", 0 },

	{ "INT3433", 0 },

	{ "INTC10EF", 0 },

	{}

};

MODULE_DEVICE_TABLE(acpi, dw_i2c_acpi_match);



static const struct platform_device_id dw_i2c_platform_ids[] = {

	{ "i2c_designware" },

	{}
@@ -488,8 +486,8 @@ static struct platform_driver dw_i2c_driver = { 
	.remove_new = dw_i2c_plat_remove,

	.driver		= {

		.name	= "i2c_designware",

		.of_match_table = of_match_ptr(dw_i2c_of_match),

		.acpi_match_table = ACPI_PTR(dw_i2c_acpi_match),

		.of_match_table = dw_i2c_of_match,

		.acpi_match_table = dw_i2c_acpi_match,

		.pm	= pm_ptr(&dw_i2c_dev_pm_ops),

	},

	.id_table = dw_i2c_platform_ids,