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=1795055829; b=LkJwoWHfe/BsVitv1reFWafGyqtmdmH4I/SLUPHnVwY9uUHHj8kcrgoAyAHQPJFQ3Lod NKHmVzOOEWh0DuURszAHEzKqw0CHMSTWVIaN6M9a6dX2ziT8PULvreS8/n7KZO94nIZYB Jd16C0JkAyYiliPfNKKxNK9P9cf7M2wBIb4QYG5ZXWz2gHrtPZ+K2yA96/SUhXtuKqE3s 0+GTV3uxHk1Cje4uts5VtTE5G+Hfa9x+ABCALxz9VTCnJmZ+M13O4ikmyPTq3lq5voF3w z3iiz4Pi+J6j3b4+uF2f8T3slAj9saQ2ByHHBNsaBXQoIGo3ZiVqAIOijZflAQmp7RQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795055829; 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=+lpxnb+VUAeDZKS4ABUNhAYnyTXPrkmbSjbj2Kq1IbY=; b=lzbXlnNW8z3CkoW6wjt5Jq3unG5pPDEvlkm9/d5Rz5Za8lncvQ0B2fg/6cjFDmClja+g 94wqGlurHLB8U99CsxjC9lNbWo9OXpdh8FLflZZCNC7hgCHHmdRZuvYzNt4nFYfmn5/Ls Syd4jGEGRkag9WqrdVJZhuQLaER8LAGt4xMnkgpMY3nBFQQz7zL+OigkcnTn9241bMbtZ ghQVlD67Yhs1KEf+LsPaRJmiHtAPulnsGwxofw8hEf4WTEHUmG70+9jvv15gE9oLomID1 emSEY40K8oU6VCU5TB2xc9MUqIL/0bivIgyXBYza4POVDrtYHgohsR9steUyV8bibVg== 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=kbdpxFkN; 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 5E01E606A31C; Thu, 19 Nov 2026 02:37:09 +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=kbdpxFkN Received: by smtp.kernel.org (Postfix) with ESMTPSA id ADBD81F000C4; Thu, 19 Nov 2026 02:37:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795055829; bh=+lpxnb+VUAeDZKS4ABUNhAYnyTXPrkmbSjbj2Kq1IbY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=kbdpxFkNdU5UG5OgBE0yzeu5BaibnaErOriU7HZWpgEsNytlBAY49igZCHleUs+40 gkhQMaqRYip0erqnoASbcUkcf0X2f6bCrIaL1WONft42fv9oYfZLM4aj3rcyT/jxpk W7iMbx3EkeHq34vzXUir1LFtOyA2EHZLdxW3GNcE= 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 5.15 1729/2214] power: supply: ab8500_charger: Skip absent AB8505 main charger Date: Wed, 18 Nov 2026 15:56:45 +0100 Message-ID: <20261118150120.861091346@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@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 5.15-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 7f35863717c7c..fe1af689c0819 100644 --- a/drivers/power/supply/ab8500_charger.c +++ b/drivers/power/supply/ab8500_charger.c @@ -649,16 +649,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 */ @@ -3372,7 +3375,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); @@ -3603,7 +3607,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