From patchwork Wed Jan 3 00:52:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 854837 X-Patchwork-Delegate: sbabic@denx.de 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; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="h7454F3c"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zBCWh0Jcnz9s82 for ; Wed, 3 Jan 2018 12:09:34 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 20B0AC21DE4; Wed, 3 Jan 2018 01:09:28 +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, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2, 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 7F4D3C21C34; Wed, 3 Jan 2018 01:09:25 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 24B3DC21C34; Wed, 3 Jan 2018 01:09:24 +0000 (UTC) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30086.outbound.protection.outlook.com [40.107.3.86]) by lists.denx.de (Postfix) with ESMTPS id 901B1C21C29 for ; Wed, 3 Jan 2018 01:09:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=eMfhGOBsrtv9Cg5ExYC6AYaskq5HhRKnXwxXct0Xzik=; b=h7454F3ceBJQik3LYYzAF+xowiOG9ggjPnb9DdzzQHzHy/K0qCYl6QtRyqXKFjYGVSS82JC6lMXjreMTj7qsQzoW0+1BHvdDY18QkhWvUZFenW8xP4Nx+bXkmKBImINA2eFMu/XqZk5uXnHLss7C3w0FC9UVJQI07+1OmpzG6Sw= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; Received: from shlinux2.ap.freescale.net (123.151.195.1) by VI1PR04MB3231.eurprd04.prod.outlook.com (2603:10a6:802:6::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.366.8; Wed, 3 Jan 2018 01:09:19 +0000 From: Peng Fan To: jagan@openedev.com, sbabic@denx.de Date: Wed, 3 Jan 2018 08:52:02 +0800 Message-Id: <1514940723-1586-1-git-send-email-peng.fan@nxp.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 X-Originating-IP: [123.151.195.1] X-ClientProxiedBy: HK2PR04CA0060.apcprd04.prod.outlook.com (2603:1096:202:14::28) To VI1PR04MB3231.eurprd04.prod.outlook.com (2603:10a6:802:6::28) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: d7e53736-0960-403f-50f1-08d552469f51 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060); SRVR:VI1PR04MB3231; X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB3231; 3:ZurhemVgEMSciImtHl+katUitF+RBaDVd7FUdBE3RzOt9VPWFZSLnwgFE3aeRswwFIjhhXPdjR7P75ym6oA9+LXY/qFAdCZpH8hxbjWzzdB8FAoCbhFABcFde41N+ziYu8V/4ynSj0iBY6JKB2B9fYIPR3X5Rs7fPe9HQPdOmJ2U94s8oE3kXW1bjkJwgvn4e3299EmbUYsGKyp3URfBhK912aAYmePE+8V1MkEM5TvXZS1UpXwNu4TUEwiFjMIR; 25:Y7kP2iX6hTW4CS7OKcvMzjd017HFUxinqVax7vEnf0xmf3GCa0zaF1t5kKuOYEnNNPajksr4m7SL3g+jyYIxbPJW1kyBPrUZJPi2bl4J5V/Lfnefj2GVFBhkb+tyGAGAoYyVsMk+TIDeQfJ9vdLBaGhDsOkV4uE2LvRwuDW21BexSVWZpxbibfe+mobfWSyelApyq3h0naOm07y+aRoyOOVd2Ee4hvKrDmJEntBjqkoimd7o+cNovTrQ/CKA/JEE6nFPNH69+pZTsSqzd9ooWs+wSWIx6sn9mXUZisRFOyf+9Uz8+t1MsY/IBM+LXCPr4Cg8oeT+Hwrq7tH1gOTY9A==; 31:4h38tdmFAnAmVRWIWrRXVBca/urg1+2FVgk7zqfhlcgQwsdd8FMWgnJKZqOLUyipZYJp3UsJb6SjX5z3rYgL3QTkgyJYjiszFawehUx3kTUxVvSJ6+zej8rn4z+A/1Q9qvN1wLumHIUCWyd85uRIi57O9YdUPC5EljCojmOi+G9prg6udFbkTgd9HZCbzXF/7skK4wICSAu1c8yKlNzF56Gc0TIFh6SX2mfzPxe0/PA= X-MS-TrafficTypeDiagnostic: VI1PR04MB3231: X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB3231; 20:w9Drv5e1GyP8+QA8H20a/h/xwttHDqwVJBumhXgVkWMWdieWMU+PeR45z7Zq7/ovYwQXNAViYUPtEICpzzaz0Bgd0d5kKPRhy3Awl4kjLePd5Ud5RL2upF7LkTLbEROECGJfMsOfVHgpG1daZEW6nPofhD+l6msS/qQHsYhjC0BHIPhDHhemwQWPWW6Dx7k1+dzvzp59LSsDGIhuU6DfZ+qa6e1xw4rtshMTDBoBOO+nfWlJ8wsslbSy+3Q4cdmn3r8VCCmCbZ/NjnIrkP0HBBhp8zvSIjfxxzbu5pe5eoTtiza/c2NX1XQbqPNJVG32wx5Foo9Q4xtNY2fRmUVBJjr3ZUMt+pZgE+mK8w5CwzlqmPC7adCmf1IBtfzkcAVEJiRFM0PEU8zqqsD2i8N/XWuswPzPCHJvJQFuXACc3oEwq8SBl8A4ADxLqKXyCq6WEXgeZK7m6+M8V+yjFww827w8hWqvIbJ4gwn0AHlrDIHslbargfFf2xKmPJBZzzVy; 4:35Ch+vpXguyeH9YOBUTtwTJIvAM+Qm2wEPduaS4HYJ6Wnity8iE9vlAHZ+5MSdh21kg1RbF5daKIYLD8FeVd93bcmL9SL61wc3042ql9aE3rsouaKtVMOcd+JSMfMmByHJABHOWFqYWb/OHGX0OgVf9aBsgtThn825FDFe+qWzx+8JpsRwhuInEprEjh4aWZlEJvLxtiuRH7AI1Y0oTk1+QEu+Pqzy2GBu3tJAhATxaHDOfEpBsgW/T2AWIgwxJq2N2RyHnzRqQmrfx3U7wB8wzMj2b4Xwo4doV3ewBpQ331zn0CVnEQTVuNkscAEf9H X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(8121501046)(5005006)(3002001)(3231023)(944501075)(10201501046)(93006095)(93001095)(6055026)(6041268)(20161123560045)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(6072148)(201708071742011); SRVR:VI1PR04MB3231; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:VI1PR04MB3231; X-Forefront-PRVS: 0541031FF6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(366004)(39380400002)(396003)(376002)(39860400002)(189003)(199004)(50226002)(316002)(8936002)(16586007)(66066001)(47776003)(6512007)(53936002)(3846002)(81166006)(6116002)(4326008)(2906002)(8676002)(81156014)(86362001)(16526018)(68736007)(305945005)(7736002)(25786009)(39060400002)(386003)(6506007)(36756003)(478600001)(6486002)(50466002)(6666003)(48376002)(51416003)(105586002)(106356001)(52116002)(97736004)(5660300001); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB3231; H:shlinux2.ap.freescale.net; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR04MB3231; 23:F1Vl43OD/sY9Aq64grmUzpmgLVmedKLmZjhXTxXOb?= nIh1Gmlmi54KRJTkBMhnyHtILbHAWXzeYbRKJd1dWz9Qb3MJBFusGqyQmIfY+QREAWxecUAfhZ7VubxPg4UJcQrMUAVI4/JkPVJbgirc34lGHIEFXbUnFRfLzkKgcoEFi/VbmcxfAdISnMzEP12FcdLlIY3RBF1kZ4rwriGr2td8l8xxFpZoJHnBRGgujR7Hn6HYRC8GgOX6nLVFD8Mdas0JA30zWHqfpjUzcD/gKjMP9JL13kzQCtSqCxzwhqsKjoFtxN6jPviEPmvblslGHaO2ofKOJX2WflJvKv8ngHkTFLTrHjawLMJuuVwHXnSzwm1XGYSHR/PSghMIhilJbdqHiaIG7pHWcNrRH7KrILAhV/Dn36qlqtGS+ZXYPNk51EZ7d8vM7/05/jzgTZIPpZILNUtqsx/bVHGSIDjjRkSL+7OcQU6nuij/9xg7Pmz4Dvo+TG3ijInczYEeCPA8Zk1Ffrd0qMZ277KZhvOOpQH+STAlnAQgB89GEFMJ7h/zbaLcXTjSCIAwwBgGghKj1ek90Lj06FeH5rNaykVmPGjXkDPnZjnf8il7xyNgW95xMqP+292Ix/kdMHCPFYrz2RYMMFbs9ZfAXjv/tXjjDKe6yWvl/pkcDlbiZe8zUZI36iFlrAAKMN/tgWgckqopZKr72Z+AVciVbs6HPNZV2lTZ7MambTNRhyLluKBf3ncgNYIjwek/OPRdRnMTtfsnj6nTubpo3iyg4xuVLglcVZxAWsqIr3KW/YtSZcjzHTF9DKOrYfH/B5x4UlXMzF2ihg95ewWHF4m+m/cIu0OYGcQBXK6HMbjooAZG/j81ECUoUKQ3O4ur+iIouRwVIq+MmqhDC+Bq+RB21/Cc81nSjkA8dAPCUOhzZQEhVq/+8Xq22UW6Ojrg0wVfKGOwqNUL8qVjRpIAHZLBeyGHpHXx42Po30vU6avJgeWNng4d03Kqpgm4Z4my1Jxint/+1DLp0o22FRCmxPiJcAT8aFEhKd3Ag== X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB3231; 6:62Sv0OdaMElNSP4ZLBrQys9NmL5VSvvQQhIxuYMUWQiYjS/sDhyczjtZuRJ/mXXjND5TfrPlKQC9j5GJamo5iTg+Tl8tl3e2ImqHzCTu2snFeNlgXlgXazTqaEZ04kZxVD6L5T4LIGdEh4KnzEAPAG7yMLqW6N2XbrDhl41iNiobfCWhFM4tysXDtMTWMdgkhW090Ct+PU8XoHVvQUGulZgiUXCFHZrLeStPzCj7+uFlqdw/n0k6VL4JTYGaspXXknwaLMl2nY7TREZjmfLrbzbhGgCFynByPs+sAlCrXdWpex94wNH+8dXAAXqiFEDuj3MK3tXiWJMlyLNe+i6LKUR8ipnLTorqLP8hmsXGQ9g=; 5:dKk16pk5xzCrHSBIE0WRkI77+DTBz1ff638XjcfxkfPk16oxWT62T8aOfJh8WmKOwbR9voYKb3VOja2Umz5IVe5maz9YXOmHhkhVmFM4xc2jCVpphdQH95uDKVASnkSCgSHc5R0fRRQ+hK3zg01FMCIkYXZhLukS5TC3ODCaXAY=; 24:qJKuV2x+JG4B/O5fkBoqz+ZvV5EYWY4obhBKf/1HgHu67hnfOdvPVyMYYFSkgNe6+iR+2Gw2UXLcnowwJq8qvIZnGoSOdRY7/fFuPy3vO+8=; 7:JEhZOsh/gGPvodYHkG9FZMQye41ZEq87REz6Lji7s1yKFhQWPfQWlMmdNBiGJfXv6bT0RnBBHjhYwePwJF99RWTsnWqPEcSRDsYokmmCetvMkZLgfsR2rD/WdXDDwPntrE212xYJkmMpuCPa9gBvH6jw76qwjaMtSyWO7yR9MbfHtJyEsCExWxeDUg2s58t39+aRZvGIb294VJ2wcRQHr0SQuazss2T1d6rfZHDCBLtqFr3uQ/jKgTfBO4cu696/ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jan 2018 01:09:19.6887 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d7e53736-0960-403f-50f1-08d552469f51 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB3231 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH V2 1/2] spi: fsl_qspi: support i.MX6UL/6ULLL/7D 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" The QSPI module on i.MX7D is modified from i.MX6SX. The module used on i.MX6UL/6ULL is reused from i.MX7D. They share same tx buffer size. The endianness is not set at qspi driver initialization. So if we don't boot from QSPI, we will get wrong endianness when accessing from AHB address directly. Add the compatible entry for 6ul/7d. Signed-off-by: Peng Fan --- V2: Add CONFIG_MX6ULL drivers/spi/fsl_qspi.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/drivers/spi/fsl_qspi.c b/drivers/spi/fsl_qspi.c index 0f3f7d9..2f5345f 100644 --- a/drivers/spi/fsl_qspi.c +++ b/drivers/spi/fsl_qspi.c @@ -20,7 +20,8 @@ DECLARE_GLOBAL_DATA_PTR; #define RX_BUFFER_SIZE 0x80 -#ifdef CONFIG_MX6SX +#if defined(CONFIG_MX6SX) || defined(CONFIG_MX6UL) || \ + defined(CONFIG_MX6ULL) || defined(CONFIG_MX7D) #define TX_BUFFER_SIZE 0x200 #else #define TX_BUFFER_SIZE 0x40 @@ -268,7 +269,8 @@ static void qspi_set_lut(struct fsl_qspi_priv *priv) INSTR0(LUT_CMD) | OPRND1(ADDR32BIT) | PAD1(LUT_PAD1) | INSTR1(LUT_ADDR)); #endif -#ifdef CONFIG_MX6SX +#if defined(CONFIG_MX6SX) || defined(CONFIG_MX6UL) || \ + defined(CONFIG_MX6ULL) || defined(CONFIG_MX7D) /* * To MX6SX, OPRND0(TX_BUFFER_SIZE) can not work correctly. * So, Use IDATSZ in IPCR to determine the size and here set 0. @@ -905,6 +907,11 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, qspi->slave.max_write_size = TX_BUFFER_SIZE; mcr_val = qspi_read32(qspi->priv.flags, ®s->mcr); + + /* Set endianness to LE for i.mx */ + if (IS_ENABLED(CONFIG_MX6) || IS_ENABLED(CONFIG_MX7)) + mcr_val = QSPI_MCR_END_CFD_LE; + qspi_write32(qspi->priv.flags, ®s->mcr, QSPI_MCR_RESERVED_MASK | QSPI_MCR_MDIS_MASK | (mcr_val & QSPI_MCR_END_CFD_MASK)); @@ -1023,6 +1030,11 @@ static int fsl_qspi_probe(struct udevice *bus) } mcr_val = qspi_read32(priv->flags, &priv->regs->mcr); + + /* Set endianness to LE for i.mx */ + if (IS_ENABLED(CONFIG_MX6) || IS_ENABLED(CONFIG_MX7)) + mcr_val = QSPI_MCR_END_CFD_LE; + qspi_write32(priv->flags, &priv->regs->mcr, QSPI_MCR_RESERVED_MASK | QSPI_MCR_MDIS_MASK | (mcr_val & QSPI_MCR_END_CFD_MASK)); @@ -1227,6 +1239,8 @@ static const struct dm_spi_ops fsl_qspi_ops = { static const struct udevice_id fsl_qspi_ids[] = { { .compatible = "fsl,vf610-qspi" }, { .compatible = "fsl,imx6sx-qspi" }, + { .compatible = "fsl,imx6ul-qspi" }, + { .compatible = "fsl,imx7d-qspi" }, { } }; From patchwork Wed Jan 3 00:52:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 854838 X-Patchwork-Delegate: sbabic@denx.de 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; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="fMws6OTU"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zBCX53F5Bz9s8J for ; Wed, 3 Jan 2018 12:09:57 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 08419C21C29; Wed, 3 Jan 2018 01:09:46 +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=-1.0 required=5.0 tests=BAD_ENC_HEADER, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, 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 2E358C21DE5; Wed, 3 Jan 2018 01:09:32 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A5E92C21D9F; Wed, 3 Jan 2018 01:09:29 +0000 (UTC) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30057.outbound.protection.outlook.com [40.107.3.57]) by lists.denx.de (Postfix) with ESMTPS id B6FB4C21D9F for ; Wed, 3 Jan 2018 01:09:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=VCp0k8++SOBwbzZ9HJJtTJZecazjwBHrjK/2EVzFCYI=; b=fMws6OTUNS6KwEer5WZxA+gi2yt6DKzlXxEQdP0O5E82DlMXmx1oJWMarrVI8eLIp0kCighMJqV8rB4Lr77mFNmXQRPjZuWSBSEmCW5Ha7R2AmG3NyceGYqN519Ypvti1bO5mZXD3FBTe4rrFgo4voIT+od7/xIvWzQjc8xtbz4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; Received: from shlinux2.ap.freescale.net (123.151.195.1) by VI1PR04MB3231.eurprd04.prod.outlook.com (2603:10a6:802:6::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.366.8; Wed, 3 Jan 2018 01:09:22 +0000 From: Peng Fan To: jagan@openedev.com, sbabic@denx.de Date: Wed, 3 Jan 2018 08:52:03 +0800 Message-Id: <1514940723-1586-2-git-send-email-peng.fan@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1514940723-1586-1-git-send-email-peng.fan@nxp.com> References: <1514940723-1586-1-git-send-email-peng.fan@nxp.com> MIME-Version: 1.0 X-Originating-IP: [123.151.195.1] X-ClientProxiedBy: HK2PR04CA0060.apcprd04.prod.outlook.com (2603:1096:202:14::28) To VI1PR04MB3231.eurprd04.prod.outlook.com (2603:10a6:802:6::28) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 9e78d764-bcb3-46c7-66bb-08d55246a0eb X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060); SRVR:VI1PR04MB3231; X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB3231; 3:0pdcV2uVK7rJF3phbYOYRXLV9zeOJXrYBPD1kbIEihLSUwBB0b7zoCKo5wWcYmwIi8kwPZQ5b0fCAgYIuJBFduVnL8QmTeHEgUq/9BaBcq8vgbmm09dzBQpx5LXE7eDVNKNuMZMWKW4l78cQVSJpZcfWakyX0bA4xHltgByYpZuitjC0abBqc7hrzrmYGaqHtTEsIwBPFMaOgNeF6cZbuBIugQCnraaRPq+flr2vcgI/A0975snYLPrv/JNVKJZc; 25:i/+VvW4wB+6A3FgUErhG3mLoMkgwqVaRi2nRo1O4aBMkk5mVw5yZop3L5XosaSXtr6D1oXuNPuUrxmLzVMwhbTsrjOfR36z63K6xBLHnnjvkEAENIpyppo0A+FjyenIEkhh58S56ltaddhVmOymR9W6+zCcRLAuzo0MT1acRn4wUMuUpEA8FmbUfcV1lOuRs3Zg+WdjQr6rpZ4LPfUzaEmouHWWfLo4Dn5ffk9VE3sxDHr8vkfn/k6QcfxdS8Y0y0H4P+qWsdOru4o7QvG6VLcoMfQbkQsr7GznQdo+8/z+Zo3NHKoRdlec+jRImQHP+jwEM5ZKBgk3Pmd/j3aDJ8Q==; 31:3JsODvw8tvmPgn4fagZqtSH9kqGk4k/oSm0rh3GT5RdW7Kkxcao/69BFLTYGYY2qJ4RHIm3e7xRkMpb97SoWiyyFp8iB9fspXSIia3f3o71oyvYALfMvSIcfFPwX99z/SKuqM2X/jLrNgUaW0AS9p/kQpVaxL2z+/39g3CprxC3qJVXnQXwsavLRjvzwrBnQBWnWOzVehHkfm1NGXIpeOfOhS8b17X59oYt4HvhKub4= X-MS-TrafficTypeDiagnostic: VI1PR04MB3231: X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB3231; 20:PBy230mVbdkAXZgnK6Zk3AODiM2r2mm1h8Yz8vchx9DHt4mgEp7R5YmlQ6eUrKyu7LZ8dfTwOQK+j88SKaKWA8rsgBWmn8hqVU+xsb7etFTgbY53uRd+lZrKXpldiXVE2SMhsXc+T8QStAwf/487qjCuTsrU/jU41e7KcT+tWBuJ8Wx5z2cMXOUI/tBiP/GWlcpZDiqgwmSXg9Ko/OuItigR74JmNKTpT3NnNepDmLy43jv+55seRcp0SfQ9pmYkVNeuAw31AsxRVxJJjAz67LGGnCKC2fCcMlFsPYs6GutN/w6e6fgIHTXttoMtP6B5/YXJDOOuczgPdaSEsMU1qkQcSWnYB95nUXj//4NPZF7t5pQeyKjzRXnzNdORfrWH513aOT43/qR+szUrcziE3N0tlgE0BSDI5z0BNim63ZtKgOzeqEysfdLaA8QCBdqIV99/V72LCG1jTfkgV+7Oq4EP+hp8FAPl0WVHNRwXtjH9J142BosTwndZjUbaHNUj; 4:5v6EJN7eJeIIfxmFP+VV4h2dBQZ/1VJF4Z02+12WKtMvVkFg/pWVvk02UYlxYoky9Nnv45rz9klkPZvzmqBPZ+1k6K+SLtAuiLil9OsxaqR7mbsNuJIdCurIkF5corZCA5VDzT79kIIyGSn/lZy8uV9I60JNO3MmAHh+O0nzgoBj6tR8wx3Yl/FR+a0CDFjF3Q9+wIZ8XQlLWY2IwduCvvnxgi5Eztp7gw+YviRQa9IFEjNd8a/Gd2N1oW4Vvz4XIoXlskcSu+PIvPU3d22ceyrLkBGwaIzRdoiWJ/dJ/XkSu/MSAr0SUkcDosnMqV6T X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(8121501046)(5005006)(3002001)(3231023)(944501075)(10201501046)(93006095)(93001095)(6055026)(6041268)(20161123560045)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(6072148)(201708071742011); SRVR:VI1PR04MB3231; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:VI1PR04MB3231; X-Forefront-PRVS: 0541031FF6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(366004)(39380400002)(396003)(376002)(39860400002)(189003)(199004)(50226002)(316002)(8936002)(16586007)(66066001)(47776003)(6512007)(53936002)(3846002)(81166006)(6116002)(4326008)(2906002)(8676002)(81156014)(86362001)(16526018)(68736007)(305945005)(7736002)(25786009)(39060400002)(386003)(6506007)(36756003)(478600001)(6486002)(50466002)(2950100002)(6666003)(230783001)(48376002)(76176011)(51416003)(105586002)(106356001)(52116002)(97736004)(5660300001)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB3231; H:shlinux2.ap.freescale.net; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR04MB3231; 23:dykRz79u9TIWaOR1+QNijR+WtO5KA65u66bPn+cnv?= SLjHYDrlCtyMcHgtOSUKvklsfzlqmR8RQN0aO45o8QJibwSby352bQdgrFQ/RRQkefzcKsren25VjhxO4hcWSOeuIfRwqlzLv97d5+AvXUWojD9kjjuRa+RXlqvxgmTQWmELldjMPswJc1tKEFpgjUNnEkFNPXSDGmUuLGVndk6vk1vebABd/FuiCGNVVUQhRpEX1yhh2YrvXBPMHy+jAbu9g19uizXZggSyF6s3QOuVjJLHNMCPx67ljZpNgMKfRmpL8XRqDOmjiOYGMynHCG5TyGqWS7X0Nz20CLgtlQ3iD6n9NiOY2/aeuhOjxEM2rKp1PGacmxl0DkzbWm9p4rNcorMxnkNL01JhScyDiHViI4Dt2StFifJG8V/6MFJrBNnfFexB6AyuL+DewWVF8VAfkJMODIex1YEdRZ1fg68jRv0MYhXbFLCp3XSGgHYFMSz1Kul7Wabg1SKxvzSL6kbhd5QCzsTvBIPrpR9+OXU5i/oaL7/rjGkXl008YXARMJ4dVe20iMI+AP6oP6s8RCnh+BrK9se3etBTx3cNXD5QbQhuDD0X6rFRbn98E4xWa3o/eVsNtdtUMnKG70sIkqaEO+1oE6FmHy8hhW8crRvMAFeH5ArTk7kMT4Rda+uVtkRiJdQLlTiewAmEAmuzy25iBvx2lnLEeH9yCUvRYHuvetTUe7jKzbcjVj2FJg7cRgAVxISk6oHRKoaEq3ezPSTW1wY/NSlOvOqfwvcRmln+5PGoHLvebzAeH4fcAuCNuqoUStbcFd5l/Z2jbYrSra2/QLTQWP3+5f8tVPcEk0tam/5Nuc3tq4ylUwYgx9Bi8yBZA4R/KL/9jJNFKbQNfq4Do5c36naj+ttR7x/GV7ZGfewEkQchZf7uGPDajSwTwICRk0uAgxNfgcrmYah8XuBpBGxeLZ4E84lybW/XT6h4VZqDOxZedmmgoEptwQw9blKPSvPqvMRadYvlcgZEjHhf3JfjSsiiVHYEZbGA4geyC/XNkqO3dhEVK/CEye6hmpWDhBWI5sZyq9GYIZSBfx0OY2U2zmQ2omyKpJvWHUek0OlgEp7xPy3eCrLmVlVwFE= X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB3231; 6:8hVhGhr6nclQD7K9xEAxDnXihmebp7UqFEjLRx1ZTJPDAJhBEX9TNyt02L4YNMaF9Lml/3oeKmNP7t/CU7BfS+1nXlUFqlqKgM60NzF0EURr0keXp/Kbopad643f0ItNghREXiQr4owcYKh+x9QIimqvX9szQ9Xy1ZQnub5wIo2WcRHRYzyCjeLv9ZrQCoMu0g/ujqMx23HBsvo85IE6FSCYM6HzqXW9GJoe+Gs6EnggrCEev1GXuFPIxOXypf9NqXlVqf6Nkh1ffolRMjOEm6J7ANc5GzEfX41RaJrq4oCTxylgrIlc+loUEcZ4Z2Y5ba7u9zXmQ6aYOpzm2dcDp54w0yOC8iToBPezlC73ZHs=; 5:c9HzBcBznPtCKSUZxgoYE/rFVqAVDbK2qTNg5infrdaMMbxDkv5OJ6a4KxK/824bjhluzQ23tO6xa85pZpbdBL1k11wYr20cdosuy70gydaZe9LjlzXwWnjg/GWdSjoPkhOIv5QMZG7QM9nGH5pu0OQhzmtbZOiWp7XTLC4GtWM=; 24:aHHBBC2Z1usny4B8p597inWmNKFQ4wfnTEQtqwrawGPUQWVKnWm/QDW8VFwQOcFffVaLtpMUIxrAS/BenPELThK4PzPVA2GcF6ktUGrd1wA=; 7:JreUFhJci7asMWws0AvBIE0AHZEAXaFWn66Pz35xkr10j7XlbZ3YqHiKHEt3t29sU+TlupDu4WWVS9pz6odF85cf402SNnqEkzIFIoSzsy8FgPWIx/k+LOLEEKuQG5YHGBN/P4UDOIiUXqyinOVAUQGQEyiVCpIw2Gn7oj9YYFTBTiJXn4BqBUGIeFySUJri3e25VpKJ/a6PxYTZK3g+yDk2uol/UERxOquMyNqT7hPQbnqV8MHjSAwBP5RkUftT SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jan 2018 01:09:22.3606 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9e78d764-bcb3-46c7-66bb-08d55246a0eb X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB3231 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH V2 2/2] imx: mx6ull-14x14-evk: enable DM 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" To support QSPI DM driver - Add spi0 alias for qspi node. Which is used for bus number 0. - Modify the n25q256a@0 compatible property to "spi-flash". - Modify spi4 (gpio_spi) node to spi5 - Define DM SPI/QSPI related config to enable QSPI Signed-off-by: Peng Fan --- V2: None arch/arm/dts/imx6ull-14x14-evk.dts | 5 +++-- arch/arm/dts/imx6ull.dtsi | 9 +++++---- configs/mx6ull_14x14_evk_defconfig | 6 ++++++ configs/mx6ull_14x14_evk_plugin_defconfig | 6 ++++++ include/configs/mx6ullevk.h | 10 ++++++++++ 5 files changed, 30 insertions(+), 6 deletions(-) diff --git a/arch/arm/dts/imx6ull-14x14-evk.dts b/arch/arm/dts/imx6ull-14x14-evk.dts index 375bd4e..2a941bf 100644 --- a/arch/arm/dts/imx6ull-14x14-evk.dts +++ b/arch/arm/dts/imx6ull-14x14-evk.dts @@ -67,7 +67,7 @@ }; }; - spi4 { + spi5 { compatible = "spi-gpio"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_spi4>; @@ -455,7 +455,8 @@ flash0: n25q256a@0 { #address-cells = <1>; #size-cells = <1>; - compatible = "micron,n25q256a"; + /* compatible = "micron,n25q256a"; */ + compatible = "spi-flash"; spi-max-frequency = <29000000>; spi-nor,ddr-quad-read-dummy = <6>; reg = <0>; diff --git a/arch/arm/dts/imx6ull.dtsi b/arch/arm/dts/imx6ull.dtsi index 65950e8..ea882a7 100644 --- a/arch/arm/dts/imx6ull.dtsi +++ b/arch/arm/dts/imx6ull.dtsi @@ -38,10 +38,11 @@ serial5 = &uart6; serial6 = &uart7; serial7 = &uart8; - spi0 = &ecspi1; - spi1 = &ecspi2; - spi2 = &ecspi3; - spi3 = &ecspi4; + spi0 = &qspi; + spi1 = &ecspi1; + spi2 = &ecspi2; + spi3 = &ecspi3; + spi4 = &ecspi4; usbphy0 = &usbphy1; usbphy1 = &usbphy2; }; diff --git a/configs/mx6ull_14x14_evk_defconfig b/configs/mx6ull_14x14_evk_defconfig index 4960056..5305c12 100644 --- a/configs/mx6ull_14x14_evk_defconfig +++ b/configs/mx6ull_14x14_evk_defconfig @@ -10,6 +10,7 @@ CONFIG_CMD_MEMTEST=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_SF=y CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y @@ -24,7 +25,12 @@ CONFIG_DM_GPIO=y CONFIG_DM_74X164=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y +CONFIG_DM_SPI_FLASH=y +CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_BAR=y +CONFIG_SPI_FLASH_STMICRO=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y CONFIG_DM_REGULATOR=y CONFIG_DM_SPI=y +CONFIG_FSL_QSPI=y diff --git a/configs/mx6ull_14x14_evk_plugin_defconfig b/configs/mx6ull_14x14_evk_plugin_defconfig index d07be22..f1023b2 100644 --- a/configs/mx6ull_14x14_evk_plugin_defconfig +++ b/configs/mx6ull_14x14_evk_plugin_defconfig @@ -11,6 +11,7 @@ CONFIG_CMD_MEMTEST=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_SF=y CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y @@ -25,7 +26,12 @@ CONFIG_DM_GPIO=y CONFIG_DM_74X164=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y +CONFIG_DM_SPI_FLASH=y +CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_BAR=y +CONFIG_SPI_FLASH_STMICRO=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y CONFIG_DM_REGULATOR=y CONFIG_DM_SPI=y +CONFIG_FSL_QSPI=y diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h index 8787df4..6a48742 100644 --- a/include/configs/mx6ullevk.h +++ b/include/configs/mx6ullevk.h @@ -164,4 +164,14 @@ #define CONFIG_SOFT_SPI +#ifdef CONFIG_FSL_QSPI +#define CONFIG_SYS_FSL_QSPI_AHB +#define CONFIG_SF_DEFAULT_BUS 0 +#define CONFIG_SF_DEFAULT_CS 0 +#define CONFIG_SF_DEFAULT_SPEED 40000000 +#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 +#define FSL_QSPI_FLASH_NUM 1 +#define FSL_QSPI_FLASH_SIZE SZ_32M +#endif + #endif