From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 2C58E215F4B; Wed, 4 Dec 2024 16:58:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733331505; cv=none; b=i0yd/FxMzpy980lijxrNV795gOHDX9nU3728+YIY/TXeMQxhgkI5g7cYU7uB2nfJlutqRgAsinKkpWydgyYlQir1e/i/9yOhRA0Zf7XNIeOPfYhWrD5MPyTHfmqAN7fsERNH/jgmygHgnrnmPCouTjImeivUPcxH9TY2kYmf224= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733331505; c=relaxed/simple; bh=VCQjoMTE9WmNOxmh4sZzq4/xmH7ZVxgr0NMQqzTKmCc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lBRHFyJUh+6/nV5ST0GLwPk9F/suCSoVIlX68PNZrpjP1rowqaWiG43AR3DvNCsur3Gdy2TbwbgnDBOGZUwHQEAmok7X32YbQg5RJZeNjFpcJG2+aeOIGjbld0CSTHPjv5v1Sp0IMuPziz6SYIY4sF1KQOHdIe+0FqoKLcVIq/s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kp02n1gd; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="kp02n1gd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ECBE3C4CEDF; Wed, 4 Dec 2024 16:58:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1733331504; bh=VCQjoMTE9WmNOxmh4sZzq4/xmH7ZVxgr0NMQqzTKmCc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kp02n1gdmVcVNEJaKbVscUqAB0rQ78fcl/0PCDMp/JSgFIvaKP4jGZn/ek2c7Gis3 rSUWZIeuhaXifqtbN9RW1emtZnv3cTyCjlJE0izgbpg9MVA7U4h3lDKFdMlCaGiTUV xzAiqHIDiE+uORbmc7Zq6BzHDowvTAgNXPbP5RbBKhJzGBOqeOIKn9y0wX3OPAiVv4 zQHW3OH2IDQfV05pRjDKpS7T1epEXGIXzQwE1RTAlDo1fG3xyn6lmTUN3+VI+gD6fh H84yyIidSuG3mMPP9Pc/ET7eKzMDfK9Sy2QSQG8HxM1fVDm92yfPp8z8SfN/cuX5KN 6oqpJ5Es90Sbg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Andre Przywara , Chen-Yu Tsai , Lee Jones , Sasha Levin Subject: [PATCH AUTOSEL 6.12 15/36] mfd: axp20x: Allow multiple regulators Date: Wed, 4 Dec 2024 10:45:31 -0500 Message-ID: <20241204154626.2211476-15-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241204154626.2211476-1-sashal@kernel.org> References: <20241204154626.2211476-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.12.1 Content-Transfer-Encoding: 8bit From: Andre Przywara [ Upstream commit e37ec32188701efa01455b9be42a392adab06ce4 ] At the moment trying to register a second AXP chip makes the probe fail, as some sysfs registration fails due to a duplicate name: ... [ 3.688215] axp20x-i2c 0-0035: AXP20X driver loaded [ 3.695610] axp20x-i2c 0-0036: AXP20x variant AXP323 found [ 3.706151] sysfs: cannot create duplicate filename '/bus/platform/devices/axp20x-regulator' [ 3.714718] CPU: 0 UID: 0 PID: 1 Comm: swapper/0 Not tainted 6.12.0-rc1-00026-g50bf2e2c079d-dirty #192 [ 3.724020] Hardware name: Avaota A1 (DT) [ 3.728029] Call trace: [ 3.730477] dump_backtrace+0x94/0xec [ 3.734146] show_stack+0x18/0x24 [ 3.737462] dump_stack_lvl+0x80/0xf4 [ 3.741128] dump_stack+0x18/0x24 [ 3.744444] sysfs_warn_dup+0x64/0x80 [ 3.748109] sysfs_do_create_link_sd+0xf0/0xf8 [ 3.752553] sysfs_create_link+0x20/0x40 [ 3.756476] bus_add_device+0x64/0x104 [ 3.760229] device_add+0x310/0x760 [ 3.763717] platform_device_add+0x10c/0x238 [ 3.767990] mfd_add_device+0x4ec/0x5c8 [ 3.771829] mfd_add_devices+0x88/0x11c [ 3.775666] axp20x_device_probe+0x70/0x184 [ 3.779851] axp20x_i2c_probe+0x9c/0xd8 ... This is because we use PLATFORM_DEVID_NONE for the mfd_add_devices() call, which would number the child devices in the same 0-based way, even for the second (or any other) instance. Use PLATFORM_DEVID_AUTO instead, which automatically assigns non-conflicting device numbers. Signed-off-by: Andre Przywara Reviewed-by: Chen-Yu Tsai Link: https://lore.kernel.org/r/20241007001408.27249-4-andre.przywara@arm.com Signed-off-by: Lee Jones Signed-off-by: Sasha Levin --- drivers/mfd/axp20x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c index 4051551757f2d..f438c5cb694ad 100644 --- a/drivers/mfd/axp20x.c +++ b/drivers/mfd/axp20x.c @@ -1419,7 +1419,7 @@ int axp20x_device_probe(struct axp20x_dev *axp20x) } } - ret = mfd_add_devices(axp20x->dev, -1, axp20x->cells, + ret = mfd_add_devices(axp20x->dev, PLATFORM_DEVID_AUTO, axp20x->cells, axp20x->nr_cells, NULL, 0, NULL); if (ret) { -- 2.43.0