i2c: pxa: move DT IDs along side platform IDs

Move the ID tables into one place, near the device dependent data.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Wolfram Sang <wsa@kernel.org>

diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 9c811a0..902cda4 100644 (file)
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -199,6 +199,15 @@ static struct pxa_reg_layout pxa_reg_layout[] = {
        },
 };
 
+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 },
@@ -1230,15 +1239,6 @@ static const struct i2c_algorithm i2c_pxa_pio_algorithm = {
 #endif
 };
 
-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)
 {