From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0A8091EA65; Thu, 28 May 2026 20:29:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780000180; cv=none; b=aP7QrRQFaRKkt4My09GtneBd+5Ce8W172PU0rDb89+5jEIUbaI/yH1/hn5m84RUKUFwuS8Di2ARl4XCVa8wdFa0/rw3yYnZywldoC+74x4G10aeHqpf7qoCL3um3HXxBKGZPpFzlZwoD3wk2wTUjWF7ZTlVDXfIa6wIICdZPh5g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780000180; c=relaxed/simple; bh=jtsU0nGGCpMxaHmql99hZsMf1mO8CC+W2QNxQlS72fg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=B+cnJjZBC4pwt6DPqT4m4c6cQOzEk+RW1gaujmXm+mJ/Ah72hAudcFTybAdtJADZnmyv+meovzUxk1xQomDJBnN6jsRQJ/bkkn0W1FskvOA7wUfWtHmu0X44rUg6cKHEQTM4fcnA160crVvGAg/X2zAYx6Kzx+Z/KRy18cQHxBA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=TMrn+pCf; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="TMrn+pCf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6A5B11F000E9; Thu, 28 May 2026 20:29:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780000178; bh=9qJdyN7Ax1oL1ero/jvpOz++zPX2L7R2D9oRFZFipGM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=TMrn+pCfNuqUvp2ADV6+kSZS+caTphuO101rkHv3n66YSnpHF3RC/Bni3+riOVVWa b2DhMYUCweP4GjGWVIPoPHBKmUmVYBrR4kd35TSDz/juyar4BcMr61bKt426WAHolu SYKTX2/qe/CRiMxCCU8fg+AvHRQZF5wLVDTiQSf8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Oliver White , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Sasha Levin Subject: [PATCH 6.18 330/377] platform/surface: aggregator_registry: omit battery & AC nodes on Surface Laptop 7 Date: Thu, 28 May 2026 21:49:28 +0200 Message-ID: <20260528194647.962934547@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260528194638.371537336@linuxfoundation.org> References: <20260528194638.371537336@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Oliver White [ Upstream commit 0488073a6c84571dd3cffe581a4a73a5fceb099d ] Surface Laptop 7 exposes battery and AC status via Qualcomm PMIC GLINK qcom_battmgr. Registering the standard SSAM battery and AC client devices on this platform causes duplicate power-supply devices to appear. Drop the SSAM battery and AC nodes from the Surface Laptop 7 registry group so that only the qcom_battmgr power supplies are instantiated. Fixes: b27622f13172 ("platform/surface: Add OF support") Signed-off-by: Oliver White Link: https://patch.msgid.link/20260409034347.17381-1-oliverjwhite07@gmail.com Reviewed-by: Ilpo Järvinen Signed-off-by: Ilpo Järvinen Signed-off-by: Sasha Levin --- drivers/platform/surface/surface_aggregator_registry.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c index a594d5fcfcfd1..d29158faba3e8 100644 --- a/drivers/platform/surface/surface_aggregator_registry.c +++ b/drivers/platform/surface/surface_aggregator_registry.c @@ -295,8 +295,6 @@ static const struct software_node *ssam_node_group_sl6[] = { /* Devices for Surface Laptop 7. */ static const struct software_node *ssam_node_group_sl7[] = { &ssam_node_root, - &ssam_node_bat_ac, - &ssam_node_bat_main, &ssam_node_tmp_perf_profile_with_fan, &ssam_node_fan_speed, &ssam_node_hid_sam_keyboard, -- 2.53.0