From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from PH8PR06CU001.outbound.protection.outlook.com (mail-westus3azon11012063.outbound.protection.outlook.com [40.107.209.63]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 04A722F25F5; Thu, 23 Apr 2026 08:59:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.209.63 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776934754; cv=fail; b=JE6l1dZS6FxrQN+nIu7itGf6s/+jnvUdV8P70vSkdS16SltNCHiXCTzFPZuDLdmjpWJlr/s1xedoxOv+fpRJTv8ln3eTyA3Y2t40WvtT0QUZS5A7JHDLAisDdAuej0GjIa5QqB+sQqFJWp8fMkr+vT8TUmSVfa0a8uieVYMfPJU= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776934754; c=relaxed/simple; bh=Cz7qjfne4Sdd1aoiZitknkA959TpN1hPUxgpQL9FHqQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=CgvQAZiPNJU/3LCJSAp39pfVc6ZQ7ih2wNxYwOMBEj2BGuAM9Ycir932iKMcQ8b46MTKKuQhP8nGXs0NJx5TBsHTXLPcaNfcGZXU0ojRfnOGZ36GXovkInlawlGlk9jfMa/LBC8U/Tgjw4aYa6U5RraRYQTCHuHqpaeFhfAJU24= ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=kHZabYLA; arc=fail smtp.client-ip=40.107.209.63 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="kHZabYLA" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=FvztL3n6QewUtNiAEdRMHR/FoRgTkXzAhpGvVz27QtHq87Q3bDwtjYE1+bmZzSqp5KVfHWzJUULMHn/J+aBo3q9O0QSxFUQszjKb+YcVml+k8beTtF7p5WMYwhjwAC1iEY/0JM+5wJDNgkl2TWLIiCU+zGeRSrzD14Wz/B6w/xxsTmCu/Tuqf6O5b1D+T4osEcvWNUF9YtsOUsWCkfeFeSxf4Or3NG+Yxs9Zsto6ZI91OmR9eoSgZlWGuIRjgLUOXnQT3inMhM4lFqjRAiKkjM1fjhZWmyqXhtCk8E6ghsQ58P0+bFrRjIZ8F/aSwp83SoMREH9Q6UUvR7GRlqer8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=cdJR/l7NuFumWPwb4nyp/FXVAJ1HR9ymMBiQPReyrCE=; b=VWvrUalPqpfkGIKQVAZqvPRYrnQyqn1CU5bSiu7dq6hPgJldJIazefxY90njkQEhTI7JVBWM/I7SSkeW0oF6HbGgexeERi5ika4e6uNfiFrI26/0sdiaxhEDrLNtwvWpfkLuOa4u7KofVrtiG4jONjNpdqgjcK4taEC8uNgQD5YPHzkJzcHTLsHkJz09ovcDIQkpprUhjmsFFUviMqUBiGHnSX38NkNllxREqxMxO7JJvDEQ3Lz8ks9xvVwoal86+5xcpHDsplqquv6UL7AMBqcdowTigXF7bU5hhNnzwmK0SEvDkR4JXqZVtJM7/XmvNPPkfSlY+8/dMPBPbOjsWQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=bootlin.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cdJR/l7NuFumWPwb4nyp/FXVAJ1HR9ymMBiQPReyrCE=; b=kHZabYLAE/0Q61oeUDZMeohB5d6QRGIr4PihBCPC+hSLKZ3cAUNfkz9xXHBUbzdaQJweaHzBeNf/fj1uj2Oz7hPbgz7Hhu6/OrFiUy4YZeELsWO9du3B5GZkJREGTTM2cM19WjzOCsVPX7njLHdwC7baW5l8vVEvVDrUwCOIwYkFQzwJRdxiy+DaULIhypurT8SBwubFREGOCjNtKyl7LWeOZ0rq8xAOCVBiB35ZiX27PAq5z+YYjQj1EpIr1Qz6DNCZtFilPB49QU+9XFy+MEAg0Nqz+KNrA5AunkigTkv1kkFKKoBeFVwYWTgNksVmyM3ztB5RPOAW+2yUoq1HyQ== Received: from BYAPR05CA0072.namprd05.prod.outlook.com (2603:10b6:a03:74::49) by CH8PR12MB9767.namprd12.prod.outlook.com (2603:10b6:610:275::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9846.22; Thu, 23 Apr 2026 08:59:02 +0000 Received: from CO1PEPF000075F2.namprd03.prod.outlook.com (2603:10b6:a03:74:cafe::17) by BYAPR05CA0072.outlook.office365.com (2603:10b6:a03:74::49) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9846.20 via Frontend Transport; Thu, 23 Apr 2026 08:59:02 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CO1PEPF000075F2.mail.protection.outlook.com (10.167.249.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9846.18 via Frontend Transport; Thu, 23 Apr 2026 08:59:01 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Thu, 23 Apr 2026 01:58:38 -0700 Received: from rnnvmail202.nvidia.com (10.129.68.7) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Thu, 23 Apr 2026 01:58:38 -0700 Received: from BUILDSERVER-IO-L4T.nvidia.com (10.127.8.9) by mail.nvidia.com (10.129.68.7) with Microsoft SMTP Server id 15.2.2562.20 via Frontend Transport; Thu, 23 Apr 2026 01:58:29 -0700 From: Akhil R To: Alexandre Belloni , Frank Li , Rob Herring , Krzysztof Kozlowski , Conor Dooley , "Rafael J . Wysocki" , Saket Dumbre , "Len Brown" , Guenter Roeck , Philipp Zabel , Bjorn Andersson , Geert Uytterhoeven , Dmitry Baryshkov , Arnd Bergmann , "Eric Biggers" , Wolfram Sang , Miquel Raynal , Jon Hunter , "Thierry Reding" , , , , , , , CC: Akhil R Subject: [PATCH v3 03/13] i3c: master: Use unified device property interface Date: Thu, 23 Apr 2026 14:27:02 +0530 Message-ID: <20260423085718.70762-4-akhilrajeev@nvidia.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260423085718.70762-1-akhilrajeev@nvidia.com> References: <20260423085718.70762-1-akhilrajeev@nvidia.com> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NVConfidentiality: public Content-Transfer-Encoding: 8bit Content-Type: text/plain X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000075F2:EE_|CH8PR12MB9767:EE_ X-MS-Office365-Filtering-Correlation-Id: b7e22a13-9400-4393-3bde-08dea1169034 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|82310400026|376014|7416014|36860700016|921020|18002099003|22082099003|56012099003; X-Microsoft-Antispam-Message-Info: 7cm9xnxtx3lIzPnw/2cBNjqVHlfeNHdUFmQPjXoET0fSii/QlFcRPQY2sa2eg9ocKrLDZXpY58eEO0oviY4KmdZ3Mi+5Vqy5SU12oV3r30PwEmV8p+fZzrDXnANbH/Tpx6eesT61oLd/reqpFdztzKS5GeYLeQMKAbSfPhVKqER69dV45oA//3hXDRxYC4+SqM4E8kpdU7q09cSu2oOGYpMB007fsr3Y5sqamlG1TtNqovFbqm9Iz7eabdqMDYGKEO2l7kK2i9amTj9+UMvApnaeZUK5sIQOpLri0OOFBitos8FFx0ZdQeHF4v30oQiR+kjlXnm9JVf7eDTXaOC4VnxURGGG+0xmL6v7xHKX7BM79PEP4mW9N0/BKBJW9xcxHZAobHfOg2FAHsfWxrhCXUVDu7CxaLd23dkrKCO3ql78ftu+Q57o46r5NeFHbV9dfuLHi21Ke35C6tJl2L2FKbObwL0zMS8mdalPGa+HYWWu7TWVxfqv0AS9q1LD9Q/41wuRBSOX6Ex6RaHdeO/tVOXO2s14GG+SGODloL0AnXXn8WhkQOdUX8jVnvvdVlWwt6FO0FzkeUfSPdebjWYZstnszcloUzYjPu6sW8EAS5cQuttYf3O32uvKQqFG5Uv7U4zulqKDJMQ902w2O3w3sMJh3yl121al1dsHUwBTD0QEw5/bNGGEKuOAmy7j5ScT6YepOZ/6PpA0mLb5CVshRywp8JrGtsKRWMjIcSrqfGSdeTDrmuSQn7268JbmZou2Fq06fn/Mkoy3b5Zhm12dxXWAVuf2/NzhEL5NSR5yTORT7HejME15WaPxm9ONZ1r9 X-Forefront-Antispam-Report: CIP:216.228.117.160;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge1.nvidia.com;CAT:NONE;SFS:(13230040)(1800799024)(82310400026)(376014)(7416014)(36860700016)(921020)(18002099003)(22082099003)(56012099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NordSlb6fRuSNzoI0ZH35xEMfbvazt380K6CDjvUgmP4g5j5EJtbw6I9oIEjAQz1KhH8/WWsC4awr3O/PkLBitcmSGy1SvEzJ44jZhwQfO9DsTKbDo/QS7n5ozHZI1S9LVAzGsesyahr29qmB7N2i06mqpM1k9Jn3LfmxJZ8Ke1ilhpF4tUvSyhfF8aCjKJ4hP25/Bh399kFGMcX14qssy12R8kS5FfkSrS3g/DaeUpta96wWIr6RkrBiUA9VFpV2PEgNJFERwJ3Mo12e9x4ada3KLHNYJli5P301aJAQOLu2P6ghGNdJNegyAth5PIGVFZjG73dMpcVhPzVA1lqipT70wfJe3ExVYl4GmMNXx1W67fjhtUQ9bW+OWpDUhYnYmydNgvnF/ltwFFpXzJVq/wcYLJEY2HdY0/Vd0T5fn9R8pHjsreVKwOqAzC333DX X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Apr 2026 08:59:01.2472 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b7e22a13-9400-4393-3bde-08dea1169034 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000075F2.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH8PR12MB9767 Replace all OF-specific functions with unified device property functions as a prerequisite to support both ACPI and device tree. Reviewed-by: Frank Li Signed-off-by: Akhil R --- drivers/i3c/master.c | 77 +++++++++++++++++++++----------------- include/linux/i3c/master.h | 5 ++- 2 files changed, 46 insertions(+), 36 deletions(-) diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c index 5cd4e5da2233..d0677061faab 100644 --- a/drivers/i3c/master.c +++ b/drivers/i3c/master.c @@ -11,10 +11,12 @@ #include #include #include +#include #include #include #include #include +#include #include #include #include @@ -497,7 +499,7 @@ static void i3c_bus_cleanup(struct i3c_bus *i3cbus) mutex_unlock(&i3c_core_lock); } -static int i3c_bus_init(struct i3c_bus *i3cbus, struct device_node *np) +static int i3c_bus_init(struct i3c_bus *i3cbus, struct fwnode_handle *fwnode) { int ret, start, end, id = -1; @@ -507,8 +509,8 @@ static int i3c_bus_init(struct i3c_bus *i3cbus, struct device_node *np) i3c_bus_init_addrslots(i3cbus); i3cbus->mode = I3C_BUS_MODE_PURE; - if (np) - id = of_alias_get_id(np, "i3c"); + if (fwnode && is_of_node(fwnode)) + id = of_alias_get_id(to_of_node(fwnode), "i3c"); mutex_lock(&i3c_core_lock); if (id >= 0) { @@ -811,7 +813,7 @@ static void i3c_masterdev_release(struct device *dev) WARN_ON(!list_empty(&bus->devs.i2c) || !list_empty(&bus->devs.i3c)); i3c_bus_cleanup(bus); - of_node_put(dev->of_node); + fwnode_handle_put(dev->fwnode); } static const struct device_type i3c_masterdev_type = { @@ -993,7 +995,7 @@ static void i3c_device_release(struct device *dev) WARN_ON(i3cdev->desc); - of_node_put(i3cdev->dev.of_node); + fwnode_handle_put(dev->fwnode); kfree(i3cdev); } @@ -1789,7 +1791,7 @@ i3c_master_register_new_i3c_devs(struct i3c_master_controller *master) desc->info.pid); if (desc->boardinfo) - desc->dev->dev.of_node = desc->boardinfo->of_node; + device_set_node(&desc->dev->dev, desc->boardinfo->fwnode); ret = device_register(&desc->dev->dev); if (ret) { @@ -2408,8 +2410,8 @@ EXPORT_SYMBOL_GPL(i3c_master_add_i3c_dev_locked); #define OF_I3C_REG1_IS_I2C_DEV BIT(31) static int -of_i3c_master_add_i2c_boardinfo(struct i3c_master_controller *master, - struct device_node *node, u32 *reg) +i3c_master_add_i2c_boardinfo(struct i3c_master_controller *master, + struct fwnode_handle *fwnode, u32 *reg) { struct i2c_dev_boardinfo *boardinfo; struct device *dev = &master->dev; @@ -2419,9 +2421,13 @@ of_i3c_master_add_i2c_boardinfo(struct i3c_master_controller *master, if (!boardinfo) return -ENOMEM; - ret = of_i2c_get_board_info(dev, node, &boardinfo->base); - if (ret) - return ret; + if (is_of_node(fwnode)) { + ret = of_i2c_get_board_info(dev, to_of_node(fwnode), &boardinfo->base); + if (ret) + return ret; + } else { + return -EINVAL; + } /* * The I3C Specification does not clearly say I2C devices with 10-bit @@ -2437,14 +2443,14 @@ of_i3c_master_add_i2c_boardinfo(struct i3c_master_controller *master, boardinfo->lvr = reg[2]; list_add_tail(&boardinfo->node, &master->boardinfo.i2c); - of_node_get(node); + fwnode_handle_get(fwnode); return 0; } static int -of_i3c_master_add_i3c_boardinfo(struct i3c_master_controller *master, - struct device_node *node, u32 *reg) +i3c_master_add_i3c_boardinfo(struct i3c_master_controller *master, + struct fwnode_handle *fwnode, u32 *reg) { struct i3c_dev_boardinfo *boardinfo; struct device *dev = &master->dev; @@ -2467,7 +2473,7 @@ of_i3c_master_add_i3c_boardinfo(struct i3c_master_controller *master, boardinfo->static_addr = reg[0]; - if (!of_property_read_u32(node, "assigned-address", &init_dyn_addr)) { + if (!fwnode_property_read_u32(fwnode, "assigned-address", &init_dyn_addr)) { if (init_dyn_addr > I3C_MAX_ADDR) return -EINVAL; @@ -2484,14 +2490,14 @@ of_i3c_master_add_i3c_boardinfo(struct i3c_master_controller *master, return -EINVAL; boardinfo->init_dyn_addr = init_dyn_addr; - boardinfo->of_node = of_node_get(node); + boardinfo->fwnode = fwnode_handle_get(fwnode); list_add_tail(&boardinfo->node, &master->boardinfo.i3c); return 0; } -static int of_i3c_master_add_dev(struct i3c_master_controller *master, - struct device_node *node) +static int i3c_master_add_dev(struct i3c_master_controller *master, + struct fwnode_handle *fwnode) { u32 reg[3]; int ret; @@ -2499,7 +2505,7 @@ static int of_i3c_master_add_dev(struct i3c_master_controller *master, if (!master) return -EINVAL; - ret = of_property_read_u32_array(node, "reg", reg, ARRAY_SIZE(reg)); + ret = fwnode_property_read_u32_array(fwnode, "reg", reg, ARRAY_SIZE(reg)); if (ret) return ret; @@ -2508,25 +2514,25 @@ static int of_i3c_master_add_dev(struct i3c_master_controller *master, * dealing with an I2C device. */ if (!reg[1]) - ret = of_i3c_master_add_i2c_boardinfo(master, node, reg); + ret = i3c_master_add_i2c_boardinfo(master, fwnode, reg); else - ret = of_i3c_master_add_i3c_boardinfo(master, node, reg); + ret = i3c_master_add_i3c_boardinfo(master, fwnode, reg); return ret; } -static int of_populate_i3c_bus(struct i3c_master_controller *master) +static int fwnode_populate_i3c_bus(struct i3c_master_controller *master) { struct device *dev = &master->dev; - struct device_node *i3cbus_np = dev->of_node; + struct fwnode_handle *fwnode = dev_fwnode(dev); int ret; u32 val; - if (!i3cbus_np) + if (!fwnode) return 0; - for_each_available_child_of_node_scoped(i3cbus_np, node) { - ret = of_i3c_master_add_dev(master, node); + fwnode_for_each_available_child_node_scoped(fwnode, child) { + ret = i3c_master_add_dev(master, child); if (ret) return ret; } @@ -2536,10 +2542,10 @@ static int of_populate_i3c_bus(struct i3c_master_controller *master) * on the bus are not supporting typical rates, or if the bus topology * prevents it from using max possible rate. */ - if (!of_property_read_u32(i3cbus_np, "i2c-scl-hz", &val)) + if (!device_property_read_u32(dev, "i2c-scl-hz", &val)) master->bus.scl_rate.i2c = val; - if (!of_property_read_u32(i3cbus_np, "i3c-scl-hz", &val)) + if (!device_property_read_u32(dev, "i3c-scl-hz", &val)) master->bus.scl_rate.i3c = val; return 0; @@ -2594,7 +2600,7 @@ static u8 i3c_master_i2c_get_lvr(struct i2c_client *client) u8 lvr = I3C_LVR_I2C_INDEX(2) | I3C_LVR_I2C_FM_MODE; u32 reg[3]; - if (!of_property_read_u32_array(client->dev.of_node, "reg", reg, ARRAY_SIZE(reg))) + if (!fwnode_property_read_u32_array(client->dev.fwnode, "reg", reg, ARRAY_SIZE(reg))) lvr = reg[2]; return lvr; @@ -2713,7 +2719,8 @@ static int i3c_master_i2c_adapter_init(struct i3c_master_controller *master) struct i2c_adapter *adap = i3c_master_to_i2c_adapter(master); struct i2c_dev_desc *i2cdev; struct i2c_dev_boardinfo *i2cboardinfo; - int ret, id; + struct fwnode_handle *fwnode = dev_fwnode(&master->dev); + int ret, id = -1; adap->dev.parent = master->dev.parent; adap->owner = master->dev.parent->driver->owner; @@ -2722,7 +2729,9 @@ static int i3c_master_i2c_adapter_init(struct i3c_master_controller *master) adap->timeout = HZ; adap->retries = 3; - id = of_alias_get_id(master->dev.of_node, "i2c"); + if (fwnode && is_of_node(fwnode)) + id = of_alias_get_id(to_of_node(fwnode), "i2c"); + if (id >= 0) { adap->nr = id; ret = i2c_add_numbered_adapter(adap); @@ -3023,7 +3032,7 @@ int i3c_master_register(struct i3c_master_controller *master, return ret; master->dev.parent = parent; - master->dev.of_node = of_node_get(parent->of_node); + device_set_node(&master->dev, fwnode_handle_get(dev_fwnode(parent))); master->dev.bus = &i3c_bus_type; master->dev.type = &i3c_masterdev_type; master->dev.release = i3c_masterdev_release; @@ -3042,13 +3051,13 @@ int i3c_master_register(struct i3c_master_controller *master, master->dev.coherent_dma_mask = parent->coherent_dma_mask; master->dev.dma_parms = parent->dma_parms; - ret = i3c_bus_init(i3cbus, master->dev.of_node); + ret = i3c_bus_init(i3cbus, dev_fwnode(&master->dev)); if (ret) goto err_put_dev; dev_set_name(&master->dev, "i3c-%d", i3cbus->id); - ret = of_populate_i3c_bus(master); + ret = fwnode_populate_i3c_bus(master); if (ret) goto err_put_dev; diff --git a/include/linux/i3c/master.h b/include/linux/i3c/master.h index 592b646f6134..6b03a3ce574c 100644 --- a/include/linux/i3c/master.h +++ b/include/linux/i3c/master.h @@ -177,7 +177,8 @@ struct i3c_device_ibi_info { * @pid: I3C Provisioned ID exposed by the device. This is a unique identifier * that may be used to attach boardinfo to i3c_dev_desc when the device * does not have a static address - * @of_node: optional DT node in case the device has been described in the DT + * @fwnode: Firmware node (DT or ACPI) in case the device has been + * described in firmware * * This structure is used to attach board-level information to an I3C device. * Not all I3C devices connected on the bus will have a boardinfo. It's only @@ -189,7 +190,7 @@ struct i3c_dev_boardinfo { u8 init_dyn_addr; u8 static_addr; u64 pid; - struct device_node *of_node; + struct fwnode_handle *fwnode; }; /** -- 2.50.1