| b.liu | e958203 | 2025-04-17 19:18:16 +0800 | [diff] [blame] | 1 | From: Russell King <rmk+kernel@armlinux.org.uk> |
| 2 | Bcc: linux@mail.armlinux.org.uk |
| 3 | Cc: linux-i2c@vger.kernel.org |
| 4 | Subject: [PATCH 09/17] i2c: pxa: move DT IDs along side platform IDs |
| 5 | MIME-Version: 1.0 |
| 6 | Content-Disposition: inline |
| 7 | Content-Transfer-Encoding: 8bit |
| 8 | Content-Type: text/plain; charset="utf-8" |
| 9 | |
| 10 | Move the ID tables into one place, near the device dependent data. |
| 11 | |
| 12 | Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> |
| 13 | --- |
| 14 | drivers/i2c/busses/i2c-pxa.c | 18 +++++++++--------- |
| 15 | 1 file changed, 9 insertions(+), 9 deletions(-) |
| 16 | |
| 17 | --- a/drivers/i2c/busses/i2c-pxa.c |
| 18 | +++ b/drivers/i2c/busses/i2c-pxa.c |
| 19 | @@ -200,6 +200,15 @@ static struct pxa_reg_layout pxa_reg_lay |
| 20 | }, |
| 21 | }; |
| 22 | |
| 23 | +static const struct of_device_id i2c_pxa_dt_ids[] = { |
| 24 | + { .compatible = "mrvl,pxa-i2c", .data = (void *)REGS_PXA2XX }, |
| 25 | + { .compatible = "mrvl,pwri2c", .data = (void *)REGS_PXA3XX }, |
| 26 | + { .compatible = "mrvl,mmp-twsi", .data = (void *)REGS_PXA910 }, |
| 27 | + { .compatible = "marvell,armada-3700-i2c", .data = (void *)REGS_A3700 }, |
| 28 | + {} |
| 29 | +}; |
| 30 | +MODULE_DEVICE_TABLE(of, i2c_pxa_dt_ids); |
| 31 | + |
| 32 | static const struct platform_device_id i2c_pxa_id_table[] = { |
| 33 | { "pxa2xx-i2c", REGS_PXA2XX }, |
| 34 | { "pxa3xx-pwri2c", REGS_PXA3XX }, |
| 35 | @@ -1178,15 +1187,6 @@ static const struct i2c_algorithm i2c_px |
| 36 | .functionality = i2c_pxa_functionality, |
| 37 | }; |
| 38 | |
| 39 | -static const struct of_device_id i2c_pxa_dt_ids[] = { |
| 40 | - { .compatible = "mrvl,pxa-i2c", .data = (void *)REGS_PXA2XX }, |
| 41 | - { .compatible = "mrvl,pwri2c", .data = (void *)REGS_PXA3XX }, |
| 42 | - { .compatible = "mrvl,mmp-twsi", .data = (void *)REGS_PXA910 }, |
| 43 | - { .compatible = "marvell,armada-3700-i2c", .data = (void *)REGS_A3700 }, |
| 44 | - {} |
| 45 | -}; |
| 46 | -MODULE_DEVICE_TABLE(of, i2c_pxa_dt_ids); |
| 47 | - |
| 48 | static int i2c_pxa_probe_dt(struct platform_device *pdev, struct pxa_i2c *i2c, |
| 49 | enum pxa_i2c_types *i2c_types) |
| 50 | { |