From patchwork Fri Nov 18 05:31:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 696436 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 3tKmnx1PFNz9t0J for ; Fri, 18 Nov 2016 16:31:49 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 79B194BA16; Fri, 18 Nov 2016 06:31:47 +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 sHYRPRumUSeR; Fri, 18 Nov 2016 06:31:47 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 74A594B98B; Fri, 18 Nov 2016 06:31:46 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 252BE4B98B for ; Fri, 18 Nov 2016 06:31: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 8n9y5tjCoAt1 for ; Fri, 18 Nov 2016 06:31:36 +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-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by theia.denx.de (Postfix) with ESMTPS id B96834B68A for ; Fri, 18 Nov 2016 06:31:31 +0100 (CET) Received: by mail-pg0-f65.google.com with SMTP id 3so19593518pgd.0 for ; Thu, 17 Nov 2016 21:31:31 -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:mime-version :content-transfer-encoding; bh=2eTLwsOohcJMQL8pM30+B3UaVDuKYI/vaB9ks388A4A=; b=d6b3J+WeyM1mxHbG/BebQBHG/2+H4aXGeaU4VcLJ1++l9kff7EyXUlnoJTVBuNedYd oUKfYhCnaGSrytqzDVKqXJfvtd7KDheTBHhLHBCXR+CVdOij42QKMstCbjLb2eiUUmyJ lM1KyL1yQK1klO+KIHPoRbod8fuKJ0swvNj06+t838xbe5Z1ePGeJIeDfvH9wB8TMOLz ZP7tnKjmRJ2HO6SDQDlq0OmjqqG3cUVdXN8uFDqdqFXQ+dW4OMWmRMmXYv9NNUmCpuNo hOrrx1otdGycFrF/WgE93C3SDPK4PZJQ5vPBNXNU0s64yT1PMpU4XC4ulb7SojFHRZvc C9iw== X-Gm-Message-State: ABUngvcjviIJfSWgOVJKOq0e3TBAYlH/Kha0rtpS/5oilWBymLL3ynP+JtyvShIckfHQyA== X-Received: by 10.99.8.133 with SMTP id 127mr15320214pgi.76.1479447090308; Thu, 17 Nov 2016 21:31:30 -0800 (PST) Received: from localhost.localdomain ([115.97.183.210]) by smtp.gmail.com with ESMTPSA id 89sm12924645pfi.70.2016.11.17.21.31.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 17 Nov 2016 21:31:29 -0800 (PST) From: Jagan Teki To: u-boot@lists.denx.de Date: Fri, 18 Nov 2016 11:01:05 +0530 Message-Id: <1479447065-4814-1-git-send-email-jagan@openedev.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Cc: Michal Simek , Jagan Teki Subject: [U-Boot] [PATCH v7 04/21] sf: Cleanup spi_flash_info{} 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" - Proper tabs spaces - Removed unnecessary - Add comments in spi_flash_info members - Add comments for spi_flash_info.flags Cc: Simon Glass Cc: Bin Meng Cc: York Sun Cc: Vignesh R Cc: Mugunthan V N Cc: Michal Simek Signed-off-by: Jagan Teki Reviewed-by: Siva Durga Prasad Paladugu Reviewed-by: Jagan Teki --- Changes for v7: - Add comments for spi_flash_info.flags drivers/mtd/spi/sf_internal.h | 44 ++++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h index a9455ac..bbc08f6 100644 --- a/drivers/mtd/spi/sf_internal.h +++ b/drivers/mtd/spi/sf_internal.h @@ -108,17 +108,9 @@ int sst_write_bp(struct spi_flash *flash, u32 offset, size_t len, #define JEDEC_ID(info) (((info)->id[1]) << 8 | ((info)->id[2])) #define JEDEC_EXT(info) (((info)->id[3]) << 8 | ((info)->id[4])) -/** - * struct spi_flash_info - SPI/QSPI flash device params structure - * - * @name: Device name ([MANUFLETTER][DEVTYPE][DENSITY][EXTRAINFO]) - * @sector_size: Isn't necessarily a sector size from vendor, - * the size listed here is what works with CMD_ERASE_64K - * @nr_sectors: No.of sectors on this device - * @flags: Important param, for flash specific behaviour - */ struct spi_flash_info { - const char *name; + /* Device name ([MANUFLETTER][DEVTYPE][DENSITY][EXTRAINFO]) */ + const char *name; /* * This array stores the ID bytes. @@ -128,20 +120,24 @@ struct spi_flash_info { u8 id[5]; u8 id_len; - u32 sector_size; - u32 nr_sectors; - - u16 page_size; - - u16 flags; -#define SECT_4K BIT(0) -#define E_FSR BIT(1) -#define SST_WR BIT(2) -#define WR_QPP BIT(3) -#define RD_QUAD BIT(4) -#define RD_DUAL BIT(5) -#define RD_QUADIO BIT(6) -#define RD_DUALIO BIT(7) + /* + * The size listed here is what works with SPINOR_OP_SE, which isn't + * necessarily called a "sector" by the vendor. + */ + u32 sector_size; + u32 nr_sectors; + + u16 page_size; + + u16 flags; +#define SECT_4K BIT(0) /* CMD_ERASE_4K works uniformly */ +#define E_FSR BIT(1) /* use flag status register for */ +#define SST_WR BIT(2) /* use SST byte/word programming */ +#define WR_QPP BIT(3) /* use Quad Page Program */ +#define RD_QUAD BIT(4) /* use Quad Read */ +#define RD_DUAL BIT(5) /* use Dual Read */ +#define RD_QUADIO BIT(6) /* use Quad IO Read */ +#define RD_DUALIO BIT(7) /* use Dual IO Read */ #define RD_FULL (RD_QUAD | RD_DUAL | RD_QUADIO | RD_DUALIO) };