| From: Russell King <rmk+kernel@armlinux.org.uk> |
| Bcc: linux@mail.armlinux.org.uk |
| Cc: linux-i2c@vger.kernel.org |
| Subject: [PATCH 09/17] i2c: pxa: move DT IDs along side platform IDs |
| MIME-Version: 1.0 |
| Content-Disposition: inline |
| Content-Transfer-Encoding: 8bit |
| Content-Type: text/plain; charset="utf-8" |
| |
| Move the ID tables into one place, near the device dependent data. |
| |
| Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> |
| --- |
| drivers/i2c/busses/i2c-pxa.c | 18 +++++++++--------- |
| 1 file changed, 9 insertions(+), 9 deletions(-) |
| |
| --- a/drivers/i2c/busses/i2c-pxa.c |
| +++ b/drivers/i2c/busses/i2c-pxa.c |
| @@ -200,6 +200,15 @@ static struct pxa_reg_layout pxa_reg_lay |
| }, |
| }; |
| |
| +static const struct of_device_id i2c_pxa_dt_ids[] = { |
| + { .compatible = "mrvl,pxa-i2c", .data = (void *)REGS_PXA2XX }, |
| + { .compatible = "mrvl,pwri2c", .data = (void *)REGS_PXA3XX }, |
| + { .compatible = "mrvl,mmp-twsi", .data = (void *)REGS_PXA910 }, |
| + { .compatible = "marvell,armada-3700-i2c", .data = (void *)REGS_A3700 }, |
| + {} |
| +}; |
| +MODULE_DEVICE_TABLE(of, i2c_pxa_dt_ids); |
| + |
| static const struct platform_device_id i2c_pxa_id_table[] = { |
| { "pxa2xx-i2c", REGS_PXA2XX }, |
| { "pxa3xx-pwri2c", REGS_PXA3XX }, |
| @@ -1178,15 +1187,6 @@ static const struct i2c_algorithm i2c_px |
| .functionality = i2c_pxa_functionality, |
| }; |
| |
| -static const struct of_device_id i2c_pxa_dt_ids[] = { |
| - { .compatible = "mrvl,pxa-i2c", .data = (void *)REGS_PXA2XX }, |
| - { .compatible = "mrvl,pwri2c", .data = (void *)REGS_PXA3XX }, |
| - { .compatible = "mrvl,mmp-twsi", .data = (void *)REGS_PXA910 }, |
| - { .compatible = "marvell,armada-3700-i2c", .data = (void *)REGS_A3700 }, |
| - {} |
| -}; |
| -MODULE_DEVICE_TABLE(of, i2c_pxa_dt_ids); |
| - |
| static int i2c_pxa_probe_dt(struct platform_device *pdev, struct pxa_i2c *i2c, |
| enum pxa_i2c_types *i2c_types) |
| { |