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 E5A3022C356; Sun, 26 Jan 2025 15:05:11 +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=1737903912; cv=none; b=llJwSBeibfxI6V+MM4kDM9g3YFXbGKQvQpJ0db5AD+FU91egtZMSnR7PvIb99S6RDUBIstxKPzGBD7HaWDtS8QT7E/1elXgzr2KyYsx3x3TsLINGCmSr+F0t/TERQZAFKD2RDfqzZtX100GuVDZZyFh6t5UPPlaABnk83pwKY70= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737903912; c=relaxed/simple; bh=ur8b3OpBwtaYWFlercXK7yLR2XsW9JEc9sIbtw+bd+M=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=g1Mh4x7lFDIupclWArb5BU5YBmQX2hxuuENe8kyu0+xL9uIqJynAQXU/NkatMSFh06MF2D+X+TJgiiXcO116/DpXqT6pZ7q268niUD0wWScUMK3YLKZMiNxMtXgkHH0xCEbu2zzqT+gVQ7SX2BpypqMP2rSL6I1Gns6AaZ9A/5o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Qj7Nz3sZ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Qj7Nz3sZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F17BEC4CEE2; Sun, 26 Jan 2025 15:05:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1737903911; bh=ur8b3OpBwtaYWFlercXK7yLR2XsW9JEc9sIbtw+bd+M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qj7Nz3sZ1xudVFed//m9jokQzIa1rn5BqY4+PAc85d8TqZo9XIMAdU0jERba3N7U8 tguaJ4jMIPZcbkG56+YDvhJbtDc1iuyDe0WJLntac8Un4mU5o11deMJnEjiiJDdcOc VvTPYDzZHOIQLM5ksqJgAyvFY+Ra2Xcs9rKMCakBe8nd4OkU0qGeSXWdZlCCNWbBCU xoU3gX1Osrio56COX1cUPwfamMOQpjtd+Nsorz54W2Pon8xupaEKPNAbAaGAYHWGQO OrnrQTK/F2gzhL/+upneyYriCjEh9HdiL4yWO8BeCyq//eaWa/7tSWypWy/xbBhzmK mUNxtnV02aM2w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hans de Goede , Andy Shevchenko , Lee Jones , Sasha Levin , ptyser@xes-inc.com Subject: [PATCH AUTOSEL 5.10 05/12] mfd: lpc_ich: Add another Gemini Lake ISA bridge PCI device-id Date: Sun, 26 Jan 2025 10:04:53 -0500 Message-Id: <20250126150500.959521-5-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250126150500.959521-1-sashal@kernel.org> References: <20250126150500.959521-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.10.233 Content-Transfer-Encoding: 8bit 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