[v5,20/24] i2c: designware: Propagate firmware node

Message ID	20231207141653.2785124-21-andriy.shevchenko@linux.intel.com
State	Accepted
Delegated to:	Andi Shyti
Headers	show Return-Path: <linux-i2c+bounces-667-incoming=patchwork.ozlabs.org@vger.kernel.org> From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> To: Mario Limonciello <mario.limonciello@amd.com>, Jarkko Nikula <jarkko.nikula@linux.intel.com>, Herbert Xu <herbert@gondor.apana.org.au>, Andy Shevchenko <andriy.shevchenko@linux.intel.com>, Wolfram Sang <wsa@kernel.org>, Andi Shyti <andi.shyti@kernel.org>, linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Mika Westerberg <mika.westerberg@linux.intel.com>, Jan Dabros <jsd@semihalf.com>, Philipp Zabel <p.zabel@pengutronix.de>, Serge Semin <fancer.lancer@gmail.com> Subject: [PATCH v5 20/24] i2c: designware: Propagate firmware node Date: Thu, 7 Dec 2023 16:14:00 +0200 Message-ID: <20231207141653.2785124-21-andriy.shevchenko@linux.intel.com> In-Reply-To: <20231207141653.2785124-1-andriy.shevchenko@linux.intel.com> References: <20231207141653.2785124-1-andriy.shevchenko@linux.intel.com> Precedence: bulk MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	i2c: designware: code consolidation & cleanups \| expand [v5,00/24] i2c: designware: code consolidation & cleanups [v5,01/24] i2c: designware: Fix PM calls order in dw_i2c_plat_probe() [v5,02/24] i2c: designware: Fix reset call order in dw_i2c_plat_probe() [v5,03/24] i2c: designware: Let PCI core to take care about interrupt vectors [v5,04/24] i2c: designware: Fix lock probe call order in dw_i2c_plat_probe() [v5,05/24] i2c: designware: Replace a while-loop by for-loop [v5,06/24] i2c: designware: Save pointer to semaphore callbacks instead of index [v5,07/24] i2c: designware: Add missing 'c' into PCI IDs variable name [v5,08/24] i2c: designware: Replace MODULE_ALIAS() with MODULE_DEVICE_TABLE() [v5,09/24] i2c: designware: Unify terminator in device ID tables [v5,10/24] i2c: designware: Always provide device ID tables [v5,11/24] i2c: designware: Drop return value from i2c_dw_acpi_configure() [v5,12/24] i2c: designware: Drop return value from dw_i2c_of_configure() [v5,13/24] i2c: designware: Rename dw_i2c_of_configure() -> i2c_dw_of_configure() [v5,14/24] i2c: designware: Consolidate firmware parsing and configuring code [v5,15/24] i2c: designware: Unify the firmware type checks [v5,16/24] i2c: designware: Move exports to I2C_DW namespaces [v5,17/24] i2c: designware: Remove ->disable() callback [v5,18/24] i2c: designware: Consolidate PM ops [v5,19/24] i2c: designware: Uninline i2c_dw_probe() [v5,20/24] i2c: designware: Propagate firmware node [v5,21/24] i2c: designware: Use pci_get_drvdata() [v5,22/24] i2c: designware: Use temporary variable for struct device [v5,23/24] i2c: designware: Get rid of redundant 'else' [v5,24/24] i2c: designware: Fix spelling and other issues in the comments

Message ID

20231207141653.2785124-21-andriy.shevchenko@linux.intel.com

State

Accepted

Delegated to:

Andi Shyti

Headers

From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Mario Limonciello <mario.limonciello@amd.com>,
	Jarkko Nikula <jarkko.nikula@linux.intel.com>,
	Herbert Xu <herbert@gondor.apana.org.au>,
	Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
	Wolfram Sang <wsa@kernel.org>,
	Andi Shyti <andi.shyti@kernel.org>,
	linux-i2c@vger.kernel.org,
	linux-kernel@vger.kernel.org
Cc: Mika Westerberg <mika.westerberg@linux.intel.com>,
	Jan Dabros <jsd@semihalf.com>,
	Philipp Zabel <p.zabel@pengutronix.de>,
	Serge Semin <fancer.lancer@gmail.com>
Subject: [PATCH v5 20/24] i2c: designware: Propagate firmware node
Date: Thu,  7 Dec 2023 16:14:00 +0200
Message-ID: <20231207141653.2785124-21-andriy.shevchenko@linux.intel.com>
In-Reply-To: <20231207141653.2785124-1-andriy.shevchenko@linux.intel.com>
References: <20231207141653.2785124-1-andriy.shevchenko@linux.intel.com>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Series

i2c: designware: code consolidation & cleanups | expand

Commit Message

Andy Shevchenko Dec. 7, 2023, 2:14 p.m. UTC

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

Reviewed-by: Andi Shyti <andi.shyti@kernel.org>
Tested-by: Serge Semin <fancer.lancer@gmail.com>
Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Link: https://lore.kernel.org/r/20231120144641.1660574-21-andriy.shevchenko@linux.intel.com
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/i2c/busses/i2c-designware-common.c  | 2 ++
 drivers/i2c/busses/i2c-designware-pcidrv.c  | 2 --
 drivers/i2c/busses/i2c-designware-platdrv.c | 3 ---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/i2c/busses/i2c-designware-common.c b/drivers/i2c/busses/i2c-designware-common.c
index 1d213bc0bbfa..45ced3354eef 100644
--- a/drivers/i2c/busses/i2c-designware-common.c
+++ b/drivers/i2c/busses/i2c-designware-common.c
@@ -716,6 +716,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 df47ba04c9ee..2c7bc7dc8e44 100644
--- 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 d9a64006a3d6..1b76f721bf81 100644
--- 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>
@@ -305,8 +304,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) {

[v5,20/24] i2c: designware: Propagate firmware node

Commit Message

Patch