Revert "i2c: imx: Remove unused .id_table support"
Fabio Estevam
reviewerPATCH 1/1 Revert "i2c: imx: Remove unused .id_table support"
Coldfire platforms are non-DT users of this driver, so keep the .id_table support.
This reverts commit c610199cd392e6e2d41811ef83d85355c1b862b3.
Fixes c610199cd392 (i2c: imx: Remove unused .id_table support")
Reported-by Sascha Hauer <[email protected]>
Signed-off-by Fabio Estevam <[email protected]>
--- drivers/i2c/busses/i2c-imx.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)
drivers/i2c/busses/i2c-imx.c +19 -1
@@ -241,6 +241,19 @@ static struct imx_i2c_hwdata vf610_i2c_hwdata = { }; +static const struct platform_device_id imx_i2c_devtype[] = { + { + .name ="imx1-i2c" , + .driver_data = (kernel_ulong_t)&imx1_i2c_hwdata, + }, { + .name ="imx21-i2c" , + .driver_data = (kernel_ulong_t)&imx21_i2c_hwdata, + }, { +/* sentinel */ + } +}; +MODULE_DEVICE_TABLE (platform, imx_i2c_devtype); +static const struct of_device_id i2c_imx_dt_ids[] = { { .compatible ="fsl,imx1-i2c" , .data = &imx1_i2c_hwdata, }, { .compatible ="fsl,imx21-i2c" , .data = &imx21_i2c_hwdata, },
@@ -1330,7 +1343,11 @@ static int i2c_imx_probe(struct platform_device *pdev)return -ENOMEM ; match =device_get_match_data (&pdev->dev); - i2c_imx->hwdata = match; +if (match) + i2c_imx->hwdata = match; +else + i2c_imx->hwdata = (struct imx_i2c_hwdata *) +platform_get_device_id (pdev)->driver_data;/* Setup i2c_imx driver structure */ strlcpy (i2c_imx->adapter.name, pdev->name,sizeof (i2c_imx->adapter.name));
@@ -1498,6 +1515,7 @@ static struct platform_driver i2c_imx_driver = { .of_match_table = i2c_imx_dt_ids, .acpi_match_table = i2c_imx_acpi_ids, }, + .id_table = imx_i2c_devtype, };static int __init i2c_adap_imx_init (void )
Signature · 1 line
2.25.1
Wolfram Sang
AppliedQuoted 8 lines · Fabio Estevam
Coldfire platforms are non-DT users of this driver, so keep the .id_table support.
This reverts commit
c610199cd392e6e2d41811ef83d85355c1b862b3.Fixes c610199cd392 (i2c: imx: Remove unused .id_table support")Reported-by Sascha Hauer <[email protected]>Signed-off-by Fabio Estevam <[email protected]>
Applied to for-current, thanks! imx21 could be removed, though.