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 D5315330651; Thu, 11 Jun 2026 16:41:00 +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=1781196062; cv=none; b=tpP8gBlpQpx+Hn8m6ecrpzy2C5H2rCln1nSPoQcCedR57K1jCE07sPAnTwFtVgn/CVDoIdis7GS1VESQicQQRoLqKhthGUwXWnoOov69nMTzfs1fRqKKu/jKfTU++BXStsd/O+szaWaRPwIB12R6P9DC6DsEG9X2emqTDnNn+jA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781196062; c=relaxed/simple; bh=Mt41lseLjAsqKt0y89ld1SAPRe6e49SEq+savjVnHoQ=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=r7zj8lLBhW0FMqiHsblfGbrFKD1hcXumPva1suDECc0AMgNr4EDSOwfG2B7kK4LGztsU914e8H1MKPZdJlbOvi30+RgSi3YuZLkwweec/9CsDCYca6KBvzCPwAMT8Fc2SI8VwQdClltKyWC7egylj8LfjEmfVQR2FjW0+6+Kxg4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LTddcBoq; 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="LTddcBoq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1E1751F00893; Thu, 11 Jun 2026 16:40:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1781196060; bh=ROq1lVBMd1TqONzV7EX6xzWPckJNHZDfKK4kRsAGgBI=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=LTddcBoqhv69JIcjLqCLxBIqk0Kqk1N+R8peoTL4iTpk/w++Ql8NnYhm5sWe/j13Q 81rQdd6CPmTs44Zhx8QH3YVsUceuLG+dH1k2hWldbVedYVvkx6l9rWnR8EAUztozss CBj8YNebMmqJ2CTUZ1H7mhCo0OXFvo7vJrPAmZ/MlMqJQy0rEvWRhq4TZSONp9MJFG EkSY2qWF8hp4TtzwFRqg01fhUfuD1L/SjdOJBXnLBq2lrbMbeoEPOHJ9Gy5nS1Ms// 2t3zI1d/ovKnKXdnaKcmcvVXhsSNVNaJ9zZ/XY6Fh5Gp3Lui0h0L8QhRT9a4g5PYIc 2hCObYE2CVUBA== Date: Thu, 11 Jun 2026 17:40:53 +0100 From: Lee Jones To: linux-kernel-dev@aliel.fr Cc: Neil Armstrong , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Andi Shyti , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Beniamino Galvani , "Rafael J. Wysocki" , Daniel Lezcano , Zhang Rui , Lukasz Luba , Liam Girdwood , Mark Brown , linux-amlogic@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org Subject: Re: [PATCH v7 4/8] mfd: khadas-mcu: Add support for VIM4 MCU variant Message-ID: <20260611164053.GC1212816@google.com> References: <20260603-add-mcu-fan-khadas-vim4-v7-0-594ba8a965d8@aliel.fr> <20260603-add-mcu-fan-khadas-vim4-v7-4-594ba8a965d8@aliel.fr> Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20260603-add-mcu-fan-khadas-vim4-v7-4-594ba8a965d8@aliel.fr> /* Sashiko Automation: Reviewed (0 Findings) */ On Wed, 03 Jun 2026, Ronald Claveau via B4 Relay wrote: > From: Ronald Claveau > > Refactor probe() to use per-variant values > instead of hardcoded globals. > > Add dedicated regmap configuration for the VIM4 MCU, > with its own volatile/writeable registers. > > Add the fan control register > (0–100 levels vs 0–3 for previous supported boards). > > Add a new compatible string "khadas,vim4-mcu". > > Reviewed-by: Neil Armstrong > Signed-off-by: Ronald Claveau > --- > drivers/mfd/khadas-mcu.c | 115 ++++++++++++++++++++++++++++++++++++++++------- > 1 file changed, 99 insertions(+), 16 deletions(-) > > diff --git a/drivers/mfd/khadas-mcu.c b/drivers/mfd/khadas-mcu.c > index ba981a7886921..1bf260729d73b 100644 > --- a/drivers/mfd/khadas-mcu.c > +++ b/drivers/mfd/khadas-mcu.c > @@ -75,47 +75,129 @@ static const struct regmap_config khadas_mcu_regmap_config = { > .cache_type = REGCACHE_MAPLE, > }; > > -static struct mfd_cell khadas_mcu_fan_cells[] = { > +static const struct khadas_mcu_fan_pdata khadas_mcu_fan_pdata = { > + .fan_reg = KHADAS_MCU_CMD_FAN_STATUS_CTRL_REG, > + .max_level = 3, /* Fan speed: 0 = off, 1 = low, 2 = medium, 3 = high */ Instead of this comment, you could always just define the value(s)? > +}; > + > +static const struct mfd_cell khadas_mcu_fan_cells[] = { > /* VIM1/2 Rev13+ and VIM3 only */ > - { .name = "khadas-mcu-fan-ctrl", }, > + { > + .name = "khadas-mcu-fan-ctrl", > + .platform_data = &khadas_mcu_fan_pdata, > + .pdata_size = sizeof(khadas_mcu_fan_pdata), No need to attempt to align the '=' like this, please. > + }, > }; > > -static struct mfd_cell khadas_mcu_cells[] = { > +static const struct mfd_cell khadas_mcu_cells[] = { > { .name = "khadas-mcu-user-mem", }, > }; > > +static bool khadas_mcu_vim4_reg_volatile(struct device *dev, unsigned int reg) > +{ > + switch (reg) { > + case KHADAS_MCU_PWR_OFF_CMD_REG: > + case KHADAS_MCU_VIM4_REST_CONF_REG: > + case KHADAS_MCU_WOL_INIT_START_REG: > + case KHADAS_MCU_VIM4_LED_ON_RAM_REG: > + case KHADAS_MCU_VIM4_FAN_CTRL_REG: > + case KHADAS_MCU_VIM4_WDT_EN_REG: > + case KHADAS_MCU_VIM4_SYS_RST_REG: > + return true; > + default: > + return false; > + } > +} > + > +static bool khadas_mcu_vim4_reg_writeable(struct device *dev, unsigned int reg) > +{ > + switch (reg) { > + case KHADAS_MCU_VERSION_0_REG: > + case KHADAS_MCU_VERSION_1_REG: > + case KHADAS_MCU_SHUTDOWN_NORMAL_STATUS_REG: > + return false; > + default: > + return true; > + } > +} > + > +static const struct regmap_config khadas_mcu_vim4_regmap_config = { > + .reg_bits = 8, > + .reg_stride = 1, > + .val_bits = 8, > + .max_register = KHADAS_MCU_VIM4_SYS_RST_REG, > + .volatile_reg = khadas_mcu_vim4_reg_volatile, > + .writeable_reg = khadas_mcu_vim4_reg_writeable, > + .cache_type = REGCACHE_MAPLE, > +}; > + > +static const struct khadas_mcu_fan_pdata khadas_vim4_fan_pdata = { > + .fan_reg = KHADAS_MCU_VIM4_FAN_CTRL_REG, > + .max_level = 0x64, > +}; > + > +static const struct mfd_cell khadas_mcu_vim4_cells[] = { > + { > + .name = "khadas-mcu-fan-ctrl", > + .platform_data = &khadas_vim4_fan_pdata, > + .pdata_size = sizeof(khadas_vim4_fan_pdata), > + }, > +}; > + > static int khadas_mcu_probe(struct i2c_client *client) > { > + const struct mfd_cell *cells, *fan_cells; > + const struct regmap_config *regmap_cfg; > struct device *dev = &client->dev; > + int ncells, nfan_cells, ret; > struct khadas_mcu *ddata; > - int ret; > > ddata = devm_kzalloc(dev, sizeof(*ddata), GFP_KERNEL); > if (!ddata) > return -ENOMEM; > > + switch ((uintptr_t)i2c_get_match_data(client)) { > + case KHADAS_MCU_GENERIC: > + regmap_cfg = &khadas_mcu_regmap_config; > + cells = khadas_mcu_cells; > + ncells = ARRAY_SIZE(khadas_mcu_cells); > + fan_cells = khadas_mcu_fan_cells; > + nfan_cells = ARRAY_SIZE(khadas_mcu_fan_cells); > + break; > + case KHADAS_MCU_VIM4: > + regmap_cfg = &khadas_mcu_vim4_regmap_config; > + cells = NULL; > + ncells = 0; > + fan_cells = khadas_mcu_vim4_cells; > + nfan_cells = ARRAY_SIZE(khadas_mcu_vim4_cells); I'm not as offended by this as I thought I would be! > + break; > + default: > + return -ENODEV; > + } > + > i2c_set_clientdata(client, ddata); > > ddata->dev = dev; > > - ddata->regmap = devm_regmap_init_i2c(client, &khadas_mcu_regmap_config); > + ddata->regmap = devm_regmap_init_i2c(client, regmap_cfg); > if (IS_ERR(ddata->regmap)) { > ret = PTR_ERR(ddata->regmap); > - dev_err(dev, "Failed to allocate register map: %d\n", ret); > - return ret; > + return dev_err_probe(dev, ret, "Failed to allocate register map\n"); > } > > - ret = devm_mfd_add_devices(dev, PLATFORM_DEVID_NONE, > - khadas_mcu_cells, > - ARRAY_SIZE(khadas_mcu_cells), > - NULL, 0, NULL); > - if (ret) > - return ret; > + if (cells && ncells) { > + ret = devm_mfd_add_devices(dev, PLATFORM_DEVID_NONE, > + cells, > + ncells, > + NULL, 0, NULL); > + if (ret) > + return ret; > + } > > if (of_property_present(dev->of_node, "#cooling-cells")) > return devm_mfd_add_devices(dev, PLATFORM_DEVID_NONE, > - khadas_mcu_fan_cells, > - ARRAY_SIZE(khadas_mcu_fan_cells), > + fan_cells, > + nfan_cells, > NULL, 0, NULL); > > return 0; > @@ -123,7 +205,8 @@ static int khadas_mcu_probe(struct i2c_client *client) > > #ifdef CONFIG_OF > static const struct of_device_id khadas_mcu_of_match[] = { > - { .compatible = "khadas,mcu", }, > + { .compatible = "khadas,mcu", .data = (void *)KHADAS_MCU_GENERIC }, > + { .compatible = "khadas,vim4-mcu", .data = (void *)KHADAS_MCU_VIM4 }, > {}, > }; > MODULE_DEVICE_TABLE(of, khadas_mcu_of_match); > > -- > 2.49.0 > > -- Lee Jones