diff options
author | Caveh Jalali <caveh@chromium.org> | 2021-06-01 23:12:38 -0700 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-06-03 04:21:54 +0000 |
commit | 27fab596a73e410cdc87c078273d9eabaa438bff (patch) | |
tree | 44b60547ea5b8bed1eb4d3016e93d9acc8eb844a /include/spi_nor.h | |
parent | 7b06daaf25d93cd7c9c98f6f14bedded35a44dca (diff) | |
download | chrome-ec-27fab596a73e410cdc87c078273d9eabaa438bff.tar.gz |
COIL: spi_nor: Rename spi_master to spi_controller
This renames the spi_master struct member of spi_nor_device_t to
spi_controller.
BRANCH=none
BUG=b:163885307
TEST=make buildall passes;
"compare_build.sh -b all" shows no difference
Change-Id: I446de6e60fa1e4dfa1266dca04d851fbfb6c250b
Signed-off-by: Caveh Jalali <caveh@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2932467
Reviewed-by: Harry Cutts <hcutts@chromium.org>
Diffstat (limited to 'include/spi_nor.h')
-rw-r--r-- | include/spi_nor.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/spi_nor.h b/include/spi_nor.h index 77347399d7..f0c379cd43 100644 --- a/include/spi_nor.h +++ b/include/spi_nor.h @@ -41,8 +41,10 @@ struct spi_nor_device_t { /* Name of the Serial NOR Flash device. */ const char *name; - /* Index of the SPI master which this device is connected through. */ - const enum spi_device spi_master; + /* Index of the SPI controller which this device is connected + * through. + */ + const enum spi_device spi_controller; /* Maximum timeout per command in microseconds. */ const uint32_t timeout_usec; @@ -109,9 +111,9 @@ int spi_nor_init(void); * * WARNING: * 1) In 3 Byte addressing mode only 16MiB of Serial NOR Flash is accessible. - * 2) If there's a second SPI master communicating with this Serial NOR Flash - * part on the board, the user is responsible for ensuring addressing mode - * compatibility and cooperation. + * 2) If there's a second SPI controller communicating with this Serial + * NOR Flash part on the board, the user is responsible for ensuring + * addressing mode compatibility and cooperation. * 3) The user must ensure that multiple users do not trample on each other * by having multiple parties changing the device's addressing mode. * |