From patchwork Wed Jun 27 07:08:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ye Li X-Patchwork-Id: 935324 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="nsVzdJdR"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41FvDR03fWz9s0n for ; Wed, 27 Jun 2018 17:09:42 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 99CD1C21DA1; Wed, 27 Jun 2018 07:09:34 +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 A7725C21DEC; Wed, 27 Jun 2018 07:09:29 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id BC8E1C21DB6; Wed, 27 Jun 2018 07:09:13 +0000 (UTC) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20081.outbound.protection.outlook.com [40.107.2.81]) by lists.denx.de (Postfix) with ESMTPS id 8157EC21DDC for ; Wed, 27 Jun 2018 07:09:13 +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=nsVzdJdRqVDIDPuLcsISmkuwa0t/IegWRtWC0Pyra1c8MGyMFUzePvb6zMDD6Ba2TDDvtdw4hIDD3YZ7jp3T5gZbboeBOiTvzSGM85rf8Nl1LrpDf+UMA5gdVwt5sITLaXN4O/EuIsVl+ENVk8LxgFnNzRFVQKoD9DDBeKHEysw= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=ye.li@nxp.com; Received: from ubuntu.localdomain (119.31.174.68) by AM0PR04MB5299.eurprd04.prod.outlook.com (2603:10a6:208:d0::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.884.24; Wed, 27 Jun 2018 07:09:09 +0000 From: Ye Li To: sbabic@denx.de, peng.fan@nxp.com, ashish.kumar@nxp.com, fabio.estevam@nxp.com Date: Wed, 27 Jun 2018 00:08:42 -0700 Message-Id: <1530083322-38144-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: HK0PR03CA0083.apcprd03.prod.outlook.com (2603:1096:203:72::23) To AM0PR04MB5299.eurprd04.prod.outlook.com (2603:10a6:208:d0::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fa78ad6a-6593-4bdf-5959-08d5dbfce248 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:AM0PR04MB5299; X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB5299; 3:XwzQsIrg5tFksEyuSeoKKRW8msPopRjHNoU+SlkRtJlP6f3HGVsZVPeUeWz8YV6oK6wguU3dClJ5UlCmoGadsBKTLYClA1Ty1OUeG1I0U978/O993wFxUN6sXf/j5memiJbc7mxYfI2HNmMwkL+bc1ZBIheQTTlIwWy89nUy0uiTs3hF2x4pA8giavqYH4r8BAS4OopSjjzggATORvSmdGtdsPd26QUo3MhiNc+PKFk2Ivb7lQnJsG0F/9h8Lq7J; 25:6J9p2t4iQiF/Rv2TYzdosdosOlHSEfF4VYjtU8m2ASRnHVCWYPfW2jGmNQEijFiG2pPqYD2FQ9gjHW+xhZIgb5+6zjH7kPBgkTjf8mjL1LDTiZC/r9BYStEdKx5STh5ofg8npAyCLZAV8IUMerdKnJampv09mVbG1oqnw4fcF5gy4ibKiq9igylJO6xZ7kaQVRGRVbhGC36aipFmMrCWBU7R/oyjHnqslLNEXOnt6cgqb/lzW6v/IIcRhqUJaGdVgQQkbZJVngf7DmQ3yJnitKpGgrtO90Rl1ItIkPOfOrI0ovCRFQI2o82AHxtYOGHx5O11bRSyfjq84RsZoe+v6g==; 31:P51UZNipcPn8n0rhDmkcjd26tXBuzmnp6RuTsEg7E/jdTaKB63QlzEroklGIsrO6EXfSjFUQvt08ufokN6vwK7d1cQuPUU0O19bzzuM80ceA4B1rYtdENccHsDrrGxuHWnTMLV8ug75VqUJG/mhuGqqWSPKUQHb4oVrZreYyJTvZshpXJqeVcrDtNrH2/dru9MiJm4il9ZbwMssv4VAA8+ghODARqFuU+fZJu9eu41Q= X-MS-TrafficTypeDiagnostic: AM0PR04MB5299: X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB5299; 20:V7tPXAvrMFoDkhnal9inziDU/sY/SwnNiSsFJRqqGFoFW1FA7RN3fM13EMOXMREd0K1fN6hsOdgKBq5wruq3jYdUotFnzNY2HNI1glK0vSBUbJ0TIP4ALKjPzMTNfh8kI/ddxN3IlCqNCZopuEfpSsCYTLJ9bbPWOecOCPOYUAPBMeQkmMZxfyBOJm4+TSUdbwGAopcShyVSFGnYxPN9kykYSw0+HCVnhOUdw5S1Rm5j2tUwof8IG57Fcb4YV172LjLRqRBkMBrshEPy8KK92h2fWXnuU2Q1rYTk3cQJy9OixA3BGIrXftU2L0Kdo4xI/8OKDuYDZij0lq8wIpNK5+4bhiTjc/LRf9Cl2UQuE4fG9zY23yBnb7DhtMm0u7tI+Jw9xOUVuB8mkUPTwtDHhxLQooF30jAgIskUW57C0ouggbiztA61+BYxDdyN3bZnRSP3bAvut0pv5Lhr50/alVDSubGh2ym4wLhloenvIpO+oiY/DgRvtzwmc9JPykgR; 4:SEI7O6mbFl/Z/heeOeAFksFtgyYQ4iSBH3k98nOsxhyWpeXskj/PBNHgKpEAICA2T7EgwEf7Zqjohp1mjnvWHKITHqNFMC9fwLtOkkA82WgkMFhWcWkpYPtDu9ZmRmWmdRhRak0VY6Rs/I12IXsXj/kxyxPGaoeDGUkBTHPghOhNfb0+kivUW5C/Ay+1PcUIIigN8xP9y2C2PGOYYVY4gGF/rH/FgZ/eEtYhTedfxKYSE74x0ly1rH8VxGC0DIIl5fLFqVW7l4SKrmIPa+LtCjNZMGcAu1mdw3XK30X89VVmORTP1tcybv1HyIe6o1HI 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:AM0PR04MB5299; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB5299; X-Forefront-PRVS: 0716E70AB6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39850400004)(366004)(396003)(376002)(136003)(346002)(189003)(199004)(486006)(97736004)(386003)(956004)(2616005)(476003)(7736002)(6512007)(53936002)(51416003)(6666003)(5660300001)(6506007)(44832011)(305945005)(36756003)(106356001)(25786009)(14444005)(105586002)(6636002)(1857600001)(4326008)(2906002)(52116002)(81156014)(68736007)(8676002)(16586007)(26005)(8936002)(50226002)(16526019)(186003)(81166006)(316002)(6486002)(48376002)(50466002)(66066001)(47776003)(6116002)(86362001)(478600001)(3846002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB5299; 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; AM0PR04MB5299; 23:sB/DwzTYJDPVVjPW8NHSB3lsP3rvfMt9ZbKqdeofQ?= WQ8OY7pdx9jH9V9tbjMQsxmgSs/Fi1fMXZIkXlLIukP0lhgeDX7C67B+lAwdlxM2Tt8yJhTF0CIbUf71BqyVx+vrn9187/D/TFcEyEQSDZwu/GWpmG2jOFydDjQ/YoboYVAa6YkeYL/OHYA3WIa/wUxk69YprgSNaFtucpHJKQEZ5JlmdTUdQLZJltq9/0m676uBk7OXSwFm68wLoAI6fOWnfREjcQPru44U4TBy5WAfhf6mG4SLmY4OgweFc51m6UBBYN3UnD7f8QZBAfe+VZ/4d4pWlPopHhldp+vfed9TpL2jic8/TSOrbDtEQBuqDX8YiDg9KPzvv/YBg2gzNl43f3PIx/pXll/aMSvjHLaBe5D1Iehb6pd8X5UJ92HIo58UIxAmbSb6KI5DHE/G7wN5sv0CdWlCpv9FJrlySmfjrQfKQ8oDKT3AQSI/ZtLN5t0nWbfBoEuAG4jooZE7XkZOyAcnbZfrcu8giIUn4G/FyTkvd3QLHNAALW4920nDpS6H0EZe5yNIaLFqLkrFjDFlPtnZZQum25NfZWq2UVpNVgmiylpgEsZM1TWONP8p7bxl9KnBNVLQZNAY8eARljOxaOIdCiNYxbc9g3oLzpCKyM5h0NbqebapnSR8plesXjTL6HZnBC2HzSTThTMWW5yBXXWom+TBTz//bB2K00tuJavRb7MsgLjKjxgRsbdGpLlygPGWH31ngPmHQiCUaNpKh6Z+XrLmqwBfOB+iXrYPJQqf2mk2Ap4urtTCISp6juf51rah+24pb5Sr6r5rD1GadH3zoa5JoYszBgUtqfLNqSRoR8WmD9GENKUmB3oUZMxSS/y1gxVED+hmL0EdMcjE/XZ1TiFbO0cIPtrpFcMkyYqKtV7Lb2+BNchVCcOn68WRWs3akjsZwJPh9BESfqfpdTKgZm3DlMCQvp8PoAEKvI/uDdxBlX+GFF6mNd7HbSGNZo+ReIT2nLpdR4QxQLUM0uwSd0x9DL/P+BpV1J5in9tBxMjW9MBIETAWN0KNA5a2PjbQj+Mic4SZ/renWgbqbeXGZfvvHM4HV3jsUH1bcrlClhRnFWKm6rarzjCcwH95C+I6Z1tyLxu+EtfM8xaHHAutwiE+rcHfiMrXnc6C46KpJEq8b6P59atknMQVys= X-Microsoft-Antispam-Message-Info: tHgnnuhk86Jnkbu+QFIMf+hsvGapk5vQzXZdDtD5A3YpnE2JWhpMaZ/ZpkggDl9hQeVu+jSMV32doTIEfDOoxRPG9DkN591esvaa2jYb051GvnVu7I2vj8OMuWStCzHyeC5WtI/nTtlDAtDWFgcrPVkALi6/9GpTv9dzPVL/hOn4Awi9KbGcyAMyyh10p/Zn0TDvKMQcBzUUqZn2uLWY5hrnjreyDE+Yjpl+C79ei1Eq7e0TW8V3tLExNBgSQ/Uw0+stgYTSI2MXIhEm7SWG3Cr0mFZ1ARj+kU4yoIG3/b7xnBj8YPuw2/KzfkmDg8+qNDFsqQ62XN2P0YDpVMI66mHvfF9oB2FxItmOUXAhh+Y= X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB5299; 6:s/TlD826Xbqv1msJgLNI973j7GzSG9oeEOTN861sbjXWSh+toUESmB34dLgYMtbIokPTNaKn0u1tBACgbY2e5wBTuuJePPwuNCLex31jiLwvjlGfhNdMpIso5yN2Joo8VAq6/Q1JL6nlPLfJ0pXlE9XwFGwyTc6KbiaKDIJIWGmxlch3gyvtI3tY0Txes7jeHtts+9mCIxC1x0CH4bAUGvunyXuaYImYmUzwkU/ojuw7HvYgy32EAh4pb1DAvZ8xcKG/r7JJBx6UnKkQbmT3R+UydVpAqiUCifdAx+ybsikoFjqqVdFZbSjF8yG0q76KHB7DZJXiMJilkwfm7UDml+wt7An5g9ja46SOYFUg74iuwZY9aW3xpfT22+3MScSlvUgNTT4oYrUZtOJisCfMjRxK8Gx8dG9nH0jYPUZaQPUguVzbdkLHbEtISc8NWuN7ii/7tFzqSvvXHPRAuAm67w==; 5:mgwIMbXW+zcru7uVJ/x+jqcbHrNw9XK+X6j7avr77zq1HaRVR7AsmuPsxShi6pxxKdQC81IVO79h4TR4Q6o1UQTnJgFP46Aze0tfO5PHUq4Lg3h2UvSWnYhmndNqcYWpX+xc/be7P+vy601+CUI2+xHGHVDBQ6wPH4WeWjA2a9o=; 24:NtdSEOQ12I85MTquoh1965IMGPSC48JNFe4lYdMoyICU2f49+IqqwymyI9zquMLpfU53fVPLjAUWp7ruJ75DchCDdACRUQY6O4UYL9GXB7M= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB5299; 7:5/rK3kgRO4IEUDvgeLiSgk2wZOAS+BwyQ/7BjakF9eWp2NnxgGcJ7N4lKnM3OmVxWHTOI66E4nc0Nqo1E5ZbR+YKhIsd2D5nkvgZb1yCeo0Iv1Vb3c0dUGWbBbX/FNTxulFmnBMydwg0cshJILY7zAYU6JI+lsRm+voHcPE3RomSuQZfG9Jx7syQ9x12r9vjYW/t4yEATnnz29tSujU3l3Ox/aePWJJ5UZdHd0FRNKH8f6maSuNDN1g7Dy8s+O8g X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2018 07:09:09.2649 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fa78ad6a-6593-4bdf-5959-08d5dbfce248 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5299 Cc: u-boot@lists.denx.de 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