Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2FF61C32771 for ; Mon, 26 Sep 2022 11:54:44 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BDD4F84DD9; Mon, 26 Sep 2022 13:53:36 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="rUUZFyOj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 23AA384D8B; Mon, 26 Sep 2022 10:19:51 +0200 (CEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60075.outbound.protection.outlook.com [40.107.6.75]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id BCBE384C5B for ; Mon, 26 Sep 2022 10:19:47 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=W.Lu@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PY/jf1sDiqtquwJCKhy5hQP66Q7fpySrD4n+W5j4N+0wg3Tnt0H0A1AP7z6hldNk+0RV4bDMq0TyWMNUQfo4ZhdcSfLZw2HL4JMDrOY6rz9dzpbHgm8Fyb54vS7ONyDcxoX4qI4FnLNEzcskB2+VYTLV8XHfTR1bgZqS2I1/0Vsk8sWpFq9NvOfPQjeB4kFnI0rI2YF44FpZpLow58dneFnESlC6vgeCWJnEsF2jkr7R/caQSLYKsOUOMC1Bs5JNTMIGDQLY2O9ugUql9gkdKCe1BmIZPbYMZxGkwQ/xFiPN9jtfyoHuMA5q76TEOUpnv+do/himGvY46IJxCoz+Vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=L0/aVGgBxq2wjC/BKz4Wh4mnDQxDQXPjqTqiQRzKk78=; b=kDnUONlGCI7DOm/A1lJTJ8BUKIW1NWSAlgjUEvEuV6yfMgKnso6ChuUU2kJ8+wusPoIiEul0ozofv9oCVHCZ0R/WwKaDgQRaQmAbBRdCYZMUEcK+QAwoVGQ3aQdMDHoifvHKLIuyIvKAiE+1gJSLY9Xm+2W6M+D3oLkGaRob9ieFg5PPL46qMmbBgKNsN0mg4kPUD3W1CdEPNvNscw6VvJ2WekEfKnI460gps+H7KZdFmhJfHi+nPtT985BBcgwo5kkMuW1nLzzVNPPBDETiShBL6KULpZQPkDz8Ntt4qIt+3QL3skQFfL6J9NW+SDolHdZcR39WJG61HTm+UMsImg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=L0/aVGgBxq2wjC/BKz4Wh4mnDQxDQXPjqTqiQRzKk78=; b=rUUZFyOjj7pqD1UzyJixABuFj+0BR2UCpAP5C+4ZUhVLiSbXJipNZyvtSVaK8Y4LjhxRGbdhPtgLBsYhmMV4oRgM4p+spi7bp0bVzpOwMrJ654W43KEvKSgxHVxjoTFd4bJHcMy0nlXGkPX+lfM4PqLxeqAxiX3wUsK0zPl0gZo= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS8PR04MB9141.eurprd04.prod.outlook.com (2603:10a6:20b:448::22) by VI1PR04MB6846.eurprd04.prod.outlook.com (2603:10a6:803:12f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.25; Mon, 26 Sep 2022 08:19:46 +0000 Received: from AS8PR04MB9141.eurprd04.prod.outlook.com ([fe80::9b48:31f9:39c4:89f8]) by AS8PR04MB9141.eurprd04.prod.outlook.com ([fe80::9b48:31f9:39c4:89f8%5]) with mapi id 15.20.5654.016; Mon, 26 Sep 2022 08:19:46 +0000 From: Wei Lu To: w.lu@nxp.com, peng.fan@nxp.com, u-boot@lists.denx.de Subject: [PATCH] ls1043ardb: nand driver fixups for revision v7.0 boards Date: Mon, 26 Sep 2022 16:18:49 +0800 Message-Id: <20220926081849.2990273-1-w.lu@nxp.com> X-Mailer: git-send-email 2.25.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SI2PR01CA0027.apcprd01.prod.exchangelabs.com (2603:1096:4:192::7) To AS8PR04MB9141.eurprd04.prod.outlook.com (2603:10a6:20b:448::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB9141:EE_|VI1PR04MB6846:EE_ X-MS-Office365-Filtering-Correlation-Id: aacc737b-5e70-43ad-52f8-08da9f97def5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2vRze+yQyk1Mg8Mg0EWkk1HJZYAH2y/ymtclrMCL/fMxKMrStnv/Pohr1Ka/VPjtjjTaMgOkXDpy+eDnSLNsVl/srntjkHYPZGr0dSzsMU6jlv67tTnuqCzEhAHuBpV2xz9abOUj6vNIUGeKooCFFPgzo5d8Rw3NnJNKjVrY8KJ8WQuaL7njwBiT08yw8tiXeyL/Z9Pkcn0XgzcpM8EcNESXDVUc/iAYaBJNb5+3U+8sxw7tvD8lO81rhKIxWz9ZN+MjG6eKxnQJ96zi25ofcBqf1ds8DgECQ+Pzugxy4rX9XlLebYgHl3Nn8FzR7+KvyVZDVFYmjROe/Se6kAcyjfV9lEUOXPVlTbzTtMNldADw76t8/mmgQ+V2zQfdfrJxPiFi89jul3nQLbLIC4Y7MQv8r+NAGUzieWJhKSe9boHTqucjx6XIhAvLyfrLjXoT/4veZqxgXu8rd12h2OU70CWh7OFYU2g3LpUeZhwE1vyhv84a3banVO+9y9r/bhVXi1alA/C0VA3igQB4Co5muO/xy/zHZilMUYejg/4I9X7x2uEkX07p8brvoo4Ujirp4D8BVYUxmPxLLD+QXI3zc2LWV3vzAgRLWAIizjv85KE8swNOLafNfIhdzo5MekZlk2qFy/JbcxnjIIYRMg7yp7AmZ0otabx/jXBcjAX3l+H2PWXSpIBedQzoGNTJJhnP1xYidUI00Sb6ybEh42sznbsL/iEciNT7P57Gc0TsoMjWVrmX+M5R1U97EJvsaAzs X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR04MB9141.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(376002)(366004)(346002)(39860400002)(396003)(136003)(451199015)(36756003)(86362001)(5660300002)(1076003)(2616005)(38100700002)(38350700002)(83380400001)(186003)(6506007)(26005)(6512007)(41300700001)(478600001)(6486002)(316002)(66476007)(66946007)(66556008)(52116002)(8676002)(8936002)(2906002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?PKFeQoPS8GnY+/EuLx3xLnRV/jVuidbwTmY2u/C5pdTUOxPsNtwyRcBmMC/W?= =?us-ascii?Q?ESw7GpeoFso+ifxxKZNzUjJnEHnDUQ8IvoSkL82Bn0QsrSsOK5+27b8VVFmu?= =?us-ascii?Q?d4SRjv7mSM7BeEf6PeXjJUKxVNOI637fSO2sPZ6Df0IrtngOklQ+VaWhFaYf?= =?us-ascii?Q?wckOml0rQ+9+40aOToZkKcXNbvq855A8Km/YkclOsCkRS3Iv9gs7EVBDx+El?= =?us-ascii?Q?u/bZVl68UVQO1x+k5zkPbJj3zvYKg2lTQqxEKm6zLZ1VHFDzRxg4r6UxQgsD?= =?us-ascii?Q?etsaJmAWlZS7Gg1Ug0rsY23xALm0DKQeg+Wged+6t5z9nsNtVZOVE1295HHi?= =?us-ascii?Q?hO0LXqAJC4QHW0xtGSRh1KiC3c3Ni4MJdRs6ZlDrEZwuIaB/sZj64rWdXce9?= =?us-ascii?Q?e1MTVTcJl2eYXQqipmmglIZO8GoqqE8Bcc2ZDMJG4/GxDCqlb6WMJ1+15fv0?= =?us-ascii?Q?7SpbtcgZAZ06C9Rm/IBQPhEQuGj1kiqpj04j1EgU8dcjMAenOXgtB2UWaoXA?= =?us-ascii?Q?fgmKVze1io3dLa96D2cDJxXmILEsrh8tSQ3ni2zTfWcuw2g7HCd54qYT+3nY?= =?us-ascii?Q?31hA5FSCJILYdXimt0Nn2/ZCpRzRQfyKXQ+CDNe3TC1C5Q7Kvdvha+2ee2t1?= =?us-ascii?Q?Vm595XhoIVxKlqCEEko5XtQHbRYPTt/WJ8XeSjsfBM52q0Iy0SBGUci280+A?= =?us-ascii?Q?izUi9/rrNZ76H9Mfvomfz9G8mBe+uPP2I9ZI5sPLTIrSYMh6GwAREHn5oTi4?= =?us-ascii?Q?1Mv3p/BRPV6um1QLaM/9Wkkw+ibSW+FBwVcHIxU32g5mPB+PYuttrzIitDSN?= =?us-ascii?Q?B8vYE5x+NynXfVNoDQaCslnySVsZ0YgocAnjAQG+hwvxJwtEYzjl0R+zEVWQ?= =?us-ascii?Q?QOXvvj4hvX+sMRvTPl8/9+VoQ47br5FL7qtzP93tvs14mcMu9p5N7LMiKbOX?= =?us-ascii?Q?OhPdzInop0/FmikVpjyEJU4qKjoZveFET0ktH3IxNahjfguq34CuBmBSer+G?= =?us-ascii?Q?KslZO0IQxetZTKcOrLtsi/FLjpRIJ/Vso9EN1q9p0JxkkenUQte8w25iFB0T?= =?us-ascii?Q?5HcbOGGodoFRf6rO2omzbPt1oL+RgPt4qHBDI9Tc+CigWg2MSQjKGpmEi9Wt?= =?us-ascii?Q?OjJfPwbBj6Ho3usNPYTIlsFh5SuXj0NCj/SmmuwSOe3jWIeSDG6Z4F1xzINd?= =?us-ascii?Q?20PLVzohq+OVa+th5Lksq3T7mMY9Udv5azNvP66HFvfYWXlKXeamfWRTLhKu?= =?us-ascii?Q?gwNx+pvkIkR5TPByNgxo6mOU1lDsx0H83zEmLHtga5Um++TD+WwP8CPziAHo?= =?us-ascii?Q?952fYiBF5k3xq7zMLNX8u3HLNFAfIgo5Wgf7VlovpixTjYCGsxtk5kPFk77w?= =?us-ascii?Q?YHngps4DtR5RVuHzm1erleZfaqBFWmEmKH+YfWvJaMWIdob4SWtkNArApGZu?= =?us-ascii?Q?Q58mxfCa0yzpowNRH8vyobJ8ZH3f985SvMFnVcpYFlMIZ+B2zlVt7ikwwJDm?= =?us-ascii?Q?I1VKSEsRBu1tNnnZ0+HfpBvmGs6TtIWEayqtq14k8O/p3GzaEfwraWt0BdqD?= =?us-ascii?Q?G2wIHjBA6xNB/aJcT0I=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: aacc737b-5e70-43ad-52f8-08da9f97def5 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB9141.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2022 08:19:46.1780 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 7mMc0H61tYpufmc2eSAepxKjC4txGNvRObf2HwxwoL7UP9vTVhIZAiTNZbfX30YJ X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6846 X-Mailman-Approved-At: Mon, 26 Sep 2022 13:53:20 +0200 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean The LS1043ARDB rev v7.0 board replace nand device MT29F4G08ABBDAH4-AITX:D with MT29F4G08ABBFAH4-AIT:F. Reflecting this change in board_fix_fdt(). CPLD V3.0 is needed for nandboot as the nand device changed. A new macro CPLD_CFG_RCW_SRC_NAND_4K(4Kpage) is added to distinguish from CPLD_CFG_RCW_SRC_NAND(2Kpage) to support nandboot on rev v7.0 board. Signed-off-by: Wei Lu --- board/freescale/ls1043ardb/cpld.c | 4 +++ board/freescale/ls1043ardb/cpld.h | 1 + board/freescale/ls1043ardb/ls1043ardb.c | 46 ++++++++++++++++++++++++- 3 files changed, 50 insertions(+), 1 deletion(-) diff --git a/board/freescale/ls1043ardb/cpld.c b/board/freescale/ls1043ardb/cpld.c index 5d2e8015a0..232035638b 100644 --- a/board/freescale/ls1043ardb/cpld.c +++ b/board/freescale/ls1043ardb/cpld.c @@ -69,6 +69,10 @@ void cpld_set_defbank(void) void cpld_set_nand(void) { u16 reg = CPLD_CFG_RCW_SRC_NAND; + + if (CPLD_READ(cpld_ver) > 0x2) + reg = CPLD_CFG_RCW_SRC_NAND_4K; + u8 reg5 = (u8)(reg >> 1); u8 reg6 = (u8)(reg & 1); diff --git a/board/freescale/ls1043ardb/cpld.h b/board/freescale/ls1043ardb/cpld.h index 2e757b557f..eed34d6354 100644 --- a/board/freescale/ls1043ardb/cpld.h +++ b/board/freescale/ls1043ardb/cpld.h @@ -41,5 +41,6 @@ void cpld_rev_bit(unsigned char *value); #define CPLD_BANK_SEL_ALTBANK 0x04 #define CPLD_CFG_RCW_SRC_NOR 0x025 #define CPLD_CFG_RCW_SRC_NAND 0x106 +#define CPLD_CFG_RCW_SRC_NAND_4K 0x118 #define CPLD_CFG_RCW_SRC_SD 0x040 #endif diff --git a/board/freescale/ls1043ardb/ls1043ardb.c b/board/freescale/ls1043ardb/ls1043ardb.c index f388eb496f..8c91f0771f 100644 --- a/board/freescale/ls1043ardb/ls1043ardb.c +++ b/board/freescale/ls1043ardb/ls1043ardb.c @@ -167,7 +167,7 @@ int checkboard(void) if (cfg_rcw_src == 0x25) printf("vBank %d\n", CPLD_READ(vbank)); - else if (cfg_rcw_src == 0x106) + else if ((cfg_rcw_src == 0x106) || (cfg_rcw_src == 0x118)) puts("NAND\n"); else printf("Invalid setting of SW4\n"); @@ -347,10 +347,54 @@ int ft_board_setup(void *blob, struct bd_info *bd) return 0; } +void nand_fixup(void) +{ + u32 csor = 0; + + if (CPLD_READ(pcba_ver) < 0x7) + return; + + /* Change NAND Flash PGS/SPRZ configuration */ + csor = CONFIG_SYS_NAND_CSOR; + if ((csor & CSOR_NAND_PGS_MASK) == CSOR_NAND_PGS_2K) + csor = (csor & ~(CSOR_NAND_PGS_MASK)) | CSOR_NAND_PGS_4K; + + if ((csor & CSOR_NAND_SPRZ_MASK) == CSOR_NAND_SPRZ_64) + csor = (csor & ~(CSOR_NAND_SPRZ_MASK)) | CSOR_NAND_SPRZ_224; + + if (IS_ENABLED(CONFIG_TFABOOT)) { + u8 cfg_rcw_src1, cfg_rcw_src2; + u16 cfg_rcw_src; + + cfg_rcw_src1 = CPLD_READ(cfg_rcw_src1); + cfg_rcw_src2 = CPLD_READ(cfg_rcw_src2); + cpld_rev_bit(&cfg_rcw_src1); + cfg_rcw_src = cfg_rcw_src1; + cfg_rcw_src = (cfg_rcw_src << 1) | cfg_rcw_src2; + + if (cfg_rcw_src == 0x25) + set_ifc_csor(IFC_CS1, csor); + else if (cfg_rcw_src == 0x118) + set_ifc_csor(IFC_CS0, csor); + else + printf("Invalid setting\n"); + } else { + if (IS_ENABLED(CONFIG_NAND_BOOT)) + set_ifc_csor(IFC_CS0, csor); + else + set_ifc_csor(IFC_CS1, csor); + } +} + #if IS_ENABLED(CONFIG_OF_BOARD_FIXUP) int board_fix_fdt(void *blob) { + /* nand driver fix up */ + nand_fixup(); + + /* fdt fix up */ fdt_fixup_phy_addr(blob); + return 0; } #endif -- 2.25.1