From patchwork Wed Feb 1 20:54: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: 13124997 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 A848BC636D4 for ; Wed, 1 Feb 2023 20:56:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231836AbjBAU4K (ORCPT ); Wed, 1 Feb 2023 15:56:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39084 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232034AbjBAU4C (ORCPT ); Wed, 1 Feb 2023 15:56:02 -0500 Received: from mail-oa1-x2a.google.com (mail-oa1-x2a.google.com [IPv6:2001:4860:4864:20::2a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B98147BE6A for ; Wed, 1 Feb 2023 12:55:35 -0800 (PST) Received: by mail-oa1-x2a.google.com with SMTP id 586e51a60fabf-16332831ed0so25237343fac.10 for ; Wed, 01 Feb 2023 12:55:35 -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=PeLd/Nd4b4e469QD3joHZ1BOJX9DeXbQDNwvbYRUV1I=; b=Le0E1lHqJU+F0j47fvyEO9e4ol9sdGF2DXOZN2ylw9JSEpo7B4hPdyBrBuceN/bQc6 YtSUf4JWAT2lUeyOEuUjZz31bV+E5/l//+MZyNp5yl9KOMd8srgpB59y3HBDN7w9lSzV I+uyXCpdRpY6J/Mkyl7QL3oD3GxQrUyaPj/b+MC6L/uq7PaSOJvEWcmjHsENhssd/uJA 0nLbepS5t6oBznb97YZJ3cEpsqQfeGFfz/bfTzYvOxXZzi9ofgYLo1A9j82Tu9582Md6 fwxrE+r/0j/c+7YGxh9T+Go/v5rC+8x6iYRz5Gy+4Y/eYHgE6+3IXBthS2IOzkD0st4b LGJw== 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=PeLd/Nd4b4e469QD3joHZ1BOJX9DeXbQDNwvbYRUV1I=; b=zJu3TuhJp0T9LFC+24FEyeUMLsmK/YVHx2Hj0VgdRlR/Vhvs/bT9NjTctN4jn6kQb1 +LEOS/nFzb52m8jyW8BSIL28h1QOvj/veUERne9tPPrSVfNkrfK2JOfgLGIFuui7fLUM lZY0uZkt6BFq5DrtBNVUgcxtFZVpZtzEgnMetgpIfcrOD26l9OwFQVgjeH4XS7s0OuyV /MEfORf1eOupKL+RxzSBsMtMuKZRPWM8mRzlgKdGP3qCsTQ4ayLBdnw27zmT1fcLMuSg HvZmI+OoD0FWZvnTQ7nd92d3231xMZoNWG/aRB7IzS0BzK/CLdrVHFOcmiYEvIewx5KR 3OSA== X-Gm-Message-State: AO0yUKUKEOE3F04wklIeHQm+8T2tkE5rKsDvD8+tj/QR39O1yNi4R7vf cYvnoWyjQkVNCHeuhAjxSTkIyA== X-Google-Smtp-Source: AK7set980F6LsXrVeJT1vu+ZMKBzX4HCzpLuzvY39OmUtsfPjVmLJSCay1+rzifobMCzBbyoD5zFLg== X-Received: by 2002:a05:6871:441:b0:163:20a2:ddde with SMTP id e1-20020a056871044100b0016320a2dddemr2189604oag.42.1675284934880; Wed, 01 Feb 2023 12:55:34 -0800 (PST) Received: from fedora.. ([186.122.181.28]) by smtp.gmail.com with ESMTPSA id n18-20020a056870971200b0014fe4867dc7sm8245908oaq.56.2023.02.01.12.55.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Feb 2023 12:55:34 -0800 (PST) From: Mauro Lima To: mika.westerberg@linux.intel.com Cc: broonie@kernel.org, alok.a.tiwari@oracle.com, linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Mauro Lima Subject: [PATCH v2 1/2] spi: intel: Fix device private data and PR_NUM for Broxton controllers Date: Wed, 1 Feb 2023 17:54:54 -0300 Message-Id: <20230201205455.550308-2-mauro.lima@eclypsium.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230201205455.550308-1-mauro.lima@eclypsium.com> References: <20230201205455.550308-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 PCH 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 Broxton controller type has five PR registers. Signed-off-by: Mauro Lima Acked-by: Mika Westerberg --- 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