sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

intel/apollolake: Rename _spi_reg_read/write to _spi_ctrlr_read/write

Browse Source 
This makes it clearer that the read/write operations are being performed
on the host controllers registers.

Change-Id: Id63d778a4a03c461d97e535c34b85ada3ae469de
Signed-off-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://review.coreboot.org/15281
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Furquan Shaikh
2016-06-20 16:38:24 -07:00
parent 2b57691ce0
commit d3f4c5be8b
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/soc/intel/apollolake/spi.c
View File

@@ -64,14 +64,15 @@ static void _spi_get_ctx(struct spi_ctx *ctx)
} }
/* Read register from the SPI controller. 'reg' is the register offset. */ /* Read register from the SPI controller. 'reg' is the register offset. */
static uint32_t _spi_reg_read(struct spi_ctx *ctx, uint16_t reg) static uint32_t _spi_ctrlr_reg_read(struct spi_ctx *ctx, uint16_t reg)
{ {
uintptr_t addr = ALIGN_DOWN(ctx->mmio_base + reg, 4); uintptr_t addr = ALIGN_DOWN(ctx->mmio_base + reg, 4);
return read32((void *)addr); return read32((void *)addr);
} }
/* Write to register in the SPI controller. 'reg' is the register offset. */ /* Write to register in the SPI controller. 'reg' is the register offset. */
static void _spi_reg_write(struct spi_ctx *ctx, uint16_t reg, uint32_t val) static void _spi_ctrlr_reg_write(struct spi_ctx *ctx, uint16_t reg,
uint32_t val)
{ {
uintptr_t addr = ALIGN_DOWN(ctx->mmio_base + reg, 4); uintptr_t addr = ALIGN_DOWN(ctx->mmio_base + reg, 4);
write32((void *)addr, val); write32((void *)addr, val);
@@ -92,8 +93,9 @@ static void _spi_reg_write(struct spi_ctx *ctx, uint16_t reg, uint32_t val)
static uint32_t read_spi_sfdp_param(struct spi_ctx *ctx, uint16_t sfdp_reg) static uint32_t read_spi_sfdp_param(struct spi_ctx *ctx, uint16_t sfdp_reg)
{ {
uint32_t ptinx_index = sfdp_reg & SPIBAR_PTINX_IDX_MASK; uint32_t ptinx_index = sfdp_reg & SPIBAR_PTINX_IDX_MASK;
_spi_reg_write(ctx, SPIBAR_PTINX, ptinx_index | SPIBAR_PTINX_HORD_JEDEC); _spi_ctrlr_reg_write(ctx, SPIBAR_PTINX,
return _spi_reg_read(ctx, SPIBAR_PTDATA); ptinx_index | SPIBAR_PTINX_HORD_JEDEC);
return _spi_ctrlr_reg_read(ctx, SPIBAR_PTDATA);
} }
/* Fill FDATAn FIFO in preparation for a write transaction. */ /* Fill FDATAn FIFO in preparation for a write transaction. */
@@ -124,8 +126,9 @@ static void start_hwseq_xfer(struct spi_ctx *ctx, uint32_t hsfsts_cycle,
hsfsts |= hsfsts_cycle & SPIBAR_HSFSTS_FCYCLE_MASK; hsfsts |= hsfsts_cycle & SPIBAR_HSFSTS_FCYCLE_MASK;
hsfsts |= SPIBAR_HSFSTS_FBDC(len - 1); hsfsts |= SPIBAR_HSFSTS_FBDC(len - 1);
_spi_reg_write(ctx, SPIBAR_FADDR, flash_addr); _spi_ctrlr_reg_write(ctx, SPIBAR_FADDR, flash_addr);
_spi_reg_write(ctx, SPIBAR_HSFSTS_CTL, hsfsts | SPIBAR_HSFSTS_FGO); _spi_ctrlr_reg_write(ctx, SPIBAR_HSFSTS_CTL,
hsfsts | SPIBAR_HSFSTS_FGO);
} }
static void print_xfer_error(struct spi_ctx *ctx, const char *failure_reason, static void print_xfer_error(struct spi_ctx *ctx, const char *failure_reason,
@@ -140,7 +143,7 @@ static int wait_for_hwseq_xfer(struct spi_ctx *ctx)
{ {
uint32_t hsfsts; uint32_t hsfsts;
do { do {
hsfsts = _spi_reg_read(ctx, SPIBAR_HSFSTS_CTL); hsfsts = _spi_ctrlr_reg_read(ctx, SPIBAR_HSFSTS_CTL);
if (hsfsts & SPIBAR_HSFSTS_FCERR) { if (hsfsts & SPIBAR_HSFSTS_FCERR) {
ctx->hsfsts_on_last_error = hsfsts; ctx->hsfsts_on_last_error = hsfsts;