Skip to content

Commit b7c3d07

Browse files
fancerwsakernel
authored andcommitted
i2c: designware: Move reg-space remapping into a dedicated function
This is a preparation patch before adding a quirk with custom registers map creation required for the Baikal-T1 System I2C support. Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Wolfram Sang <wsa@kernel.org>
1 parent fac25d7 commit b7c3d07

1 file changed

Lines changed: 13 additions & 5 deletions

File tree

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

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,15 @@ static void dw_i2c_plat_pm_cleanup(struct dw_i2c_dev *dev)
108108
pm_runtime_put_noidle(dev->dev);
109109
}
110110

111+
static int dw_i2c_plat_request_regs(struct dw_i2c_dev *dev)
112+
{
113+
struct platform_device *pdev = to_platform_device(dev->dev);
114+
115+
dev->base = devm_platform_ioremap_resource(pdev, 0);
116+
117+
return PTR_ERR_OR_ZERO(dev->base);
118+
}
119+
111120
static int dw_i2c_plat_probe(struct platform_device *pdev)
112121
{
113122
struct dw_i2c_platform_data *pdata = dev_get_platdata(&pdev->dev);
@@ -125,15 +134,14 @@ static int dw_i2c_plat_probe(struct platform_device *pdev)
125134
return -ENOMEM;
126135

127136
dev->flags = (uintptr_t)device_get_match_data(&pdev->dev);
128-
129-
dev->base = devm_platform_ioremap_resource(pdev, 0);
130-
if (IS_ERR(dev->base))
131-
return PTR_ERR(dev->base);
132-
133137
dev->dev = &pdev->dev;
134138
dev->irq = irq;
135139
platform_set_drvdata(pdev, dev);
136140

141+
ret = dw_i2c_plat_request_regs(dev);
142+
if (ret)
143+
return ret;
144+
137145
dev->rst = devm_reset_control_get_optional_exclusive(&pdev->dev, NULL);
138146
if (IS_ERR(dev->rst))
139147
return PTR_ERR(dev->rst);

0 commit comments

Comments
 (0)