From patchwork Sun Feb 14 20:48:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 582571 X-Patchwork-Delegate: jagannadh.teki@gmail.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 ECC9E140321 for ; Mon, 15 Feb 2016 07:53:51 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0CD77A765A; Sun, 14 Feb 2016 21:52:15 +0100 (CET) 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 JuNsbUbrHKSP; Sun, 14 Feb 2016 21:52:14 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DDCFDA7641; Sun, 14 Feb 2016 21:51:45 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B4260A7649 for ; Sun, 14 Feb 2016 21:51:38 +0100 (CET) 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 IKLWwxd7pRSB for ; Sun, 14 Feb 2016 21:51:38 +0100 (CET) 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 mail-pa0-f52.google.com (mail-pa0-f52.google.com [209.85.220.52]) by theia.denx.de (Postfix) with ESMTPS id 45FD4A7637 for ; Sun, 14 Feb 2016 21:51:24 +0100 (CET) Received: by mail-pa0-f52.google.com with SMTP id fl4so62592455pad.0 for ; Sun, 14 Feb 2016 12:51:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=vG1V0lo02ENgnETAzfjYzd28A2eDUZlpW8Ta+Re/Rew=; b=OMLmBWa1OAMfwIrU86Qmx6zbBIYJbCKROJRJ6hlGU8Nyk0F3WH5DsAx6tq85sOYJck wL/q2YW6Shb7UQaQzsRurK+eiQCUj88KldgVK3ldo7CBHmvQcsLIAKOabaro8uHImO3S +F6RYTH4TpmahJAI2+sX0WPN2yaLKYkr/7YnYFjJ/PKTkR0UoUd6GcwcnApleEPNWBfb C0eTpNXB0rYvbsMSWgy/cGwFod3F6t/68jr0mms2yEtoxqkVinGTMR7leS8qCRgb7/oj Cgg2zAt6SL6YBoUup8cC4En/Gi5ujrGWu4f+wNq2UcLWTXhxDdDCl30PZyzbN3wcL9IK lxDg== X-Gm-Message-State: AG10YOS3NAC93xwS74h/j7Oa9bLwpLUyIAkaHJL3QLvV2zeNN5jkaVpnlnsfKxj8GhuBkQ== X-Received: by 10.66.186.14 with SMTP id fg14mr8032956pac.102.1455483083341; Sun, 14 Feb 2016 12:51:23 -0800 (PST) Received: from localhost.localdomain ([123.236.183.254]) by smtp.gmail.com with ESMTPSA id cq9sm11423890pac.26.2016.02.14.12.51.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 14 Feb 2016 12:51:21 -0800 (PST) From: Jagan Teki To: u-boot@lists.denx.de Date: Mon, 15 Feb 2016 02:18:19 +0530 Message-Id: <1455482955-19053-20-git-send-email-jteki@openedev.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1455482955-19053-1-git-send-email-jteki@openedev.com> References: <1455482955-19053-1-git-send-email-jteki@openedev.com> Cc: Michal Simek , Siva Durga Prasad Paladugu , Jagan Teki Subject: [U-Boot] [PATCH v6 20/76] mtd: spi-nor: Rename SPI_FLASH_BAR to SPI_NOR_BAR 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Renamed SPI_FLASH_BAR to SPI_NOR_BAR Cc: Simon Glass Cc: Bin Meng Cc: Mugunthan V N Cc: Michal Simek Cc: Siva Durga Prasad Paladugu Signed-off-by: Jagan Teki --- drivers/mtd/spi-nor/spi-nor.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index b867ce9..130f7af 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -181,7 +181,7 @@ static int spi_nor_wait_till_ready(struct spi_nor *nor, unsigned long timeout) return -ETIMEDOUT; } -#ifdef CONFIG_SPI_FLASH_BAR +#ifdef CONFIG_SPI_NOR_BAR static int spi_nor_write_bar(struct spi_nor *nor, u32 offset) { u8 bank_sel; @@ -514,7 +514,7 @@ static int spi_nor_erase(struct mtd_info *mtd, struct erase_info *instr) if (nor->dual > SNOR_DUAL_SINGLE) spi_nor_dual(nor, &erase_addr); #endif -#ifdef CONFIG_SPI_FLASH_BAR +#ifdef CONFIG_SPI_NOR_BAR ret = spi_nor_write_bar(nor, erase_addr); if (ret < 0) return ret; @@ -577,7 +577,7 @@ static int spi_nor_write(struct mtd_info *mtd, loff_t offset, size_t len, if (nor->dual > SNOR_DUAL_SINGLE) spi_nor_dual(nor, &write_addr); #endif -#ifdef CONFIG_SPI_FLASH_BAR +#ifdef CONFIG_SPI_NOR_BAR ret = spi_nor_write_bar(nor, write_addr); if (ret < 0) return ret; @@ -647,7 +647,7 @@ static int spi_nor_read(struct mtd_info *mtd, loff_t from, size_t len, if (nor->dual > SNOR_DUAL_SINGLE) spi_nor_dual(nor, &read_addr); #endif -#ifdef CONFIG_SPI_FLASH_BAR +#ifdef CONFIG_SPI_NOR_BAR ret = spi_nor_write_bar(nor, read_addr); if (ret < 0) return ret; @@ -1103,7 +1103,7 @@ int spi_nor_scan(struct spi_nor *nor) } /* Configure the BAR - discover bank cmds and read current bank */ -#ifdef CONFIG_SPI_FLASH_BAR +#ifdef CONFIG_SPI_NOR_BAR ret = spi_nor_read_bar(nor, info); if (ret < 0) return ret; @@ -1127,13 +1127,13 @@ int spi_nor_scan(struct spi_nor *nor) puts("\n"); #endif -#ifndef CONFIG_SPI_FLASH_BAR +#ifndef CONFIG_SPI_NOR_BAR if (((nor->dual == SNOR_DUAL_SINGLE) && (mtd->size > SNOR_16MB_BOUN)) || ((nor->dual > SNOR_DUAL_SINGLE) && (mtd->size > SNOR_16MB_BOUN << 1))) { puts("spi-nor: Warning - Only lower 16MiB accessible,"); - puts(" Full access #define CONFIG_SPI_FLASH_BAR\n"); + puts(" Full access #define CONFIG_SPI_NOR_BAR\n"); } #endif