i2c: designware: Propagate firmware node

Propagate firmware node by using a specific API call, i.e. device_set_node().

Reviewed-by: Andi Shyti <andi.shyti@kernel.org>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Tested-by: Serge Semin <fancer.lancer@gmail.com>
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>

diff --git a/drivers/i2c/busses/i2c-designware-common.c b/drivers/i2c/busses/i2c-designware-common.c
index a6dbccd85565b05c6ebade1e4242f5e28ca58f95..080204182bb5ace8717af5cdbe050045e35be847 100644 (file)
--- a/drivers/i2c/busses/i2c-designware-common.c
+++ b/drivers/i2c/busses/i2c-designware-common.c
@@ -739,6 +739,8 @@ EXPORT_SYMBOL_GPL(i2c_dw_disable);
 
 int i2c_dw_probe(struct dw_i2c_dev *dev)
 {
+       device_set_node(&dev->adapter.dev, dev_fwnode(dev->dev));
+
        switch (dev->mode) {
        case DW_IC_SLAVE:
                return i2c_dw_probe_slave(dev);

diff --git a/drivers/i2c/busses/i2c-designware-pcidrv.c b/drivers/i2c/busses/i2c-designware-pcidrv.c
index 04377533f3ae0e4230e1a14845bbe8507a5e9597..64f7bd8c7fafb73a6735579205b29938f842286f 100644 (file)
--- a/drivers/i2c/busses/i2c-designware-pcidrv.c
+++ b/drivers/i2c/busses/i2c-designware-pcidrv.c
@@ -9,7 +9,6 @@
  * Copyright (C) 2009 Provigent Ltd.
  * Copyright (C) 2011, 2015, 2016 Intel Corporation.
  */
-#include <linux/acpi.h>
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
@@ -273,7 +272,6 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev,
        adap = &dev->adapter;
        adap->owner = THIS_MODULE;
        adap->class = 0;
-       ACPI_COMPANION_SET(&adap->dev, ACPI_COMPANION(&pdev->dev));
        adap->nr = controller->bus_num;
 
        r = i2c_dw_probe(dev);

diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
index 285ba4c1803ff4d775cf53d327efc629b9fd6ae4..2d0c7348e4917c5ace79c7b28591dfc9c321a11d 100644 (file)
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@ -8,7 +8,6 @@
  * Copyright (C) 2007 MontaVista Software Inc.
  * Copyright (C) 2009 Provigent Ltd.
  */
-#include <linux/acpi.h>
 #include <linux/clk-provider.h>
 #include <linux/clk.h>
 #include <linux/delay.h>
@@ -279,8 +278,6 @@ static int dw_i2c_plat_probe(struct platform_device *pdev)
        adap->owner = THIS_MODULE;
        adap->class = dmi_check_system(dw_i2c_hwmon_class_dmi) ?
                                        I2C_CLASS_HWMON : I2C_CLASS_DEPRECATED;
-       ACPI_COMPANION_SET(&adap->dev, ACPI_COMPANION(&pdev->dev));
-       adap->dev.of_node = pdev->dev.of_node;
        adap->nr = -1;
 
        if (dev->flags & ACCESS_NO_IRQ_SUSPEND) {