GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 14:41:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

sf: Minor cleanups

Browse source 
- Add spaces, tabs
- Commenting.
- Rearrange code.
- Add static qualifier for missing func.
- Remove memory_map from ramtron.c
- Ramtron: spi_flash_internal.h -> sf_internal.h

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
This commit is contained in:
Jagannadha Sutradharudu Teki 2013-10-07 19:34:56 +05:30
parent 2f24223ae1
commit ce22b922dd
5 changed files with 22 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/mtd/spi/ramtron.c
View file

@ -36,7 +36,7 @@
#include <common.h> #include <common.h>
#include <malloc.h> #include <malloc.h>
#include <spi_flash.h> #include <spi_flash.h>
#include "spi_flash_internal.h" #include "sf_internal.h"
/* /*
* Properties of supported FRAMs * Properties of supported FRAMs
@ -383,8 +383,6 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs,
printf("SF: Detected %s with page size ", flash->name); printf("SF: Detected %s with page size ", flash->name);
print_size(flash->sector_size, ", total "); print_size(flash->sector_size, ", total ");
print_size(flash->size, ""); print_size(flash->size, "");
if (flash->memory_map)
printf(", mapped at %p", flash->memory_map);
puts("\n"); puts("\n");
spi_release_bus(spi); spi_release_bus(spi);

8
drivers/mtd/spi/sf_internal.h
View file

@ -13,7 +13,7 @@
#define SPI_FLASH_16MB_BOUN 0x1000000 #define SPI_FLASH_16MB_BOUN 0x1000000
/* SECT flags */ /* SECT flags */
#define SECT_4K (1 << 1) #define SECT_4K (1 << 1)
#define SECT_32K (1 << 2) #define SECT_32K (1 << 2)
#define E_FSR (1 << 3) #define E_FSR (1 << 3)
@ -29,8 +29,8 @@
#define CMD_WRITE_DISABLE 0x04 #define CMD_WRITE_DISABLE 0x04
#define CMD_READ_STATUS 0x05 #define CMD_READ_STATUS 0x05
#define CMD_WRITE_ENABLE 0x06 #define CMD_WRITE_ENABLE 0x06
#define CMD_READ_CONFIG 0x35 #define CMD_READ_CONFIG 0x35
#define CMD_FLAG_STATUS 0x70 #define CMD_FLAG_STATUS 0x70
/* Read commands */ /* Read commands */
#define CMD_READ_ARRAY_SLOW 0x03 #define CMD_READ_ARRAY_SLOW 0x03
@ -57,7 +57,7 @@
/* SST specific */ /* SST specific */
#ifdef CONFIG_SPI_FLASH_SST #ifdef CONFIG_SPI_FLASH_SST
# define SST_WP 0x01 /* Supports AAI word program */ # define SST_WP 0x01 /* Supports AAI word program */
# define CMD_SST_BP 0x02 /* Byte Program */ # define CMD_SST_BP 0x02 /* Byte Program */
# define CMD_SST_AAI_WP 0xAD /* Auto Address Incr Word Program */ # define CMD_SST_AAI_WP 0xAD /* Auto Address Incr Word Program */
int sst_write_wp(struct spi_flash *flash, u32 offset, size_t len, int sst_write_wp(struct spi_flash *flash, u32 offset, size_t len,

7
drivers/mtd/spi/sf_probe.c
View file

@ -152,7 +152,8 @@ static const struct spi_flash_params spi_flash_params_table[] = {
*/ */
}; };
struct spi_flash *spi_flash_validate_params(struct spi_slave *spi, u8 *idcode) static struct spi_flash *spi_flash_validate_params(struct spi_slave *spi,
u8 *idcode)
{ {
const struct spi_flash_params *params; const struct spi_flash_params *params;
struct spi_flash *flash; struct spi_flash *flash;
@ -189,6 +190,7 @@ struct spi_flash *spi_flash_validate_params(struct spi_slave *spi, u8 *idcode)
flash->spi = spi; flash->spi = spi;
flash->name = params->name; flash->name = params->name;
flash->memory_map = spi->memory_map;
/* Assign spi_flash ops */ /* Assign spi_flash ops */
flash->write = spi_flash_cmd_write_ops; flash->write = spi_flash_cmd_write_ops;
@ -203,7 +205,6 @@ struct spi_flash *spi_flash_validate_params(struct spi_slave *spi, u8 *idcode)
flash->page_size = (ext_jedec == 0x4d00) ? 512 : 256; flash->page_size = (ext_jedec == 0x4d00) ? 512 : 256;
flash->sector_size = params->sector_size; flash->sector_size = params->sector_size;
flash->size = flash->sector_size * params->nr_sectors; flash->size = flash->sector_size * params->nr_sectors;
flash->memory_map = spi->memory_map;
/* Compute erase sector and command */ /* Compute erase sector and command */
if (params->flags & SECT_4K) { if (params->flags & SECT_4K) {
@ -224,8 +225,8 @@ struct spi_flash *spi_flash_validate_params(struct spi_slave *spi, u8 *idcode)
flash->poll_cmd = CMD_FLAG_STATUS; flash->poll_cmd = CMD_FLAG_STATUS;
#endif #endif
/* Configure the BAR - discover bank cmds and read current bank */
#ifdef CONFIG_SPI_FLASH_BAR #ifdef CONFIG_SPI_FLASH_BAR
/* Configure the BAR - discover bank cmds and read current bank */
u8 curr_bank = 0; u8 curr_bank = 0;
if (flash->size > SPI_FLASH_16MB_BOUN) { if (flash->size > SPI_FLASH_16MB_BOUN) {
flash->bank_read_cmd = (idcode[0] == 0x01) ? flash->bank_read_cmd = (idcode[0] == 0x01) ?

22
include/spi.h
View file

@ -25,24 +25,24 @@
#define SPI_PREAMBLE 0x80 /* Skip preamble bytes */ #define SPI_PREAMBLE 0x80 /* Skip preamble bytes */
/* SPI transfer flags */ /* SPI transfer flags */
#define SPI_XFER_BEGIN 0x01 /* Assert CS before transfer */ #define SPI_XFER_BEGIN 0x01 /* Assert CS before transfer */
#define SPI_XFER_END 0x02 /* Deassert CS after transfer */ #define SPI_XFER_END 0x02 /* Deassert CS after transfer */
#define SPI_XFER_MMAP 0x08 /* Memory Mapped start */ #define SPI_XFER_MMAP 0x08 /* Memory Mapped start */
#define SPI_XFER_MMAP_END 0x10 /* Memory Mapped End */ #define SPI_XFER_MMAP_END 0x10 /* Memory Mapped End */
/* Header byte that marks the start of the message */ /* Header byte that marks the start of the message */
#define SPI_PREAMBLE_END_BYTE 0xec #define SPI_PREAMBLE_END_BYTE 0xec
/** /**
* struct spi_slave: Representation of a SPI slave, * struct spi_slave - Representation of a SPI slave
* i.e. what we're communicating with.
* *
* Drivers are expected to extend this with controller-specific data. * Drivers are expected to extend this with controller-specific data.
* *
* bus: ID of the bus that the slave is attached to. * @bus: ID of the bus that the slave is attached to.
* cs: ID of the chip select connected to the slave. * @cs: ID of the chip select connected to the slave.
* max_write_size: If non-zero, the maximum number of bytes which can * @max_write_size: If non-zero, the maximum number of bytes which can
* be written at once, excluding command bytes. * be written at once, excluding command bytes.
* @memory_map: Address of read-only SPI flash access.
*/ */
struct spi_slave { struct spi_slave {
unsigned int bus; unsigned int bus;

4
include/spi_flash.h
View file

@ -27,13 +27,13 @@
* @size: Total flash size * @size: Total flash size
* @page_size: Write (page) size * @page_size: Write (page) size
* @sector_size: Sector size * @sector_size: Sector size
* @erase_size: Erase size * @erase_size: Erase size
* @bank_read_cmd: Bank read cmd * @bank_read_cmd: Bank read cmd
* @bank_write_cmd: Bank write cmd * @bank_write_cmd: Bank write cmd
* @bank_curr: Current flash bank * @bank_curr: Current flash bank
* @poll_cmd: Poll cmd - for flash erase/program * @poll_cmd: Poll cmd - for flash erase/program
* @erase_cmd: Erase cmd 4K, 32K, 64K * @erase_cmd: Erase cmd 4K, 32K, 64K
* @memory_map: Address of read-only SPI flash access * @memory_map: Address of read-only SPI flash access
* @read: Flash read ops: Read len bytes at offset into buf * @read: Flash read ops: Read len bytes at offset into buf
* Supported cmds: Fast Array Read * Supported cmds: Fast Array Read
* @write: Flash write ops: Write len bytes from buf into offeset * @write: Flash write ops: Write len bytes from buf into offeset