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 7BBDD1C5D6C; Wed, 19 Feb 2025 09:19:17 +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=1739956757; cv=none; b=kvl5EUPIXGagMGotFiFGWU3/5Dc5Dls40bOZBHKiVgvLA6TMyFun7DT1h8JxMwZ/AjU2Ju4MZmcW/7q1KzP9TDTiPUw9Vdo1ZDRZ9HWWSC3vGcs07/fLtRe97UvELpMQMaAJLX2VYkayRWvu9Co6bbkdWNBe/Mn1cGvkp0TaZcA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739956757; c=relaxed/simple; bh=ZoJ6lsJYxrzZHSx6dULsEPy49o/5+3B9vrhe0VRmRQE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YJ1wX/mFm/p+NUDiB3VSku8AQUSa243+HzAUVOojoSc9cShnn0rDOesEfuUWjkEdQLs8r8yFZAh216oI7m7aImjDdtqdtYwFd9avVoKYa6UZA376kJT/gk2a/Bcx3ubswIHRjJp7yAsahHOYLMJWCmv/zyZKbQ87JX9E1B2A1+g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=fEURQqlo; 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="fEURQqlo" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 02ADDC4CED1; Wed, 19 Feb 2025 09:19:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1739956757; bh=ZoJ6lsJYxrzZHSx6dULsEPy49o/5+3B9vrhe0VRmRQE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fEURQqloHXYL5+5aTbXBbmzk05PlP8A/a1wHvn5lYc7oOAMwJxWhyLN8xTeLD0c+W NWL64STr+78qr8LKTXA/rzBMBhQH8QtneBp5dAv0fqW5A+YET5zGc2w/sIomHmZ726 UobjWibptjsA/dA42RZP+SQhVUuByJhjyRxPYsj0= 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 6.1 290/578] mfd: lpc_ich: Add another Gemini Lake ISA bridge PCI device-id Date: Wed, 19 Feb 2025 09:24:54 +0100 Message-ID: <20250219082704.420980969@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250219082652.891560343@linuxfoundation.org> References: <20250219082652.891560343@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-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 7b1c597b6879f..03367fcac42a7 100644 --- a/drivers/mfd/lpc_ich.c +++ b/drivers/mfd/lpc_ich.c @@ -756,8 +756,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