From patchwork Wed Oct 19 15:04:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 5668 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp382105wrs; Wed, 19 Oct 2022 08:15:55 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5R+Mz1oYIk1pTs7eLxutNB2ZC+mIDDk4FtZ03bpovMVy87prLh4euT05G4CHYqTuo0Rj7L X-Received: by 2002:a17:907:86a9:b0:78d:f741:7fa0 with SMTP id qa41-20020a17090786a900b0078df7417fa0mr7106110ejc.734.1666192555097; Wed, 19 Oct 2022 08:15:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666192555; cv=none; d=google.com; s=arc-20160816; b=q1LpRE7ogyokZnYe/ylk+WqVFFsk6kD6VJqfOATeRlIqOmFJYqx6ms5RIiXfPcauj0 K3xf2MooekFP/LsjgRpdkHUKSKSoOwQjo3R+4TlxSOpKtJAZ41O9BdJCjrbuO9QN0qBS rLcN6HVFPvVWuIdjn2Dqr2IPpNQrGf8ee0E1sRvJKg/6jqrm+oX6IkgkPcnLx4A5HyA/ q78aXMR8Xs3vp44ERaZZQu+BW+y32ZgbHaZd8KdDjMIsZ/0bwFsTutTr1emOIJ8E+4dS FucHjlEMr3mwGulyZMmNEIvjPt/E+HYs2lLkr21IV8etjTGvDZewqbrR0TRdWl0Xe9FP SjZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=oN6xjEPnA3cRolRYKf4Aj9BRbKg6tneV70IdDwPJSMk=; b=r09VMfdoiqAH9g6Da/DkLEiEFV9r6xY2bcUCJ2WU6fn4Dt5jYqq133SPiWUh87HKXB I2z9ANxHQy/Vggr3oWB7Zndyl9XvJ6STgx7BWoTmmw1EOFHccBPR+afskPYt3OrAe5sw rBLlP8hR0+YaLBduZ+sYD57xAsTPgxGzBpn+BN1rdi8Hc19GdjcjpHL+9ec0WZBk+cx2 Un/u5E6flIZeiXkmVTTL0gxLNXG/WLAx/CpEP0onqVECrUys6KKI+fAT6GtD6Y+1REmL bSYWLp73sWn+YAFAbZyL3HhoR48OP46kQF2po0kTXx1g1tS4ig2YdI1AxyzkL4pUkWhr SNGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="QKZW2Ob/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x10-20020a170906710a00b007820f00167fsi11774390ejj.260.2022.10.19.08.15.26; Wed, 19 Oct 2022 08:15:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="QKZW2Ob/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232329AbiJSPMg (ORCPT + 99 others); Wed, 19 Oct 2022 11:12:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232135AbiJSPL2 (ORCPT ); Wed, 19 Oct 2022 11:11:28 -0400 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E59BFBE502; Wed, 19 Oct 2022 08:04:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1666191875; x=1697727875; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=hWe3aaoOgf+xq5Pq0douiTL3qv6/yUoCMHsfExvmaKw=; b=QKZW2Ob/gLgvdrrzndHUmNcbqnGhalNyWb2jbMg02XFcfNP555gSMUeW dQZw/3XhrlCAmqunf52C1bvZiB2c/MvkECC3ihrAcoXNSEreNYeA7Kc/d f3bunUKefznjdldmEZbgVlPMH6oiMgVIOzywaepTvrsvczS7Hz1iCWgrZ mu7m72qN4I678mC4qwD1PObQxUat4Y1kQpIj3t4W8Ma5ZgfsiC5PUzRsY zbFcH2dkil4ojipZQYo6SWsw1pBzetQN0twpubR5heL/8UxexPPIyDlFe KjKt3itWXMaUglg0R0m1JvMn5SRl9SO2eWlnpSGB4HNKvKkYSck+V+a25 g==; X-IronPort-AV: E=McAfee;i="6500,9779,10505"; a="305170523" X-IronPort-AV: E=Sophos;i="5.95,196,1661842800"; d="scan'208";a="305170523" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Oct 2022 08:04:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10505"; a="607135193" X-IronPort-AV: E=Sophos;i="5.95,196,1661842800"; d="scan'208";a="607135193" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga006.jf.intel.com with ESMTP; 19 Oct 2022 08:04:12 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 8B3FED0; Wed, 19 Oct 2022 18:04:33 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-arm-kernel@lists.infradead.org, linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Daniel Mack , Haojian Zhuang , Robert Jarzmik , Mark Brown Subject: [PATCH v2 1/5] spi: pxa2xx: Respect Intel SSP type given by a property Date: Wed, 19 Oct 2022 18:04:26 +0300 Message-Id: <20221019150430.27142-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221019150430.27142-1-andriy.shevchenko@linux.intel.com> References: <20221019150430.27142-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747129524627775491?= X-GMAIL-MSGID: =?utf-8?q?1747129524627775491?= Allow to set the Intel SSP type by reading the property. Signed-off-by: Andy Shevchenko --- drivers/spi/spi-pxa2xx.c | 6 ++++++ include/linux/pxa2xx_ssp.h | 1 + 2 files changed, 7 insertions(+) diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index 03ed6d4a14cd..857732a54ca7 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c @@ -1460,6 +1460,7 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev) struct resource *res; struct pci_dev *pcidev = dev_is_pci(parent) ? to_pci_dev(parent) : NULL; const struct pci_device_id *pcidev_id = NULL; + u32 value = SSP_UNDEFINED; enum pxa_ssp_type type; const void *match; int status; @@ -1468,9 +1469,14 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev) if (pcidev) pcidev_id = pci_match_id(pxa2xx_spi_pci_compound_match, pcidev); + /* Always try to read property */ + device_property_read_u32(&pdev->dev, "intel,spi-pxa2xx-type", &value); + match = device_get_match_data(&pdev->dev); if (match) type = (enum pxa_ssp_type)match; + else if (value > SSP_UNDEFINED && value < SSP_MAX) + type = (enum pxa_ssp_type)value; else if (pcidev_id) type = (enum pxa_ssp_type)pcidev_id->driver_data; else diff --git a/include/linux/pxa2xx_ssp.h b/include/linux/pxa2xx_ssp.h index a3fec2de512f..cd1973e6ac4b 100644 --- a/include/linux/pxa2xx_ssp.h +++ b/include/linux/pxa2xx_ssp.h @@ -229,6 +229,7 @@ enum pxa_ssp_type { LPSS_SPT_SSP, LPSS_BXT_SSP, LPSS_CNL_SSP, + SSP_MAX }; struct ssp_device { From patchwork Wed Oct 19 15:04:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 5663 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp381026wrs; Wed, 19 Oct 2022 08:13:47 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4KJvkXJfYhXAuZKq7nfILrVrWz22fHIdLA61o+XPCowQ3u7UijFiLBrvKumcPtrcttJvJY X-Received: by 2002:a17:907:2e19:b0:78e:11cc:3bc5 with SMTP id ig25-20020a1709072e1900b0078e11cc3bc5mr7193802ejc.543.1666192427152; Wed, 19 Oct 2022 08:13:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666192427; cv=none; d=google.com; s=arc-20160816; b=Ygrudwua9U8sbLJ71lE0bxkS4a/W0vMr15+tmUrp0F9hlP0haa1ujMT4LtPFsRxmB4 UWeDZ8luAxx84Rpd+0lSj4D87W2p7D7wwgu19PfQRBf5GQrDFVDf22UFVOzLS5ngfiuw wOKubnJyqomyiICcoc1GD48XsNBZogfx8IvWS/ovHKUESRq6EYROKiOswnh6VeptdkCO m0kMFUvb2OqxVu/S5jeP1sFi1Kr9e6eiPSUaAJoyMnmX3yvo3x5kSDl0oFJkdCn+0VNe 1ubIzoEuEcIsIZKGyqAh0MJ7UgblLrTUrlf5vRvwYjaVjkWOdY7/dl+LTj73oxszh1og iymA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=wrjFeUcgSX6FabgS6Q66GklLRP1b4SA7UoMmA9jsAZ4=; b=SStzCV0Awl7tXgMutGRpk/ClhtTlKb7BxpXm5vrpNgCyo34fVc99z0idOMCinqLuhI J8J/iwJE089teFbarXGurAg9sqo3Ik26khRL9zEShod6nmaoymvt55udB2A8V60wFzZZ KobksLBVEADZVzIANwOXmd1RW3TqmeFIY2Lt+k8f4CM3DjxBj0JffT1F16agmtrKH3Kq yT0Nr5gh9q/Tibtzmkn2+eBDtxt5MMcgZduTujrfc9Kyrs343K0c5tEA1uKBR11lAx1w dX9UXTyFwldJkcB4Io6geBAJgG6ItFCR/Wyy+Y5QGy6GoPon70Votgl7yj+PfHc4dOof UpQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=hu8LJ3Q0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l16-20020aa7cad0000000b00459c1e64776si13018144edt.412.2022.10.19.08.13.17; Wed, 19 Oct 2022 08:13:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=hu8LJ3Q0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232267AbiJSPLm (ORCPT + 99 others); Wed, 19 Oct 2022 11:11:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57646 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230455AbiJSPLA (ORCPT ); Wed, 19 Oct 2022 11:11:00 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1DE5F53CD; Wed, 19 Oct 2022 08:04:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1666191855; x=1697727855; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tLH6McL/k+1AdtQX5dfk1xHgIg0bo2xOAuTSBmeqVyU=; b=hu8LJ3Q0qXL89V8Ai5PayL8yuVkii5Pu8VvvwOZYTudSjSmXmDtaN6qe 7XjrmBmPfLeIC2KFxogq+FEuHdUOlKj+dU6ekBBjRo6YlK/7cYeAigTyb f1xxmEURtfpFvSsGOy8Gt8DyA7Tw4SPBok/ltPImNUUe4stAff6Hzl5fs CVAlki83gQscJWO30AvkdqEKEgsizNzsOkOLY2Ea4wHF6wefhpqvZ20Yj aQX/MlBGYgKdIQa5PQ0AmF/fWtMKlvwsDqexs7kAfL0bqFtAlJ1ZKrbG4 8/2SMG2+TKqtYZ5ipLnB+yfM3N+wyIkgdpFnYAiKgYD7C7QlgdSvaUVku g==; X-IronPort-AV: E=McAfee;i="6500,9779,10505"; a="306425602" X-IronPort-AV: E=Sophos;i="5.95,196,1661842800"; d="scan'208";a="306425602" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Oct 2022 08:04:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10505"; a="771826790" X-IronPort-AV: E=Sophos;i="5.95,196,1661842800"; d="scan'208";a="771826790" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 19 Oct 2022 08:04:12 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 9E2401C7; Wed, 19 Oct 2022 18:04:33 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-arm-kernel@lists.infradead.org, linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Daniel Mack , Haojian Zhuang , Robert Jarzmik , Mark Brown Subject: [PATCH v2 2/5] spi: pxa2xx: Remove no more needed PCI ID table Date: Wed, 19 Oct 2022 18:04:27 +0300 Message-Id: <20221019150430.27142-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221019150430.27142-1-andriy.shevchenko@linux.intel.com> References: <20221019150430.27142-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_HI,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747129390623575772?= X-GMAIL-MSGID: =?utf-8?q?1747129390623575772?= Since the PCI enumerated devices provide a property with SSP type, there is no more necessity to bear the copy of the ID table here. Remove it for good. Signed-off-by: Andy Shevchenko --- drivers/spi/spi-pxa2xx.c | 117 +-------------------------------------- 1 file changed, 2 insertions(+), 115 deletions(-) diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index 857732a54ca7..1d36d055a9d6 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include @@ -1335,121 +1334,17 @@ static const struct acpi_device_id pxa2xx_spi_acpi_match[] = { MODULE_DEVICE_TABLE(acpi, pxa2xx_spi_acpi_match); #endif -/* - * PCI IDs of compound devices that integrate both host controller and private - * integrated DMA engine. Please note these are not used in module - * autoloading and probing in this module but matching the LPSS SSP type. - */ -static const struct pci_device_id pxa2xx_spi_pci_compound_match[] = { - /* SPT-LP */ - { PCI_VDEVICE(INTEL, 0x9d29), LPSS_SPT_SSP }, - { PCI_VDEVICE(INTEL, 0x9d2a), LPSS_SPT_SSP }, - /* SPT-H */ - { PCI_VDEVICE(INTEL, 0xa129), LPSS_SPT_SSP }, - { PCI_VDEVICE(INTEL, 0xa12a), LPSS_SPT_SSP }, - /* KBL-H */ - { PCI_VDEVICE(INTEL, 0xa2a9), LPSS_SPT_SSP }, - { PCI_VDEVICE(INTEL, 0xa2aa), LPSS_SPT_SSP }, - /* CML-V */ - { PCI_VDEVICE(INTEL, 0xa3a9), LPSS_SPT_SSP }, - { PCI_VDEVICE(INTEL, 0xa3aa), LPSS_SPT_SSP }, - /* BXT A-Step */ - { PCI_VDEVICE(INTEL, 0x0ac2), LPSS_BXT_SSP }, - { PCI_VDEVICE(INTEL, 0x0ac4), LPSS_BXT_SSP }, - { PCI_VDEVICE(INTEL, 0x0ac6), LPSS_BXT_SSP }, - /* BXT B-Step */ - { PCI_VDEVICE(INTEL, 0x1ac2), LPSS_BXT_SSP }, - { PCI_VDEVICE(INTEL, 0x1ac4), LPSS_BXT_SSP }, - { PCI_VDEVICE(INTEL, 0x1ac6), LPSS_BXT_SSP }, - /* GLK */ - { PCI_VDEVICE(INTEL, 0x31c2), LPSS_BXT_SSP }, - { PCI_VDEVICE(INTEL, 0x31c4), LPSS_BXT_SSP }, - { PCI_VDEVICE(INTEL, 0x31c6), LPSS_BXT_SSP }, - /* ICL-LP */ - { PCI_VDEVICE(INTEL, 0x34aa), LPSS_CNL_SSP }, - { PCI_VDEVICE(INTEL, 0x34ab), LPSS_CNL_SSP }, - { PCI_VDEVICE(INTEL, 0x34fb), LPSS_CNL_SSP }, - /* EHL */ - { PCI_VDEVICE(INTEL, 0x4b2a), LPSS_BXT_SSP }, - { PCI_VDEVICE(INTEL, 0x4b2b), LPSS_BXT_SSP }, - { PCI_VDEVICE(INTEL, 0x4b37), LPSS_BXT_SSP }, - /* JSL */ - { PCI_VDEVICE(INTEL, 0x4daa), LPSS_CNL_SSP }, - { PCI_VDEVICE(INTEL, 0x4dab), LPSS_CNL_SSP }, - { PCI_VDEVICE(INTEL, 0x4dfb), LPSS_CNL_SSP }, - /* TGL-H */ - { PCI_VDEVICE(INTEL, 0x43aa), LPSS_CNL_SSP }, - { PCI_VDEVICE(INTEL, 0x43ab), LPSS_CNL_SSP }, - { PCI_VDEVICE(INTEL, 0x43fb), LPSS_CNL_SSP }, - { PCI_VDEVICE(INTEL, 0x43fd), LPSS_CNL_SSP }, - /* ADL-P */ - { PCI_VDEVICE(INTEL, 0x51aa), LPSS_CNL_SSP }, - { PCI_VDEVICE(INTEL, 0x51ab), LPSS_CNL_SSP }, - { PCI_VDEVICE(INTEL, 0x51fb), LPSS_CNL_SSP }, - /* ADL-M */ - { PCI_VDEVICE(INTEL, 0x54aa), LPSS_CNL_SSP }, - { PCI_VDEVICE(INTEL, 0x54ab), LPSS_CNL_SSP }, - { PCI_VDEVICE(INTEL, 0x54fb), LPSS_CNL_SSP }, - /* APL */ - { PCI_VDEVICE(INTEL, 0x5ac2), LPSS_BXT_SSP }, - { PCI_VDEVICE(INTEL, 0x5ac4), LPSS_BXT_SSP }, - { PCI_VDEVICE(INTEL, 0x5ac6), LPSS_BXT_SSP }, - /* RPL-S */ - { PCI_VDEVICE(INTEL, 0x7a2a), LPSS_CNL_SSP }, - { PCI_VDEVICE(INTEL, 0x7a2b), LPSS_CNL_SSP }, - { PCI_VDEVICE(INTEL, 0x7a79), LPSS_CNL_SSP }, - { PCI_VDEVICE(INTEL, 0x7a7b), LPSS_CNL_SSP }, - /* ADL-S */ - { PCI_VDEVICE(INTEL, 0x7aaa), LPSS_CNL_SSP }, - { PCI_VDEVICE(INTEL, 0x7aab), LPSS_CNL_SSP }, - { PCI_VDEVICE(INTEL, 0x7af9), LPSS_CNL_SSP }, - { PCI_VDEVICE(INTEL, 0x7afb), LPSS_CNL_SSP }, - /* MTL-P */ - { PCI_VDEVICE(INTEL, 0x7e27), LPSS_CNL_SSP }, - { PCI_VDEVICE(INTEL, 0x7e30), LPSS_CNL_SSP }, - { PCI_VDEVICE(INTEL, 0x7e46), LPSS_CNL_SSP }, - /* CNL-LP */ - { PCI_VDEVICE(INTEL, 0x9daa), LPSS_CNL_SSP }, - { PCI_VDEVICE(INTEL, 0x9dab), LPSS_CNL_SSP }, - { PCI_VDEVICE(INTEL, 0x9dfb), LPSS_CNL_SSP }, - /* CNL-H */ - { PCI_VDEVICE(INTEL, 0xa32a), LPSS_CNL_SSP }, - { PCI_VDEVICE(INTEL, 0xa32b), LPSS_CNL_SSP }, - { PCI_VDEVICE(INTEL, 0xa37b), LPSS_CNL_SSP }, - /* CML-LP */ - { PCI_VDEVICE(INTEL, 0x02aa), LPSS_CNL_SSP }, - { PCI_VDEVICE(INTEL, 0x02ab), LPSS_CNL_SSP }, - { PCI_VDEVICE(INTEL, 0x02fb), LPSS_CNL_SSP }, - /* CML-H */ - { PCI_VDEVICE(INTEL, 0x06aa), LPSS_CNL_SSP }, - { PCI_VDEVICE(INTEL, 0x06ab), LPSS_CNL_SSP }, - { PCI_VDEVICE(INTEL, 0x06fb), LPSS_CNL_SSP }, - /* TGL-LP */ - { PCI_VDEVICE(INTEL, 0xa0aa), LPSS_CNL_SSP }, - { PCI_VDEVICE(INTEL, 0xa0ab), LPSS_CNL_SSP }, - { PCI_VDEVICE(INTEL, 0xa0de), LPSS_CNL_SSP }, - { PCI_VDEVICE(INTEL, 0xa0df), LPSS_CNL_SSP }, - { PCI_VDEVICE(INTEL, 0xa0fb), LPSS_CNL_SSP }, - { PCI_VDEVICE(INTEL, 0xa0fd), LPSS_CNL_SSP }, - { PCI_VDEVICE(INTEL, 0xa0fe), LPSS_CNL_SSP }, - { }, -}; - static const struct of_device_id pxa2xx_spi_of_match[] = { { .compatible = "marvell,mmp2-ssp", .data = (void *)MMP2_SSP }, {}, }; MODULE_DEVICE_TABLE(of, pxa2xx_spi_of_match); -#ifdef CONFIG_PCI - static bool pxa2xx_spi_idma_filter(struct dma_chan *chan, void *param) { return param == chan->device->dev; } -#endif /* CONFIG_PCI */ - static struct pxa2xx_spi_controller * pxa2xx_spi_init_pdata(struct platform_device *pdev) { @@ -1458,17 +1353,12 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev) struct device *parent = dev->parent; struct ssp_device *ssp; struct resource *res; - struct pci_dev *pcidev = dev_is_pci(parent) ? to_pci_dev(parent) : NULL; - const struct pci_device_id *pcidev_id = NULL; u32 value = SSP_UNDEFINED; enum pxa_ssp_type type; const void *match; int status; u64 uid; - if (pcidev) - pcidev_id = pci_match_id(pxa2xx_spi_pci_compound_match, pcidev); - /* Always try to read property */ device_property_read_u32(&pdev->dev, "intel,spi-pxa2xx-type", &value); @@ -1477,8 +1367,6 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev) type = (enum pxa_ssp_type)match; else if (value > SSP_UNDEFINED && value < SSP_MAX) type = (enum pxa_ssp_type)value; - else if (pcidev_id) - type = (enum pxa_ssp_type)pcidev_id->driver_data; else return ERR_PTR(-EINVAL); @@ -1494,13 +1382,12 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev) ssp->phys_base = res->start; -#ifdef CONFIG_PCI - if (pcidev_id) { + /* Platforms with iDMA 64-bit */ + if (platform_get_resource_byname(pdev, IORESOURCE_MEM, "lpss_priv")) { pdata->tx_param = parent; pdata->rx_param = parent; pdata->dma_filter = pxa2xx_spi_idma_filter; } -#endif ssp->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(ssp->clk)) From patchwork Wed Oct 19 15:04:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 5666 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp381195wrs; Wed, 19 Oct 2022 08:14:05 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5jgN++DyXXXsoviCYOqbYXwoRVLxiPqOxKfh3nCq2Ooy/flfAWI4gmDwUKVf4qRNNvpVLv X-Received: by 2002:a05:6402:274c:b0:45d:4015:cd8c with SMTP id z12-20020a056402274c00b0045d4015cd8cmr8186460edd.268.1666192445189; Wed, 19 Oct 2022 08:14:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666192445; cv=none; d=google.com; s=arc-20160816; b=FTDSRKbwpGylwh1y1sTvN726heyJFOUZAS+We7kRQoS9i+OSB0CD6h1YS3GefIB1EI a2Lh9DQiWA8xynFA9kdV2Dwut7cAGgPuGFm2OpyWoWFRVJngEINf3HfJRw5ALAkU/VDr AbU1lYzRccrU5wW/zzUNkLv1SgYoIs2u+s86s+PcxS+Z4IwxBGu1rklYjhoU0LFr3kkD VBhfvnvJTKh0O4vefEJtQWPoRdv4tyhEXDN1FNRxPNAXam7O81qPdAf8uJhq+kultyxU jEhz+TN6HSdOx7+7cO5tQvsPcohQXZb+1D3KqqwQ5oyQrS2juksR1TK/7u9mAm8cFZYJ vofg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=SUsqh44yz67MZi+PLVc6evmnn/PmOlsg9PVknHREaKo=; b=KDOdO3xdJRp2IsoGReNijX0yXFFrob0tQCvjBQm4OsJWDj6boQ+jCiBnXwoNRhH2kk p0vmdqssksBGSLNbGfKUMdlC+Y1hoOPI7GZ3FX/t6ySbORPuh3edY2XUC/bxaVqTesmz WERkMAz1IwvlXt/lyHHauxdNqpz3h3o8DgmGTg+nUOc1DZ6TsQRAu+QtCZ+NeyvCnveT 4Gev2ciF8rv1VmbKAPZ7DQOc+J3tKZUaDG91vfNJfZtUFsvhJ8w+wL5Nn2Rc67AbWpQH YT7B8/sXfX1RHHmox6SDHhNE6qrDHvYkzeMQyyW6LKrOG/tyvjfEwaF1ssP3cyiPNmo6 JbRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="nTHH/5bZ"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n11-20020a05640205cb00b00452697eda4csi17237808edx.58.2022.10.19.08.13.40; Wed, 19 Oct 2022 08:14:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="nTHH/5bZ"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232287AbiJSPMZ (ORCPT + 99 others); Wed, 19 Oct 2022 11:12:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232261AbiJSPLc (ORCPT ); Wed, 19 Oct 2022 11:11:32 -0400 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 58E677D1C2; Wed, 19 Oct 2022 08:04:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1666191887; x=1697727887; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7hGgSA2GsBhzJwzVfaWPKJQVLq/322V9p+NlpEwW/lY=; b=nTHH/5bZEj8QgClyUBItabkN55sTS+n3da2h2SmyDBNCTQYDeRjMrpoG QDyyLxrVAm171JGP0PEmcW8pqN8mfnyfnBll6WyiD4SkqNNDM7j6rvTwR WFVVKQs5huf1vKnrwtnHjsrDSWPajEekgEA+Ajy6BtmDZlXg2d9sdelVd o/UsEqu7K9NxPN6l51gs6elUFPB9AwkEH8yn0iKJCRUCUrjX+rdg7etHB otIUYOkRQn5NsTAFV5BV7nqiMADTtx3jyWRIOBPh4xXGPLWeIyyBYICNi A4xpWW+UOGRveYJJ+UIBZnp0W2lETDY9LCLheNFrewQCsvEqiaWmdKQax g==; X-IronPort-AV: E=McAfee;i="6500,9779,10505"; a="305170527" X-IronPort-AV: E=Sophos;i="5.95,196,1661842800"; d="scan'208";a="305170527" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Oct 2022 08:04:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10505"; a="607135198" X-IronPort-AV: E=Sophos;i="5.95,196,1661842800"; d="scan'208";a="607135198" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga006.jf.intel.com with ESMTP; 19 Oct 2022 08:04:12 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id AA5D215C; Wed, 19 Oct 2022 18:04:33 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-arm-kernel@lists.infradead.org, linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Daniel Mack , Haojian Zhuang , Robert Jarzmik , Mark Brown Subject: [PATCH v2 3/5] spi: pxa2xx: Remove no more needed driver data Date: Wed, 19 Oct 2022 18:04:28 +0300 Message-Id: <20221019150430.27142-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221019150430.27142-1-andriy.shevchenko@linux.intel.com> References: <20221019150430.27142-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747129409413428436?= X-GMAIL-MSGID: =?utf-8?q?1747129409413428436?= Since the ACPI enumerated devices provide a property with SSP type, there is no more necessity to bear the copy of them in the ID table. Drop the driver data in ACPI ID table. Signed-off-by: Andy Shevchenko --- drivers/spi/spi-pxa2xx.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index 1d36d055a9d6..31927493eeb0 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c @@ -1323,12 +1323,12 @@ static void cleanup(struct spi_device *spi) #ifdef CONFIG_ACPI static const struct acpi_device_id pxa2xx_spi_acpi_match[] = { - { "INT33C0", LPSS_LPT_SSP }, - { "INT33C1", LPSS_LPT_SSP }, - { "INT3430", LPSS_LPT_SSP }, - { "INT3431", LPSS_LPT_SSP }, - { "80860F0E", LPSS_BYT_SSP }, - { "8086228E", LPSS_BSW_SSP }, + { "INT33C0" }, + { "INT33C1" }, + { "INT3430" }, + { "INT3431" }, + { "80860F0E" }, + { "8086228E" }, { }, }; MODULE_DEVICE_TABLE(acpi, pxa2xx_spi_acpi_match); From patchwork Wed Oct 19 15:04:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 5665 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp381162wrs; Wed, 19 Oct 2022 08:14:02 -0700 (PDT) X-Google-Smtp-Source: AMsMyM699W+030nvVLFD0T1v3Ijiv/CY7tIXKux7/EeF77N34ujsRcQqUZzbY8GQIP1ZJVskzApF X-Received: by 2002:a17:907:6288:b0:78d:ab30:c374 with SMTP id nd8-20020a170907628800b0078dab30c374mr7287923ejc.266.1666192441895; Wed, 19 Oct 2022 08:14:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666192441; cv=none; d=google.com; s=arc-20160816; b=nRL9n4kkEnhyka9vx1nbqLB0qqcRhtbd6UurpQp5eWOrs4t6ji/+Uk3l2rWkbVUwg+ 34aOuAafTvhDzBeZID5gw3R0vpznx/VnXAVbttWunoc5CFemxNAnFjfgU2i7YeJBG7Op H2xodukl1AeX0BoZHgFHRdFHzxjKSf/QdpXbcpvjQ/mZxryMAYqIHA1W0piaSya800G2 e7/OvyPK79rfRdbHtKXe3NHILf2RpiJpI1U4tYkwXxYH/AYEsm+jpU3IzRMOU36Eh7O3 staqGZA9zUHneXWLbjopgYNjIypD/UFP4Drmuf3NHHcr+VKxUa+l0b/OwnYnbR3xYPke VPYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=kj3flBS8jRJCDm/6iMh6Wugi6AtDY8VFGPPFxUuNgyo=; b=WxjqIO7Vv5Mg3Q2rU5ZzAlA06BpirqrpSrb9yV/fU3XloODDOlvFT1hjv/8QoUZDuz kwAcnCfxfcfd0df3UuKasCOlfbE92J1mjpHhIVvnlZBRyl7J8S7vHNCmgRBF2HA+AzRs 018WUU319315Sx3nMmIsSx8WWnRdlWJ5uFMliaXMZhtM5vuKTRKrvvHwLuTLRYab2A90 +Ba3VsCXshEXeQZmHdB3Q6cjO6P+MRq/qUSk7eRRv3pS9hITZvWtXaH1riv+3ZgxpYCq WNznFSm3wZqWi5XmAf1+MyFImP9NbOs6H8ZCc/u97gTUzkTUPRREN6PNQxax1Jx0GvHb i/bg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=jLJil0Cf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sc11-20020a1709078a0b00b007303db545e6si13766210ejc.786.2022.10.19.08.13.36; Wed, 19 Oct 2022 08:14:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=jLJil0Cf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232194AbiJSPMV (ORCPT + 99 others); Wed, 19 Oct 2022 11:12:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231755AbiJSPL7 (ORCPT ); Wed, 19 Oct 2022 11:11:59 -0400 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4A6AF33E00; Wed, 19 Oct 2022 08:04:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1666191886; x=1697727886; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ADkxelsrZAI/xTgM7q/ZgWlu+FGtliIPT22gKCweeCM=; b=jLJil0CfGyR+xXapkSHN+BRKj6ua3n63A5TQ4VKTXFyt2k6utUmaNZ3x PQ9S7muznqk3IfU0d+WiloGZ/12Ian+GtrHOZnll9T6kQnjI2ExSrI/mx Eiwaw+LCyt2PSV8zwZWM8WFfHzWjPAUHy3nxdGTpolReEppR1Gwmt4e7u /JgGrYKTCN4TXZganaEw1U59ks2VxkneW9Ex2o1qULtpPE4XruCYg6DBy 9hRcE5z38xWtoUzcBPrb3FDstyGGvcKJLqrrh4i+8R3fIk4nQ+tX5veNM gS1jPUJLx/gogYVLWTK2uTnESnV3QOIrkpnTw5WWejqE61YDIVJd8rZ4d g==; X-IronPort-AV: E=McAfee;i="6500,9779,10505"; a="305170525" X-IronPort-AV: E=Sophos;i="5.95,196,1661842800"; d="scan'208";a="305170525" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Oct 2022 08:04:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10505"; a="607135196" X-IronPort-AV: E=Sophos;i="5.95,196,1661842800"; d="scan'208";a="607135196" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga006.jf.intel.com with ESMTP; 19 Oct 2022 08:04:12 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id B73F620B; Wed, 19 Oct 2022 18:04:33 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-arm-kernel@lists.infradead.org, linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Daniel Mack , Haojian Zhuang , Robert Jarzmik , Mark Brown Subject: [PATCH v2 4/5] spi: pxa2xx: Move OF and ACPI ID tables closer to their user Date: Wed, 19 Oct 2022 18:04:29 +0300 Message-Id: <20221019150430.27142-5-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221019150430.27142-1-andriy.shevchenko@linux.intel.com> References: <20221019150430.27142-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747129406420533929?= X-GMAIL-MSGID: =?utf-8?q?1747129406420533929?= There is no code that uses ID tables directly, except the struct device_driver at the end of the file. Hence, move tables closer to its user. It's always possible to access them via pointer to a platform device. Signed-off-by: Andy Shevchenko --- drivers/spi/spi-pxa2xx.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index 31927493eeb0..76046612466d 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c @@ -1321,25 +1321,6 @@ static void cleanup(struct spi_device *spi) kfree(chip); } -#ifdef CONFIG_ACPI -static const struct acpi_device_id pxa2xx_spi_acpi_match[] = { - { "INT33C0" }, - { "INT33C1" }, - { "INT3430" }, - { "INT3431" }, - { "80860F0E" }, - { "8086228E" }, - { }, -}; -MODULE_DEVICE_TABLE(acpi, pxa2xx_spi_acpi_match); -#endif - -static const struct of_device_id pxa2xx_spi_of_match[] = { - { .compatible = "marvell,mmp2-ssp", .data = (void *)MMP2_SSP }, - {}, -}; -MODULE_DEVICE_TABLE(of, pxa2xx_spi_of_match); - static bool pxa2xx_spi_idma_filter(struct dma_chan *chan, void *param) { return param == chan->device->dev; @@ -1759,6 +1740,25 @@ static const struct dev_pm_ops pxa2xx_spi_pm_ops = { pxa2xx_spi_runtime_resume, NULL) }; +#ifdef CONFIG_ACPI +static const struct acpi_device_id pxa2xx_spi_acpi_match[] = { + { "80860F0E" }, + { "8086228E" }, + { "INT33C0" }, + { "INT33C1" }, + { "INT3430" }, + { "INT3431" }, + {} +}; +MODULE_DEVICE_TABLE(acpi, pxa2xx_spi_acpi_match); +#endif + +static const struct of_device_id pxa2xx_spi_of_match[] = { + { .compatible = "marvell,mmp2-ssp", .data = (void *)MMP2_SSP }, + {} +}; +MODULE_DEVICE_TABLE(of, pxa2xx_spi_of_match); + static struct platform_driver driver = { .driver = { .name = "pxa2xx-spi", From patchwork Wed Oct 19 15:04:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 5667 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp381222wrs; Wed, 19 Oct 2022 08:14:09 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7MucUMX2/cJOut/nuxJu31KyNneVXsWWqvA3gdXwtmB1FpvHK8qkOOT5OJrBnZ30TVyDN9 X-Received: by 2002:a05:6402:4446:b0:457:eebd:fe52 with SMTP id o6-20020a056402444600b00457eebdfe52mr7890765edb.234.1666192449615; Wed, 19 Oct 2022 08:14:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666192449; cv=none; d=google.com; s=arc-20160816; b=gL4XWrLnypWxXZeZYS3oytIr4HH9dtf8ZI+UqQSxbkRVGFkbJV7XbbX7JiNSQIHJXH nsUdRPBjhbf2RsMAhm+UKa2b1barEROiPJ4wsT8fTnma59ReUpt7vms2EX1Sl9bVR8Qm zc9c3VqcejiMTY7ETWZz2kb6zllFVQZfe75V/6EyyWFYuUTT/ldWkpQAk9g5E+Uw5xX8 gMv9qcnjGKjCYTZhgou2//YhvEr8yqR+eb7NVFw3ZaYvKFIvqCXskPwj3Wct5sSXQwHT db6nzT03qj+N+3btmFwlMp5+iNjBuKf+uDiU4lzNj+cDpCEvTTlcl2iyF9UdNkLtWoN9 UU6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=EiBzRhdFNtZC8ggQWILwxH0mWpEU34USSvGckG708/o=; b=njOWhpBfBd4+bDEg4GBd0BWkdaM+1R77kb/n9uQJPJrqkhhYDxmU8p+8a9zvFnv4ym 34OBQ3HXhAGx52n37tRETfBv+d665puSLo/4gCpiRibg54i9dvycGXXncQ2VDuTNT3Zy A4fbKBQP9ojGHcuaOYCffHYDPTQFEbeWpJvQc4uzWzTV1RTcyvkiGvUQjBS0F8vEV+x5 ZwcFSBgYAJHLkeqEiuqCAY00k2BSAtziqlF2tqqAXTpuZyMH7y13n8YCi+H4SJXLivPv MaIJiwlx3uWM5UJh3rqr4GlTm4smRQi5OCn72OVPVhIfwfPQA1eqoUYtScAylVzQgA9y PPOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=RxCotl8g; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id qb35-20020a1709077ea300b0078dbec0aa81si15555581ejc.214.2022.10.19.08.13.44; Wed, 19 Oct 2022 08:14:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=RxCotl8g; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231959AbiJSPLg (ORCPT + 99 others); Wed, 19 Oct 2022 11:11:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231302AbiJSPLB (ORCPT ); Wed, 19 Oct 2022 11:11:01 -0400 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 11221103240; Wed, 19 Oct 2022 08:04:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1666191858; x=1697727858; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=XlIOXCJHhj4h3agf1DUjrph2j3laCRQuoVVmOELxnfg=; b=RxCotl8g4uNM3p8hDeab3Ch68UMHyszInBjvgrH/k0es+Rh3Z//v1rUs ub3XhI74qaoQENGc4ix5bqyJWGMuiX+m+DxZWeD0T5Gb+B54WUA5hcAb3 XE9sI0SySi5jw7B12LWkSqMzLurAublHw1uq0ggreNjBNJ2yc6VUaWs7T 8eP9eRW3scBMPzJoOhfWTw28Obdl1REfw+azSW6gt5lXTLyrlEF58BOZa ibV41i2QvvGu3lWkhtNUp7Qne8sWSlHx7hMnax0B7aeHmzgoKsYEHXPmT OwQ6kxZQMeBXHMdfIrbO1jF0p9sNOWqWhAjroBM8x4nW4Lcw3JKw4T+9A A==; X-IronPort-AV: E=McAfee;i="6500,9779,10505"; a="293830293" X-IronPort-AV: E=Sophos;i="5.95,196,1661842800"; d="scan'208";a="293830293" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Oct 2022 08:04:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10505"; a="804340276" X-IronPort-AV: E=Sophos;i="5.95,196,1661842800"; d="scan'208";a="804340276" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga005.jf.intel.com with ESMTP; 19 Oct 2022 08:04:15 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id C895C3FD; Wed, 19 Oct 2022 18:04:33 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-arm-kernel@lists.infradead.org, linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Daniel Mack , Haojian Zhuang , Robert Jarzmik , Mark Brown Subject: [PATCH v2 5/5] spi: pxa2xx: Switch from PM ifdeffery to pm_ptr() Date: Wed, 19 Oct 2022 18:04:30 +0300 Message-Id: <20221019150430.27142-6-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221019150430.27142-1-andriy.shevchenko@linux.intel.com> References: <20221019150430.27142-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747129414000868383?= X-GMAIL-MSGID: =?utf-8?q?1747129414000868383?= Cleaning up the driver to use pm_ptr() macro instead of ifdeffery that makes it simpler and allows the compiler to remove those functions if built without CONFIG_PM and CONFIG_PM_SLEEP support. Signed-off-by: Andy Shevchenko --- drivers/spi/spi-pxa2xx.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index 76046612466d..60cab241200b 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c @@ -1680,7 +1680,6 @@ static int pxa2xx_spi_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM_SLEEP static int pxa2xx_spi_suspend(struct device *dev) { struct driver_data *drv_data = dev_get_drvdata(dev); @@ -1715,9 +1714,7 @@ static int pxa2xx_spi_resume(struct device *dev) /* Start the queue running */ return spi_controller_resume(drv_data->controller); } -#endif -#ifdef CONFIG_PM static int pxa2xx_spi_runtime_suspend(struct device *dev) { struct driver_data *drv_data = dev_get_drvdata(dev); @@ -1732,12 +1729,10 @@ static int pxa2xx_spi_runtime_resume(struct device *dev) return clk_prepare_enable(drv_data->ssp->clk); } -#endif static const struct dev_pm_ops pxa2xx_spi_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(pxa2xx_spi_suspend, pxa2xx_spi_resume) - SET_RUNTIME_PM_OPS(pxa2xx_spi_runtime_suspend, - pxa2xx_spi_runtime_resume, NULL) + SYSTEM_SLEEP_PM_OPS(pxa2xx_spi_suspend, pxa2xx_spi_resume) + RUNTIME_PM_OPS(pxa2xx_spi_runtime_suspend, pxa2xx_spi_runtime_resume, NULL) }; #ifdef CONFIG_ACPI @@ -1762,7 +1757,7 @@ MODULE_DEVICE_TABLE(of, pxa2xx_spi_of_match); static struct platform_driver driver = { .driver = { .name = "pxa2xx-spi", - .pm = &pxa2xx_spi_pm_ops, + .pm = pm_ptr(&pxa2xx_spi_pm_ops), .acpi_match_table = ACPI_PTR(pxa2xx_spi_acpi_match), .of_match_table = of_match_ptr(pxa2xx_spi_of_match), },