From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 69F28C36002 for ; Wed, 9 Apr 2025 21:02:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=VzEjXNkLNu9GbyJRrsPm3OGWMuRzZZwPEzkpfwqOZVo=; b=hdMRExgFYBARBmjU6O9RIaV5kC ksDLJ/HghL1CKKZx79cFBaPYlLYn52BnUP5LbfmsZ0pAUfe1WeAhs8su++WrKhwJa7EzSUptjjXQJ 3lc+gpRAoz+uQOMAAactCqXvB4xl4VwColtzv2sMMpyEAqbgaoHwghYhOiHn0awyFjTM00ICtmxAx /1Y9bifd1Q92j7+ivW4CEUSh207z4IysRyoj0qOi3UFPxxkBW0rILcCxEW0WEDLaTAQqR6Na8ce1C oG9G5h/S2XkB1ANfkLuNjt9iGVXx18xCN2JMmPf1OmsJFI0AO7l0qj9nwUOBlFz7KWaCQIf0TY5Z4 gMiSv0Ig==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1u2cYo-00000008WNd-0vg9; Wed, 09 Apr 2025 21:02:14 +0000 Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1u2cB0-00000008Sd7-2QOJ for linux-arm-kernel@lists.infradead.org; Wed, 09 Apr 2025 20:37:39 +0000 Received: by mail-ej1-x62c.google.com with SMTP id a640c23a62f3a-ac2af2f15d1so14071666b.1 for ; Wed, 09 Apr 2025 13:37:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744231057; x=1744835857; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=VzEjXNkLNu9GbyJRrsPm3OGWMuRzZZwPEzkpfwqOZVo=; b=zYSXT6WarvBS3RO4HLqYvAxqO+Ds2yslPKzhzfX/jdexDA/1jAtzjPZigW19vtmhN8 kNAc6VWGyG8YHw1khJ/k4xcAMtcJSIWf7X8y2vXSVefrBS556N/zo5+v9SlWdWz6l6FZ 3weFLexlFTPevqE44NXjXX64Sgeipx96Feen2LWbNkBnNSOhmKXKXNvOSNJRnGS70MC7 lYR5dthMOsP3k0ikT3drDE0ZILSQGIaGdPdq4o7ZaBIzHlF9lCTwUo32UQelpQQCrir0 HsoKyqIEd74dgjA9mSzjF5lJYQo5DU6K0ewnnEiRhohr7MuHLHabMUs4sqQ5Xfq0Fhe0 ZUtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744231057; x=1744835857; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VzEjXNkLNu9GbyJRrsPm3OGWMuRzZZwPEzkpfwqOZVo=; b=MWAWpACHyAKpGTaWuP8+CUKnApPUJ9PiVVFDUWCR9XyC4ORsDtouS70wxP6ZezPyAG 6hUF0Fawvqde3iAJtg90k4EpiQ23vgsoa/l/raeyG5PERIpM+bPx0N6YF9x9xWhDMZG+ yEfM/JuNdrXZj3AKQcIurHJ1ioi7JI5gIr9nUIAZ+k8WiXW3g3LJ63Bhak+2xZcOwZZW vYvgmu+HN9ZevGirav+x4pQG7MFdYoQ/QlNdeSkekMn0JLCX1d+5qgyLHxP5D3OG4rz7 51KR99ANFxc38k746QSiNj3nOemAm2GndLqZixmFwYwWe2E+JEm7R0vvF9w8vs8YZY/K 8cZA== X-Forwarded-Encrypted: i=1; AJvYcCWGxZ8Lzbiayy8LWIAODNjhCBla/z/P6sk82/NuX188E54g29LE66o0K8RgKOfdvp/q8RyQoMogVmIhuh9HRAc0@lists.infradead.org X-Gm-Message-State: AOJu0YyajtTennnQQSf7jNbYjZCt5qyJWL4woCCGen+QWbto50i0NxTM R6OzfpeYcmoPfjToz9GVyDOloFmcTgDlnEVVQ6uS8JpZBrIPQzXzMLSOSzNAby4= X-Gm-Gg: ASbGncvFlO53WkyY6BjIBgvIPOWM/gGISDZAHG7TQioXzFymqLEED7qW6XhaNEPfh4n 2hWvuZ+nfvDR6t5ZayCK77whVvd3KHvI8xhAWKEZL8QusxRbWxyo/2FU73MHIsBF6XWKHMb70qv wCXpJvayTjNcWdJlLlKxc3nc6LZYecej54l6oJl+sxSqLnLX+fd8v5sEen9YrpsDtgTd6Iubf3D 4q623C7FVDyub73Hqgmd1jV8lLv9GmZF/7OkmzagdYx3HGPs6C39BOF+pHTBGkT6s7DVl0BGi3c JMPAMzviTL0PgQr6ZGa/s1w9gCgw9JFclDOL/L0QT2bCfPZm5NJc7GApTtEpNekrz5NMbSxJ82C B+iwE+CAh44ricik9BSI+imiwzpGReclsdS9rbw== X-Google-Smtp-Source: AGHT+IGzaRFtKWEVWYdD0lu6CSjddwUa5mqgDytfA0O5AR616wmqNvg2sZQEFHwPTrDOE7dwUEpCcw== X-Received: by 2002:a17:907:3d09:b0:ac7:edc4:3d42 with SMTP id a640c23a62f3a-acabd24cb8amr9037566b.24.1744231056790; Wed, 09 Apr 2025 13:37:36 -0700 (PDT) Received: from puffmais.c.googlers.com (40.162.204.35.bc.googleusercontent.com. [35.204.162.40]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-acaa1ccc001sm145850366b.126.2025.04.09.13.37.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Apr 2025 13:37:36 -0700 (PDT) From: =?utf-8?q?Andr=C3=A9_Draszik?= Date: Wed, 09 Apr 2025 21:37:35 +0100 Subject: [PATCH v4 14/32] mfd: sec-i2c: s2dos05/s2mpu05: Use explicit regmap config and drop default MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20250409-s2mpg10-v4-14-d66d5f39b6bf@linaro.org> References: <20250409-s2mpg10-v4-0-d66d5f39b6bf@linaro.org> In-Reply-To: <20250409-s2mpg10-v4-0-d66d5f39b6bf@linaro.org> To: Krzysztof Kozlowski , Lee Jones , Rob Herring , Conor Dooley , Sylwester Nawrocki , Chanwoo Choi , Alim Akhtar , Michael Turquette , Stephen Boyd , Russell King , Catalin Marinas , Will Deacon , Alexandre Belloni Cc: Peter Griffin , Tudor Ambarus , Will McVicker , kernel-team@android.com, linux-kernel@vger.kernel.org, linux-samsung-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rtc@vger.kernel.org, =?utf-8?q?Andr=C3=A9_Draszik?= , Krzysztof Kozlowski X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250409_133738_623318_C6E1923B X-CRM114-Status: GOOD ( 18.16 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org When support for PMICs without compatibles was removed in commit f736d2c0caa8 ("mfd: sec: Remove PMICs without compatibles"), sec_regmap_config effectively became an orphan, because S5M8763X was the only user left of it before removal, using the default: case of the switch statement. When s2dos05 and s2mpu05 support was added in commit bf231e5febcf ("mfd: sec-core: Add support for the Samsung s2dos05") and commit ed33479b7beb ("mfd: sec: Add support for S2MPU05 PMIC"), they ended up using that orphaned regmap_config in a non-obvious way due to the default: case of the device type switch matching statement taking effect again. To make things more obvious, and to help the reader of this code while reasoning about what the intention might be here, and to ensure future additions to support new devices in this driver don't forget to add a regmap config, add an explicit regmap config for these two devices, and completely remove the generic regmap config as it becomes an orphan again that shouldn't be used by any device. Note that this commit doesn't fix the issue that s2dos05_regmap_config ands2mpu05_regmap_config really are incomplete, but I have no documentation on them. Reviewed-by: Krzysztof Kozlowski Signed-off-by: André Draszik --- v2: * squash two previously separate patches into this one (Krzysztof) --- drivers/mfd/sec-i2c.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/drivers/mfd/sec-i2c.c b/drivers/mfd/sec-i2c.c index a107a9c1e760f90fcb59a9944b74e9a39a0d946c..81f90003eea2a40f2caaebb49fc9494b89370e7f 100644 --- a/drivers/mfd/sec-i2c.c +++ b/drivers/mfd/sec-i2c.c @@ -61,7 +61,7 @@ static bool s2mpu02_volatile(struct device *dev, unsigned int reg) } } -static const struct regmap_config sec_regmap_config = { +static const struct regmap_config s2dos05_regmap_config = { .reg_bits = 8, .val_bits = 8, }; @@ -120,6 +120,11 @@ static const struct regmap_config s2mpu02_regmap_config = { .cache_type = REGCACHE_FLAT, }; +static const struct regmap_config s2mpu05_regmap_config = { + .reg_bits = 8, + .val_bits = 8, +}; + static const struct regmap_config s5m8767_regmap_config = { .reg_bits = 8, .val_bits = 8, @@ -138,6 +143,9 @@ static int sec_pmic_i2c_probe(struct i2c_client *client) device_type = (unsigned long)of_device_get_match_data(&client->dev); switch (device_type) { + case S2DOS05: + regmap = &s2dos05_regmap_config; + break; case S2MPA01: regmap = &s2mpa01_regmap_config; break; @@ -156,12 +164,16 @@ static int sec_pmic_i2c_probe(struct i2c_client *client) case S2MPU02: regmap = &s2mpu02_regmap_config; break; + case S2MPU05: + regmap = &s2mpu05_regmap_config; + break; case S5M8767X: regmap = &s5m8767_regmap_config; break; default: - regmap = &sec_regmap_config; - break; + return dev_err_probe(&client->dev, -ENODEV, + "Unsupported device type %lu\n", + device_type); } regmap_pmic = devm_regmap_init_i2c(client, regmap); -- 2.49.0.604.gff1f9ca942-goog