Commit a6e690b0 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Andi Shyti

i2c: designware: Propagate firmware node

Propagate firmware node by using a specific API call, i.e. device_set_node().
Reviewed-by: default avatarAndi Shyti <andi.shyti@kernel.org>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Tested-by: default avatarSerge Semin <fancer.lancer@gmail.com>
Signed-off-by: default avatarAndi Shyti <andi.shyti@kernel.org>
parent 588e5a06
...@@ -739,6 +739,8 @@ EXPORT_SYMBOL_GPL(i2c_dw_disable); ...@@ -739,6 +739,8 @@ EXPORT_SYMBOL_GPL(i2c_dw_disable);
int i2c_dw_probe(struct dw_i2c_dev *dev) int i2c_dw_probe(struct dw_i2c_dev *dev)
{ {
device_set_node(&dev->adapter.dev, dev_fwnode(dev->dev));
switch (dev->mode) { switch (dev->mode) {
case DW_IC_SLAVE: case DW_IC_SLAVE:
return i2c_dw_probe_slave(dev); return i2c_dw_probe_slave(dev);
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
* Copyright (C) 2009 Provigent Ltd. * Copyright (C) 2009 Provigent Ltd.
* Copyright (C) 2011, 2015, 2016 Intel Corporation. * Copyright (C) 2011, 2015, 2016 Intel Corporation.
*/ */
#include <linux/acpi.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/errno.h> #include <linux/errno.h>
...@@ -273,7 +272,6 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev, ...@@ -273,7 +272,6 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev,
adap = &dev->adapter; adap = &dev->adapter;
adap->owner = THIS_MODULE; adap->owner = THIS_MODULE;
adap->class = 0; adap->class = 0;
ACPI_COMPANION_SET(&adap->dev, ACPI_COMPANION(&pdev->dev));
adap->nr = controller->bus_num; adap->nr = controller->bus_num;
r = i2c_dw_probe(dev); r = i2c_dw_probe(dev);
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
* Copyright (C) 2007 MontaVista Software Inc. * Copyright (C) 2007 MontaVista Software Inc.
* Copyright (C) 2009 Provigent Ltd. * Copyright (C) 2009 Provigent Ltd.
*/ */
#include <linux/acpi.h>
#include <linux/clk-provider.h> #include <linux/clk-provider.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/delay.h> #include <linux/delay.h>
...@@ -279,8 +278,6 @@ static int dw_i2c_plat_probe(struct platform_device *pdev) ...@@ -279,8 +278,6 @@ static int dw_i2c_plat_probe(struct platform_device *pdev)
adap->owner = THIS_MODULE; adap->owner = THIS_MODULE;
adap->class = dmi_check_system(dw_i2c_hwmon_class_dmi) ? adap->class = dmi_check_system(dw_i2c_hwmon_class_dmi) ?
I2C_CLASS_HWMON : I2C_CLASS_DEPRECATED; 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; adap->nr = -1;
if (dev->flags & ACCESS_NO_IRQ_SUSPEND) { if (dev->flags & ACCESS_NO_IRQ_SUSPEND) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment