Skip to content

Commit a6e690b

Browse files
andy-shevAndi Shyti
authored andcommitted
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>
1 parent 588e5a0 commit a6e690b

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -739,6 +739,8 @@ EXPORT_SYMBOL_GPL(i2c_dw_disable);
739739

740740
int i2c_dw_probe(struct dw_i2c_dev *dev)
741741
{
742+
device_set_node(&dev->adapter.dev, dev_fwnode(dev->dev));
743+
742744
switch (dev->mode) {
743745
case DW_IC_SLAVE:
744746
return i2c_dw_probe_slave(dev);

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
* Copyright (C) 2009 Provigent Ltd.
1010
* Copyright (C) 2011, 2015, 2016 Intel Corporation.
1111
*/
12-
#include <linux/acpi.h>
1312
#include <linux/delay.h>
1413
#include <linux/err.h>
1514
#include <linux/errno.h>
@@ -273,7 +272,6 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev,
273272
adap = &dev->adapter;
274273
adap->owner = THIS_MODULE;
275274
adap->class = 0;
276-
ACPI_COMPANION_SET(&adap->dev, ACPI_COMPANION(&pdev->dev));
277275
adap->nr = controller->bus_num;
278276

279277
r = i2c_dw_probe(dev);

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
* Copyright (C) 2007 MontaVista Software Inc.
99
* Copyright (C) 2009 Provigent Ltd.
1010
*/
11-
#include <linux/acpi.h>
1211
#include <linux/clk-provider.h>
1312
#include <linux/clk.h>
1413
#include <linux/delay.h>
@@ -279,8 +278,6 @@ static int dw_i2c_plat_probe(struct platform_device *pdev)
279278
adap->owner = THIS_MODULE;
280279
adap->class = dmi_check_system(dw_i2c_hwmon_class_dmi) ?
281280
I2C_CLASS_HWMON : I2C_CLASS_DEPRECATED;
282-
ACPI_COMPANION_SET(&adap->dev, ACPI_COMPANION(&pdev->dev));
283-
adap->dev.of_node = pdev->dev.of_node;
284281
adap->nr = -1;
285282

286283
if (dev->flags & ACCESS_NO_IRQ_SUSPEND) {

0 commit comments

Comments
 (0)