DW I2C driver tries to register a clk from id->driver_data as an alternative way besides intel lpss. But code doesn't register the clk to clkdev. So, devm_clk_get will fail during probe.
The patch can fix this issue. Signed-off-by: Ken Xue <[email protected]> Signed-off-by: Xiangliang Yu <[email protected]> Cc: [email protected] --- drivers/i2c/busses/i2c-designware-platdrv.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c index 3dd2de3..9ee1fc6 100644 --- a/drivers/i2c/busses/i2c-designware-platdrv.c +++ b/drivers/i2c/busses/i2c-designware-platdrv.c @@ -27,6 +27,7 @@ #include <linux/i2c.h> #include <linux/clk.h> #include <linux/clk-provider.h> +#include <linux/clkdev.h> #include <linux/errno.h> #include <linux/sched.h> #include <linux/err.h> @@ -78,6 +79,7 @@ static int dw_i2c_acpi_configure(struct platform_device *pdev) { struct dw_i2c_dev *dev = platform_get_drvdata(pdev); const struct acpi_device_id *id; + struct clk *clk; dev->adapter.nr = -1; dev->tx_fifo_depth = 32; @@ -97,9 +99,11 @@ static int dw_i2c_acpi_configure(struct platform_device *pdev) * id->driver_data. */ id = acpi_match_device(pdev->dev.driver->acpi_match_table, &pdev->dev); - if (id && id->driver_data) - clk_register_fixed_rate(&pdev->dev, dev_name(&pdev->dev), NULL, - CLK_IS_ROOT, id->driver_data); + if (id && id->driver_data) { + clk = clk_register_fixed_rate(&pdev->dev, dev_name(&pdev->dev), + NULL, CLK_IS_ROOT, id->driver_data); + clk_register_clkdev(clk, NULL, dev_name(&pdev->dev)); + } return 0; } -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
