From patchwork Thu Dec 31 09:21:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 561869 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 ADE33140BA4 for ; Thu, 31 Dec 2015 20:22:52 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A20664BAB7; Thu, 31 Dec 2015 10:22:46 +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 88_f643htdO1; Thu, 31 Dec 2015 10:22:46 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2EC6E4BABB; Thu, 31 Dec 2015 10:22:42 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4BA8B4B9EB for ; Thu, 31 Dec 2015 10:22:37 +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 AsmUTRBcGc4V for ; Thu, 31 Dec 2015 10:22:37 +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-pf0-f179.google.com (mail-pf0-f179.google.com [209.85.192.179]) by theia.denx.de (Postfix) with ESMTPS id 93C6D4BA4C for ; Thu, 31 Dec 2015 10:22:32 +0100 (CET) Received: by mail-pf0-f179.google.com with SMTP id 78so154148495pfw.2 for ; Thu, 31 Dec 2015 01:22:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=t/ctzmoVxlC0cxP3nKXljmMGFggm5n+jbpLV+E6tcoM=; b=SV9gtYPpniOoMqsKLTGEmobK2UzJ1HL1vdQTCcpBSEd0rjuYSJfyQhk8V9zW1JZYFn kQrjJOTGhyl2LgHbGPr4RI8SjJIosQazagpQK+DaQ//mCb+JNISfFABBnpcg9DzDOLDh MG4bDRpb9eLkbuJfDF4TUFKMOmRCdwy4s+EPqr+02CqQkxy5v5pthVLuS+u3FZm8fNbF ALYgVUJQXiB7CFFxClKyGoPI45BCDYnIp2ooZG2p6nOD2wlbi6Dau9C5wfVfzItA535Z dpJWhTpcs+L5LTiGx5npLM8J9Snnu30dZNxoqu51skSX7Av2vC5y++KCt12Pv2nl/oBj YA+A== X-Received: by 10.98.72.199 with SMTP id q68mr100392750pfi.140.1451553751199; Thu, 31 Dec 2015 01:22:31 -0800 (PST) Received: from Jubuntu.amcc.com ([182.73.239.130]) by smtp.gmail.com with ESMTPSA id ry1sm100325498pab.30.2015.12.31.01.22.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 31 Dec 2015 01:22:29 -0800 (PST) From: Jagan Teki To: u-boot@lists.denx.de Date: Thu, 31 Dec 2015 14:51:57 +0530 Message-Id: <1451553724-1098-3-git-send-email-jteki@openedev.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1451553724-1098-1-git-send-email-jteki@openedev.com> References: <1451553724-1098-1-git-send-email-jteki@openedev.com> Cc: Jagan Teki , Michal Simek , Siva Durga Prasad Paladugu Subject: [U-Boot] [PATCH v3 02/10] sf: Rename SST_WR to SST_WRITE 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" SST_WR => SST_WRITE Cc: Simon Glass Cc: Bin Meng Cc: Michal Simek Cc: Siva Durga Prasad Paladugu Tested-by: Mugunthan V N Tested-by: Jagan Teki Signed-off-by: Jagan Teki --- drivers/mtd/spi/sf_internal.h | 2 +- drivers/mtd/spi/sf_probe.c | 2 +- drivers/mtd/spi/spi_flash.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h index 007a5a0..8eaadd7 100644 --- a/drivers/mtd/spi/sf_internal.h +++ b/drivers/mtd/spi/sf_internal.h @@ -49,7 +49,7 @@ enum { }; enum spi_nor_option_flags { - SNOR_F_SST_WR = BIT(0), + SNOR_F_SST_WRITE = BIT(0), SNOR_F_USE_FSR = BIT(1), }; diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c index daa1d5b..4da67d0 100644 --- a/drivers/mtd/spi/sf_probe.c +++ b/drivers/mtd/spi/sf_probe.c @@ -127,7 +127,7 @@ static int spi_flash_std_write(struct udevice *dev, u32 offset, size_t len, struct spi_flash *flash = dev_get_uclass_priv(dev); #if defined(CONFIG_SPI_FLASH_SST) - if (flash->flags & SNOR_F_SST_WR) { + if (flash->flags & SNOR_F_SST_WRITE) { if (flash->spi->mode & SPI_TX_BYTE) return sst_write_bp(flash, offset, len, buf); else diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c index 2c309e7..bf9ac36 100644 --- a/drivers/mtd/spi/spi_flash.c +++ b/drivers/mtd/spi/spi_flash.c @@ -1325,14 +1325,14 @@ int spi_flash_scan(struct spi_flash *flash) flash->dual_flash = spi->option; /* Assign spi flash flags */ - if (info->flags & SST_WR) - flash->flags |= SNOR_F_SST_WR; + if (info->flags & SST_WRITE) + flash->flags |= SNOR_F_SST_WRITE; /* Assign spi_flash ops */ #ifndef CONFIG_DM_SPI_FLASH flash->write = spi_flash_cmd_write_ops; #if defined(CONFIG_SPI_FLASH_SST) - if (flash->flags & SNOR_F_SST_WR) { + if (flash->flags & SNOR_F_SST_WRITE) { if (spi->mode & SPI_TX_BYTE) flash->write = sst_write_bp; else