From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 014322EEE75; Wed, 14 Oct 2026 10:48:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791974889; cv=none; b=gCu1Nm1x31NlBR3RQ1u5lFtrj92iIyfS2zNsBRAyp4r8Q+5Z51+QmyVZQdfx+wp0IIQJ+h7BEAHJ3ymYtB3J+JCXZ06hJ+A9q6rQgehhuO0Z+9btU/IQXmED7p3AZ01bOL9s/8XykhebVLVTrOxeNJCeYU9GrSIsRRye3nc2FfA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791974889; c=relaxed/simple; bh=GVCpDbrRjbZ4Pi/31sCr9DOZ+YzuYodsxC36J9LaJk4=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=XfecYzsacsPFOBEQMwNULv7wrBUwHaO381+deBk1bXEEHNSjc6UddruXrWiMjnYG3EZlGJQiMil6FwkSomAbK3CG6voF6K6VfyTOfk6Tbvlys9YziZEMCP0z7QqBG6Wh3/gEiL5sV+rD4oCfk8JEIQiCBBUJAogSjZFjahAHYi4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kBLwjNL4; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="kBLwjNL4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B2FD31F000FF; Wed, 14 Oct 2026 10:48:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1791974887; bh=cfdwL4eK2wRiumJlSJtGztn4niiqjSBnFr1jXdJdAc0=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=kBLwjNL4NFxitt6Ejou3P4IR+QeLReCvtd6Q42SmrkJDDTuUrXeyuQ7+7psO9JjLI qccR+XslpvSqXDSzSi8V1vYufQxMwzOGi9mhkd9D5PlIlu8wm2yIa9W6jykFLQBB0W J+Q2j4JT4aR5WZXNY/exsbj9rh1xdO6xiP6wYOFYZIy9dAumzjdQ00GV/+wY50TUKq N8fEDw1kLw7lz8tpmOn/y5NlGTHub+oAArRzQgAzysjkxcM8DGAgDMoCPf30lVtja4 +z5kZFhDWPjMZWc4nk2K5HEfQqLeBSOmtLFpkGNeVWq8IUE+F1qmsDQVGTwC0wJFPW tx5tRb+eLPP+Q== Date: Wed, 14 Oct 2026 11:48:01 +0100 From: Lee Jones To: Jerome Brunet Cc: Andre Przywara , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Chen-Yu Tsai , Liam Girdwood , Mark Brown , Hans de Goede , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, mfd@lists.linux.dev, linux-sunxi@lists.linux.dev, Sashiko Subject: Re: [PATCH v8 2/5] mfd: axp20x-i2c: Fix i2c instantiation Message-ID: <20261014104801.GI199624@google.com> References: <20260910-axp318-regulator-v8-0-e906a61a7f3d@baylibre.com> <20260910-axp318-regulator-v8-2-e906a61a7f3d@baylibre.com> <20260924082705.GO3864833@google.com> <1jy0cq94na.fsf@starbuckisacylon.baylibre.com> Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1jy0cq94na.fsf@starbuckisacylon.baylibre.com> Note: --- checkpatch.pl (3 issues) --- Line 2: WARNING: Prefer a maximum 75 chars per line (possible unwrapped commit description?) Line 3: ERROR: Invalid commit separator - some tools may have problems applying this ---------------------------------- On Thu, 24 Sep 2026, Jerome Brunet wrote: > On jeu. 24 sept. 2026 at 09:27, Lee Jones wrote: > > > On Thu, 10 Sep 2026, Jerome Brunet wrote: > > > >> Apparently this device never really supported i2c instantiation via > >> sysfs, because the driver does not even look at the i2c device data, > >> 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") > >> Acked-by: Chen-Yu Tsai > >> Signed-off-by: Jerome Brunet > >> --- > >> drivers/mfd/axp20x-i2c.c | 24 +++++++++++++----------- > >> drivers/mfd/axp20x-rsb.c | 1 + > >> drivers/mfd/axp20x.c | 1 - > >> include/linux/mfd/axp20x.h | 3 +-- > >> 4 files changed, 15 insertions(+), 14 deletions(-) > >> > >> diff --git a/drivers/mfd/axp20x-i2c.c b/drivers/mfd/axp20x-i2c.c > >> index 5c93136f977e..a76bec5604c4 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); > > > > device_get_match_data() is bus agnostic and should still work from the > > core driver. What's the purpose of splitting it out and adding > > additional call-sites? > > device_get_match_data() works when the data comes through that path, > which is generally the case. > > i2c_get_match_data() calls device_get_match_data() then fallback to the > i2c_device_ids. It covers the instanciation from sysfs mainly, not > something usual. > > As explained in the description, this changes plugs a hole identified by > sashiko that technically exists but I highly doubt anyone will > instanciate the PMIC through that interface. Those things do not really > come as breakout boards ... That being said, it is cheap to fix. I'm confused. We already call device_get_match_data() in axp20x_match_device(). So if you populate .driver_data in axp20x_i2c_id[], you should be able to drop these changes altogether, no? > >> ret = axp20x_match_device(axp20x); > >> if (ret) > >> return ret; > >> @@ -76,17 +77,18 @@ 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" }, > >> - { "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 = "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 4d770e718716..de6946d4bb13 100644 > >> --- a/drivers/mfd/axp20x.c > >> +++ b/drivers/mfd/axp20x.c > >> @@ -1267,7 +1267,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); > >> diff --git a/include/linux/mfd/axp20x.h b/include/linux/mfd/axp20x.h > >> index b352661d99a1..1badb4868d17 100644 > >> --- a/include/linux/mfd/axp20x.h > >> +++ b/include/linux/mfd/axp20x.h > >> @@ -997,8 +997,7 @@ static inline int axp20x_read_variable_width(struct regmap *regmap, > >> /** > >> * axp20x_match_device(): Setup axp20x variant related fields > >> * > >> - * @axp20x: axp20x device to setup (.dev field must be set) > >> - * @dev: device associated with this axp20x device > >> + * @axp20x: axp20x device to setup (.dev and variant fields must be set) > >> * > >> * This lets the axp20x core configure the mfd cells and register maps > >> * for later use. > >> > >> -- > >> 2.53.0 > >> > > > > -- > > Lee Jones > > -- > Jerome -- Lee Jones