diff options
| author | martin yan <martin.yan@microchip.corp-partner.google.com> | 2022-04-26 15:01:21 -0400 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-04-27 16:20:02 +0000 |
| commit | ed043078369d675883e7a7aa6b2a942d3b340a4e (patch) | |
| tree | 61e50c7cec8053e4592087caba0e1c61806b3037 | |
| parent | b2a94a15bcab83f9079799c2c986ef3772afa7f7 (diff) | |
| download | chrome-ec-ed043078369d675883e7a7aa6b2a942d3b340a4e.tar.gz | |
zephyr: mchp: Remove shim flash read API
Remove shim flash read API, use flash read API from zephyr main driver
BUG=none
BRANCH=main
TEST=zmake testall
Signed-off-by: martin yan <martin.yan@microchip.corp-partner.google.com>
Change-Id: I2375131ab6d9be50e9207ff34791d392c8950656
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3606922
Reviewed-by: Denis Brockus <dbrockus@chromium.org>
| -rw-r--r-- | zephyr/drivers/cros_flash/cros_flash_xec.c | 9 | ||||
| -rw-r--r-- | zephyr/include/cros/microchip/mec172x.dtsi | 3 |
2 files changed, 2 insertions, 10 deletions
diff --git a/zephyr/drivers/cros_flash/cros_flash_xec.c b/zephyr/drivers/cros_flash/cros_flash_xec.c index f75518004d..aaa181c9bf 100644 --- a/zephyr/drivers/cros_flash/cros_flash_xec.c +++ b/zephyr/drivers/cros_flash/cros_flash_xec.c @@ -392,14 +392,6 @@ static int cros_flash_xec_init(const struct device *dev) return 0; } -/* TODO(b/205175314): Migrate cros-flash driver to Zephyr flash driver) */ -static int cros_flash_xec_read(const struct device *dev, int offset, int size, - char *dst_data) -{ - struct cros_flash_xec_data *data = dev->data; - - return flash_read(data->flash_dev, offset, dst_data, size); -} static int cros_flash_xec_write(const struct device *dev, int offset, int size, const char *src_data) @@ -565,7 +557,6 @@ static int cros_flash_xec_get_status(const struct device *dev, uint8_t *sr1, /* cros ec flash driver registration */ static const struct cros_flash_driver_api cros_flash_xec_driver_api = { .init = cros_flash_xec_init, - .physical_read = cros_flash_xec_read, .physical_write = cros_flash_xec_write, .physical_erase = cros_flash_xec_erase, .physical_get_protect = cros_flash_xec_get_protect, diff --git a/zephyr/include/cros/microchip/mec172x.dtsi b/zephyr/include/cros/microchip/mec172x.dtsi index 42e1859ef8..6833fa57d0 100644 --- a/zephyr/include/cros/microchip/mec172x.dtsi +++ b/zephyr/include/cros/microchip/mec172x.dtsi @@ -13,7 +13,8 @@ cros-ec,adc = &adc0; cros-ec,bbram = &bbram; cros-ec,espi = &espi0; - cros-ec,flash = &fiu0; + cros-ec,flash = &int_flash; + cros-ec,flash-controller = &fiu0; cros-ec,raw-kb = &cros_kb_raw; cros-ec,watchdog = &wdog; cros,rtc = &crtc; |