From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) (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 6C91C492195 for ; Thu, 22 Jan 2026 15:49:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.66 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769096991; cv=none; b=VgdZmGs8JOCMQ4hKMXfTiO2G1+qLQ373WiPI0dM3vuuPPfUzyOmAcqs2xeo8HsWzMZ69Rb4OkWCCRciLe+kkTxaFM9qRc3RoqkscErsX4IYBURbnS0P9mo6AtpnzLhv4Z/rBV8fa51PRpNOcN1QgyEpmJqzCO0bFZTcwxUgssfo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769096991; c=relaxed/simple; bh=+e6wsl5d67gepE+dFjWdKbJ6vjQoBdZjQhDABfPMTsI=; h=Message-ID:Subject:From:To:Cc:Date:In-Reply-To:References: Content-Type:MIME-Version; b=u0SNIzUywy3ar07C5CUSTss9miJpUSZV0Tydedx7t40LQMZ5rhEozFugp8JboyNJSJHm11SkobH00wGioyT99+WV3+ouP593k0ur9tLn2kNNhZe//JRm215f7DIYhIFINCZDVrBJjPW1STa4f6fL9+X/duRNiM99ef33XcoedGs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=SLc348yH; arc=none smtp.client-ip=209.85.128.66 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="SLc348yH" Received: by mail-wm1-f66.google.com with SMTP id 5b1f17b1804b1-47ee0291921so10459375e9.3 for ; Thu, 22 Jan 2026 07:49:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1769096985; x=1769701785; darn=vger.kernel.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=+e6wsl5d67gepE+dFjWdKbJ6vjQoBdZjQhDABfPMTsI=; b=SLc348yHoHg26UnNunRhyrescOI5qvVkN5xUjhfwkyu4I3hisalmDptiYWkPbuxWtJ C6sFMS23VUuNv8VvLfd5eeMaCOk9lGo8crjO5IJx5T/+yoMItEl/hDWJMMn3w9vVJBXy 0vY/RrMvEzOZF5hq60fpAekJtXNJBP4zN7/RD/vaPBgPqGud3Ei06hRh4tLVABYgibaq HaT14NjVQqYN5/DPr+o3jP/Z/bcAoJWDTYpajNx2/v6IBd+s138l4erRwnHkdXr3zVrR gcSUTJvGKpn7e9W7PbIEw5b6Vb04jx5rpMZjTvglYNWkTg7Y7M8RdN3/B0Verz/IdpFO ckew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769096985; x=1769701785; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=+e6wsl5d67gepE+dFjWdKbJ6vjQoBdZjQhDABfPMTsI=; b=X3rr6xjnOQgQwikACyevPY5zXkgCaZdPJxch0VXh5+gAvI9QO3L62oYmuSBsVo/TbH xOtSeDldHdnF/IKOHTznPVWssx2GYqoMqtvDVeT9UAsoMqHnhND+Uv1n/8IO16rOTURz HJX99vGOe6HqwBQl+ev15OaNyvbT09U8TCXJv1GcGsio/LROMjbT9SP32rsWZl2NNcxJ 5QCYjntSu7mTfLzit5r78FKQEIXGlarh5/KrLsl5NfUNMUsZeVbtZUwVx+7qUnEyLsv1 D92uaWQQ97xxhInDtFDdlqrcxkETuiBD06gmZhValX9rzrX+UHzJgXSTldvXWBQw8uaS 2RKQ== X-Forwarded-Encrypted: i=1; AJvYcCVbIW0Oqt1KsIdU+GOwZHFTKGlOvB/wypDE/dcwJA04QpWvg9ICRaCSuhEKQ1rnBvfsX1BNwUIz4mceYHs=@vger.kernel.org X-Gm-Message-State: AOJu0YzJWApC6p/rUcRzqJ1aUjUUw/Gbmmg20ssGIIJfBjuHJ9RlHNXH sEHoY6FIqiWM16kfRzATQsgQHx6jsxErRkArPdKkhMgiakEEmLclMxB7RKsOHTDzOMU= X-Gm-Gg: AZuq6aIrv9r+CJJQOqXEjISFkgLWgCeLhf/Xd+UhmRYtYCQ2BufD9MrFuzPN8u22jH8 YL5LPRTkARkFxcwvJZ2bGPwWJf4+1Xqi9aqTco3a3rMOxWIfuFcp++pz9GFDk8BBvIXHoKrMHmT +LdZOSeSA+JNTWvUyyOCCCZQP1VZaTp9HOINpk29QaPkLA3cA1scMpreJxE1PgRH/up3m2S7W+W 0EvQpGEBXPR8Ix0LR2KN6haEpqCVQqj1pC22Rtj6MQqzCaZtQWK+ptKCSYSpcC2UC3mEH0m1ZQg uKgAYSwl4Y2vPUX2P2XGixoL/Kp99cGATUb1r5dXCaTYPUkJfkqGQKfYxamKo8dmfCX86V+21cB ufUxQCOE1CkdcgleZc+l3WrbzNqTGn5VU/ZpYnj7+rw/ccciJaeMlz5SuaNM6DroGr+Ym2JL3gp nM3lX0YCa7MBl3MakxdMNrzlSAhmo4 X-Received: by 2002:a05:600c:8209:b0:480:1a9a:e571 with SMTP id 5b1f17b1804b1-4804c9aff3emr1043695e9.22.1769096985161; Thu, 22 Jan 2026 07:49:45 -0800 (PST) Received: from draszik.lan ([212.129.87.109]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-480424d4912sm56957665e9.7.2026.01.22.07.49.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jan 2026 07:49:44 -0800 (PST) Message-ID: Subject: Re: [PATCH v6 00/20] Samsung S2MPG10 regulator and S2MPG11 PMIC drivers From: =?ISO-8859-1?Q?Andr=E9?= Draszik To: Lee Jones Cc: Tudor Ambarus , Rob Herring , Conor Dooley , Krzysztof Kozlowski , Liam Girdwood , Mark Brown , Bartosz Golaszewski , Krzysztof Kozlowski , Linus Walleij , Bartosz Golaszewski , Peter Griffin , Will McVicker , Juan Yescas , kernel-team@android.com, linux-kernel@vger.kernel.org, linux-samsung-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-gpio@vger.kernel.org, Bartosz Golaszewski Date: Thu, 22 Jan 2026 15:49:44 +0000 In-Reply-To: <20260122150634.GK3831112@google.com> References: <20260105-s2mpg1x-regulators-v6-0-80f4b6d1bf9d@linaro.org> <20260122150634.GK3831112@google.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.56.2-2+build3 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Hi Lee, On Thu, 2026-01-22 at 15:06 +0000, Lee Jones wrote: > On Mon, 05 Jan 2026, Andr=C3=A9 Draszik wrote: >=20 > > This series extends the existing S2MPG10 PMIC driver to add support for > > the regulators, and adds new S2MPG11 core and regulator drivers. > >=20 > > --- dependency note --- > > This series must be applied in-order, due to the regulator drivers > > depending on headers & definitions added by the bindings and core > > drivers. I would expect them all to go via the MFD tree. > >=20 > > The MFD patches in this series also depend on my Samsung MFD patches > > due to patch context: > > https://lore.kernel.org/all/20251217-s5m-alarm-v2-0-b7bff003e94c@linaro= .org/ > >=20 > > While these patches compile, regulator probe will only be successful > > with my deferrable regulators patches from > > https://lore.kernel.org/r/20251227-regulators-defer-v1-0-3104b22d84cb@l= inaro.org > > --- end --- > >=20 > > The patches are kept together in one series, due to S2MPG11 and its > > regulators being very similar to S2MPG10. > >=20 > > The Samsung S2MPG11 PMIC is a Power Management IC for mobile > > applications with buck converters, various LDOs, power meters, and > > additional GPIO interfaces. It typically complements an S2MPG10 PMIC in > > a main/sub configuration as the sub-PMIC and both are used on the > > Google Pixel 6 and 6 Pro (oriole / raven). > >=20 > > A DT update for Oriole / Raven to enable these is required which I will > > send out separately. > >=20 > > Cheers, > > Andre' > >=20 > > Signed-off-by: Andr=C3=A9 Draszik >=20 > Applying patch(es) > Applying: dt-bindings: mfd: samsung,s2mps11: Split s2mpg10-pmic into sepa= rate file > Applying: dt-bindings: mfd: samsung,s2mpg10-pmic: Link to its regulators > Applying: dt-bindings: mfd: Add samsung,s2mpg11-pmic > Applying: mfd: sec: s2mpg10: reorder regulators for better probe performa= nce > Applying: mfd: sec: Add support for S2MPG11 PMIC via ACPM > error: invalid object 100644 11a56154d36d251d40b40e91da514db0faa15ae3 for= 'drivers/mfd/sec-irq.c' > error: Repository lacks necessary blobs to fall back on 3-way merge. > Patch failed at 0005 mfd: sec: Add support for S2MPG11 PMIC via ACPM > hint: Use 'git am --show-current-patch=3Ddiff' to see the failed patch > hint: When you have resolved this problem, run "git am --continue". > hint: If you prefer to skip this patch, run "git am --skip" instead. > hint: To restore the original branch and stop patching, run "git am --abo= rt". > hint: Disable this message with "git config set advice.mergeConflict fals= e" >=20 > Doesn't apply to `for-mfd-next` or `ib-mfd-rtc-v6.20`. >=20 > Please rebase. Strange, git rebase onto for-mfd-next had no trouble. I presume you used b4= am / shazam above? Just trying to understand why the difference. Anyway, rebased v7 is https://lore.kernel.org/r/20260122-s2mpg1x-regulators-v7-0-3b1f9831fffd@li= naro.org Cheers, Andre'