From patchwork Wed Jun 27 06:49:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ye Li X-Patchwork-Id: 935318 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; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="ufb0zZTU"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41Ftnn1vB2z9s0n for ; Wed, 27 Jun 2018 16:50:05 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id E8E42C21C93; Wed, 27 Jun 2018 06:49:50 +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 C5A43C21D8A; Wed, 27 Jun 2018 06:49:46 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 63DDBC21D74; Wed, 27 Jun 2018 06:49:28 +0000 (UTC) Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-eopbgr40070.outbound.protection.outlook.com [40.107.4.70]) by lists.denx.de (Postfix) with ESMTPS id 0387DC21C93 for ; Wed, 27 Jun 2018 06:49:28 +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:X-MS-Exchange-SenderADCheck; bh=a1JToL470aBW7eL7NF3yFIhl31sC3QDM3jK6Z03OxAM=; b=ufb0zZTUlM/lQlghYQP4aWNUa6O6L5bhlwawaNCw4DjvgMEEK7S8xXznJ7NWfP8wSymIPtRXYpGkQbQJhpxnSQNCdFxDyFT+sCLfQ+eDnmPD0xwL+Jfj45JA2AUGMsaBGQe/Rfq9HlJ1w0jFAMTuVXvZjiVolBtIzgNESapc540= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=ye.li@nxp.com; Received: from ubuntu.localdomain (119.31.174.68) by DB7PR04MB5305.eurprd04.prod.outlook.com (2603:10a6:10:22::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.884.22; Wed, 27 Jun 2018 06:49:23 +0000 From: Ye Li To: u-boot@lists.denx.de Date: Tue, 26 Jun 2018 23:49:00 -0700 Message-Id: <1530082140-37962-1-git-send-email-ye.li@nxp.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Originating-IP: [119.31.174.68] X-ClientProxiedBy: HK0PR03CA0027.apcprd03.prod.outlook.com (2603:1096:203:2f::15) To DB7PR04MB5305.eurprd04.prod.outlook.com (2603:10a6:10:22::13) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2814ab70-da78-4c29-b779-08d5dbfa1fc0 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(8989117)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600026)(711020)(48565401081)(2017052603328)(7153060)(7193020); SRVR:DB7PR04MB5305; X-Microsoft-Exchange-Diagnostics: 1; DB7PR04MB5305; 3:GvIT9slrzfjbEkIbpPlETsGG+mPR9ninBXiGK0SUAqkmHLvzk2XqiK3eLLysvoedurllGJLMuFsDjG5nmpIVWEoQdMOTxYzA+XqTQUVgMQQLWm+68aW9lebz8x/yBxn8CirTYSNScfICRgfeiCTvfrUAAwaVLi9nfBTpYMC5XRfw++67GNBEVS5AL08qhsgBK/rBplCtemm+8iwLrks1afHEDlH4efFD9gISAbQ2m1DVuvGpYvpl95treVeHuYbL; 25:sJfekhnax3+c10O8IU0ZTrriGN51TosK6/nr9O+ib1zt+aaoIn18udouhdeET6zmYfI/bAYTLhcWJ/BvboTUUlMJKC5uB05P7bRdn3aQC/lhq+AMUdP+i9NNhOS1PSqTpS0ybKmyDQ3ZVUTOM5fSSn/91v37Dr34defqabQfm26Q3CaXfBANDiWlibADqMM4ULFWJCv4hyQRgtKFK5Js/FPqhs+JH6WHMUR2bYDPgIQIJZFjKYKx8FFX2qZIkQdyh2NacWimhvbWxGdcWTjSo9P0y+Q4GDD7MBHw0+cpIlhC48Wi551lGAGw4fCSdsn+6VVLjSSCOmU/dozAqVhWKg==; 31:2txifssAXf+Bv9oBchI1k1CDhl4KrkqdYdyPzQ85RQHztv8G0nB34+9+BTYabFAQIKggJGFpqDraysYpcHk29/bq5YoEh1LHFafjx9KR0TpQVmtppUykXmO3wBTnoME6wS0pC3A3sNP3Wi+WizYRA5pg4mH0gwzwwcIhJYiUKVb5CRbdvTLI5+S7rx60Liu7Z5UNSaSOSLiY7fdxaC1/OhGfKJteWiyiKa6Kx0q3f1U= X-MS-TrafficTypeDiagnostic: DB7PR04MB5305: X-Microsoft-Exchange-Diagnostics: 1; DB7PR04MB5305; 20:ZciWVzGBuiLA65SkVRziab3NrEj7bOUmVZyFYVamqLih2gVwrEamd8c1Uyhssy5iJH/TmTtrglZKJoATBhY2/OTpR2hzkSKf3tNwxlvtRu1bFbI0j89q6JdQYlDgVhQ8VPwvskHVcPEtEtzftZO8AlFmoloUnTwwJv0jx61WJ0U4XdPSYK+j6h2FWkaXGqNnrBVFtRpzM2OPfNmT3tdbcIcWgQDz0YOn6uFnLqADzOI4Fxjkz64Nfuxxa8jVnnYgrenfDOPM+7HQH7afg5YUohjeXPvtLzaNHJuHbI9CjMZqVqmXOIifTuC1IVMfPxe7cTf8tu2bZeqVzhBMuQhryaCpBWEjsEvwIZZJD02W/xS7qYlfxSIXJjGrVTiLh77KKrX48Ygc8rclygOv0QrdzbjvDyO2c+i24l3nYxSlbZU8UFHCsNjrgarkIxlyc6loA7zW56wQrUUvFE8KHSCYEmFEVyq5sfZuW9aJuvj3M3twaSF5Nc3nXQHrpa7gBlaH; 4:9h6sWc1hTvdSB6d5hDjsWq3mg2PcV57z3TckxWfblZkNgT0QpNizUVH11R/IjjJMj7Lg8+dN+MG6nHLZyiRE7YZxUuny7mRx2MvGSvMSuVctEtKHtwkm269CDmZplRma5K1u0mUYxiQmwSMA1XcKPBvv5XTcK1UG5Qt3hvUuRAgW4h3H/xPqgLx5EYpo0yslg4vPHNPcPCAfMgIchIFGy8c1/9GI4k6+WTH61upJ9GzrPy9p6dDH/QofwGxeIcPnoNwTfX0D/EO8FPUeTZhsoxzMekx01Gzeb/lxP+Uxs2kYbdL+1058znKHjPI0gbPY X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3231254)(944501410)(52105095)(10201501046)(3002001)(6055026)(149027)(150027)(6041310)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(20161123558120)(6072148)(201708071742011)(7699016); SRVR:DB7PR04MB5305; BCL:0; PCL:0; RULEID:; SRVR:DB7PR04MB5305; X-Forefront-PRVS: 0716E70AB6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(136003)(376002)(366004)(39860400002)(396003)(189003)(199004)(6116002)(106356001)(2361001)(105586002)(68736007)(50226002)(6666003)(6512007)(50466002)(6916009)(48376002)(2906002)(2351001)(51416003)(97736004)(5660300001)(8936002)(16586007)(47776003)(8676002)(316002)(86362001)(52116002)(81156014)(3846002)(66066001)(81166006)(6506007)(956004)(2616005)(486006)(44832011)(26005)(186003)(476003)(16526019)(386003)(4326008)(36756003)(478600001)(53936002)(25786009)(305945005)(6486002)(14444005)(7736002)(1857600001); DIR:OUT; SFP:1101; SCL:1; SRVR:DB7PR04MB5305; H:ubuntu.localdomain; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB7PR04MB5305; 23:/Ar5lY3QbmiVgtzJ2hQPfqca7LZFhJpxqeiwwIO5f?= 24Gt0UV59gStPSKcSJ/d5O9U0N5jOlF/JCrfrfRVM/vt5L+DfazvWg99QWrVwQDJ07kLmcxYVEj1wp3iGyMfl6viUXTC0o0NHk31JfLgmoeM2lCN/zYVhj0U908Pah/Qq9v0u44xuxI2d/eVsz98kSldMzsBzVw0T0/H4kUoDiOeoU3Wyhe2GC81PmhBcB97P6D9nVWEHYIlefaL9+DGEjDWuhHtnpMaY1u9MR1tArj5bMg+cVGX47JdQCkCJy24FcBCad8l4NPtEQ+wZLjkx3LPAN7CqXfHWBT7AcxtT7eRyC/h8vW0cIkhFsWQM/3V1HiIkFLwboRgt7PrjMlI8YuA6L0A4aDT2dPifjzjv857giGU2e1NFsTwgwNWsRw58aOY7mg2ss/n93yGYRt7xCJRUv3j17tZfoLYCkXD8kH16am/oqcz+OFKUWClztpuiTKFEYHieQ1Qbw0/S/7i4Up9WH+vBSxWPENVnJUUgonln32zJUhUvyllpb2bsF6GTOiwCB9eeFmRNM+wk/CiPBpqAUQA6p6i0BaNQ2MPu2Q+KCxt+ImyEP6pzEFbDueDqhfujFB7m0BTJlyxX1MEnJAyqYJ/0fvuQOiyDp5CelJpptN1bW7lOWiCspjMABEiF3vgC9Z79kkisHGjuX8jrd8PhbXDXguFWeKvfVh98S6MbwZOOh2yMa/G1ibxksi+e1M6VXQu3T1DTEwBAIhZzM218JiZ4KfzEzzV1j9Kj5RXUSARwzngbRbRA2oLhzmMLfIYlvL0kjqn1RFMOckaHgDU2zaAd7DcB6nNWvXFTs17tHmte+mNEtW3sYyy67nyR2k30eXX6kYYaKf7rJKtOl4lysova4DHNM43pkdMPIXXdfSHX94iYdDteZPY3XaFi438qMaM4vaerinc6ORAA98Nj+50vgx9om3ers8/lw57HyyHogbB74stlxe0zPyN+g6pBxBt2XJF916aTaNoR2iAiROGmZh5jYnjgO9YqFET6s2dzcviMvQklofqlVPI2LrFZHdBmyaxbQgGSqoW9RoIP87IcIPhFd1gJ0Hm+B0VdYHuWa7edUp6A0RGoNDfqQHRG4Rd3bUs5KBgz0y7Arn0jIL0SZxTXVlqApQJQv3ED09rl/BoiANo/21whJWeHyAHm03dNXMbrp0e93j9+Br X-Microsoft-Antispam-Message-Info: OfZVLFa1XB5r/i+3ChJ6a7yW6Uoj6IouftbOEiffIkQfUsOtjmuiwwcujUEbl5BtSJf31ki7flowl5Bxtg9GJMsb6Gbwe47DbHSZ/LudTDmWzyjUFCl84oPm5f3QXheaS1TFz/NU9/3GOuSPMiuDJI6NpL7J+T0xo0V2owYeuJ+K5vChDyOKFm/VtdZjIdaQbzSonWQXcHv6mxMm4Hcb1PDxo2+hV6mQVJ8rEu9D1AFvXk18ZsmT6A39p/+uYMgv2XHRjto829LafAE6Br5Z0fvf08RnQSZdaFSP3RIfT4Jo07PEMxtQqFFboDB6EBGyYOUL27b83r9UP97gjcMgJn9Fz7Mqye2gaEpNxxLeI5E= X-Microsoft-Exchange-Diagnostics: 1; DB7PR04MB5305; 6:+ttBZiw0anGysguBufvqD1s9szW8fAR6YKXe7prAvVZF+kXKsYDZNKWu55WUvPYLWCRqVJHD+6UzyLflGP9W/mWOGeyrl+31uM9+buuIWted2oLPBgdp1pT6nttE03YiT2EiuH3XGjuhY9+p9gnr3i531pOvxsnqQWkmadDCWJPI3W4rlA1dhTXIAX0mtkInOSkuJri+XU1Fu2zUvIYliUKT8Ow/kqB4Ya6z4aiLx1wakHejQGndID/44pjnxWDPhHSWtYwbRWhMDfZFgBSEYuoLxgOkXoF80p/+rIcrhbR2A2HO+473o/O6VLlVB0GF0703QN2e54Zqgn+SWaX2lfKI3YqE/22QfHTMr43D/ZxOjG+lBaiocIg6qyV4gkNjs24lKdUAX2GkODFzhvng0aBpY+HHgHtGkPCwg909dojg7bvui5cFdJ5uuC+gr7oOAaWZ92CvGgplb6Ru5Tc0lQ==; 5:Kwk4XENgA8to6GBLgsRalYBVKuovOfOPtTSKHKZ9JUaJ4oB0HzgJc6F/85jVbv8L5JudDpRxZ/8HrqUZhQKizQ44qhFy1EiRueh5pMjUReUcQ2bGdqj6wvqIqtWULiUwqnK0vhgbqpRcddmQNmt3/10YSeT4DHAv7aV1P8VjaHk=; 24:MO3JyOTQjx6G49YrObse0MUCrdiTfQkcnVmZAOl8FT8GEziIG5g695b/jTn00dWBI7PRNGa6fJASTXqSpZY4CqwuLxnFmhyt6DjVrE1/vNU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB7PR04MB5305; 7:NP0S1bzNKFmlmpMh8lwIhu95cvSshTU+QVblPuIHIVejJRQfnGykoOGzlDj9MGL1QT6cg+iss55l00xdc3uK3wGDqw3Za31caoHsXfyv7vQtcZRZYR+JcQH5ZEBPYWErVQybFAxf++39pNaNmTClz8H/b7ivgWg2LjxxbI0Ll8F/xMCVxtWPRf3sGzko+CNvs51GFAG5jOMkTWvOu2rLPvxm9lVvhgFKLez381xrTIGtBmEz0fd5zsfqpME7rxK3 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2018 06:49:23.1948 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2814ab70-da78-4c29-b779-08d5dbfa1fc0 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB5305 Cc: fabio.estevam@nxp.com Subject: [U-Boot] [PATCH] imx: imx7d-sdb: Add DM QSPI support 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" On iMX7D SabreSD board, the QSPI has pins conflict with EPDC (default). To use QSPI, users have to rework the board (de-populate R388-R391, R396-R399 populate R392-R395, R299, R300). So we add new DTS file and new defconfig dedicated for QSPI. Other changes to support the DM QSPI: - Add QSPI node and alias spi0. - Modify spi4 (spi-gpio) node and add alias spi5 for it to avoid req conflict - Add EPDC node in imx7d.dtsi and disable it in imx7d-sdb-qspi.dts, to present the conflict. - Remove iomux settings of qspi in board codes which is not needed for DM driver. Signed-off-by: Ye Li --- arch/arm/dts/Makefile | 3 +- arch/arm/dts/imx7d-sdb-qspi.dts | 44 ++++++++++++++++ arch/arm/dts/imx7d-sdb.dts | 6 ++- arch/arm/dts/imx7d.dtsi | 12 +++++ arch/arm/dts/imx7s.dtsi | 22 ++++++-- board/freescale/mx7dsabresd/mx7dsabresd.c | 16 ------ configs/mx7dsabresd_qspi_defconfig | 83 +++++++++++++++++++++++++++++++ include/configs/mx7dsabresd.h | 4 +- 8 files changed, 165 insertions(+), 25 deletions(-) create mode 100644 arch/arm/dts/imx7d-sdb-qspi.dts create mode 100644 configs/mx7dsabresd_qspi_defconfig diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 493652e..dfabec0 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -433,7 +433,8 @@ dtb-$(CONFIG_MX6UL) += \ dtb-$(CONFIG_MX6ULL) += imx6ull-14x14-evk.dtb dtb-$(CONFIG_MX7) += imx7-colibri.dtb \ - imx7d-sdb.dtb + imx7d-sdb.dtb \ + imx7d-sdb-qspi.dtb dtb-$(CONFIG_ARCH_MX7ULP) += imx7ulp-evk.dtb diff --git a/arch/arm/dts/imx7d-sdb-qspi.dts b/arch/arm/dts/imx7d-sdb-qspi.dts new file mode 100644 index 0000000..38d69ec --- /dev/null +++ b/arch/arm/dts/imx7d-sdb-qspi.dts @@ -0,0 +1,44 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2015 Freescale Semiconductor, Inc. + * Copyright 2018 NXP + */ + +#include "imx7d-sdb.dts" + +/* disable epdc, conflict with qspi */ +&epdc { + status = "disabled"; +}; + +&iomuxc { + qspi1 { + pinctrl_qspi1_1: qspi1grp_1 { + fsl,pins = < + MX7D_PAD_EPDC_DATA00__QSPI_A_DATA0 0x51 + MX7D_PAD_EPDC_DATA01__QSPI_A_DATA1 0x51 + MX7D_PAD_EPDC_DATA02__QSPI_A_DATA2 0x51 + MX7D_PAD_EPDC_DATA03__QSPI_A_DATA3 0x51 + MX7D_PAD_EPDC_DATA05__QSPI_A_SCLK 0x51 + MX7D_PAD_EPDC_DATA06__QSPI_A_SS0_B 0x51 + >; + }; + }; +}; + +&qspi1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_qspi1_1>; + status = "okay"; + ddrsmp=<0>; + + flash0: mx25l51245g@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "spi-flash"; + spi-max-frequency = <29000000>; + /* take off one dummy cycle */ + spi-nor,ddr-quad-read-dummy = <5>; + reg = <0>; + }; +}; diff --git a/arch/arm/dts/imx7d-sdb.dts b/arch/arm/dts/imx7d-sdb.dts index bafcc79..76aa69a 100644 --- a/arch/arm/dts/imx7d-sdb.dts +++ b/arch/arm/dts/imx7d-sdb.dts @@ -11,11 +11,15 @@ model = "Freescale i.MX7 SabreSD Board"; compatible = "fsl,imx7d-sdb", "fsl,imx7d"; + aliases { + spi5 = &soft_spi; + }; + memory { reg = <0x80000000 0x80000000>; }; - spi4 { + soft_spi: soft-spi { compatible = "spi-gpio"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_spi1>; diff --git a/arch/arm/dts/imx7d.dtsi b/arch/arm/dts/imx7d.dtsi index f6dee41..30b0589 100644 --- a/arch/arm/dts/imx7d.dtsi +++ b/arch/arm/dts/imx7d.dtsi @@ -86,6 +86,18 @@ }; }; +&aips2 { + epdc: epdc@306f0000 { + compatible = "fsl,imx7d-epdc"; + interrupts = ; + reg = <0x306f0000 0x10000>; + clocks = <&clks IMX7D_CLK_DUMMY>, <&clks IMX7D_EPDC_PIXEL_ROOT_CLK>; + clock-names = "epdc_axi", "epdc_pix"; + epdc-ram = <&gpr 0x4 30>; + status = "disabled"; + }; +}; + &aips3 { usbotg2: usb@30b20000 { compatible = "fsl,imx7d-usb", "fsl,imx27-usb"; diff --git a/arch/arm/dts/imx7s.dtsi b/arch/arm/dts/imx7s.dtsi index a7d48e7..540de6c 100644 --- a/arch/arm/dts/imx7s.dtsi +++ b/arch/arm/dts/imx7s.dtsi @@ -81,10 +81,11 @@ serial4 = &uart5; serial5 = &uart6; serial6 = &uart7; - spi0 = &ecspi1; - spi1 = &ecspi2; - spi2 = &ecspi3; - spi3 = &ecspi4; + spi0 = &qspi1; + spi1 = &ecspi1; + spi2 = &ecspi2; + spi3 = &ecspi3; + spi4 = &ecspi4; }; cpus { @@ -966,6 +967,19 @@ status = "disabled"; }; + qspi1: qspi@30bb0000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "fsl,imx7d-qspi"; + reg = <0x30bb0000 0x10000>, <0x60000000 0x10000000>; + reg-names = "QuadSPI", "QuadSPI-memory"; + interrupts = ; + clocks = <&clks IMX7D_QSPI_ROOT_CLK>, + <&clks IMX7D_QSPI_ROOT_CLK>; + clock-names = "qspi_en", "qspi"; + status = "disabled"; + }; + sdma: sdma@30bd0000 { compatible = "fsl,imx7d-sdma", "fsl,imx35-sdma"; reg = <0x30bd0000 0x10000>; diff --git a/board/freescale/mx7dsabresd/mx7dsabresd.c b/board/freescale/mx7dsabresd/mx7dsabresd.c index 90e2d1a..191b59a 100644 --- a/board/freescale/mx7dsabresd/mx7dsabresd.c +++ b/board/freescale/mx7dsabresd/mx7dsabresd.c @@ -36,9 +36,6 @@ DECLARE_GLOBAL_DATA_PTR; #define LCD_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_PUS_PU100KOHM | \ PAD_CTL_DSE_3P3V_49OHM) -#define QSPI_PAD_CTRL \ - (PAD_CTL_DSE_3P3V_49OHM | PAD_CTL_PUE | PAD_CTL_PUS_PU47KOHM) - #define NAND_PAD_CTRL (PAD_CTL_DSE_3P3V_49OHM | PAD_CTL_SRE_SLOW | PAD_CTL_HYS) #define SPI_PAD_CTRL \ @@ -278,21 +275,8 @@ int board_phy_config(struct phy_device *phydev) #endif #ifdef CONFIG_FSL_QSPI -static iomux_v3_cfg_t const quadspi_pads[] = { - MX7D_PAD_EPDC_DATA00__QSPI_A_DATA0 | MUX_PAD_CTRL(QSPI_PAD_CTRL), - MX7D_PAD_EPDC_DATA01__QSPI_A_DATA1 | MUX_PAD_CTRL(QSPI_PAD_CTRL), - MX7D_PAD_EPDC_DATA02__QSPI_A_DATA2 | MUX_PAD_CTRL(QSPI_PAD_CTRL), - MX7D_PAD_EPDC_DATA03__QSPI_A_DATA3 | MUX_PAD_CTRL(QSPI_PAD_CTRL), - MX7D_PAD_EPDC_DATA05__QSPI_A_SCLK | MUX_PAD_CTRL(QSPI_PAD_CTRL), - MX7D_PAD_EPDC_DATA06__QSPI_A_SS0_B | MUX_PAD_CTRL(QSPI_PAD_CTRL), -}; - int board_qspi_init(void) { - /* Set the iomux */ - imx_iomux_v3_setup_multiple_pads(quadspi_pads, - ARRAY_SIZE(quadspi_pads)); - /* Set the clock */ set_clk_qspi(); diff --git a/configs/mx7dsabresd_qspi_defconfig b/configs/mx7dsabresd_qspi_defconfig new file mode 100644 index 0000000..a798804 --- /dev/null +++ b/configs/mx7dsabresd_qspi_defconfig @@ -0,0 +1,83 @@ +CONFIG_ARM=y +CONFIG_ARCH_MX7=y +CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_TARGET_MX7DSABRESD=y +CONFIG_ARMV7_BOOT_SEC_DEFAULT=y +# CONFIG_ARMV7_VIRT is not set +CONFIG_IMX_RDC=y +CONFIG_IMX_BOOTAUX=y +# CONFIG_CMD_BMODE is not set +CONFIG_DEFAULT_DEVICE_TREE="imx7d-sdb-qspi" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7dsabresd/imximage.cfg" +# CONFIG_CONSOLE_MUX is not set +CONFIG_SYS_CONSOLE_IS_IN_ENV=y +CONFIG_HUSH_PARSER=y +# CONFIG_CMD_BOOTD is not set +CONFIG_CMD_BOOTZ=y +# CONFIG_CMD_IMI is not set +# CONFIG_CMD_XIMG is not set +# CONFIG_CMD_EXPORTENV is not set +# CONFIG_CMD_IMPORTENV is not set +CONFIG_CMD_MEMTEST=y +CONFIG_CMD_DFU=y +CONFIG_CMD_GPIO=y +CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y +CONFIG_CMD_SF=y +CONFIG_CMD_USB=y +CONFIG_CMD_USB_MASS_STORAGE=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_BMP=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PMIC=y +CONFIG_CMD_REGULATOR=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_EXT4_WRITE=y +CONFIG_CMD_FAT=y +CONFIG_OF_CONTROL=y +CONFIG_DFU_MMC=y +CONFIG_DFU_RAM=y +CONFIG_DM_GPIO=y +CONFIG_DM_74X164=y +CONFIG_DM_I2C=y +CONFIG_DM_MMC=y +CONFIG_MMC_IO_VOLTAGE=y +CONFIG_MMC_UHS_SUPPORT=y +CONFIG_MMC_HS200_SUPPORT=y +CONFIG_FSL_ESDHC=y +CONFIG_FSL_QSPI=y +CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_EON=y +CONFIG_SPI_FLASH_MACRONIX=y +CONFIG_SPI_FLASH_BAR=y +CONFIG_PHYLIB=y +CONFIG_PINCTRL=y +CONFIG_PINCTRL_IMX7=y +CONFIG_DM_PMIC=y +CONFIG_DM_PMIC_PFUZE100=y +CONFIG_DM_REGULATOR=y +CONFIG_DM_REGULATOR_PFUZE100=y +CONFIG_DM_REGULATOR_FIXED=y +CONFIG_DM_REGULATOR_GPIO=y +CONFIG_SPI=y +CONFIG_DM_SPI=y +CONFIG_DM_SPI_FLASH=y +CONFIG_SOFT_SPI=y +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_USB_EHCI_HCD=y +CONFIG_MXC_USB_OTG_HACTIVE=y +CONFIG_USB_STORAGE=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_MANUFACTURER="FSL" +CONFIG_USB_GADGET_VENDOR_NUM=0x0525 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 +CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_USB_HOST_ETHER=y +CONFIG_USB_ETHER_ASIX=y +CONFIG_VIDEO=y +CONFIG_ERRNO_STR=y diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index 87d2b52..3cd32ea 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -227,9 +227,7 @@ #endif #ifdef CONFIG_FSL_QSPI -#define CONFIG_SPI_FLASH -#define CONFIG_SPI_FLASH_MACRONIX -#define CONFIG_SPI_FLASH_BAR +#define CONFIG_SYS_FSL_QSPI_AHB #define CONFIG_SF_DEFAULT_BUS 0 #define CONFIG_SF_DEFAULT_CS 0 #define CONFIG_SF_DEFAULT_SPEED 40000000