From patchwork Tue Jun 7 08:15:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Yuan X-Patchwork-Id: 631394 X-Patchwork-Delegate: yorksun@freescale.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3rP4SX5msYz9t2p for ; Tue, 7 Jun 2016 18:27:40 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=freescale.onmicrosoft.com header.i=@freescale.onmicrosoft.com header.b=B7FqjJMC; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6DA7FB3839; Tue, 7 Jun 2016 10:27:10 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Z5fuFsVhAJ_q; Tue, 7 Jun 2016 10:27:10 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BA5A4B386D; Tue, 7 Jun 2016 10:26:36 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B050EB381F for ; Tue, 7 Jun 2016 10:26:11 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id a20BWgNkNrS5 for ; Tue, 7 Jun 2016 10:26:11 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1bon0134.outbound.protection.outlook.com [157.56.111.134]) by theia.denx.de (Postfix) with ESMTPS id BAB2EB3804 for ; Tue, 7 Jun 2016 10:26:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freescale.onmicrosoft.com; s=selector1-freescale-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=yXzDhyEoJPDqVmFsjeoH/OiXDEPZ9sLZU411NTJxK0Q=; b=B7FqjJMC223nukjPjiQFEGaZFJbrmwJDaQYuczj3Zayah/fYcHDrsmIBCqkUwqOaWumDKbrivc406WflWtGzDzXBDA6FwthVKVMJQ82glxYKFv7QuWb4w5WVKxsJHuA7yUeXrCZOf2wbxdZ4pdzxRweiiEo7xB5BXR51HoSAQfg= Received: from CH1PR03CA001.namprd03.prod.outlook.com (10.255.156.146) by BN3PR0301MB1204.namprd03.prod.outlook.com (10.161.207.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.511.8; Tue, 7 Jun 2016 08:26:02 +0000 Received: from BN1AFFO11FD043.protection.gbl (10.255.156.132) by CH1PR03CA001.outlook.office365.com (10.255.156.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.511.8 via Frontend Transport; Tue, 7 Jun 2016 08:26:02 +0000 Authentication-Results: spf=neutral (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=freescale.com; Received-SPF: Neutral (protection.outlook.com: 192.88.158.2 is neither permitted nor denied by domain of freescale.com) Received: from az84smr01.freescale.net (192.88.158.2) by BN1AFFO11FD043.mail.protection.outlook.com (10.58.52.190) with Microsoft SMTP Server (TLS) id 15.1.497.8 via Frontend Transport; Tue, 7 Jun 2016 08:26:01 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id u578Pd15014772; Tue, 7 Jun 2016 01:25:58 -0700 From: Yuan Yao To: Date: Tue, 7 Jun 2016 16:15:26 +0800 Message-ID: <1465287329-984-8-git-send-email-yao.yuan@freescale.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1465287329-984-1-git-send-email-yao.yuan@freescale.com> References: <1465287329-984-1-git-send-email-yao.yuan@freescale.com> X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(199003)(189002)(2906002)(33646002)(8936002)(36756003)(50226002)(5003940100001)(69596002)(92566002)(4326007)(229853001)(47776003)(105586002)(68736007)(106466001)(110136002)(2351001)(87936001)(76176999)(50986999)(81156014)(8676002)(19580405001)(81166006)(19580395003)(2950100001)(11100500001)(50466002)(586003)(86362001)(575784001)(8666004)(97736004)(6806005)(77096005)(48376002)(189998001)(5008740100001)(104016004)(7059030); DIR:OUT; SFP:1102; SCL:1; SRVR:BN3PR0301MB1204; H:az84smr01.freescale.net; FPR:; SPF:Neutral; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD043; 1:JPXc8CHnhj0Lu5Fk38e/2IcfghosDoJHbXf1ibSPmoW2Yyzwf5yroeway6ioYpnTquJ3P5kk4nidHrd21hh6O0rBup7OvGLN72hKe3d/WFPpqR3/RSszGlWccdxX6UAcFBynyW1YQrN/FqZWd/7qL6aT2SUkLyMQIEaJCIhhqibaWoAiVLqLIOt9WLN9TaiQaajcp/GCuH46qeT3zStUO/HVwQxxKz+KKa7UdzqCcj881LrvtJ5BXojZ0JL3zWogepvXVYiqtDE9kPx2uh8tN3Nyt3jFspb41F0iRE9CmHKVXkwSTVzkbQlrSJMTq4VqOh9AB3hWvOIB7NLXxtdPQwL/Jqyr8f/x5zKZgZoqZQhIJfj9mk/wadJm5Du35+WK3GD9cmfG+kD1dek+U6UAJ6YUOnjK9nWkznc/E2RIjaMlZ46LPdvrWjgpgvEKEn8vJWp1GsSH5xPM9wkwV0a5guzUlLOgPOvWscncVa5KboPUDAI+/ChG1WBvt6tu9zi70TMcjDjGJms9Yt6+jPxKjkDc8mwtj2kh65WgbjC+p08YGtFlkf7UzBLmqA17bq8f MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 3cda3705-f7c9-4748-2191-08d38ead5c50 X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB1204; 2:EtKStwjenKf0MfjdPUmvVbL82LnYlVlr3+4YnlS9NbNJoLFuqntF1hmNFlGwWH7EN9G4eGdIJ5ofp/tHC+Lidy2z3i3Eti9D2YxDkRw9P3qivyt/tl2GGA3pLNxXPdl483D0S8pyE8oipWPdNxYsa7i5ORx9sW+ixxyUPirhJrJAFqxJnhBKVoT1iusuPbR5; 3:6Weu+7ys05gMY57ih+eBZw5hgXq/xzhYSyUtz10heDs4BURwIpcCeuvtb1yXMbUa/tx90BbvWQfayxaWBh60Cgk/RkWl/CxH0yPfOY50j5NjlXw1+S+/kUHZFmsAOQPZvUo5DKT4+8kSvqOcakiRtDSfuuQKSjEbfUastoGtRXnD5WQ5J9ey+oxYuygYP05fF5vdx6vl0bG0U81TUQt3+RjgBEY2RilOrPzkGdnBG1w=; 25:fYEq4XujIuBKUDaVe/H5vdzZ+HjEUoUYq23OPxcb3jirbhh42Jj0L6O7IIlF9vEP5D1rjOVmsByyShZz4o7meDuR8Bo+/0dQ5QYaPqxmoJ0MYD0C4sbJYVU5XBlzoUp7nXA/vItq10XqUjDyM/bremfsK0vlJ8dUHwfruzouIjCx9jAuzM652QmN7Wtidbg0xueXO2H437cNxJBsfh0T4f5PVM197MERovsHxYQBQ2s7crdE/ShaLaS77HdTODrqAERPM7NRSaYrapyB8vikg/Kz0zxegNulJbd6iuQPEBsrjbn8/qq0Yi7dMgCYIZy/fLordoNHV8zapLEKbO48BsA+eey2GyAxYdGv9g54w+6F3metgggDERFcKfYhEkcl0TPiRvOWZ81+k3MvJD/jun9+M2LJyUBIvexoC+EXNU4= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN3PR0301MB1204; X-LD-Processed: 710a03f5-10f6-4d38-9ff4-a80b81da590d,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB1204; 20:pZHjw+Xpypsx67u6wkk7FMMCDD8pE+eGfLiMykK3L1K53wmfOB91JyhnHsnLlg4HCptClEI5xDcjCNX0+mbMCrdaxG1fNFlpdTo0TKMq9YXVD5IeECTn2lWP2gg3cq0BzyisLAny9LfkZ3ZNSMLJmwv/4X3i9cN2G/22VvEGvA2xR3vdXZmJ+rlxf+bVmjocskanERS/rkrEvWlTt96COSgwWeHJfMb0q7Yyj/GM8JgUk/u53cUW+XkQzAq2KF4+QWMAT0kr6SzPFmNCtcg+jZ2z1TXX4HVU1svM3U1RdwxtFjczFsPFQRKhxxCaZmGnrn/jP4NRrY1Czq7W2DS3CYVvZpOJ6RVsoaKIFdDHoAyYMpJlCXw792T5tjwGRKRliPoSxQ/RDGAY74t76U4q7ATMbQCkQpTvZmjNbiQVYm1ON2PJextUTrAr4Fb6LDUOqalM16pa6RubzOpnEpjBxM+ZWxUkePS4qvV1qIVaHisdtrJvT5bxWrd7EhBbe0Uf/xnVLCf9cXdk7ecPd/ewcnUPAb4AAZxwcWjZuY4qwjbIxiGwwXo4V6fIIDLLgdXbA4ZL0Z7g5PD8lwHgJDTyfmYRsK4T2PIfV9jGENxcQ08= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(13017025)(13023025)(8121501046)(13015025)(13018025)(13024025)(10201501046)(3002001)(6055026); SRVR:BN3PR0301MB1204; BCL:0; PCL:0; RULEID:; SRVR:BN3PR0301MB1204; X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB1204; 4:P67ZqyJTjKk4UXY3v+qZqC5WaosL72xNfmd/2zc0ed81kt+FmyhuiOkNEZflbXRtZMS0wgx8QwORQhc5Atvy5jSZH0T20u6TsYu9JEAIi8J8HQ1Zq9+chyX338BrJXTOQmR/J7x52OIaxC6YVAYgVq/XbSMy95osUVcVTYryGFV6ucWQmvTG3UXNBW4wHW+qlv1+RFVGAm8WWg1XJQB8HMnmOiri6FYp2hZB3bvz8/mfy7LrRS36tgvb9lvt46dIKOlkIvAHQmINsP8kS/79UZW8cc12l4BDuAtfeSGRbLUpdxwxCM00fKHOdlxH58Vb+9zifwsQhFgAxWP1RvuhC520xAfzSWoTvlgwyy1XDp+l/bVS6r3wgo2T3DMK0aElwQmnhy65rxDMTKyVUFLlBhsdJD0UdqvKDzeYvH1G3OjMhQDH4UHlku2LPERqlDaGzbe9dRE2KbZ6PmbVtN9bF733i0VkbxIXOBHH2UGID9YTgOfhgrCmR09oXxjVwwm6s4OZEfOhbvmZKqvdWzSf8w== X-Forefront-PRVS: 09669DB681 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR0301MB1204; 23:DOmPWDd+kM/VRAbjEbiF7TCM8ITkNjcSxtv3xHu?= =?us-ascii?Q?Ipw4SGEvW8cNb4h+Fd2pumCUs6YkhlhkQgHI3V5v5cYDGJmVrWRBUG6SAUtD?= =?us-ascii?Q?mS//+r4+ChxJahdsMGGrDX5wq8tZ/CFLIB4Whzn41he2M6KquB0TlI0vijOZ?= =?us-ascii?Q?2jp1ksLxbvkDv5S+lp4FT7ha7ejKIeKploZzstQ58lgmMQOkwWkRtCELfrWh?= =?us-ascii?Q?qm+ntFrcLbo/vPFrejTgTLwzJwD3zfYDIs9B6xzcT2g17UW2HuegJfqa6zK6?= =?us-ascii?Q?XpMSMTwQzxsDg4bBciv5uBoIz8GXcwhU5vev9ZYg/JZLlxpS55iz2GfZ6cl9?= =?us-ascii?Q?NdLrdv6SWTL4IXbWxdlGuLDMz0upRuqTJUGwDMie/rAWxCTtCvDwaBNpeGwT?= =?us-ascii?Q?PXL2URIXicEYHKyZTolchCKqbXHUinS3+n4sJm/gPKTVr3eYOPV+GK9ZLOyr?= =?us-ascii?Q?2KiVaFlQdw+o5gU1jME3FwuOk4EY5JelCNs0Rq9ek3hkkcQFGccrkxekTVJr?= =?us-ascii?Q?p685zi6DeKLA8WjSZy2+Cc25CaM4+B6NQmODOWZoRvd+kOx7Ba+NYkfK4eC5?= =?us-ascii?Q?bk6jrxSsuvtPjdp+zfgUJYVi7sxfDjtD3uZQ9YjRIPaBuv43wbeXQg8tusTk?= =?us-ascii?Q?Z+zSQAxLncq0yrjzOYTi0OZKF2cVuafOTPeoPpiSCkps0XM9h10DhroVHYEp?= =?us-ascii?Q?jP/KKQAGJ4ItDDPR4DiuyzhREgsxZqeLlqYbjInCRgAQ/xuB8TIyTNDySL4n?= =?us-ascii?Q?kUuX5Kox/Dw7NinI3olvM1+fXRE6JGTMmNklMQTg8s4QipNKpVEK+gwSQbfc?= =?us-ascii?Q?0hgbIp6RA6snFQchMtUyW+Yl8E5kz9Jli3xbL0KjU8s6MddSr4OpAHGeUIpR?= =?us-ascii?Q?Pd8AR9VMIWGSMDHXWpt/Df1hN+D/E6Tj0Ni2QGP7xS4YsX8BXtaKlrIXCoBR?= =?us-ascii?Q?y5Uwr2vnuAXh5Na//uTkemhvEYTQv8S+XggTurAkvWmtdODuUeo7PuhYzbTs?= =?us-ascii?Q?ClL1nuSQmcJqjdZeNlQXVSJUgD1sRCsKQ0NROBRxFRQFsh2fO1u3MCl1848S?= =?us-ascii?Q?gZ3DwFteZA5QWS2joVrTpBaQrgBPqdvKjnTMO2ERhh6oH91QSew=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB1204; 5:IlDUsokysdN2tz+beeTa9cJuIQHYY/HH5HY1sHaJw46sdXFai1ie+jL1XWNgjoFX5S8KAMJM/my/WfK41m+VsuK4ARQ1gu4pIZ7hfKWbHn0AXNzzE8DkvNNMY3vHRABU6nsAhNwkLHoRGbJluvKK/A==; 24:SScoce1uV46JCMBNRgHCgh/Dgly4XVyBXIya0yD+SYM5Qk77XpWnI+tVipVSQbb8U9tXWQMCgC7O8JlrEIIWrVJRNFJqhFbIWwlMeaPTbdo=; 7:tQwMvMLiFXZWChD7TO+oxfPaxbPpmGdIOCIyd86T54vJ7KYlHcbL5ddoR2kTZuMoEcVVOFzUTSOzTfEVqdwLr7eFe0kZWzjBOETvqbnNNUIHNUQfR4ba/avVyc0P249mMsQOcFXYgm0bO1YziyxshT0CLrNyYTw+jILjFimTPaqhaDvoy+GcpnfLUNJczUJCFSPGLmXIf/SrWIzwxCG9P1w/azUfR8zlKGPejBbqtjw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jun 2016 08:26:01.6429 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR0301MB1204 Cc: yunhui.cui@nxp.com, leoyang.li@nxp.com, u-boot@lists.denx.de Subject: [U-Boot] [PATCH v4 07/10] armv8: ls2080aqds: Config QSPI pin mux via FPGA in NAND boot X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 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" From: Yuan Yao In order to access QSPI flash we must asserted ISO allowing the DUT to access the full IFC domain. But deasserted the unused ISO will allowing maximum performance. Signed-off-by: Yuan Yao --- arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h | 2 ++ board/freescale/ls2080aqds/ls2080aqds.c | 9 +++++++++ include/configs/ls2080aqds.h | 6 ++++++ 3 files changed, 17 insertions(+) diff --git a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h index bfff2ec..7c47cc8 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h @@ -128,6 +128,8 @@ #define DCFG_PORSR1_RCW_SRC_NOR 0x12f00000 #define DCFG_RCWSR13 0x130 #define DCFG_RCWSR13_DSPI (0 << 8) +#define DCFG_RCWSR15 0x138 +#define DCFG_RCWSR15_IFCGRPABASE_QSPI 0x3 #define DCFG_DCSR_BASE 0X700100000ULL #define DCFG_DCSR_PORCR1 0x000 diff --git a/board/freescale/ls2080aqds/ls2080aqds.c b/board/freescale/ls2080aqds/ls2080aqds.c index d7acb48..80a6e93 100644 --- a/board/freescale/ls2080aqds/ls2080aqds.c +++ b/board/freescale/ls2080aqds/ls2080aqds.c @@ -208,6 +208,15 @@ int board_init(void) else config_board_mux(MUX_TYPE_SDHC); +#if defined(CONFIG_NAND) && defined(CONFIG_FSL_QSPI) + val = in_le32(dcfg_ccsr + DCFG_RCWSR15 / 4); + + if (DCFG_RCWSR15_IFCGRPABASE_QSPI == (val & (u32)0x3)) + QIXIS_WRITE(brdcfg[9], + (QIXIS_READ(brdcfg[9]) & 0xf8) | + FSL_QIXIS_BRDCFG9_QSPI); +#endif + #ifdef CONFIG_ENV_IS_NOWHERE gd->env_addr = (ulong)&default_environment[0]; #endif diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index c0c2a97..bebbc88 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -304,6 +304,12 @@ unsigned long get_board_ddr_clk(void); #define FSL_QSPI_FLASH_SIZE (1 << 26) /* 64MB */ #define FSL_QSPI_FLASH_NUM 4 #endif +/* + * Verify QSPI when boot from NAND, QIXIS brdcfg9 need configure. + * If boot from on-board NAND, ISO1 = 1, ISO2 = 0, IBOOT = 0 + * If boot from IFCCard NAND, ISO1 = 0, ISO2 = 0, IBOOT = 1 + */ +#define FSL_QIXIS_BRDCFG9_QSPI 0x1 #endif /*