diff options
| author | Simon Glass <sjg@chromium.org> | 2020-12-19 10:40:01 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2021-01-05 12:24:41 -0700 |
| commit | a1a8a633859ce6ecfe298e3b40eb97c49248f8a0 (patch) | |
| tree | d6c1c122405793434303b6cf635c2ea6b7e38d00 | |
| parent | e2a7cfe9d5fce65789972a31ff50fb1d8d509848 (diff) | |
| download | u-boot-a1a8a633859ce6ecfe298e3b40eb97c49248f8a0.tar.gz u-boot-a1a8a633859ce6ecfe298e3b40eb97c49248f8a0.tar.bz2 u-boot-a1a8a633859ce6ecfe298e3b40eb97c49248f8a0.zip | |
spi: Tweak a few strange SPI NOR features for of-platdata
The #define of one struct to another has been around for a while. It
confuses dtoc and makes it think that struct spi_flash does not exist.
Make a few changes to improve things while we wait for migration to be
completed:
- Move the 'struct spi_flash' to column 1 so dtoc scans it
- Remove the #define when compiling dt-platdata.c
- Update the strange mtd_get/set_of_node() functions
- Use struct spi_nor in the drivers, so dtoc sees the correct struct
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | drivers/mtd/spi/sf-uclass.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/spi/sf_probe.c | 2 | ||||
| -rw-r--r-- | include/linux/mtd/spi-nor.h | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/drivers/mtd/spi/sf-uclass.c b/drivers/mtd/spi/sf-uclass.c index ed629f1d45..3017022abb 100644 --- a/drivers/mtd/spi/sf-uclass.c +++ b/drivers/mtd/spi/sf-uclass.c @@ -100,5 +100,5 @@ UCLASS_DRIVER(spi_flash) = { .id = UCLASS_SPI_FLASH, .name = "spi_flash", .post_bind = spi_flash_post_bind, - .per_device_auto = sizeof(struct spi_flash), + .per_device_auto = sizeof(struct spi_nor), }; diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c index c8bcec3c58..630787df1b 100644 --- a/drivers/mtd/spi/sf_probe.c +++ b/drivers/mtd/spi/sf_probe.c @@ -166,7 +166,7 @@ U_BOOT_DRIVER(jedec_spi_nor) = { .of_match = spi_flash_std_ids, .probe = spi_flash_std_probe, .remove = spi_flash_std_remove, - .priv_auto = sizeof(struct spi_flash), + .priv_auto = sizeof(struct spi_nor), .ops = &spi_flash_std_ops, }; diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h index 2642bf91d0..363f2749d7 100644 --- a/include/linux/mtd/spi-nor.h +++ b/include/linux/mtd/spi-nor.h @@ -258,11 +258,13 @@ struct flash_info; /* * TODO: Remove, once all users of spi_flash interface are moved to MTD * - * struct spi_flash { +struct spi_flash { * Defined below (keep this text to enable searching for spi_flash decl) * } */ +#ifndef DT_PLATDATA_C #define spi_flash spi_nor +#endif /** * struct spi_nor - Structure for defining a the SPI NOR layer |