From patchwork Tue Jun 26 09:37:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siva Durga Prasad Paladugu X-Patchwork-Id: 934747 X-Patchwork-Delegate: jagannadh.teki@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=xilinx.onmicrosoft.com header.i=@xilinx.onmicrosoft.com header.b="uCd64e6c"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41FLdC3Fnsz9rxs for ; Tue, 26 Jun 2018 19:40:47 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 11E84C21DA2; Tue, 26 Jun 2018 09:40:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=BAD_ENC_HEADER, SPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id A0D53C21C8B; Tue, 26 Jun 2018 09:40:16 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6B0ADC21DD4; Tue, 26 Jun 2018 09:40:09 +0000 (UTC) Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0074.outbound.protection.outlook.com [104.47.34.74]) by lists.denx.de (Postfix) with ESMTPS id ECC0AC21DB5 for ; Tue, 26 Jun 2018 09:40:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector1-xilinx-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=njvH1nVvkpRAsMI5KUQ3vRy+zI/ZZHaaCk5gHCuZ8RE=; b=uCd64e6cymsW/qa+iluy5YAIhFn4D26PvtPgKJwG41hXoi1DmTFiaqKmu35V6RDPYfp2JfnAoo9wV7FvQG22zFGfJct8Rk02V3hLEXQMMbHx8sG32ECltFVRZqm9gNNaG2Insa0YrkKcdc3S98Pdj6kANZqxFG0y41DDcDbvENE= Received: from MWHPR0201CA0003.namprd02.prod.outlook.com (2603:10b6:301:74::16) by BN1PR02MB165.namprd02.prod.outlook.com (2a01:111:e400:20::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.884.22; Tue, 26 Jun 2018 09:40:00 +0000 Received: from CY1NAM02FT006.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::209) by MWHPR0201CA0003.outlook.office365.com (2603:10b6:301:74::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.906.20 via Frontend Transport; Tue, 26 Jun 2018 09:39:59 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; openedev.com; dkim=none (message not signed) header.d=none;openedev.com; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.83 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.83; helo=xsj-pvapsmtpgw01; Received: from xsj-pvapsmtpgw01 (149.199.60.83) by CY1NAM02FT006.mail.protection.outlook.com (10.152.74.104) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.906.15 via Frontend Transport; Tue, 26 Jun 2018 09:39:59 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66] helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1fXkS6-0001sN-Kp; Tue, 26 Jun 2018 02:39:58 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1fXkS1-0000dy-IK; Tue, 26 Jun 2018 02:39:53 -0700 Received: from xsj-pvapsmtp01 (smtp2.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id w5Q9dkne029279; Tue, 26 Jun 2018 02:39:47 -0700 Received: from [172.23.37.99] (helo=xhdsivadur40.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1fXkRu-0000dF-3W; Tue, 26 Jun 2018 02:39:46 -0700 From: Siva Durga Prasad Paladugu To: Date: Tue, 26 Jun 2018 15:07:54 +0530 Message-ID: <1530005875-1613-1-git-send-email-siva.durga.paladugu@xilinx.com> X-Mailer: git-send-email 2.7.4 X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.2.0.1013-23620.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.83; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(376002)(136003)(346002)(39860400002)(396003)(2980300002)(438002)(189003)(199004)(9786002)(6916009)(316002)(47776003)(5660300001)(476003)(106466001)(50226002)(2616005)(63266004)(126002)(305945005)(486006)(81166006)(426003)(48376002)(54906003)(81156014)(106002)(50466002)(2351001)(8676002)(478600001)(356003)(6666003)(8936002)(16586007)(4326008)(2906002)(336012)(26005)(51416003)(186003)(7696005)(77096007)(575784001)(36386004)(36756003)(107886003)(14444005)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN1PR02MB165; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; LANG:en; PTR:unknown-60-83.xilinx.com; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: 1; CY1NAM02FT006; 1:YYAz2DzBeykhhpnNylm7df7o4dggAXzw5InjBRHkYWaTg5xl5iPdruzQWrwaYo3tooBKr5hh6FN8Fe9lULqJ/2ANOoJARC2BwxxsFoBpK51whfd6g6jegfTi5X4/pSiM MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a3d1db13-2f29-4bc2-c449-08d5db48c8b4 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(8989117)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600026)(711020)(4608076)(2017052603328)(7153060); SRVR:BN1PR02MB165; X-Microsoft-Exchange-Diagnostics: 1; BN1PR02MB165; 3:nVskWF0gbxmU5RSiPIOugUxr/Bq1+fXc1kAQwtDDupdTTJTzqceC5U7WdDrWyXqh2JLBxmIa4AlbmmWsLEbg5IM3SGMoCY/U7/WOXmB2OrveCPtS99IqU2FoLV53Owzi9tUfHxUIKPK8tIi6JNSViUhQjss2/HdKOxvQlAprje98h4tjK2deDntcx0gDMj1DtRsyF5gAiF2KgclV5s3V40uhuoeQZLCNvJ93WsIqC8QA2IOiJK7FaOhqk3p3E6ZTSy6jB9gpSx/MLiQATULqjsPtN/FR25T5o0u8Hnyyo99WBA7CV8g+g3BVnMEBBDzCkMj/LFf+jUoEC3b7KMW5pfytHysGggxsuLdZC9mNBn4=; 25:233PvYQ0ygG4ZAd9AASv8NNEktrLNu0P/3/DWXhZq/Epqd7EZiVhcVwQaLdQ86z6bFO47n9oEdN8NDl9B6WSWSrw65cGf+ww/FhLFdPdel4OH3GgvK1381ryNkBakKey2ZimUscR1ma6ScmcGgXtBOLMGnyKfiOeNaMyEpLl1hxR8gJp86FWW2B49KcdbYUqEgDD4tfaqpnKHUqNQdSq/g9R0XGE5Zj0o339+7EUoKZSFB5DkDBPAsIu1CFwKTQoPCM0tnOktmFrTls97OsQgKLP2qSfo8JHsRQ0cDNlKq60+jkJiGhkcibf203wXzTRi07n8yudJrXo4YxI/7i+ZQ== X-MS-TrafficTypeDiagnostic: BN1PR02MB165: X-Microsoft-Exchange-Diagnostics: 1; BN1PR02MB165; 31:VNxWBOppPJ/k5KiuDHN9QK4iwhHy+iJIclMEHM2GIfqIw8YdSVNcSz9SvGxQ/HydgU56eOpIDsqv1f0o1/QVAMdtHhyK/KD8+Zp6EOJ2H9trwTKsgOwJaPoAM0RvwmFjhPl5M3RwefX9imZ9syBP/keh+uyDPmn3oJwysyl8BrnmkRG7a3PdTMKM1lFpauTHu6h2ULSVbRClkVTLNOEGYQhXQ7VTW3ZiJ49KM8SYLPE=; 20:R1tlkav+iX5wNcyamwxSOp9cC5duvuDYbaEi50Q+1sFGSYKC/pYcDAdcFkmJFR5FaDvR6mhnymw/DvYml7Vs3w8s1JaYF6tcTvuzmgHGWzq3+iNS0qX7IO45T/7n01D/j1JpguEsmKe3YYOL1GXBOSYX5h3I2I1DgX3RFD5/GWB/lzO7v5Yfb4baiEaRJNxwe0f6ec6/lhVJzCBwB4jcsGiJ5Xkv4O8fz9JLUNd0X6iYpGkPUBq3ny8cPLgF59aEq41KgQVfuc+qs9tG0ECa0PeEV2rmvV2J68u/s+Fugarg5stOToet3XZiCy+POvKQLhy+9NIyLU5/2XaXilp7mLVQqBRYnIfBveC1Mvy5lhYZWh35GSaO8E9Xa0B6q4egQOSW0y4aZVQS4sDjFA/q88hYhHcWimZ0HRbZIDLg/1dQpoQNPNd7VakoEpVr1hdaLaRS2qYJFmuPpROs/rib1q/yrr7iFL759hAUQWIqtKzCvOJh74aN8XfRiNH8C7kx X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(192813158149592)(21532816269658); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(10201501046)(3231254)(944501410)(52105095)(93006095)(93004095)(6055026)(149027)(150027)(6041310)(20161123558120)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:BN1PR02MB165; BCL:0; PCL:0; RULEID:; SRVR:BN1PR02MB165; X-Microsoft-Exchange-Diagnostics: 1; BN1PR02MB165; 4:GFeJ+G9/pGb1qIag2GEgq+NTH9LRVSCCzYh8hOEJtTURhdvrV+XIYZCbXYY3eKmzHsF7XBItQmbKKwZi/VUmK5mVUfG4HdCfER6sU3L9Z98SmMty3rY44fhvCEKadfn6g4ZZFaWXzkVieFh57Y0kBeeNSwZWkMtWucZ/RW4V25K2jp7NOwugW8ldXulL7tD+6mbWlsUk8wImzq3ybV+kaCLO16FBXgO2HYVJ31x9DpXnitBPw9UBgh5MNHpgPECKPYb7v5mdj3yF6bx84NLeIGgu4RxcXKZ5gkGIsWGWKw9Qu4P+A9RImejSdeHvKwB+jeobVQDb4hMJxNoqEm1NAfz8ek4XDkbctt6FbOmyouA= X-Forefront-PRVS: 071518EF63 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN1PR02MB165; 23:B3K+ualnjSH+VQgRp1nyw9hdtETR5cIBX8sHPB1QSv?= dzpCLRsRQEC5iaLXLl2kBXaEYZXknChaLC8kcyhy3jrDNaAMyOdCx3HfGzY/wU4L+tRzv717fmO+v3Jk7iVda5kLWdHMN0CScIjVFN/dAT8g87MSjlL3jN2w6ksTRAaiXHHuJVRkURjiG4e8v/7wawO4ynIfLZQ4VVZgMHbnOVCMOuWVMDVOK7xutryBNIzaY6gF1J5XsnO4g2iJQj1c0A8IVcyUB/TR4RZ/Rza2BT4JIwXuPDxgSU4l59htOULqEmF/Pn5GJz2IsFgY7P1m2QHpojzinX17+QoY68joMCR7o8xzJFZ1m+nSroN2yoBdpIbMmEy/D45cY1KP3aZxP4yibYbN8du2BeDrcTSedGJXqHFCcVXGvKBZX9fBvWklEznoxnGKj97KrNuBqx5XcAj+QdP/LZ1ekWbFzqE/22Tz9WWlQndglMiPBnnLDdj2VFDhTmXxOhioJs8F1ssgNp33RDr0RCZV8nXWw8n5b6QrGV+PY/kml5zi5oNhkMjJZyZETxjI41GgvT5GXc3nXBqCRY1ec0VHrox1EhnpgJB69/sQ94HX8SN04bpZe3Q+GjFTtVH76efkWLnRuOmofoqViKVaTpTlquP9/BWPhIqHQ8FXxGhPpkVNnZZxQf/bnN44RItXfE63A+NCTc7GDwjixoAh2jV72SRJ/enmMVCzKYjzbfiWLmu9ZrSQHYAKhajutLp8LcEMBIoeMcLpwKR3Qr73ZVw4vOOIAPGUHE4WST7Hq8Vk/QPhXLIt8FkiiVz+4/yOBTREVlWNxFOqeVGvIhl+lK+0g1JqJncsKP+ksg8jeDfE//yKxYY6OiVdH6AVTm+TjcbTonQ3AksBBh8PuwdR2FeiRfpx8YVEotfzunNlfehN7cgY4MJaOH0vNCRMH+ChJiN2YCoXIEL/jKqwbeIND4oFXjjNfpdwUAGcgRiOI7iWPKWPjWAwnkC5grNvlFUwj8P1JYjipHpU5xklXkSXItQHyGmzgaEdgp7Msg2+egH72ueilGoEYC4tDrfVobW/avn5apTBRMFB3ppg4Qdn67UOS+KCxIR16OxA== X-Microsoft-Antispam-Message-Info: z1+PjGCpOLswv0RfIRD9Vil5b2hu7elKUxz5yd0YCRZsr5IZ07GwfiJcoJwN1aqv3q7OGiDvkH1YNZKNiJJQdTFIyOmUwpG1pm3QL0fiqQgsQMXY0SDueyhW2nOLxrhbCUUt5Szwqbjth47DRVC8452YKvkthtjvhh1AVFpYuWZB49FkTPlqd7+vRL5UhC+mOG9jJdsDExhzAeA0e/DW6EUkhd58TAVK2PUZ7GJcw5HBXVzhKudcQEHox78+OBz2y+rWn88u+HtWFSTb7nNWiVXp27cMQPABlzuQ3AWyaPcQ/dcOtiUiXxe0r34Dlzwhjf76dm14Y+psx/+/SeiGO1rmOGQ8IMUWY+8iPffwXnM= X-Microsoft-Exchange-Diagnostics: 1; BN1PR02MB165; 6:EJV06ATE/nZONKXgUV30HABL4641s20Yt0sihQOhuE0olaiuPqn93kenQBLB68MeoGFaHKg2zljEcVbFdYLy9rXsac5Jx7ilGxFug+D08yAxOHVcoAt/Wos36Qp+duii7jvYE9c7eWvJS2vv5UARrCqHLV+GlJ+0jJ2MU01uwcbtPKGLvZ/GVEC2sQepZo5geYJqvznduXeEqClqv4Txr7VNQKRL3UTSZ9mqmP2Dzjq+Zhls3od7GaUCM42DPPqxwTh0a/PeHNvVB577YoKHD64+p7OswtcmwWR2oVoCxGzd9/Nno4jZeeCIhh0fRkE8Z78Ot+PWzKwWIuhUiqsVUtV8hmtebFsNST3KHe+U+HsbIG5lT3v5zroPBwkxNgk0aUjv9x/pZMVptH3p2fBu0yhkuNvU6Ozag1/52JT/RpcY+XWB1IrrjhFMECwyYVu9VMBIp2yspP5HuJVeIFaapg==; 5:RBoXTOm98eA8HYDuRVmZIbuJkenRn2+TOJP0oJ2Q+/Q56IlDGRj89S1LBjkzLa+64rGQRA3KgFIUMCBV0hOVCq551pzhiKLbhnU8StRdOOoLXMyKkYlA/dj2A3FuljsPVGH/KyGgZ6Q+L7b4EMx8C9tre3Lo11F2gVcCACUiDOw=; 24:p65BlAzt6IMs9DAfOINwbokbHWUd6qnHf24wRxSHnNBncqE11QzpH7h7klNq7EDPmHrnB3wceB/AZODdxpAzT7ZQ8qnRnzu6QyXqOnFv96U= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN1PR02MB165; 7:CDzLBJx7sf+qZeJ59R+QgHnWYi4FJaPqALWXcdygvd20GkUsjArJTDgX8HKev3MtG69/wFmDLudgehetF5ipET8L5rGG1+HBf7PLskv5QzL1Dqu9u5QmMsKaZ+olh7PtlTtq/awy/xTvQTeYZi0g0RlPGNkpKZYV8eNaSmUf0DLcBPItJGhbbIZKUbFevgUMdbTXPEHJ6/g0LCdcFwMkOBz3RFNoB5s2bmUI2Hxwu5IeLfCNYD3Pw0NaK7fLFbHH X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jun 2018 09:39:59.0930 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a3d1db13-2f29-4bc2-c449-08d5db48c8b4 X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.83]; Helo=[xsj-pvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN1PR02MB165 Cc: jagan@openedev.com, michal.simek@xilinx.com Subject: [U-Boot] [PATCH v5 1/2] spi: zynqmp_gqspi: Add support for ZynqMP qspi driver X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This patch adds qspi driver support for ZynqMP SoC. This driver is responsible for communicating with qspi flash devices. Signed-off-by: Siva Durga Prasad Paladugu --- Changed for v5: - Removed zynqm_gqspi.h file which was added by mistake. Changes for v4: - Moved macro definitions back to .c - Removed last_cmd and flash command checks in driver - Used macros and GENMASK as per comments - Removed debugs wherever commented. - Modified set_mode routine as per comment Changes for v3: - Renamed all macros, functions, files and configs as per comment - Used wait_for_bit wherever required - Removed unnecessary header inclusion Changes for v2: - Rebased on top of latest master - Moved macro definitions to .h file as per comment - Fixed magic values with macros as per comment --- drivers/spi/Kconfig | 7 + drivers/spi/Makefile | 1 + drivers/spi/zynqmp_gqspi.c | 794 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 802 insertions(+) create mode 100644 drivers/spi/zynqmp_gqspi.c diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 3532c2a..c3c424e 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -223,6 +223,13 @@ config ZYNQ_QSPI Zynq QSPI IP core. This IP is used to connect the flash in 4-bit qspi, 8-bit dual stacked and shared 4-bit dual parallel. +config ZYNQMP_GQSPI + bool "Configure ZynqMP Generic QSPI" + depends on ARCH_ZYNQMP + help + This option is used to enable ZynqMP QSPI controller driver which + is used to communicate with qspi flash devices. + endif # if DM_SPI config SOFT_SPI diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index 5a2c00e..2187633 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -51,3 +51,4 @@ obj-$(CONFIG_TI_QSPI) += ti_qspi.o obj-$(CONFIG_XILINX_SPI) += xilinx_spi.o obj-$(CONFIG_ZYNQ_SPI) += zynq_spi.o obj-$(CONFIG_ZYNQ_QSPI) += zynq_qspi.o +obj-$(CONFIG_ZYNQMP_GQSPI) += zynqmp_gqspi.o diff --git a/drivers/spi/zynqmp_gqspi.c b/drivers/spi/zynqmp_gqspi.c new file mode 100644 index 0000000..9a04839 --- /dev/null +++ b/drivers/spi/zynqmp_gqspi.c @@ -0,0 +1,794 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * (C) Copyright 2018 Xilinx + * + * Xilinx ZynqMP Generic Quad-SPI(QSPI) controller driver(master mode only) + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define GQSPI_GFIFO_STRT_MODE_MASK BIT(29) +#define GQSPI_CONFIG_MODE_EN_MASK (3 << 30) +#define GQSPI_CONFIG_DMA_MODE (2 << 30) +#define GQSPI_CONFIG_CPHA_MASK BIT(2) +#define GQSPI_CONFIG_CPOL_MASK BIT(1) + +/* QSPI MIO's count for different connection topologies */ +#define GQSPI_MIO_NUM_QSPI0 6 +#define GQSPI_MIO_NUM_QSPI1 5 +#define GQSPI_MIO_NUM_QSPI1_CS 1 + +/* + * QSPI Interrupt Registers bit Masks + * + * All the four interrupt registers (Status/Mask/Enable/Disable) have the same + * bit definitions. + */ +#define GQSPI_IXR_TXNFULL_MASK 0x00000004 /* QSPI TX FIFO Overflow */ +#define GQSPI_IXR_TXFULL_MASK 0x00000008 /* QSPI TX FIFO is full */ +#define GQSPI_IXR_RXNEMTY_MASK 0x00000010 /* QSPI RX FIFO Not Empty */ +#define GQSPI_IXR_GFEMTY_MASK 0x00000080 /* QSPI Generic FIFO Empty */ +#define GQSPI_IXR_ALL_MASK (GQSPI_IXR_TXNFULL_MASK | \ + GQSPI_IXR_RXNEMTY_MASK) + +/* + * QSPI Enable Register bit Masks + * + * This register is used to enable or disable the QSPI controller + */ +#define GQSPI_ENABLE_ENABLE_MASK 0x00000001 /* QSPI Enable Bit Mask */ + +#define GQSPI_GFIFO_LOW_BUS BIT(14) +#define GQSPI_GFIFO_CS_LOWER BIT(12) +#define GQSPI_GFIFO_UP_BUS BIT(15) +#define GQSPI_GFIFO_CS_UPPER BIT(13) +#define GQSPI_SPI_MODE_QSPI (3 << 10) +#define GQSPI_SPI_MODE_SPI BIT(10) +#define GQSPI_SPI_MODE_DUAL_SPI (2 << 10) +#define GQSPI_IMD_DATA_CS_ASSERT 5 +#define GQSPI_IMD_DATA_CS_DEASSERT 5 +#define GQSPI_GFIFO_TX BIT(16) +#define GQSPI_GFIFO_RX BIT(17) +#define GQSPI_GFIFO_STRIPE_MASK BIT(18) +#define GQSPI_GFIFO_IMD_MASK 0xFF +#define GQSPI_GFIFO_EXP_MASK BIT(9) +#define GQSPI_GFIFO_DATA_XFR_MASK BIT(8) +#define GQSPI_STRT_GEN_FIFO BIT(28) +#define GQSPI_GEN_FIFO_STRT_MOD BIT(29) +#define GQSPI_GFIFO_WP_HOLD BIT(19) +#define GQSPI_BAUD_DIV_MASK (7 << 3) +#define GQSPI_DFLT_BAUD_RATE_DIV BIT(3) +#define GQSPI_GFIFO_ALL_INT_MASK 0xFBE +#define GQSPI_DMA_DST_I_STS_DONE BIT(1) +#define GQSPI_DMA_DST_I_STS_MASK 0xFE +#define MODEBITS 0x6 + +#define QUAD_OUT_READ_CMD 0x6B +#define QUAD_PAGE_PROGRAM_CMD 0x32 +#define DUAL_OUTPUT_FASTRD_CMD 0x3B + +#define GQSPI_GFIFO_SELECT BIT(0) + +#define GQSPI_FIFO_THRESHOLD 1 + +#define SPI_XFER_ON_BOTH 0 +#define SPI_XFER_ON_LOWER 1 +#define SPI_XFER_ON_UPPER 2 + +#define GQSPI_DMA_ALIGN 0x4 +#define GQSPI_MAX_BAUD_RATE_VAL 7 +#define GQSPI_DFLT_BAUD_RATE_VAL 2 + +#define GQSPI_TIMEOUT 100000000 + +#define GQSPI_BAUD_DIV_SHIFT 2 +#define GQSPI_LPBK_DLY_ADJ_LPBK_SHIFT 5 +#define GQSPI_LPBK_DLY_ADJ_DLY_1 0x2 +#define GQSPI_LPBK_DLY_ADJ_DLY_1_SHIFT 3 +#define GQSPI_LPBK_DLY_ADJ_DLY_0 0x3 +#define GQSPI_USE_DATA_DLY 0x1 +#define GQSPI_USE_DATA_DLY_SHIFT 31 +#define GQSPI_DATA_DLY_ADJ_VALUE 0x2 +#define GQSPI_DATA_DLY_ADJ_SHIFT 28 +#define TAP_DLY_BYPASS_LQSPI_RX_VALUE 0x1 +#define TAP_DLY_BYPASS_LQSPI_RX_SHIFT 2 +#define GQSPI_DATA_DLY_ADJ_OFST 0x000001F8 +#define IOU_TAPDLY_BYPASS_OFST 0xFF180390 +#define GQSPI_LPBK_DLY_ADJ_USE_LPBK_MASK 0x00000020 +#define GQSPI_FREQ_40MHZ 40000000 +#define GQSPI_FREQ_100MHZ 100000000 +#define GQSPI_FREQ_150MHZ 150000000 +#define IOU_TAPDLY_BYPASS_MASK 0x7 + +#define GQSPI_REG_OFFSET 0x100 +#define GQSPI_DMA_REG_OFFSET 0x800 + +/* QSPI register offsets */ +struct zynqmp_qspi_regs { + u32 confr; /* 0x00 */ + u32 isr; /* 0x04 */ + u32 ier; /* 0x08 */ + u32 idisr; /* 0x0C */ + u32 imaskr; /* 0x10 */ + u32 enbr; /* 0x14 */ + u32 dr; /* 0x18 */ + u32 txd0r; /* 0x1C */ + u32 drxr; /* 0x20 */ + u32 sicr; /* 0x24 */ + u32 txftr; /* 0x28 */ + u32 rxftr; /* 0x2C */ + u32 gpior; /* 0x30 */ + u32 reserved0; /* 0x34 */ + u32 lpbkdly; /* 0x38 */ + u32 reserved1; /* 0x3C */ + u32 genfifo; /* 0x40 */ + u32 gqspisel; /* 0x44 */ + u32 reserved2; /* 0x48 */ + u32 gqfifoctrl; /* 0x4C */ + u32 gqfthr; /* 0x50 */ + u32 gqpollcfg; /* 0x54 */ + u32 gqpollto; /* 0x58 */ + u32 gqxfersts; /* 0x5C */ + u32 gqfifosnap; /* 0x60 */ + u32 gqrxcpy; /* 0x64 */ + u32 reserved3[36]; /* 0x68 */ + u32 gqspidlyadj; /* 0xF8 */ +}; + +struct zynqmp_qspi_dma_regs { + u32 dmadst; /* 0x00 */ + u32 dmasize; /* 0x04 */ + u32 dmasts; /* 0x08 */ + u32 dmactrl; /* 0x0C */ + u32 reserved0; /* 0x10 */ + u32 dmaisr; /* 0x14 */ + u32 dmaier; /* 0x18 */ + u32 dmaidr; /* 0x1C */ + u32 dmaimr; /* 0x20 */ + u32 dmactrl2; /* 0x24 */ + u32 dmadstmsb; /* 0x28 */ +}; + +DECLARE_GLOBAL_DATA_PTR; + +struct zynqmp_qspi_platdata { + struct zynqmp_qspi_regs *regs; + struct zynqmp_qspi_dma_regs *dma_regs; + u32 frequency; + u32 speed_hz; + unsigned int tx_rx_mode; +}; + +struct zynqmp_qspi_priv { + struct zynqmp_qspi_regs *regs; + struct zynqmp_qspi_dma_regs *dma_regs; + u8 mode; + const void *tx_buf; + void *rx_buf; + unsigned int len; + int bytes_to_transfer; + int bytes_to_receive; + unsigned int is_inst; + unsigned int cs_change:1; +}; + +static int zynqmp_qspi_ofdata_to_platdata(struct udevice *bus) +{ + struct zynqmp_qspi_platdata *plat = bus->platdata; + u32 mode = 0; + u32 value; + int ret; + struct clk clk; + unsigned long clock; + + debug("%s\n", __func__); + + plat->regs = (struct zynqmp_qspi_regs *)(devfdt_get_addr(bus) + + GQSPI_REG_OFFSET); + plat->dma_regs = (struct zynqmp_qspi_dma_regs *) + (devfdt_get_addr(bus) + GQSPI_DMA_REG_OFFSET); + + ret = clk_get_by_index(bus, 0, &clk); + if (ret < 0) { + dev_err(dev, "failed to get clock\n"); + return ret; + } + + clock = clk_get_rate(&clk); + if (IS_ERR_VALUE(clock)) { + dev_err(dev, "failed to get rate\n"); + return clock; + } + debug("%s: CLK %ld\n", __func__, clock); + + ret = clk_enable(&clk); + if (ret && ret != -ENOSYS) { + dev_err(dev, "failed to enable clock\n"); + return ret; + } + + if (dev_read_bool(bus, "spi-cpol")) + mode |= SPI_CPOL; + if (dev_read_bool(bus, "spi-cpha")) + mode |= SPI_CPHA; + + value = dev_read_u32_default(bus, "spi-rx-bus-width", 1); + switch (value) { + case 1: + break; + case 2: + mode |= SPI_RX_DUAL; + break; + case 4: + mode |= SPI_RX_QUAD; + break; + default: + printf("Invalid spi-rx-bus-width %d\n", value); + break; + } + + value = dev_read_u32_default(bus, "spi-tx-bus-width", 1); + switch (value) { + case 1: + break; + case 2: + mode |= SPI_TX_DUAL; + break; + case 4: + mode |= SPI_TX_QUAD; + break; + default: + printf("Invalid spi-tx-bus-width %d\n", value); + break; + } + + plat->tx_rx_mode = mode; + plat->frequency = clock; + plat->speed_hz = plat->frequency; + + return 0; +} + +static void zynqmp_qspi_init_hw(struct zynqmp_qspi_priv *priv) +{ + u32 config_reg; + struct zynqmp_qspi_regs *regs = priv->regs; + + writel(GQSPI_GFIFO_SELECT, ®s->gqspisel); + writel(GQSPI_GFIFO_ALL_INT_MASK, ®s->idisr); + writel(GQSPI_FIFO_THRESHOLD, ®s->txftr); + writel(GQSPI_FIFO_THRESHOLD, ®s->rxftr); + writel(GQSPI_GFIFO_ALL_INT_MASK, ®s->isr); + + config_reg = readl(®s->confr); + config_reg &= ~(GQSPI_GFIFO_STRT_MODE_MASK | + GQSPI_CONFIG_MODE_EN_MASK); + config_reg |= GQSPI_CONFIG_DMA_MODE | + GQSPI_GFIFO_WP_HOLD | + GQSPI_DFLT_BAUD_RATE_DIV; + writel(config_reg, ®s->confr); + + writel(GQSPI_ENABLE_ENABLE_MASK, ®s->enbr); +} + +static u32 zynqmp_qspi_bus_select(struct zynqmp_qspi_priv *priv) +{ + u32 gqspi_fifo_reg = 0; + + gqspi_fifo_reg = GQSPI_GFIFO_LOW_BUS | + GQSPI_GFIFO_CS_LOWER; + + return gqspi_fifo_reg; +} + +static void zynqmp_qspi_fill_gen_fifo(struct zynqmp_qspi_priv *priv, + u32 gqspi_fifo_reg) +{ + struct zynqmp_qspi_regs *regs = priv->regs; + int ret = 0; + + ret = wait_for_bit_le32(®s->isr, GQSPI_IXR_GFEMTY_MASK, 1, + GQSPI_TIMEOUT, 1); + if (ret) + printf("%s Timeout\n", __func__); + + writel(gqspi_fifo_reg, ®s->genfifo); +} + +static void zynqmp_qspi_chipselect(struct zynqmp_qspi_priv *priv, int is_on) +{ + u32 gqspi_fifo_reg = 0; + + if (is_on) { + gqspi_fifo_reg = zynqmp_qspi_bus_select(priv); + gqspi_fifo_reg |= GQSPI_SPI_MODE_SPI | + GQSPI_IMD_DATA_CS_ASSERT; + } else { + gqspi_fifo_reg = GQSPI_GFIFO_LOW_BUS; + gqspi_fifo_reg |= GQSPI_IMD_DATA_CS_DEASSERT; + } + + debug("GFIFO_CMD_CS: 0x%x\n", gqspi_fifo_reg); + + zynqmp_qspi_fill_gen_fifo(priv, gqspi_fifo_reg); +} + +void zynqmp_qspi_set_tapdelay(struct udevice *bus, u32 baudrateval) +{ + struct zynqmp_qspi_platdata *plat = bus->platdata; + struct zynqmp_qspi_priv *priv = dev_get_priv(bus); + struct zynqmp_qspi_regs *regs = priv->regs; + u32 tapdlybypass = 0, lpbkdlyadj = 0, datadlyadj = 0, clk_rate; + u32 reqhz = 0; + + clk_rate = plat->frequency; + reqhz = (clk_rate / (GQSPI_BAUD_DIV_SHIFT << baudrateval)); + + debug("%s, req_hz:%d, clk_rate:%d, baudrateval:%d\n", + __func__, reqhz, clk_rate, baudrateval); + + if (reqhz < GQSPI_FREQ_40MHZ) { + zynqmp_mmio_read(IOU_TAPDLY_BYPASS_OFST, &tapdlybypass); + tapdlybypass |= (TAP_DLY_BYPASS_LQSPI_RX_VALUE << + TAP_DLY_BYPASS_LQSPI_RX_SHIFT); + } else if (reqhz < GQSPI_FREQ_100MHZ) { + zynqmp_mmio_read(IOU_TAPDLY_BYPASS_OFST, &tapdlybypass); + tapdlybypass |= (TAP_DLY_BYPASS_LQSPI_RX_VALUE << + TAP_DLY_BYPASS_LQSPI_RX_SHIFT); + lpbkdlyadj = readl(®s->lpbkdly); + lpbkdlyadj |= (GQSPI_LPBK_DLY_ADJ_USE_LPBK_MASK); + datadlyadj = readl(®s->gqspidlyadj); + datadlyadj |= ((GQSPI_USE_DATA_DLY << GQSPI_USE_DATA_DLY_SHIFT) + | (GQSPI_DATA_DLY_ADJ_VALUE << + GQSPI_DATA_DLY_ADJ_SHIFT)); + } else if (reqhz < GQSPI_FREQ_150MHZ) { + lpbkdlyadj = readl(®s->lpbkdly); + lpbkdlyadj |= ((GQSPI_LPBK_DLY_ADJ_USE_LPBK_MASK) | + GQSPI_LPBK_DLY_ADJ_DLY_0); + } + + zynqmp_mmio_write(IOU_TAPDLY_BYPASS_OFST, IOU_TAPDLY_BYPASS_MASK, + tapdlybypass); + writel(lpbkdlyadj, ®s->lpbkdly); + writel(datadlyadj, ®s->gqspidlyadj); +} + +static int zynqmp_qspi_set_speed(struct udevice *bus, uint speed) +{ + struct zynqmp_qspi_platdata *plat = bus->platdata; + struct zynqmp_qspi_priv *priv = dev_get_priv(bus); + struct zynqmp_qspi_regs *regs = priv->regs; + u32 confr; + u8 baud_rate_val = 0; + + debug("%s\n", __func__); + if (speed > plat->frequency) + speed = plat->frequency; + + /* Set the clock frequency */ + confr = readl(®s->confr); + if (speed == 0) { + /* Set baudrate x8, if the freq is 0 */ + baud_rate_val = GQSPI_DFLT_BAUD_RATE_VAL; + } else if (plat->speed_hz != speed) { + while ((baud_rate_val < 8) && + ((plat->frequency / + (2 << baud_rate_val)) > speed)) + baud_rate_val++; + + if (baud_rate_val > GQSPI_MAX_BAUD_RATE_VAL) + baud_rate_val = GQSPI_DFLT_BAUD_RATE_VAL; + + plat->speed_hz = plat->frequency / (2 << baud_rate_val); + } + confr &= ~GQSPI_BAUD_DIV_MASK; + confr |= (baud_rate_val << 3); + writel(confr, ®s->confr); + + zynqmp_qspi_set_tapdelay(bus, baud_rate_val); + debug("regs=%p, speed=%d\n", priv->regs, plat->speed_hz); + + return 0; +} + +static int zynqmp_qspi_child_pre_probe(struct udevice *bus) +{ + struct spi_slave *slave = dev_get_parent_priv(bus); + struct zynqmp_qspi_platdata *plat = dev_get_platdata(bus->parent); + + slave->mode = plat->tx_rx_mode; + + return 0; +} + +static int zynqmp_qspi_probe(struct udevice *bus) +{ + struct zynqmp_qspi_platdata *plat = dev_get_platdata(bus); + struct zynqmp_qspi_priv *priv = dev_get_priv(bus); + + debug("%s: bus:%p, priv:%p\n", __func__, bus, priv); + + priv->regs = plat->regs; + priv->dma_regs = plat->dma_regs; + + /* init the zynq spi hw */ + zynqmp_qspi_init_hw(priv); + + return 0; +} + +static int zynqmp_qspi_set_mode(struct udevice *bus, uint mode) +{ + struct zynqmp_qspi_priv *priv = dev_get_priv(bus); + struct zynqmp_qspi_regs *regs = priv->regs; + u32 confr; + + debug("%s\n", __func__); + /* Set the SPI Clock phase and polarities */ + confr = readl(®s->confr); + confr &= ~(GQSPI_CONFIG_CPHA_MASK | + GQSPI_CONFIG_CPOL_MASK); + + if (mode & SPI_CPHA) + confr |= GQSPI_CONFIG_CPHA_MASK; + if (mode & SPI_CPOL) + confr |= GQSPI_CONFIG_CPOL_MASK; + + priv->mode = mode; + writel(confr, ®s->confr); + + debug("regs=%p, mode=%d\n", priv->regs, priv->mode); + + return 0; +} + +static int zynqmp_qspi_fill_tx_fifo(struct zynqmp_qspi_priv *priv, u32 size) +{ + u32 data; + int ret = 0; + struct zynqmp_qspi_regs *regs = priv->regs; + u32 *buf = (u32 *)priv->tx_buf; + u32 len = size; + + debug("TxFIFO: 0x%x, size: 0x%x\n", readl(®s->isr), + size); + + while (size) { + ret = wait_for_bit_le32(®s->isr, GQSPI_IXR_TXNFULL_MASK, 1, + GQSPI_TIMEOUT, 1); + if (ret) { + printf("%s: Timeout\n", __func__); + return ret; + } + + if (size >= 4) { + writel(*buf, ®s->txd0r); + buf++; + size -= 4; + } else { + switch (size) { + case 1: + data = *((u8 *)buf); + buf += 1; + data |= GENMASK(31, 8); + break; + case 2: + data = *((u16 *)buf); + buf += 2; + data |= GENMASK(31, 16); + break; + case 3: + data = *((u16 *)buf); + buf += 2; + data |= (*((u8 *)buf) << 16); + buf += 1; + data |= GENMASK(31, 24); + break; + } + writel(data, ®s->txd0r); + size = 0; + } + } + + priv->tx_buf += len; + return 0; +} + +static void zynqmp_qspi_genfifo_cmd(struct zynqmp_qspi_priv *priv) +{ + u32 gen_fifo_cmd; + u32 bytecount = 0; + + while (priv->len) { + gen_fifo_cmd = zynqmp_qspi_bus_select(priv); + gen_fifo_cmd |= GQSPI_GFIFO_TX | GQSPI_SPI_MODE_SPI; + gen_fifo_cmd |= *(u8 *)priv->tx_buf; + bytecount++; + priv->len--; + priv->tx_buf = (u8 *)priv->tx_buf + 1; + + debug("GFIFO_CMD_Cmd = 0x%x\n", gen_fifo_cmd); + + zynqmp_qspi_fill_gen_fifo(priv, gen_fifo_cmd); + } +} + +static u32 zynqmp_qspi_calc_exp(struct zynqmp_qspi_priv *priv, + u32 *gen_fifo_cmd) +{ + u32 expval = 8; + u32 len; + + while (1) { + if (priv->len > 255) { + if (priv->len & (1 << expval)) { + *gen_fifo_cmd &= ~GQSPI_GFIFO_IMD_MASK; + *gen_fifo_cmd |= GQSPI_GFIFO_EXP_MASK; + *gen_fifo_cmd |= expval; + priv->len -= (1 << expval); + return expval; + } + expval++; + } else { + *gen_fifo_cmd &= ~(GQSPI_GFIFO_IMD_MASK | + GQSPI_GFIFO_EXP_MASK); + *gen_fifo_cmd |= (u8)priv->len; + len = (u8)priv->len; + priv->len = 0; + return len; + } + } +} + +static int zynqmp_qspi_genfifo_fill_tx(struct zynqmp_qspi_priv *priv) +{ + u32 gen_fifo_cmd; + u32 len; + int ret = 0; + + gen_fifo_cmd = zynqmp_qspi_bus_select(priv); + gen_fifo_cmd |= GQSPI_GFIFO_TX | + GQSPI_GFIFO_DATA_XFR_MASK; + + gen_fifo_cmd |= GQSPI_SPI_MODE_SPI; + + while (priv->len) { + len = zynqmp_qspi_calc_exp(priv, &gen_fifo_cmd); + zynqmp_qspi_fill_gen_fifo(priv, gen_fifo_cmd); + + debug("GFIFO_CMD_TX:0x%x\n", gen_fifo_cmd); + + if (gen_fifo_cmd & GQSPI_GFIFO_EXP_MASK) + ret = zynqmp_qspi_fill_tx_fifo(priv, + 1 << len); + else + ret = zynqmp_qspi_fill_tx_fifo(priv, + len); + + if (ret) + return ret; + } + return ret; +} + +static int zynqmp_qspi_start_dma(struct zynqmp_qspi_priv *priv, + u32 gen_fifo_cmd, u32 *buf) +{ + u32 addr; + u32 size, len; + u32 actuallen = priv->len; + int ret = 0; + struct zynqmp_qspi_dma_regs *dma_regs = priv->dma_regs; + + writel((unsigned long)buf, &dma_regs->dmadst); + writel(roundup(priv->len, ARCH_DMA_MINALIGN), &dma_regs->dmasize); + writel(GQSPI_DMA_DST_I_STS_MASK, &dma_regs->dmaier); + addr = (unsigned long)buf; + size = roundup(priv->len, ARCH_DMA_MINALIGN); + flush_dcache_range(addr, addr + size); + + while (priv->len) { + len = zynqmp_qspi_calc_exp(priv, &gen_fifo_cmd); + if (!(gen_fifo_cmd & GQSPI_GFIFO_EXP_MASK) && + (len % ARCH_DMA_MINALIGN)) { + gen_fifo_cmd &= ~GENMASK(7, 0); + gen_fifo_cmd |= roundup(len, ARCH_DMA_MINALIGN); + } + zynqmp_qspi_fill_gen_fifo(priv, gen_fifo_cmd); + + debug("GFIFO_CMD_RX:0x%x\n", gen_fifo_cmd); + } + + ret = wait_for_bit_le32(&dma_regs->dmaisr, GQSPI_DMA_DST_I_STS_DONE, + 1, GQSPI_TIMEOUT, 1); + if (ret) { + printf("DMA Timeout:0x%x\n", readl(&dma_regs->dmaisr)); + return -1; + } + + writel(GQSPI_DMA_DST_I_STS_DONE, &dma_regs->dmaisr); + + debug("buf:0x%lx, rxbuf:0x%lx, *buf:0x%x len: 0x%x\n", + (unsigned long)buf, (unsigned long)priv->rx_buf, *buf, + actuallen); + + if (buf != priv->rx_buf) + memcpy(priv->rx_buf, buf, actuallen); + + return 0; +} + +static int zynqmp_qspi_genfifo_fill_rx(struct zynqmp_qspi_priv *priv) +{ + u32 gen_fifo_cmd; + u32 *buf; + u32 actuallen = priv->len; + + gen_fifo_cmd = zynqmp_qspi_bus_select(priv); + gen_fifo_cmd |= GQSPI_GFIFO_RX | + GQSPI_GFIFO_DATA_XFR_MASK; + + gen_fifo_cmd |= GQSPI_SPI_MODE_SPI; + + /* + * Check if receive buffer is aligned to 4 byte and length + * is multiples of four byte as we are using dma to receive. + */ + if (!((unsigned long)priv->rx_buf & (GQSPI_DMA_ALIGN - 1)) && + !(actuallen % GQSPI_DMA_ALIGN)) { + buf = (u32 *)priv->rx_buf; + return zynqmp_qspi_start_dma(priv, gen_fifo_cmd, buf); + } + + ALLOC_CACHE_ALIGN_BUFFER(u8, tmp, roundup(priv->len, + GQSPI_DMA_ALIGN)); + buf = (u32 *)tmp; + return zynqmp_qspi_start_dma(priv, gen_fifo_cmd, buf); +} + +static int zynqmp_qspi_start_transfer(struct zynqmp_qspi_priv *priv) +{ + int ret = 0; + + if (priv->is_inst) { + if (priv->tx_buf) + zynqmp_qspi_genfifo_cmd(priv); + else + ret = -1; + } else { + if (priv->tx_buf) + ret = zynqmp_qspi_genfifo_fill_tx(priv); + else if (priv->rx_buf) + ret = zynqmp_qspi_genfifo_fill_rx(priv); + else + ret = -1; + } + return ret; +} + +static int zynqmp_qspi_transfer(struct zynqmp_qspi_priv *priv) +{ + static unsigned int cs_change = 1; + int status = 0; + + debug("%s\n", __func__); + + while (1) { + /* Select the chip if required */ + if (cs_change) + zynqmp_qspi_chipselect(priv, 1); + + cs_change = priv->cs_change; + + if (!priv->tx_buf && !priv->rx_buf && priv->len) { + status = -1; + break; + } + + /* Request the transfer */ + if (priv->len) { + status = zynqmp_qspi_start_transfer(priv); + priv->is_inst = 0; + if (status < 0) + break; + } + + if (cs_change) + /* Deselect the chip */ + zynqmp_qspi_chipselect(priv, 0); + break; + } + + return status; +} + +static int zynqmp_qspi_claim_bus(struct udevice *dev) +{ + struct udevice *bus = dev->parent; + struct zynqmp_qspi_priv *priv = dev_get_priv(bus); + struct zynqmp_qspi_regs *regs = priv->regs; + + writel(GQSPI_ENABLE_ENABLE_MASK, ®s->enbr); + + return 0; +} + +static int zynqmp_qspi_release_bus(struct udevice *dev) +{ + struct udevice *bus = dev->parent; + struct zynqmp_qspi_priv *priv = dev_get_priv(bus); + struct zynqmp_qspi_regs *regs = priv->regs; + + writel(~GQSPI_ENABLE_ENABLE_MASK, ®s->enbr); + + return 0; +} + +int zynqmp_qspi_xfer(struct udevice *dev, unsigned int bitlen, const void *dout, + void *din, unsigned long flags) +{ + struct udevice *bus = dev->parent; + struct zynqmp_qspi_priv *priv = dev_get_priv(bus); + + debug("%s: priv: 0x%08lx bitlen: %d dout: 0x%08lx ", __func__, + (unsigned long)priv, bitlen, (unsigned long)dout); + debug("din: 0x%08lx flags: 0x%lx\n", (unsigned long)din, flags); + + priv->tx_buf = dout; + priv->rx_buf = din; + priv->len = bitlen / 8; + + /* + * Assume that the beginning of a transfer with bits to + * transmit must contain a device command. + */ + if (dout && flags & SPI_XFER_BEGIN) + priv->is_inst = 1; + else + priv->is_inst = 0; + + if (flags & SPI_XFER_END) + priv->cs_change = 1; + else + priv->cs_change = 0; + + zynqmp_qspi_transfer(priv); + + return 0; +} + +static const struct dm_spi_ops zynqmp_qspi_ops = { + .claim_bus = zynqmp_qspi_claim_bus, + .release_bus = zynqmp_qspi_release_bus, + .xfer = zynqmp_qspi_xfer, + .set_speed = zynqmp_qspi_set_speed, + .set_mode = zynqmp_qspi_set_mode, +}; + +static const struct udevice_id zynqmp_qspi_ids[] = { + { .compatible = "xlnx,zynqmp-qspi-1.0" }, + { } +}; + +U_BOOT_DRIVER(zynqmp_qspi) = { + .name = "zynqmp_qspi", + .id = UCLASS_SPI, + .of_match = zynqmp_qspi_ids, + .ops = &zynqmp_qspi_ops, + .ofdata_to_platdata = zynqmp_qspi_ofdata_to_platdata, + .platdata_auto_alloc_size = sizeof(struct zynqmp_qspi_platdata), + .priv_auto_alloc_size = sizeof(struct zynqmp_qspi_priv), + .probe = zynqmp_qspi_probe, + .child_pre_probe = zynqmp_qspi_child_pre_probe, +}; From patchwork Tue Jun 26 09:37:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siva Durga Prasad Paladugu X-Patchwork-Id: 934746 X-Patchwork-Delegate: jagannadh.teki@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=xilinx.onmicrosoft.com header.i=@xilinx.onmicrosoft.com header.b="hKml726w"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41FLcW00pfz9rxs for ; Tue, 26 Jun 2018 19:40:10 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id A09BBC21DB5; Tue, 26 Jun 2018 09:40:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAD_ENC_HEADER, SPF_HELO_PASS, T_DKIM_INVALID, UPPERCASE_50_75 autolearn=no autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id B0C8BC21C8B; Tue, 26 Jun 2018 09:40:03 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D25B3C21C8B; Tue, 26 Jun 2018 09:40:02 +0000 (UTC) Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0082.outbound.protection.outlook.com [104.47.37.82]) by lists.denx.de (Postfix) with ESMTPS id 14BFEC21C27 for ; Tue, 26 Jun 2018 09:40:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector1-xilinx-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8JsXNckPC5dR2/AVwJdNTgOoePOOidveZ22Y6QYeYlQ=; b=hKml726wXiUqj1yH1FNjR2s4P/u4QqWTLHD1V3ti28NBp0sf4TVxQpDWIEYFKBsHBMsLYOkaEy5Vi4lYIZ2Sp1O9DpwdWRV0VTqgMgiMsj2/OpIIJow9V6prZoel9QRaETkzLaNFr7w/CdZ6kgSE7ZDgCo1FWPVL5OrdS6dzsd4= Received: from SN4PR0201CA0063.namprd02.prod.outlook.com (10.171.31.153) by SN1PR02MB2158.namprd02.prod.outlook.com (10.166.68.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.884.22; Tue, 26 Jun 2018 09:39:59 +0000 Received: from SN1NAM02FT018.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::202) by SN4PR0201CA0063.outlook.office365.com (2603:10b6:803:20::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.884.21 via Frontend Transport; Tue, 26 Jun 2018 09:39:59 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.100) smtp.mailfrom=xilinx.com; openedev.com; dkim=none (message not signed) header.d=none;openedev.com; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.100 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.100; helo=xsj-pvapsmtpgw02; Received: from xsj-pvapsmtpgw02 (149.199.60.100) by SN1NAM02FT018.mail.protection.outlook.com (10.152.72.122) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.906.15 via Frontend Transport; Tue, 26 Jun 2018 09:39:58 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:50055 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1fXkS6-0003kj-IV; Tue, 26 Jun 2018 02:39:58 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1fXkS1-0000dy-FR; Tue, 26 Jun 2018 02:39:53 -0700 Received: from xsj-pvapsmtp01 (mailhub.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id w5Q9dm02028912; Tue, 26 Jun 2018 02:39:48 -0700 Received: from [172.23.37.99] (helo=xhdsivadur40.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1fXkRw-0000dF-4Z; Tue, 26 Jun 2018 02:39:48 -0700 From: Siva Durga Prasad Paladugu To: Date: Tue, 26 Jun 2018 15:07:55 +0530 Message-ID: <1530005875-1613-2-git-send-email-siva.durga.paladugu@xilinx.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530005875-1613-1-git-send-email-siva.durga.paladugu@xilinx.com> References: <1530005875-1613-1-git-send-email-siva.durga.paladugu@xilinx.com> X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.2.0.1013-23620.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.100; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(39860400002)(346002)(396003)(376002)(136003)(2980300002)(438002)(189003)(199004)(486006)(77096007)(47776003)(6916009)(6666003)(50226002)(426003)(5660300001)(9786002)(107886003)(4326008)(36756003)(305945005)(478600001)(54906003)(63266004)(316002)(106466001)(356003)(81166006)(81156014)(2906002)(8936002)(26005)(106002)(476003)(446003)(76176011)(11346002)(2351001)(51416003)(16586007)(36386004)(7696005)(186003)(126002)(336012)(2616005)(8676002)(50466002)(48376002)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR02MB2158; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; LANG:en; PTR:xapps1.xilinx.com,unknown-60-100.xilinx.com; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02FT018; 1:8jnfAoCTmHHkR7+S1ufxbLVr1H9Fv1ZDsgxIJ5Gzo3BrnUmX/oNgSOZCAVYTNhAaoe3toMmu2UUpLGa0RnzPLFzK1iyka69Fbiu9/R7/fg/RKqdN2g4wDgjJzBoIwDpP MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 06648c1c-efb6-42b8-a040-08d5db48c884 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(8989117)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600026)(711020)(4608076)(2017052603328)(7153060); SRVR:SN1PR02MB2158; X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB2158; 3:nduGcgMC3plzsUM/NSAoFrzt5YDfXjQNayUhN7DH6OTQX50Pdr84DJcHavOOwhGkLidZURwGQf9Q1dhNK9rH+QClbQvG17BI3NWffpf4b+gQfTSNOj7a/sPTOOUjJ6U0t94Et308LIxU5OEsTG7glfSWZ77LiLYH7LeO08j1DAJe7pMiqOsrq7XZlHQNUYOkfutyMnz1A6WrK43OWBBzMNDfWt+0iEGdJSJpcj0VT8c+tv6eK9G56UwO83vc/6xgOrnZwAcDFa5aIQ8LbZ/6a9lMFmfAWNVoe0nQIyFG4LjgWTG9pZUJBICgTf0wmh0IqURJgk7lFOUFH+GJY14yvKsv5tRq1nzHhHa9A7Tg3d0=; 25:rM6QN8IiDjSBUtRQazlnlR3PXY7s1xtN7q8Gb34i9yc0lCERJ5Ifzyix0SOIeTmXHBE1gCozUcnqyDrcVlGewnkF+5nfK3bgzrkXiB9PXQhNMl29Kx17JNLCO/gC9/AQxvz4ErPWBAUyTxygCyxuAGQA478mXCMowdhBGH5RlAyjmAnlSrC0VdzrZKgBCtT8HWtQcc688xOx+n5d1rAb+VF3hKomYg4TAoESQtm7MM/8iTRezZB9woYJ/vArzFON+vhZhUDLAZc8rAiFzwax/jda46Dk/z7n+qGkMvaI0s+pofXV/ssND2S483mO9q0u6xc0BCyYjyGCCXnbO+7DYA== X-MS-TrafficTypeDiagnostic: SN1PR02MB2158: X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB2158; 31:Q/iekvqoaqSmRJqT/8kkYmHBaYxtYfBRM+/yt8SEUaTLSOzpjoSfFKDqmiMONdjpPev1oIsqT8zC7Yp3cSFopSrCLYhK3sLv5YIwNOoYPE6FiNfrTUC0OwCXUUODQMNYh254SZzEQzgeKBYYYcjK/OWcKVNeCv7ZZNV6ycpEzpfuNx1vr6hFv/eYYGcnqzybbn8kHYp/WiuE6ywWglgiifynpK6I/KtZXc47oPknwlc=; 20:VIxvQFqdrY3xwA8FUZbsIic+kfiO7kbLiewkD0QfF5m1UTJWNt5VFEws7CMNd8SV4NXmkt3Qifr7lIrXUnXYHdVJoFw2Fo/5mMq3qx51+6jssSLDPFw464ii2im8RCVR0e49nEwUQCwK5NqLh7OCFOHDUjsOgPNVaVsFtH9AhEW33Gen6ub4OskPOJIZ2SoArqZonrbVbXMb6vLLhpha2abEoD5B6zjog9aPmJ9FFbbkGQmBDHyC/cWKf+KHxD58hU5uzkCwbEO5VShfkT0+zmGpCnmZLxV02y7sjvTCzZ7kgqHfKKsqu9uZfEiSG8tEE4LOpvfM8jDraASlvQY1BqwJ4Mxs3Rph4FzoUGJzx5c3nk7eH0EdIO6oc+JDoXTFcoH7MjymutGF5Jzwn3TRIP4Zf7GTSp/g1BmhxifTC9NL9fO2K9LFB1CGfFxod/WDeeGsULmd061W9wGcpnzdFDno7dJN+n9FTH7bwNkcVO14NodgCbETqoTyxb5iv4uq X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(192813158149592); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(10201501046)(3231254)(944501410)(52105095)(93006095)(93004095)(6055026)(149027)(150027)(6041310)(20161123558120)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:SN1PR02MB2158; BCL:0; PCL:0; RULEID:; SRVR:SN1PR02MB2158; X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB2158; 4:VBe8kVG4XmwCsKSwUBsGdWTpB/jS380DfgLbSL+9chXOqwIStd3Y8mdXgoz5ckZY3mm3N/Z/ZkLCiwSaOH3TYGdpozIkyFIUAAwIroaZqJgyXr3oZs49XtSqeVXVIqaozNfMIDGV9xO1ttaCVCYssQ0SKYswE6chwZuFk2l69FuSu12W3iFDYEDRE2GcupKpKds8dDWoCTXFQxtBZotzer5o5JGFPqHtdfAM6hitiLl+1YA+Hz21zdPylJl4mFMXzcbN4Ec6kpclc18AuazFFquI0NwkesJDSb90po/aO5U8xkQqO1HjPnQp8eBujenk X-Forefront-PRVS: 071518EF63 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR02MB2158; 23:LItFlzXATxMTPVmaHm5lgbwTukZpfkVknz1zN2jhD?= jk2yJRYQkGY0sl9e/FKkdI7ztCJKswyd1gFe/lGm43B3+j/T5fG4tSN62UJ4IfoW2TzSot7DjHJeeoZKnRy2Q1/YZ4siZu+9EC7gobvjFUyVgr6uNIW9XtKOG3P0hHouKi7rx70jCBm1N9zPuKABS43uQhiU7BODNZbLk7JdCQ4SJ+2IUdmOvK1wiL55rjVpJGa7JYZ+4ICRQiouNGlml2n7ekzsuSdYMEV3MRDOHBycJ2uuEJmYx6BkAc+GSsxFdaYFk9Kq4g9LtUQz2/Rs1hLGmAhnZ6sx0mcCcUV7xaBhycnnVKehG0W5wigNBEnDFP3ANC+UbtqH2pMDmAVtQ2rAOQsSfeEcWhRpJd/oAvDgDkUlaVkkxLctN4sd0axeomPPbvdlne53WzBwj2aXOusgi156qp5y5XFp2LtJV4GJONbP1Q/PBg2Uf0OL8vob/uvVPMyZouGOD2IyXR9AtZp+0qZa1rD3koKSZQ+AMkelMvSM1IrZHMd7lWLbvZgVtldU4pj+1GOo+vCZC/BRvBPpY12lt2+JQaxcgUhYyRzRQZQi6dW9+p8BIl9h/XGTZO+1XfwzNRG1xQn64j/kfS59Y6aKG9d8zSKp1uZvaGUdz0PAiZzLGPMxcqPXTg/ZlCoTU8o/Tf4/uTX7u5jRxYMGz991Mv4qvfGj24alWLniaSN5iwwdRUyUm2uCko0c8+fbf308wIySCV6ezJMxXUMZK5XdN3oVr0HdcBCKBe9PpNAD4Zf3p3zFdD1mlmgLfAXNkQBtG2neO+wvhcp3Ejl1LSSSnkfK+8gDcy7Krs87rrugXQMALNXBO3uQiZS/LlnJawgwkadBcI52ARv6sgngQjjCYbf3us0c45y5/LDyHEc5gebnUzmD0vR3qCFqsZDnx0xoR3hh6zhO5P6rr0y55KD1+tEysQsiCC8EzRQMcNMtLMmgtGplnOFHFpDdAerFArbGybq8WbrZNy2gDvVQzrAnPpsMmurR3SNPHwsipAaaBw7yoGJZxeIA2CMQ85/mg9wsshAmWdDeB1MV2npK7MLYwxKBZCOGLHBS4JFQX1uAozVwtQIIdi/gmvXQFPdz6rBl4YIPgDB1Lh4VwEorXqrAfy5/mriOfvku7B0CA== X-Microsoft-Antispam-Message-Info: e0NJlzvTMlbMsVHBTz9CdFLHXUENArOj6VKAb2RiM6SGe9XWutYlwVFwtg2vErcizjIvZs2C5gL3mPkXuxI43rl0d0d2JUCkVziAx/Yiq33+5/W3AxyuxIHlgylAuYYTyp2L7OmpvEPAjFvpT19gM7mSA5I/YwzOR1VMOGCmOr9UjitqxLqJWERX7qItB4Oq/JR2DmlUsRGfPd6DSCkch2EOyLEGTJq/AF59KLTlnbFOw+ZYoFJ/yiH6CAyqVB9bEC8WT4pPOIOZJjIMwdY+B1NjKllxmskYIDxhcHpLULyJb9wOcjmUDvjIfU/pblzeg1NNToRQPyxulDSTm9Q3MGxbW4Cvy62bE28SYlrRnzM= X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB2158; 6:+WursVtV/WVbs6FHVuBH/f7sxUe1N4MpVt4Jy/rt8w1QdpqSXY7j68nURRGhw5KYoD7L/YpxTyVXmhwkpwuNgRzBGeaimkTV7XwPxI1AWkesup0hFbXGKn3X5d1BKQSVj2JfgAUizWSpk1h+FKuJs+b2dIQNhPBEdiI7gQIER83iMzDLuvHfAxGhJmtKykYR6SmDnG8HRdWV5bgsYoeqASzowCLQ8F6E45xOwJx8SahYNPlilgYUcMEIMsYNg8DBUvdSsMFopHffdK0YKj/rzNTTnM7o+0/jMbnq3tMgF4a//+39ZFsDueHd7RZzkBrMnSC+6NYy6eD00mVI8lVD6qYJ6OqQsFZtfyqfpSwv+KShJQano2FWLCyUfnEiWloVlsWulsYrncWpdZZTMg84iVcDO17d9BV2AiAemKf5kMrQ04jPRyXxQ/glnJZaggkxYyvuGAQSUgiWnSUa0yKomg==; 5:gSodpwxlvPQu+oVjPHIlhjs8WGxfnVkfpBQKpFCHs1ONkAUkg5rpOs5kBsVhUpy8IuowjlI8sRXgnZ6phbs7aXDqCjbTjAb2CzfrfrDZmWyLZXxBQSal/CM724LMkcPM9CKVd8zmvgoyBmHHG5zrcyW5LBjp3d+kbPyzCwtms0s=; 24:QxrT2L17OGMQcEkomoplGO6u2V4rCwxeQJy0NHJHIoa9tz4MNwJ0sHbvVXMRom2fR9SSUaBAkrEnl0Mmf+Pw00B4TjmX/akh1YcfMyIVdVA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB2158; 7:x39rwqmE5qjCjGnHETuT4X3U5TmBz7Z8UUz9rWJIFGI9Sp+f3bZXE9lxeAoWcGwnl1quCRYn72LLqPFr0oeNAzYi+nO99sckVzw9JllJyIaFSBB4WJH5TXYzR15gtQwAzeEI/5NuDsErRytGYCEEJ3WddQ9GcS1U9fw99wvQ292WA47aijHVkEFzrMl0iryH1kPcJyt3HnssTwidT5LFUfMCGSMGRMykFOM2e7hYhXjV1iqks+lb+Y7bSBXHNwhM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jun 2018 09:39:58.9493 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 06648c1c-efb6-42b8-a040-08d5db48c884 X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.100]; Helo=[xsj-pvapsmtpgw02] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR02MB2158 Cc: jagan@openedev.com, michal.simek@xilinx.com Subject: [U-Boot] [PATCH v5 2/2] zynqmp: zcu102: Add qspi driver support for ZynqMP zcu102 boards X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This patch adds qspi driver support for all ZynqMP ZCU102 boards. Signed-off-by: Siva Durga Prasad Paladugu Acked-by: Michal Simek --- Changes for v5: - None Changes for v4: - None Changes for v3: - Changed as per latest changes in 1/2 Changes for v2: - Rebased on top of latest master and enabled qspi for all zcu102 boards. --- configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 5 +++++ configs/xilinx_zynqmp_zcu102_revA_defconfig | 5 +++++ configs/xilinx_zynqmp_zcu102_revB_defconfig | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig index 49a14d8..da53aa4 100644 --- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig +++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig @@ -36,6 +36,7 @@ CONFIG_CMD_GPT=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_SDRAM=y +CONFIG_CMD_SF=y CONFIG_CMD_USB=y CONFIG_CMD_TFTPPUT=y CONFIG_CMD_TIME=y @@ -69,6 +70,7 @@ CONFIG_MMC_IO_VOLTAGE=y CONFIG_MMC_UHS_SUPPORT=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y +CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_MACRONIX=y @@ -90,6 +92,9 @@ CONFIG_DM_SCSI=y CONFIG_DEBUG_UART_ZYNQ=y CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_ZYNQ_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y +CONFIG_ZYNQMP_GQSPI=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig index 05dad41..60e1269 100644 --- a/configs/xilinx_zynqmp_zcu102_revA_defconfig +++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig @@ -35,6 +35,7 @@ CONFIG_CMD_GPT=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_SDRAM=y +CONFIG_CMD_SF=y CONFIG_CMD_USB=y CONFIG_CMD_TFTPPUT=y CONFIG_CMD_TIME=y @@ -66,6 +67,7 @@ CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20 CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y +CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_MACRONIX=y @@ -87,6 +89,9 @@ CONFIG_DM_SCSI=y CONFIG_DEBUG_UART_ZYNQ=y CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_ZYNQ_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y +CONFIG_ZYNQMP_GQSPI=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig index b3711b4..fa2804d 100644 --- a/configs/xilinx_zynqmp_zcu102_revB_defconfig +++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig @@ -35,6 +35,7 @@ CONFIG_CMD_GPT=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_SDRAM=y +CONFIG_CMD_SF=y CONFIG_CMD_USB=y CONFIG_CMD_TFTPPUT=y CONFIG_CMD_TIME=y @@ -66,6 +67,7 @@ CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20 CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y +CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_MACRONIX=y @@ -87,6 +89,9 @@ CONFIG_DM_SCSI=y CONFIG_DEBUG_UART_ZYNQ=y CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_ZYNQ_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y +CONFIG_ZYNQMP_GQSPI=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y