From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 8F4461684AC; Tue, 11 Mar 2025 15:25:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741706701; cv=none; b=mHjSPMXEBVH9GTyxEQshtTvz5hkVbPPgyfGOZ+8PqsmaAeEZL0YagTXqN3a/H5+wSSgErkRdg5P5YD02FZ2xXG8KEAJWPVcMQYwXQgO0BXiQ1Zbn9xgErglEPRc5u826uB0JBQnUHUoyVB4uPQKfbBHE+US36hQNTL/+CdGPufU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741706701; c=relaxed/simple; bh=tqKaQGlSIQTIqM8mQzzwEp3KfEgDy6jocl63CMS8DIE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VBmd4NE1XMnG4sdI6g/uCOkR1ysJej+9pUaRNEQdO8xsIUfbUiRyxx3A624sUgbR9bqT8lqYd4HpYtqn4qDF+6vlL6vfEI/fk6XCPWzN+X+BVl9FOaSc6wD8/+V/GpxkOFk9bLcTXBuL2CCQwbWl+s33Y5WFb6sAK6/V3VCOdIk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=hRHKinrh; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="hRHKinrh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1C3ABC4CEE9; Tue, 11 Mar 2025 15:25:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1741706701; bh=tqKaQGlSIQTIqM8mQzzwEp3KfEgDy6jocl63CMS8DIE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hRHKinrhxWRIWdloMBeQNBFAQdB6A2bIfdl6oA93o0BfceYgUIFvrmKJaM/2AJYuH VL4dgLM1asrAe3QPTKB2Sv32dSpl1sFNkNAzlIR5ng+mkRucLeYURnMPDAK6EJAiZq IqIIBG6LzzURsIx3IAdl7n+tBTNBVsEElLxlMBZk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Hans de Goede , Andy Shevchenko , Lee Jones , Sasha Levin Subject: [PATCH 5.10 137/462] mfd: lpc_ich: Add another Gemini Lake ISA bridge PCI device-id Date: Tue, 11 Mar 2025 15:56:43 +0100 Message-ID: <20250311145803.770761015@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250311145758.343076290@linuxfoundation.org> References: <20250311145758.343076290@linuxfoundation.org> User-Agent: quilt/0.68 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-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Hans de Goede [ Upstream commit 1e89d21f8189d286f80b900e1b7cf57cb1f3037e ] On N4100 / N4120 Gemini Lake SoCs the ISA bridge PCI device-id is 31e8 rather the 3197 found on e.g. the N4000 / N4020. While at fix the existing GLK PCI-id table entry breaking the table being sorted by device-id. Signed-off-by: Hans de Goede Reviewed-by: Andy Shevchenko Link: https://lore.kernel.org/r/20241114193808.110132-1-hdegoede@redhat.com Signed-off-by: Lee Jones Signed-off-by: Sasha Levin --- drivers/mfd/lpc_ich.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/mfd/lpc_ich.c b/drivers/mfd/lpc_ich.c index 2411b7a2e6f47..4c21c00124d5e 100644 --- a/drivers/mfd/lpc_ich.c +++ b/drivers/mfd/lpc_ich.c @@ -687,8 +687,9 @@ static const struct pci_device_id lpc_ich_ids[] = { { PCI_VDEVICE(INTEL, 0x2917), LPC_ICH9ME}, { PCI_VDEVICE(INTEL, 0x2918), LPC_ICH9}, { PCI_VDEVICE(INTEL, 0x2919), LPC_ICH9M}, - { PCI_VDEVICE(INTEL, 0x3197), LPC_GLK}, { PCI_VDEVICE(INTEL, 0x2b9c), LPC_COUGARMOUNTAIN}, + { PCI_VDEVICE(INTEL, 0x3197), LPC_GLK}, + { PCI_VDEVICE(INTEL, 0x31e8), LPC_GLK}, { PCI_VDEVICE(INTEL, 0x3a14), LPC_ICH10DO}, { PCI_VDEVICE(INTEL, 0x3a16), LPC_ICH10R}, { PCI_VDEVICE(INTEL, 0x3a18), LPC_ICH10}, -- 2.39.5