From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795030912; b=2obPGCcLaoAjJcEa1xuo1bkZyF3cm97ahr5XRNyP2bq+SNHT7WdvEyKxl7n3wJfKYMRr HUwlAog+X+30EMZnRHyrp1aLCCMqFOzqg3SvyebbQvdPeUrabSJc9sBDRxPUD319mO6Lj GUtpemEVXyXOvTMrMUVC50m9WpY85IBjRfcCnoNbSlGRxleztrs6qa4hyuhXRkoFm64co WMuZBPFTilnJY27inurpOVAkeP7I4f19IV+0gBj1eI0dbmfHeoDsQhZSRSOKybR7r1fKl hW/v78Y2NaKK5Jauen5/0eyldnOXWgQzhbfR4O/Gh6lpAd5KWKkojnva3Bac1mfEmkA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795030912; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=n1TCpDq9KCdFS616w5Zyj6bD+JfusF1HcWym35oBJws=; b=xHdoEmX02vSvTsjwXy27ysfFNTKsVACjiYLBHAmsud5QSC/VbB96CpmATxZKhrSfqZd9 ESTAeLQ453+nhUnbI+B1viWNpRPNuvQZm7D5DI/oZGGQZEO8R08rs2tGruSMCpgFugE18 wrse4Vdpea1oaViyQdQztGC4Gmz6OW8xVNgIjg134M0FognOVBSAepAl7LshqxswQo/yX frIQVsrOKFsePctmSn2c5ig9D/b/e3RfQ6kxvLcy0Jh5AGi8wIHCKfIITttoQtiwXggb0 MW1du5awD0tUiKFjkK5dMK9pLf9e8F7SHp5gDAqHeV5s6WT8aHV/x1hhUFBSp3f5wPg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=BDqCOJ6R; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 177F9606A331; Wed, 18 Nov 2026 19:41:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=BDqCOJ6R Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6201B1F000C6; Wed, 18 Nov 2026 19:41:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795030911; bh=n1TCpDq9KCdFS616w5Zyj6bD+JfusF1HcWym35oBJws=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=BDqCOJ6RCMXWNyE8FlbszJpLxVyNnLFM7KwP5pGstA6O02rp7gwOdS1QsV8IqMUIP eGEG6yVa6FHdXSFYy0hDkCfZ1sy6eoA7mmRfKaPwGZhmwDPKRKFc9U90oJbwOJ12tI Pmaf3GDofugyTWXYWMCLw60ndf5AoeQo4xvC9QWE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Linus Walleij , Sebastian Reichel , Sasha Levin Subject: [PATCH 6.12 0835/1756] power: supply: ab8500_charger: Skip absent AB8505 main charger Date: Wed, 18 Nov 2026 15:49:22 +0100 Message-ID: <20261118150042.718700135@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150007.957976754@linuxfoundation.org> References: <20261118150007.957976754@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Linus Walleij [ Upstream commit 52c8cdcc1146d86fae524a589d4512c8d59ea8b4 ] AB8505 contains only the USB charger. It has no integrated main charger, main-charger status register, or main-charger interrupts. Avoid reading the missing status register, requesting the five missing interrupts, or disabling an AC charger which was never enabled. This lets the driver bind using only the AB8505 USB charger resources. Fixes: d4337660d069 ("ab8500-charger: Add AB8505_USB_LINK_STATUS") Assisted-by: LLM Signed-off-by: Linus Walleij Link: https://patch.msgid.link/20260916-ab8500-charging-v1-11-e986ed321cc6@kernel.org Signed-off-by: Sebastian Reichel Signed-off-by: Sasha Levin --- drivers/power/supply/ab8500_charger.c | 32 ++++++++++++++++++--------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/drivers/power/supply/ab8500_charger.c b/drivers/power/supply/ab8500_charger.c index f530682bfd1e8..d384004dd42a8 100644 --- a/drivers/power/supply/ab8500_charger.c +++ b/drivers/power/supply/ab8500_charger.c @@ -692,16 +692,19 @@ static int ab8500_charger_detect_chargers(struct ab8500_charger *di, bool probe) int ret; u8 val; - /* Check for AC charger */ - ret = abx500_get_register_interruptible(di->dev, AB8500_CHARGER, - AB8500_CH_STATUS1_REG, &val); - if (ret < 0) { - dev_err(di->dev, "%s ab8500 read failed\n", __func__); - return ret; - } + /* AB8505 has no integrated main charger. */ + if (!is_ab8505(di->parent)) { + ret = abx500_get_register_interruptible(di->dev, + AB8500_CHARGER, + AB8500_CH_STATUS1_REG, &val); + if (ret < 0) { + dev_err(di->dev, "%s ab8500 read failed\n", __func__); + return ret; + } - if (val & MAIN_CH_DET) - result = AC_PW_CONN; + if (val & MAIN_CH_DET) + result = AC_PW_CONN; + } /* Check for USB charger */ @@ -3501,7 +3504,8 @@ static void ab8500_charger_unbind(struct device *dev) int ret; /* Disable AC charging */ - ab8500_charger_ac_en(&di->ac_chg, false, 0, 0); + if (di->ac_chg.enabled) + ab8500_charger_ac_en(&di->ac_chg, false, 0, 0); /* Disable USB charging */ ab8500_charger_usb_en(&di->usb_chg, false, 0, 0); @@ -3725,7 +3729,13 @@ static int ab8500_charger_probe(struct platform_device *pdev) } /* Request interrupts */ - for (i = 0; i < ARRAY_SIZE(ab8500_charger_irq); i++) { + /* The first five interrupts belong to the AB8500 main charger. */ + if (is_ab8505(di->parent)) + i = 5; + else + i = 0; + + for (; i < ARRAY_SIZE(ab8500_charger_irq); i++) { irq = platform_get_irq_byname(pdev, ab8500_charger_irq[i].name); if (irq < 0) return irq; -- 2.53.0