From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lj1-f179.google.com (mail-lj1-f179.google.com [209.85.208.179]) (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 2A932344D95 for ; Fri, 17 Apr 2026 07:11:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776409901; cv=none; b=eD2LsgnzJ42IgkkqWRTmJHoHG/7gW7qqz8WwbZez4Vcs0Ce6Plv1XHh2Ce1lhzVr8het0Pp21ahmsDTxRSXkjh9DGZnh3/C3izQTatuD/ORD2pCwROoY/qkfaWaYp7iTXNG4kCuALGYfNC8yAnrj6lodk5QFK2keH4q7YzAFg0M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776409901; c=relaxed/simple; bh=Fi8+HlKnN1h+N9DJycInvz7TYXjUPCLz5vbSQaQ2Gmo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lPJT9SGXwFqwQInYLkenG+BhMFh2VoWDciaeMklP2QNPaNMy1N5KnbdYW98gOQkaXo9K/JXMNoGz83LbMSJqvcYDnr7N+BEoP8FK5YFU8aCO1Vy6UhXEM4dEkVI+bNsRNFbkDUFqIb+JR+OOe7Sbj4mXhEzzpmLTy3l/DicEnbc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=p67Y96Jp; arc=none smtp.client-ip=209.85.208.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="p67Y96Jp" Received: by mail-lj1-f179.google.com with SMTP id 38308e7fff4ca-38e84ed22bdso3274551fa.2 for ; Fri, 17 Apr 2026 00:11:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776409896; x=1777014696; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PX7h5kXQ2ZfXYWkWgx4GofzlTaZv8NlPbhuLaaOQgic=; b=p67Y96Jphzf5W62bzpTZtxrWzGfeFl+IhjPJj5Tn5mYIdvJT5TwLloseTaPptgKtJu G3iDi9+I1NDns5dUdwWqfC1hI7slF7J6G69y5pl9UnKp0dUdbbzXK6Frh7+fuazmGkjp Jzpd++k3La4VV/XaoqAi6l2mqv59njJ9+s7oP7/S777Bdzm54YZQ+W4+eFgWpAAioPUV zLKhk98PgfYoUNKlOvfBpGLJAxceRcwkBavtFxmHgubKs3t0hi1BliXn/a0W/6KgsaXf ZTEWeGYrAnMn2agHiLRPuqfQRLqDO2qs1vEBy1AiO8pSI8527aaLwr37jSsjFqykqot4 bIEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776409896; x=1777014696; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=PX7h5kXQ2ZfXYWkWgx4GofzlTaZv8NlPbhuLaaOQgic=; b=hQ9j5irKlicKatRRCMBWHkMUJE9TmZiu0M0IWGA1uUsilSkuVN5c+MNctf9ji6TYRP hte2i8XhfQyfvywE96iDQEo8S9InPA/AqsB63mmbW1WlT1hhaW+0l4gm4Ftzxwv1Dq6z 31JatrcGqrdl1cirq4hmEnVRtiHrtj02+F218eWKdosDOzofXETqNFUQklRAu6/LWbsP QmVOwumk5Mf09Evlea61SIrscFuAEHG6y+l9HrXA9aiKoHsM7wxEvmiGTZvL536qSyiB XUzsZCPxKnccvstgtgoR2YEHmGYJNWG1YsH5/JzrFg7yFJdkcGflomZRXK8XgsHceSia kMnw== X-Forwarded-Encrypted: i=1; AFNElJ/E2B04SjduNBgen3LtJx4sKRhH2IA7K7qGnmeozuv8uRcvZqv8yOZQBx+wu8VzPp45yq3HfvE99otB@vger.kernel.org X-Gm-Message-State: AOJu0Yxc7UBvTaMp0UlNnhdidnwRGnOT/68Vit/JfG3dOGc96hKMQeWW nJWOgJW2QOOTdFLgDZm/qUWtfAnLzgHzOvSmrELI74nd7SfJCscPw+/l X-Gm-Gg: AeBDievY3cXy2fOy1amS4gXnsi+Sf/I4PBoNuYB0SOHsLkxU0LidMM5lvm5uZlt9WYh NVqBJI9piHnuyNb3/cMAt6vrNdjToIV11ag9nuWEu/FtKX3ss9DuZjPv4d/bcREpfLAmgU33H+a ZpWXFvSu7Sjc4s2sKHU9vI9b97rLVeRnQ+dUl8edQ7D4GSFtg5outCwrAhVUj+h9GtJdg233vr5 qJ5E4HEoB0YvqOfz7A0YlChVvZVt3U96xJon8UcNpNoLP6C7ypDRoxoUWB8dM3P6KySZNNszL7O aSs+hUZTYHID6baPVyGoCbEo+FJzPgIGDKQWsajJjcXJ+d+0SaM0j8fUyThwYiFJ9yxvuSbuhUw cq8NzmwHXaSPT5QD8mj2YH6dbbcbAex2i655scRfAJ5pbRii6fYNYxZ64473WySssDpDO58FeGf 2flS87lWai2S89EhwLauWhY1FOAQu3SuJ34A== X-Received: by 2002:a05:6512:3b12:b0:5a3:f3a4:1aff with SMTP id 2adb3069b0e04-5a4172e87afmr393310e87.38.1776409896176; Fri, 17 Apr 2026 00:11:36 -0700 (PDT) Received: from xeon ([188.163.112.56]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5a4185bc240sm162772e87.23.2026.04.17.00.11.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Apr 2026 00:11:35 -0700 (PDT) From: Svyatoslav Ryhel To: Dmitry Torokhov , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Lee Jones , Pavel Machek , Svyatoslav Ryhel , David Lechner , Tony Lindgren Cc: linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-leds@vger.kernel.org Subject: [PATCH v4 5/6] mfd: motorola-cpcap: diverge configuration per-board Date: Fri, 17 Apr 2026 10:11:05 +0300 Message-ID: <20260417071106.21984-6-clamor95@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260417071106.21984-1-clamor95@gmail.com> References: <20260417071106.21984-1-clamor95@gmail.com> Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit MFD have rigid subdevice structure which does not allow flexible dynamic subdevice linking. Address this by diverging CPCAP subdevice composition to take into account board specific configuration. Create a common default subdevice composition, rename existing subdevice composition into cpcap_mapphone_mfd_devices since it targets mainly Mapphone board. Removed st,6556002 as it is no longer applicable to all cases and duplicates motorola,cpcap, which is used as the default composition. Signed-off-by: Svyatoslav Ryhel --- drivers/mfd/motorola-cpcap.c | 101 ++++++++++++++++++++++++++++------- 1 file changed, 83 insertions(+), 18 deletions(-) diff --git a/drivers/mfd/motorola-cpcap.c b/drivers/mfd/motorola-cpcap.c index d8243b956f87..516d1e33affa 100644 --- a/drivers/mfd/motorola-cpcap.c +++ b/drivers/mfd/motorola-cpcap.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include @@ -24,10 +25,16 @@ #define CPCAP_REGISTER_SIZE 4 #define CPCAP_REGISTER_BITS 16 +struct cpcap_chip_data { + const struct mfd_cell *mfd_devices; + unsigned int num_devices; +}; + struct cpcap_ddata { struct spi_device *spi; struct regmap_irq *irqs; struct regmap_irq_chip_data *irqdata[CPCAP_NR_IRQ_CHIPS]; + const struct cpcap_chip_data *cdata; const struct regmap_config *regmap_conf; struct regmap *regmap; }; @@ -195,20 +202,6 @@ static int cpcap_init_irq(struct cpcap_ddata *cpcap) return 0; } -static const struct of_device_id cpcap_of_match[] = { - { .compatible = "motorola,cpcap", }, - { .compatible = "st,6556002", }, - {}, -}; -MODULE_DEVICE_TABLE(of, cpcap_of_match); - -static const struct spi_device_id cpcap_spi_ids[] = { - { .name = "cpcap", }, - { .name = "6556002", }, - {}, -}; -MODULE_DEVICE_TABLE(spi, cpcap_spi_ids); - static const struct regmap_config cpcap_regmap_config = { .reg_bits = 16, .reg_stride = 4, @@ -241,7 +234,56 @@ static int cpcap_resume(struct device *dev) static DEFINE_SIMPLE_DEV_PM_OPS(cpcap_pm, cpcap_suspend, cpcap_resume); -static const struct mfd_cell cpcap_mfd_devices[] = { +static const struct mfd_cell cpcap_default_mfd_devices[] = { + { + .name = "cpcap_adc", + .of_compatible = "motorola,cpcap-adc", + }, { + .name = "cpcap_battery", + .of_compatible = "motorola,cpcap-battery", + }, { + .name = "cpcap-regulator", + .of_compatible = "motorola,cpcap-regulator", + }, { + .name = "cpcap-rtc", + .of_compatible = "motorola,cpcap-rtc", + }, { + .name = "cpcap-pwrbutton", + .of_compatible = "motorola,cpcap-pwrbutton", + }, { + .name = "cpcap-usb-phy", + .of_compatible = "motorola,cpcap-usb-phy", + }, { + .name = "cpcap-led", + .id = 0, + .of_compatible = "motorola,cpcap-led-red", + }, { + .name = "cpcap-led", + .id = 1, + .of_compatible = "motorola,cpcap-led-green", + }, { + .name = "cpcap-led", + .id = 2, + .of_compatible = "motorola,cpcap-led-blue", + }, { + .name = "cpcap-led", + .id = 3, + .of_compatible = "motorola,cpcap-led-adl", + }, { + .name = "cpcap-led", + .id = 4, + .of_compatible = "motorola,cpcap-led-cp", + }, { + .name = "cpcap-codec", + }, +}; + +static const struct cpcap_chip_data cpcap_default_data = { + .mfd_devices = cpcap_default_mfd_devices, + .num_devices = ARRAY_SIZE(cpcap_default_mfd_devices), +}; + +static const struct mfd_cell cpcap_mapphone_mfd_devices[] = { { .name = "cpcap_adc", .of_compatible = "motorola,mapphone-cpcap-adc", @@ -285,7 +327,12 @@ static const struct mfd_cell cpcap_mfd_devices[] = { .of_compatible = "motorola,cpcap-led-cp", }, { .name = "cpcap-codec", - } + }, +}; + +static const struct cpcap_chip_data cpcap_mapphone_data = { + .mfd_devices = cpcap_mapphone_mfd_devices, + .num_devices = ARRAY_SIZE(cpcap_mapphone_mfd_devices), }; static int cpcap_probe(struct spi_device *spi) @@ -297,6 +344,10 @@ static int cpcap_probe(struct spi_device *spi) if (!cpcap) return -ENOMEM; + cpcap->cdata = device_get_match_data(&spi->dev); + if (!cpcap->cdata) + return -ENODEV; + cpcap->spi = spi; spi_set_drvdata(spi, cpcap); @@ -331,10 +382,24 @@ static int cpcap_probe(struct spi_device *spi) spi->dev.coherent_dma_mask = 0; spi->dev.dma_mask = &spi->dev.coherent_dma_mask; - return devm_mfd_add_devices(&spi->dev, 0, cpcap_mfd_devices, - ARRAY_SIZE(cpcap_mfd_devices), NULL, 0, NULL); + return devm_mfd_add_devices(&spi->dev, 0, cpcap->cdata->mfd_devices, + cpcap->cdata->num_devices, NULL, 0, NULL); } +static const struct of_device_id cpcap_of_match[] = { + { .compatible = "motorola,cpcap", .data = &cpcap_default_data }, + { .compatible = "motorola,mapphone-cpcap", .data = &cpcap_mapphone_data }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(of, cpcap_of_match); + +static const struct spi_device_id cpcap_spi_ids[] = { + { .name = "cpcap", .driver_data = (kernel_ulong_t)&cpcap_default_data }, + { .name = "mapphone-cpcap", .driver_data = (kernel_ulong_t)&cpcap_mapphone_data }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(spi, cpcap_spi_ids); + static struct spi_driver cpcap_driver = { .driver = { .name = "cpcap-core", -- 2.51.0