From patchwork Wed Jul 6 04:20:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Srikandan, Nandhini" X-Patchwork-Id: 588042 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 B6DF4CCA473 for ; Wed, 6 Jul 2022 04:26:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231537AbiGFE0X (ORCPT ); Wed, 6 Jul 2022 00:26:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46196 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231454AbiGFE0W (ORCPT ); Wed, 6 Jul 2022 00:26:22 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 36C011B7BF; Tue, 5 Jul 2022 21:26:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657081582; x=1688617582; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=lU8TYXAHLldW1ztoF7cJu4ArDgCj/irihWhQS5ZPdQ4=; b=QZJ3HwsXXqLy0cy2J7UHFOhmlCWDgo0nXlfVhdUb5hg0a349LKQMAAfd 5NzJhy+nV9vNT3uJ3diZKKIwQSa4Gn7ettog6+ezrYkD2MgM08+Lq3mm8 Xhfxg4wZZAz3qyxgeixbpuxUnNoHfD9R4FNRnJOV7HKEPsK3wdUl98qUd T0ApYDlfPRyE+pAdvzJQ3fnEL3nzb1tbWybp3PJeV6jok9KqWD8kwA21p 3RXsUG7XwOV7zfWGT0WEqHu5ifulz+PWH075js/TxM8Kugaq826IbzxGj rtiDzpHqnhU+IhnMYM1au1vGVzaW1RxVQg+bhRYcn0PyRF4OltdivUruN A==; X-IronPort-AV: E=McAfee;i="6400,9594,10399"; a="283663243" X-IronPort-AV: E=Sophos;i="5.92,248,1650956400"; d="scan'208";a="283663243" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jul 2022 21:26:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,248,1650956400"; d="scan'208";a="769895423" Received: from srikandan-ilbpg12.png.intel.com ([10.88.229.69]) by orsmga005.jf.intel.com with ESMTP; 05 Jul 2022 21:26:18 -0700 From: nandhini.srikandan@intel.com To: fancer.lancer@gmail.com, broonie@kernel.org, robh+dt@kernel.org, linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: devicetree@vger.kernel.org, mgross@linux.intel.com, kris.pan@intel.com, kenchappa.demakkanavar@intel.com, furong.zhou@intel.com, mallikarjunappa.sangannavar@intel.com, mahesh.r.vaidya@intel.com, nandhini.srikandan@intel.com, rashmi.a@intel.com Subject: [PATCH v5 1/4] spi: dw: Fix IP-core versions macro Date: Wed, 6 Jul 2022 12:20:36 +0800 Message-Id: <20220706042039.5763-2-nandhini.srikandan@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220706042039.5763-1-nandhini.srikandan@intel.com> References: <20220706042039.5763-1-nandhini.srikandan@intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org From: Nandhini Srikandan Fixes: 2cc8d9227bbb ("spi: dw: Introduce Synopsys IP-core versions interface") Signed-off-by: Nandhini Srikandan --- drivers/spi/spi-dw.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/spi-dw.h b/drivers/spi/spi-dw.h index d5ee5130601e..79d853f6d192 100644 --- a/drivers/spi/spi-dw.h +++ b/drivers/spi/spi-dw.h @@ -23,7 +23,7 @@ ((_dws)->ip == DW_ ## _ip ## _ID) #define __dw_spi_ver_cmp(_dws, _ip, _ver, _op) \ - (dw_spi_ip_is(_dws, _ip) && (_dws)->ver _op DW_ ## _ip ## _ver) + (dw_spi_ip_is(_dws, _ip) && (_dws)->ver _op DW_ ## _ip ## _ ## _ver) #define dw_spi_ver_is(_dws, _ip, _ver) __dw_spi_ver_cmp(_dws, _ip, _ver, ==) From patchwork Wed Jul 6 04:20:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Srikandan, Nandhini" X-Patchwork-Id: 589162 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 6750ECCA473 for ; Wed, 6 Jul 2022 04:26:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231901AbiGFE0g (ORCPT ); Wed, 6 Jul 2022 00:26:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46282 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231750AbiGFE00 (ORCPT ); Wed, 6 Jul 2022 00:26:26 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E737C1BE86; Tue, 5 Jul 2022 21:26:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657081585; x=1688617585; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=FlcudMl4wt40GaXEm95OBt7epfsxqnaQwFMkE/EImQI=; b=Yxok1eHBcv5InlmWCvnxMaV53IF64K6WCmeY6r8NaHksBpkKAzlcZUJ3 6IPFeeqOaJUPKOgxz+j1q9SSQOzfbRsiNUcWbdazR0gUNuIyuXatGQOnh mYFheIaGy0aUWGcdp4ApKg0iF/jnM9sNiEepHR32X31FNjm4PA5BcilPG HPkinghzKpNkgXr2UmNl4yDasrPtvpOWQXnsUiM/2yvOIcBdA3NFK8ERL KBx8/rfUmkvhYofMQgsp0Afs8vyJHKriyISx1/1jF/vqgTH8Xjwpl03TN wds1dFs8nB24r+eyJJoX2hnx5bNu7sGvL9IQQVANwZ5Xb5g8vy7tPcXxz g==; X-IronPort-AV: E=McAfee;i="6400,9594,10399"; a="283663251" X-IronPort-AV: E=Sophos;i="5.92,248,1650956400"; d="scan'208";a="283663251" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jul 2022 21:26:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,248,1650956400"; d="scan'208";a="769895435" Received: from srikandan-ilbpg12.png.intel.com ([10.88.229.69]) by orsmga005.jf.intel.com with ESMTP; 05 Jul 2022 21:26:22 -0700 From: nandhini.srikandan@intel.com To: fancer.lancer@gmail.com, broonie@kernel.org, robh+dt@kernel.org, linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: devicetree@vger.kernel.org, mgross@linux.intel.com, kris.pan@intel.com, kenchappa.demakkanavar@intel.com, furong.zhou@intel.com, mallikarjunappa.sangannavar@intel.com, mahesh.r.vaidya@intel.com, nandhini.srikandan@intel.com, rashmi.a@intel.com Subject: [PATCH v5 2/4] dt-bindings: spi: Add bindings for Intel Thunder Bay SoC Date: Wed, 6 Jul 2022 12:20:37 +0800 Message-Id: <20220706042039.5763-3-nandhini.srikandan@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220706042039.5763-1-nandhini.srikandan@intel.com> References: <20220706042039.5763-1-nandhini.srikandan@intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org From: Nandhini Srikandan Add documentation for SPI controller in Intel Thunder Bay SoC. Signed-off-by: Nandhini Srikandan --- Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml b/Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml index d7e08b03e204..5ecd996ebf33 100644 --- a/Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml +++ b/Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml @@ -61,6 +61,8 @@ properties: - const: snps,dw-apb-ssi - description: Intel Keem Bay SPI Controller const: intel,keembay-ssi + - description: Intel Thunder Bay SPI Controller + const: intel,thunderbay-ssi - description: Baikal-T1 SPI Controller const: baikal,bt1-ssi - description: Baikal-T1 System Boot SPI Controller From patchwork Wed Jul 6 04:20:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Srikandan, Nandhini" X-Patchwork-Id: 588041 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 242F0C433EF for ; Wed, 6 Jul 2022 04:26:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231968AbiGFE0i (ORCPT ); Wed, 6 Jul 2022 00:26:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46466 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231873AbiGFE0e (ORCPT ); Wed, 6 Jul 2022 00:26:34 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 529C71C928; Tue, 5 Jul 2022 21:26:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657081589; x=1688617589; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=TD+EcV7QHWo/7h2QaSDBHa9JniiobECtkUYXZk9C9nA=; b=D4fQ8opUH3d/CELwqoRPDMkZy/GbmVBDLnaGAk6houkTwWJxaQ3s7o9c 5G0kMTlfIotAdiY6akkdWS/3PoVKzNT31ja9z20DU5aQMKd5cUTkdoPVP T0rcWwhbOoR88F6PnSMQuFBueOgaGRL0GZEyjbNd/qMCTDK7uzbbConIJ jD2z7aT++MZBVdLmCWB89KoNJR1H/K04CRdhe4EwqbIMBpY0W57O4lAHn g5nwnHBKl9GANLaD5UqyjTFT5OWy8H0N8iaPcO54cmjD7AUgmASKATNwN f+vkY6L3DXKj1NfTxzhYXkLF6NinD6KM6XM51y5Jr6bCFuYxxzZNWPFdN w==; X-IronPort-AV: E=McAfee;i="6400,9594,10399"; a="283663257" X-IronPort-AV: E=Sophos;i="5.92,248,1650956400"; d="scan'208";a="283663257" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jul 2022 21:26:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,248,1650956400"; d="scan'208";a="769895459" Received: from srikandan-ilbpg12.png.intel.com ([10.88.229.69]) by orsmga005.jf.intel.com with ESMTP; 05 Jul 2022 21:26:25 -0700 From: nandhini.srikandan@intel.com To: fancer.lancer@gmail.com, broonie@kernel.org, robh+dt@kernel.org, linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: devicetree@vger.kernel.org, mgross@linux.intel.com, kris.pan@intel.com, kenchappa.demakkanavar@intel.com, furong.zhou@intel.com, mallikarjunappa.sangannavar@intel.com, mahesh.r.vaidya@intel.com, nandhini.srikandan@intel.com, rashmi.a@intel.com Subject: [PATCH v5 3/4] spi: dw: Add support for master mode selection for DWC SSI controller Date: Wed, 6 Jul 2022 12:20:38 +0800 Message-Id: <20220706042039.5763-4-nandhini.srikandan@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220706042039.5763-1-nandhini.srikandan@intel.com> References: <20220706042039.5763-1-nandhini.srikandan@intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org From: Nandhini Srikandan Add support to select the controller mode as master mode by setting Bit 31 of CTRLR0 register. This feature is supported for controller versions above v1.02. Signed-off-by: Nandhini Srikandan Acked-by: Serge Semin --- drivers/spi/spi-dw-core.c | 5 +++-- drivers/spi/spi-dw.h | 8 +------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/spi/spi-dw-core.c b/drivers/spi/spi-dw-core.c index ecea471ff42c..41ae21e1b879 100644 --- a/drivers/spi/spi-dw-core.c +++ b/drivers/spi/spi-dw-core.c @@ -307,8 +307,9 @@ static u32 dw_spi_prepare_cr0(struct dw_spi *dws, struct spi_device *spi) if (spi->mode & SPI_LOOP) cr0 |= DW_HSSI_CTRLR0_SRL; - if (dws->caps & DW_SPI_CAP_KEEMBAY_MST) - cr0 |= DW_HSSI_CTRLR0_KEEMBAY_MST; + /* CTRLR0[31] MST */ + if (dw_spi_ver_is_ge(dws, HSSI, 102A)) + cr0 |= DW_HSSI_CTRLR0_MST; } return cr0; diff --git a/drivers/spi/spi-dw.h b/drivers/spi/spi-dw.h index 79d853f6d192..8b8f924ac410 100644 --- a/drivers/spi/spi-dw.h +++ b/drivers/spi/spi-dw.h @@ -94,13 +94,7 @@ #define DW_HSSI_CTRLR0_SCPOL BIT(9) #define DW_HSSI_CTRLR0_TMOD_MASK GENMASK(11, 10) #define DW_HSSI_CTRLR0_SRL BIT(13) - -/* - * For Keem Bay, CTRLR0[31] is used to select controller mode. - * 0: SSI is slave - * 1: SSI is master - */ -#define DW_HSSI_CTRLR0_KEEMBAY_MST BIT(31) +#define DW_HSSI_CTRLR0_MST BIT(31) /* Bit fields in CTRLR1 */ #define DW_SPI_NDF_MASK GENMASK(15, 0) From patchwork Wed Jul 6 04:20:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Srikandan, Nandhini" X-Patchwork-Id: 589161 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 A8BB3C43334 for ; Wed, 6 Jul 2022 04:26:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231873AbiGFE0m (ORCPT ); Wed, 6 Jul 2022 00:26:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46536 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231922AbiGFE0h (ORCPT ); Wed, 6 Jul 2022 00:26:37 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D6A081F2FA; Tue, 5 Jul 2022 21:26:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657081592; x=1688617592; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=IGqxreDaqAFMdcqbAut4ZSRNAEhShbPr78+UyrQRROE=; b=fheOeRwtivbFKACv4h9VunJ+oso07/g+H1thaCB1Dfc3/k9udAY4Cw2T FPSToT9uP8fdOkqlgmJY0dy+dt77pBPy1ChTzo/k//Ua/ptzcOGFwneKz wUhGHgKQp9bcRu4dR765blPmOgtCC757tnr176iEGWDpsGqKa+eoHsGrU mgQd+4Pp07/Ociyq+BDsFPdBK+GBoXcuNYzcq5+ssAmieg0u+ICaQwrQp oDmY3H4yIeV7uMkmlx1RpXu5V2mugB2bfpHtFDxhhZXB8w76+X7dqsswP cvGFwn6rgIcQnuyDPDtyN7nOLsV32RC2BPiF60Tpcxpp2tP+138F6Rj1X w==; X-IronPort-AV: E=McAfee;i="6400,9594,10399"; a="283663262" X-IronPort-AV: E=Sophos;i="5.92,248,1650956400"; d="scan'208";a="283663262" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jul 2022 21:26:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,248,1650956400"; d="scan'208";a="769895465" Received: from srikandan-ilbpg12.png.intel.com ([10.88.229.69]) by orsmga005.jf.intel.com with ESMTP; 05 Jul 2022 21:26:29 -0700 From: nandhini.srikandan@intel.com To: fancer.lancer@gmail.com, broonie@kernel.org, robh+dt@kernel.org, linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: devicetree@vger.kernel.org, mgross@linux.intel.com, kris.pan@intel.com, kenchappa.demakkanavar@intel.com, furong.zhou@intel.com, mallikarjunappa.sangannavar@intel.com, mahesh.r.vaidya@intel.com, nandhini.srikandan@intel.com, rashmi.a@intel.com Subject: [PATCH v5 4/4] spi: dw: Add support for Intel Thunder Bay SPI controller Date: Wed, 6 Jul 2022 12:20:39 +0800 Message-Id: <20220706042039.5763-5-nandhini.srikandan@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220706042039.5763-1-nandhini.srikandan@intel.com> References: <20220706042039.5763-1-nandhini.srikandan@intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org From: Nandhini Srikandan Add support for Intel Thunder Bay SPI controller, which uses DesignWare DWC_ssi core and also add common init function for both Keem Bay and Thunder Bay. Signed-off-by: Nandhini Srikandan --- drivers/spi/spi-dw-mmio.c | 8 ++++---- drivers/spi/spi-dw.h | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/spi/spi-dw-mmio.c b/drivers/spi/spi-dw-mmio.c index 5101c4c6017b..26c40ea6dd12 100644 --- a/drivers/spi/spi-dw-mmio.c +++ b/drivers/spi/spi-dw-mmio.c @@ -214,11 +214,10 @@ static int dw_spi_hssi_init(struct platform_device *pdev, return 0; } -static int dw_spi_keembay_init(struct platform_device *pdev, - struct dw_spi_mmio *dwsmmio) +static int dw_spi_intel_init(struct platform_device *pdev, + struct dw_spi_mmio *dwsmmio) { dwsmmio->dws.ip = DW_HSSI_ID; - dwsmmio->dws.caps = DW_SPI_CAP_KEEMBAY_MST; return 0; } @@ -349,7 +348,8 @@ static const struct of_device_id dw_spi_mmio_of_match[] = { { .compatible = "amazon,alpine-dw-apb-ssi", .data = dw_spi_alpine_init}, { .compatible = "renesas,rzn1-spi", .data = dw_spi_pssi_init}, { .compatible = "snps,dwc-ssi-1.01a", .data = dw_spi_hssi_init}, - { .compatible = "intel,keembay-ssi", .data = dw_spi_keembay_init}, + { .compatible = "intel,keembay-ssi", .data = dw_spi_intel_init}, + { .compatible = "intel,thunderbay-ssi", .data = dw_spi_intel_init}, { .compatible = "microchip,sparx5-spi", dw_spi_mscc_sparx5_init}, { .compatible = "canaan,k210-spi", dw_spi_canaan_k210_init}, { /* end of table */} diff --git a/drivers/spi/spi-dw.h b/drivers/spi/spi-dw.h index 8b8f924ac410..9e8eb2b52d5c 100644 --- a/drivers/spi/spi-dw.h +++ b/drivers/spi/spi-dw.h @@ -31,8 +31,7 @@ /* DW SPI controller capabilities */ #define DW_SPI_CAP_CS_OVERRIDE BIT(0) -#define DW_SPI_CAP_KEEMBAY_MST BIT(1) -#define DW_SPI_CAP_DFS32 BIT(2) +#define DW_SPI_CAP_DFS32 BIT(1) /* Register offsets (Generic for both DWC APB SSI and DWC SSI IP-cores) */ #define DW_SPI_CTRLR0 0x00