From patchwork Wed Feb 1 05:04:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mauro Lima X-Patchwork-Id: 649612 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2FD90C05027 for ; Wed, 1 Feb 2023 05:05:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231268AbjBAFFT (ORCPT ); Wed, 1 Feb 2023 00:05:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230443AbjBAFFQ (ORCPT ); Wed, 1 Feb 2023 00:05:16 -0500 Received: from mail-ot1-x331.google.com (mail-ot1-x331.google.com [IPv6:2607:f8b0:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 31E35577D3 for ; Tue, 31 Jan 2023 21:05:14 -0800 (PST) Received: by mail-ot1-x331.google.com with SMTP id cm26-20020a056830651a00b00684e5c0108dso6095433otb.9 for ; Tue, 31 Jan 2023 21:05:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eclypsium.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MC6IpfrRtaolTBtBXQnK4Tbg6VHGS7OhoKF9+jdKZ1M=; b=LteX0C8RuM8rK8FapkxofHtKEc6fX0UhGEoMI0Qd+HKqhnAPKcRuXQWaQDNN47aopu O3qNQgSCMjlVBvX7MJT6mHxgL1EtGLY6vvbUZs3iOEAbcyOpdWVgGv+0QQX8gQIAnuRT X12kakC2ST0SWP2NGUt+apxREHRo1O75zBJsZtUTjdyO13MDWuCMpmT8ekypBwWDQzLR +qe+WrhWZN99tLglWeqEI1qQAFVSCIOtiEQv3KWDLVow8tY6mGfCT8ec9XDYc0IpX/Wd vW1xqV7KfbrDbt6SnwjjfeqVOSRIvqohNNw3uLFxynzTgURirnQwYsFpADgSxO8klaqm /rNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MC6IpfrRtaolTBtBXQnK4Tbg6VHGS7OhoKF9+jdKZ1M=; b=BW565g4u8fOA6Z096kJSrrONMGMBHa6QIsJACrHWF/raGBgLTAGiIkeVeKAPPDFwGv j/fPYHj2hJIzyh3djVkwE5N0k4IZu/aaD3y4HXQeX0bsDtI18TD4qH/iM0Yub4G8voI/ /Hz6nLt1gJ9S2VOEem5XtphQKerhV/gCrJunm7wxjbx7xNNGb9dU7CkHRz4TTEEGBXhp NPgT6IL0d5NAMfIH6yypBpavRY0COaqAIRrGCefrTHXQfckn7h9N4EDX+JWdvj+XAr/2 tsTZq/Bp4oVf1x3q/sabILNbmuAXu5VnpdM/56mtDTyj43gW9r+NR08gdbBJ/tFGSvxR Dpbw== X-Gm-Message-State: AO0yUKVtsI2SeAAcIyKc+tAZ8Gpc8U4D16MjgRrErLMIkkIEkvDtqUV0 CWbOXO5KYgXBFdpqeuXtr7jUxw4xSCxLp7mx X-Google-Smtp-Source: AK7set81jzCzLEL3SjggV9XQelmZwnU7B4y5JCAsagVTD3lBddTVFU+BKa0iLn7v7l2x9enmhSnkFg== X-Received: by 2002:a9d:6243:0:b0:68b:c67c:5d0b with SMTP id i3-20020a9d6243000000b0068bc67c5d0bmr657318otk.10.1675227913459; Tue, 31 Jan 2023 21:05:13 -0800 (PST) Received: from fedora.. ([186.122.181.28]) by smtp.gmail.com with ESMTPSA id cd26-20020a056830621a00b0068be61a7ac6sm1123445otb.56.2023.01.31.21.05.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Jan 2023 21:05:13 -0800 (PST) From: Mauro Lima To: mika.westerberg@linux.intel.com Cc: broonie@kernel.org, linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Mauro Lima Subject: [PATCH 1/2] spi: intel: Fix device private data and PR_NUM for BXT Date: Wed, 1 Feb 2023 02:04:54 -0300 Message-Id: <20230201050455.505135-2-mauro.lima@eclypsium.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230201050455.505135-1-mauro.lima@eclypsium.com> References: <20230201050455.505135-1-mauro.lima@eclypsium.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org Some private data fields have to change from bxt_info to cnl_info. Here is the list of Device IDs with the respective documentation taken for validation: 0xa0a4 - Intel® 500 Series Chipset Family On-Package Platform Controller Hub 0x02a4 - Intel® 400 Series Chipset Family On-Package PCH 0x06a4 - Intel® 400 Series Chipset Family Platform Controller Hub 0x34a4 - Intel® 495 Chipset Family On-Package 0xa3a4 - Intel® B460 and H410 Chipset According to documentation BXT has five PR registers. Signed-off-by: Mauro Lima --- drivers/spi/spi-intel-pci.c | 10 +++++----- drivers/spi/spi-intel.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/spi/spi-intel-pci.c b/drivers/spi/spi-intel-pci.c index f0d532ea40e8..10fa3a7fa4f5 100644 --- a/drivers/spi/spi-intel-pci.c +++ b/drivers/spi/spi-intel-pci.c @@ -60,12 +60,12 @@ static int intel_spi_pci_probe(struct pci_dev *pdev, } static const struct pci_device_id intel_spi_pci_ids[] = { - { PCI_VDEVICE(INTEL, 0x02a4), (unsigned long)&bxt_info }, - { PCI_VDEVICE(INTEL, 0x06a4), (unsigned long)&bxt_info }, + { PCI_VDEVICE(INTEL, 0x02a4), (unsigned long)&cnl_info }, + { PCI_VDEVICE(INTEL, 0x06a4), (unsigned long)&cnl_info }, { PCI_VDEVICE(INTEL, 0x18e0), (unsigned long)&bxt_info }, { PCI_VDEVICE(INTEL, 0x19e0), (unsigned long)&bxt_info }, { PCI_VDEVICE(INTEL, 0x1bca), (unsigned long)&bxt_info }, - { PCI_VDEVICE(INTEL, 0x34a4), (unsigned long)&bxt_info }, + { PCI_VDEVICE(INTEL, 0x34a4), (unsigned long)&cnl_info }, { PCI_VDEVICE(INTEL, 0x38a4), (unsigned long)&bxt_info }, { PCI_VDEVICE(INTEL, 0x43a4), (unsigned long)&cnl_info }, { PCI_VDEVICE(INTEL, 0x4b24), (unsigned long)&bxt_info }, @@ -75,11 +75,11 @@ static const struct pci_device_id intel_spi_pci_ids[] = { { PCI_VDEVICE(INTEL, 0x7a24), (unsigned long)&cnl_info }, { PCI_VDEVICE(INTEL, 0x7aa4), (unsigned long)&cnl_info }, { PCI_VDEVICE(INTEL, 0x7e23), (unsigned long)&cnl_info }, - { PCI_VDEVICE(INTEL, 0xa0a4), (unsigned long)&bxt_info }, + { PCI_VDEVICE(INTEL, 0xa0a4), (unsigned long)&cnl_info }, { PCI_VDEVICE(INTEL, 0xa1a4), (unsigned long)&bxt_info }, { PCI_VDEVICE(INTEL, 0xa224), (unsigned long)&bxt_info }, { PCI_VDEVICE(INTEL, 0xa324), (unsigned long)&cnl_info }, - { PCI_VDEVICE(INTEL, 0xa3a4), (unsigned long)&bxt_info }, + { PCI_VDEVICE(INTEL, 0xa3a4), (unsigned long)&cnl_info }, { }, }; MODULE_DEVICE_TABLE(pci, intel_spi_pci_ids); diff --git a/drivers/spi/spi-intel.c b/drivers/spi/spi-intel.c index f619212b0d5c..1052fb4b7973 100644 --- a/drivers/spi/spi-intel.c +++ b/drivers/spi/spi-intel.c @@ -104,7 +104,7 @@ #define BXT_PR 0x84 #define BXT_SSFSTS_CTL 0xa0 #define BXT_FREG_NUM 12 -#define BXT_PR_NUM 6 +#define BXT_PR_NUM 5 #define CNL_PR 0x84 #define CNL_FREG_NUM 6