From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A93F742A7AB for ; Fri, 17 Jul 2026 14:32:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784298725; cv=none; b=pIukQiYr+iV8qcEHB49Zc1dydsg/X7tMlPuNkvMuuEH87NhMyov5StBh5W1KhxCriuFGW0YgSZh7vnDc6Ck4DDg9mlrxSaJ9cjnStmKexZ4e688Z3S6YcA/iiyajHSTPCWb/cvPIIzGtD0s0hUt1N2hsXkIB7Hoiua6wGuP67tI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784298725; c=relaxed/simple; bh=emDMT9NIkUOn9WbfqG2lTPmNFmGjyQ6ZUvObpV0fse4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WXt8BvFNp2y62cdoPsYF86YN0+SbzdEus6WI8jAnEHBc35hM5DO2HNkNrKfkvPp9Hu85lC9NyuxHdbXKmQI0svuCULCR19t3YhWuS8R7yZKJfo4+wRfSCx5BfE9UuGDo//jqEA6UkoWCPEQdLvkpJ6bvrBRjjKpujFIMxtRw3Ck= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre.com header.i=@baylibre.com header.b=iKM6R/Do; arc=none smtp.client-ip=209.85.221.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre.com header.i=@baylibre.com header.b="iKM6R/Do" Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-47d70879764so5720306f8f.2 for ; Fri, 17 Jul 2026 07:32:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre.com; s=google; t=1784298722; x=1784903522; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=JbFe/xqqWwVO7S5FZ/SPGOsIDhaRTrMUwAwwo3v1d3c=; b=iKM6R/Do/+kyRGSsm6qy7Eku0FDMs0JsBMzTo6JnD/uz7WBlp5uVeGovLcAWOGkzEo Z+fTJj/saafVQiwIU6hTmdEsY4Tx33SOWMdmgZ5CTWkYSPgBCXfUVttyJtPJfjYwBrtu SEDcrULRfgBRevigjudB2jfW7hjUBg0N3bHOhDN2dkIk4/RhCvlSW9n9gN1SVz/eEq94 qrXbYdnsiDlYDFiIlfWiLiotzhfbxxQ3KxKZPSmMB/xuPFrkNO6RwVubn7BzzM5xKtUM TjthYsq7ckw3/WlXEwcIJgauk5sowKPXqZRn8U23aE1OOpNUPDXXPlyfkjbYmToLGw4N Qnhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784298722; x=1784903522; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=JbFe/xqqWwVO7S5FZ/SPGOsIDhaRTrMUwAwwo3v1d3c=; b=Fyf714JKbPDs42F1tax1eXGZFpSLLSeGFTK2edJJ0yuEJsCwpoSy1HfhGU6pEOVion rlJ2b1cVRQxnPiyYaydyIsKXcYMZW8fbiPwvLK+n+J9O5EgfCwBbyr67WlvClfbbCGza /8sywwFcEtbu9+S0syFhzJXfgZ/Ow14jQyfhgqMlgDORe5GvGX7+KHo6lsx9dUiloLwq wN4u/yE0OXBPB/ZpuJS67t2BcDgkUeyoGTvVdLfhV4/2UiX1+guJQR++m/c3wLA0nRM/ ZUmwHBDZYwTUULmUrzmXEpJrgjEyzfBVK9J1tPiS8c4H0ddCMf/5ZApiAqKVRokYvMJK UabA== X-Forwarded-Encrypted: i=1; AHgh+RpXPPlpvsjRt5yPD8nby78zYhiGfDm6uguLnHvNCbtyDh8VAPmvuADiCD2W5SUMBEB4M9FsfQzy0f0ypos=@vger.kernel.org X-Gm-Message-State: AOJu0YxQFBNj7ec0QW77IqVASDCBldXQYMaPCBRsoVS2xI9KBixxvvX+ 3S6M+JjGxESJ/r5qq8j2O+G4AwIHGb17h6Qu6PBYwh9Dxn4VXT3Lo4UcE1qfRRBx9qw= X-Gm-Gg: AfdE7ckuPwls/VY7krMihDsNjwJri85QwQNLnudNNlaI//ZaCoIvc6JWUrrbn9W7Oum RyhzDQ1R3O0xdd/LtkNKFxA58DKZRFn4GyjhiiqaMJ9uuSj+C/1UCac5RNQr5UYjVkQe9NJhe7w 8XdbPbtdUqtpVJRgePRAEpuHs1eZ24sDoqojhppkztYG/57tGJ81D1h71SYQVZMluRxijTuMKrE y1yN1wgfYfvEkO3hjZ0i3I+Q2sgJzrTHmcdITnOia8AsaYUMFM1YmYcw54BNLYQYGgMK5QudDlD 56OoUG2ul95wJFyo+A7VYHdFGlttM1dZuUQe35sGyMjQXKL7pkLhnt1CchcIp/dz9C65zecHaDc rFOqFbjb0MQg8oxxuVyvwsEQZDhyAcqACG4BJ0YNh/r5e10GJ9uV2fp26BoN0tsKikd+W6Jnhkz Mr X-Received: by 2002:a05:600c:1509:b0:494:6baa:ccef with SMTP id 5b1f17b1804b1-4954a3dcaa5mr21904115e9.11.1784298721998; Fri, 17 Jul 2026 07:32:01 -0700 (PDT) Received: from localhost ([2a01:e0a:3c5:5fb1:8e22:8a15:f33f:dc60]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-47f63ee9281sm4815844f8f.36.2026.07.17.07.32.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2026 07:32:01 -0700 (PDT) From: Jerome Brunet Date: Fri, 17 Jul 2026 16:31:26 +0200 Subject: [PATCH v4 4/5] mfd: axp20x-i2c: Fix i2c instantiation Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260717-axp318-regulator-v4-4-50aff97084dd@baylibre.com> References: <20260717-axp318-regulator-v4-0-50aff97084dd@baylibre.com> In-Reply-To: <20260717-axp318-regulator-v4-0-50aff97084dd@baylibre.com> To: Andre Przywara , Lee Jones , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Chen-Yu Tsai , Liam Girdwood , Mark Brown Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sashiko , Jerome Brunet X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3202; i=jbrunet@baylibre.com; h=from:subject:message-id; bh=emDMT9NIkUOn9WbfqG2lTPmNFmGjyQ6ZUvObpV0fse4=; b=owEBbQKS/ZANAwAKAeb8Dxw38tqFAcsmYgBqWjzReCRYZxUGT43zb0ThRQ5oxtrJNQwDM6D86 e6witjKCFCJAjMEAAEKAB0WIQT04VmuGPP1bV8btxvm/A8cN/LahQUCalo80QAKCRDm/A8cN/La hRCeD/9mtk/YuSR0N3RlnumgDn7oIem0X4A1ex7l6FOWE03Xm5vI3XhccX4SnKOU7SkSZ+YUOE8 fXGGUE1Og00+sEsOeBCU5oBBui9Z6M2wmS+vVmWd5GWe4TXd3lrXCl5MWgtUnorDR4qfaNXJjY1 zVO3f47Veh+n/rVrt/KqWNn3Zy+xyIikVhM31DUIO5zXCHhy3F95LUI47FwJGTXyNI4XwEt0Jdk yNFaW4iUtlQLP3lTEchV14siGAqEBe4guTVY2YjFcAg1YqVyLyyG2hGZd1T9Qj9MxqD2PKVJXeT mniBD6oG3NZ8ijrqVa+WTz/qQu7q7ZHao9ZsQksWdxYfDH4TkkIuKloqAXa0/eSVAyRRukRX7ml 8XXP8HX/xvzrqWSOC2zv8/9z0h/wZHlnoLwBCV0Co0lD3VbdigmV3PwzbV0USqFFjaMx4A/edvS l+9EgX02ly6v+x3GQ1ohWU6f0Ntxd9rvSL/eoRX1GGd+dJWoa9QN0g6SYIHOmzNn+1XPjOhCS6I IUArsPZQ9qF6Ggkp5hiCKWv0tJxf9eVQd//sf7hyZi8rywdHZXclqo1h67z+x3bxu3PlPuTzi7W 27APUSh0gZsutOeVlJc2VpUYVWueBVZhJt7h1nNoyV1TG7OYTc9GTHyPhMokZRzQthI8MdvauKO dQ5jqSS/MAlXVUQ== X-Developer-Key: i=jbrunet@baylibre.com; a=openpgp; fpr=F29F26CF27BAE1A9719AE6BDC3C92AAF3E60AED9 Apparently this device never really supported i2c instantiation via sysfs, because the driver does not even look at the i2c driver, which are not set. It would only probe if the device matched through DT. Fix that for correctness, even-though it is probably useless. Add the missing AXP323 while at it. Reported-by: Sashiko Closes: https://lore.kernel.org/r/20260717090209.2A09B1F000E9@smtp.kernel.org Fixes: 41751b033aaa ("mfd: axp20x-i2c: Add i2c-ids to fix module auto-loading") Signed-off-by: Jerome Brunet --- drivers/mfd/axp20x-i2c.c | 26 ++++++++++++++------------ drivers/mfd/axp20x-rsb.c | 1 + drivers/mfd/axp20x.c | 1 - 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/drivers/mfd/axp20x-i2c.c b/drivers/mfd/axp20x-i2c.c index 4e4ebfc78525..64c212b76e5e 100644 --- a/drivers/mfd/axp20x-i2c.c +++ b/drivers/mfd/axp20x-i2c.c @@ -35,6 +35,7 @@ static int axp20x_i2c_probe(struct i2c_client *i2c) axp20x->irq = i2c->irq; dev_set_drvdata(axp20x->dev, axp20x); + axp20x->variant = (kernel_ulong_t)i2c_get_match_data(i2c); ret = axp20x_match_device(axp20x); if (ret) return ret; @@ -77,18 +78,19 @@ MODULE_DEVICE_TABLE(of, axp20x_i2c_of_match); #endif static const struct i2c_device_id axp20x_i2c_id[] = { - { "axp152" }, - { "axp192" }, - { "axp202" }, - { "axp209" }, - { "axp221" }, - { "axp223" }, - { "axp313a" }, - { "axp318w" }, - { "axp717" }, - { "axp803" }, - { "axp806" }, - { "axp15060" }, + { .name = "axp152", .driver_data = AXP152_ID }, + { .name = "axp192", .driver_data = AXP192_ID }, + { .name = "axp202", .driver_data = AXP202_ID }, + { .name = "axp209", .driver_data = AXP209_ID }, + { .name = "axp221", .driver_data = AXP221_ID }, + { .name = "axp223", .driver_data = AXP223_ID }, + { .name = "axp313a", .driver_data = AXP313A_ID }, + { .name = "axp318w", .driver_data = AXP318_ID }, + { .name = "axp323", .driver_data = AXP323_ID }, + { .name = "axp717", .driver_data = AXP717_ID }, + { .name = "axp803", .driver_data = AXP803_ID }, + { .name = "axp806", .driver_data = AXP806_ID }, + { .name = "axp15060", .driver_data = AXP15060_ID }, { } }; MODULE_DEVICE_TABLE(i2c, axp20x_i2c_id); diff --git a/drivers/mfd/axp20x-rsb.c b/drivers/mfd/axp20x-rsb.c index 059656f2a1bd..8fdc870c1fe4 100644 --- a/drivers/mfd/axp20x-rsb.c +++ b/drivers/mfd/axp20x-rsb.c @@ -35,6 +35,7 @@ static int axp20x_rsb_probe(struct sunxi_rsb_device *rdev) axp20x->irq = rdev->irq; dev_set_drvdata(&rdev->dev, axp20x); + axp20x->variant = (kernel_ulong_t)device_get_match_data(axp20x->dev); ret = axp20x_match_device(axp20x); if (ret) return ret; diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c index 2bbe73afff43..25509e47bedc 100644 --- a/drivers/mfd/axp20x.c +++ b/drivers/mfd/axp20x.c @@ -1339,7 +1339,6 @@ int axp20x_match_device(struct axp20x_dev *axp20x) const struct mfd_cell *cells_no_irq = NULL; int nr_cells_no_irq = 0; - axp20x->variant = (long)device_get_match_data(dev); switch (axp20x->variant) { case AXP152_ID: axp20x->nr_cells = ARRAY_SIZE(axp152_cells); -- 2.47.3