From patchwork Sat Jan 19 20:02:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Derald D. Woods" X-Patchwork-Id: 1028012 X-Patchwork-Delegate: trini@ti.com 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=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="IqY+X5e/"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43hpgN0Sc3z9sCs for ; Sun, 20 Jan 2019 07:04:31 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 40271C21C2C; Sat, 19 Jan 2019 20:03:57 +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=FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2, 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 23A3EC21E26; Sat, 19 Jan 2019 20:03:12 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 0C8FDC21D74; Sat, 19 Jan 2019 20:03:01 +0000 (UTC) Received: from mail-it1-f195.google.com (mail-it1-f195.google.com [209.85.166.195]) by lists.denx.de (Postfix) with ESMTPS id 8B5DDC21E44 for ; Sat, 19 Jan 2019 20:02:57 +0000 (UTC) Received: by mail-it1-f195.google.com with SMTP id g85so11537943ita.3 for ; Sat, 19 Jan 2019 12:02:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9TEiC74Rp/WJ/dhyjomN9FmkyMfHqdCew4EvbG70yqs=; b=IqY+X5e/TLtdbS6xHF5Moa0s/5gVO0w8ggIKQ7Ak0D7wjGydebmIz6Gsp7fxZtws7k PYYTkoeJft92A92k5XYdlJ1HFd5pyYUtC/TbB+VHriQ7mzCKhT/wvjR3zUeiH71zDic/ IZ9CaAL1khScpUN1FIak/l2la6BT+IF9mvo8HPj0CL0tekSlgbD/ZlT9cgpuCZ8z0KB6 O605Ur6aRZk+7aa1kmPnTQM8Dl4fxd2qj2xlJHs1j0g4zycK6nP9Wi5q0nOQdQCFmacW DuHk1LyoCn05MVr26rPA396DdfKtIqTzfi/N7B9bFtWf5sh5o7jKLixhwtVDtTcRLMJb NunA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9TEiC74Rp/WJ/dhyjomN9FmkyMfHqdCew4EvbG70yqs=; b=pP5JyiTY+n4cTdqH1xV6q+V4dwFlSHICgPojFrk+2P5nlbMMyNfSyrkMQ00PHq7NEM BoRrN06N1C6vJHloCuwmG15OhEB1Cbz6KLQ3McbGfUWYacRsq0FtoFEOyfb24Bd+2g7g ooNZjiccvDgN0h6jhfqMpAvhi0Qa8zfSY7PIX0gXfMUOWQ4YpUNeMZ4CMCzzm1TibXjv 60FUfuT8/2F7zAqQgCR27gC67G8mmb0nKH9k9DnPCdTwXPebn1BuyZDNktEEJHSuKQFA RGqfQcf2BhhDVpChAZdyXv50N4IZ2OXnsi0aKCpGXF5gUJ6zqDZFWn6RPq8gCO8szDlW 72pg== X-Gm-Message-State: AJcUukeJuhnCUoaS6IGEDiwtuPwmDUFeWUYvpyuj1nVBqWtLsA4ZVFFB Op9wkQewixqaXrbLsgREidQa6yKx X-Google-Smtp-Source: ALg8bN6D1vfsHDGRO/HTwQ8QxxKF7DZeaYOByWkqoxeEGXKq+ClNKtWqgE5+pQGh96oiSoMNn7X0+w== X-Received: by 2002:a05:660c:4c5:: with SMTP id v5mr14557790itk.104.1547928176284; Sat, 19 Jan 2019 12:02:56 -0800 (PST) Received: from ethiopia.woodsts.org (c-73-176-50-185.hsd1.il.comcast.net. [73.176.50.185]) by smtp.gmail.com with ESMTPSA id b192sm3854115itb.12.2019.01.19.12.02.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Jan 2019 12:02:55 -0800 (PST) From: "Derald D. Woods" To: u-boot@lists.denx.de Date: Sat, 19 Jan 2019 14:02:30 -0600 Message-Id: <20190119200231.4504-2-woods.technical@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190119200231.4504-1-woods.technical@gmail.com> References: <20181215073646.28583-1-woods.technical@gmail.com> <20190119200231.4504-1-woods.technical@gmail.com> MIME-Version: 1.0 Cc: photonthunder@gmail.com, trini@konsulko.com Subject: [U-Boot] [PATCH 1/2] nand: atmel: Replace SYS_NAND_ECC_BASE with ATMEL_BASE_ECC 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" This commit removes remaining uses of SYS_NAND_ECC_BASE. Including "" in "drivers/mtd/nand/raw/atmel_nand.c" provides access to ATMEL_BASE_ECC. Cc: Simon Glass Signed-off-by: Derald D. Woods --- drivers/mtd/nand/raw/atmel_nand.c | 19 ++++++++++--------- include/configs/snapper9g45.h | 1 - scripts/config_whitelist.txt | 1 - 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/mtd/nand/raw/atmel_nand.c b/drivers/mtd/nand/raw/atmel_nand.c index 31ad2cfa88..0563472b9d 100644 --- a/drivers/mtd/nand/raw/atmel_nand.c +++ b/drivers/mtd/nand/raw/atmel_nand.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include @@ -995,13 +996,13 @@ static int atmel_nand_calculate(struct mtd_info *mtd, unsigned int ecc_value; /* get the first 2 ECC bytes */ - ecc_value = ecc_readl(CONFIG_SYS_NAND_ECC_BASE, PR); + ecc_value = ecc_readl(ATMEL_BASE_ECC, PR); ecc_code[0] = ecc_value & 0xFF; ecc_code[1] = (ecc_value >> 8) & 0xFF; /* get the last 2 ECC bytes */ - ecc_value = ecc_readl(CONFIG_SYS_NAND_ECC_BASE, NPR) & ATMEL_ECC_NPARITY; + ecc_value = ecc_readl(ATMEL_BASE_ECC, NPR) & ATMEL_ECC_NPARITY; ecc_code[2] = ecc_value & 0xFF; ecc_code[3] = (ecc_value >> 8) & 0xFF; @@ -1084,16 +1085,16 @@ static int atmel_nand_correct(struct mtd_info *mtd, u_char *dat, unsigned int ecc_word, ecc_bit; /* get the status from the Status Register */ - ecc_status = ecc_readl(CONFIG_SYS_NAND_ECC_BASE, SR); + ecc_status = ecc_readl(ATMEL_BASE_ECC, SR); /* if there's no error */ if (likely(!(ecc_status & ATMEL_ECC_RECERR))) return 0; /* get error bit offset (4 bits) */ - ecc_bit = ecc_readl(CONFIG_SYS_NAND_ECC_BASE, PR) & ATMEL_ECC_BITADDR; + ecc_bit = ecc_readl(ATMEL_BASE_ECC, PR) & ATMEL_ECC_BITADDR; /* get word address (12 bits) */ - ecc_word = ecc_readl(CONFIG_SYS_NAND_ECC_BASE, PR) & ATMEL_ECC_WORDADDR; + ecc_word = ecc_readl(ATMEL_BASE_ECC, PR) & ATMEL_ECC_WORDADDR; ecc_word >>= 4; /* if there are multiple errors */ @@ -1164,22 +1165,22 @@ int atmel_hwecc_nand_init_param(struct nand_chip *nand, struct mtd_info *mtd) switch (mtd->writesize) { case 512: nand->ecc.layout = &atmel_oobinfo_small; - ecc_writel(CONFIG_SYS_NAND_ECC_BASE, MR, + ecc_writel(ATMEL_BASE_ECC, MR, ATMEL_ECC_PAGESIZE_528); break; case 1024: nand->ecc.layout = &atmel_oobinfo_large; - ecc_writel(CONFIG_SYS_NAND_ECC_BASE, MR, + ecc_writel(ATMEL_BASE_ECC, MR, ATMEL_ECC_PAGESIZE_1056); break; case 2048: nand->ecc.layout = &atmel_oobinfo_large; - ecc_writel(CONFIG_SYS_NAND_ECC_BASE, MR, + ecc_writel(ATMEL_BASE_ECC, MR, ATMEL_ECC_PAGESIZE_2112); break; case 4096: nand->ecc.layout = &atmel_oobinfo_large; - ecc_writel(CONFIG_SYS_NAND_ECC_BASE, MR, + ecc_writel(ATMEL_BASE_ECC, MR, ATMEL_ECC_PAGESIZE_4224); break; default: diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h index f2c47dabc5..4b384641d1 100644 --- a/include/configs/snapper9g45.h +++ b/include/configs/snapper9g45.h @@ -36,7 +36,6 @@ /* NAND Flash */ #define CONFIG_ATMEL_NAND_HWECC -#define CONFIG_SYS_NAND_ECC_BASE ATMEL_BASE_ECC #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3 #define CONFIG_SYS_NAND_DBW_8 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e2c2889acf..6fee575a43 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3543,7 +3543,6 @@ CONFIG_SYS_NAND_ECCPOS CONFIG_SYS_NAND_ECCSIZE CONFIG_SYS_NAND_ECCSTEPS CONFIG_SYS_NAND_ECCTOTAL -CONFIG_SYS_NAND_ECC_BASE CONFIG_SYS_NAND_ENABLE_PIN CONFIG_SYS_NAND_ENABLE_PIN_SPL CONFIG_SYS_NAND_FTIM0