configs: migrate CONFIG_VIDEO_BMP_RLE8 to defconfigs

[platform/kernel/u-boot.git] / include / spi_flash.h

diff --git a/include/spi_flash.h b/include/spi_flash.h
index 7f691e8..85cae32 100644 (file)
--- a/include/spi_flash.h
+++ b/include/spi_flash.h
@@ -9,21 +9,23 @@
 #ifndef _SPI_FLASH_H_
 #define _SPI_FLASH_H_
 
-#include <dm.h>        /* Because we dereference struct udevice here */
 #include <linux/types.h>
 #include <linux/mtd/spi-nor.h>
 
-#ifndef CONFIG_SF_DEFAULT_SPEED
-# define CONFIG_SF_DEFAULT_SPEED       1000000
+struct udevice;
+
+/* by default ENV use the same parameters than SF command */
+#ifndef CONFIG_ENV_SPI_BUS
+# define CONFIG_ENV_SPI_BUS    CONFIG_SF_DEFAULT_BUS
 #endif
-#ifndef CONFIG_SF_DEFAULT_MODE
-# define CONFIG_SF_DEFAULT_MODE                SPI_MODE_3
+#ifndef CONFIG_ENV_SPI_CS
+# define CONFIG_ENV_SPI_CS     CONFIG_SF_DEFAULT_CS
 #endif
-#ifndef CONFIG_SF_DEFAULT_CS
-# define CONFIG_SF_DEFAULT_CS          0
+#ifndef CONFIG_ENV_SPI_MAX_HZ
+# define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
 #endif
-#ifndef CONFIG_SF_DEFAULT_BUS
-# define CONFIG_SF_DEFAULT_BUS         0
+#ifndef CONFIG_ENV_SPI_MODE
+# define CONFIG_ENV_SPI_MODE   CONFIG_SF_DEFAULT_MODE
 #endif
 
 struct spi_slave;
@@ -33,25 +35,12 @@ struct dm_spi_flash_ops {
        int (*write)(struct udevice *dev, u32 offset, size_t len,
                     const void *buf);
        int (*erase)(struct udevice *dev, u32 offset, size_t len);
-       /**
-        * get_sw_write_prot() - Check state of software write-protect feature
-        *
-        * SPI flash chips can lock a region of the flash defined by a
-        * 'protected area'. This function checks if this protected area is
-        * defined.
-        *
-        * @dev:        SPI flash device
-        * @return 0 if no region is write-protected, 1 if a region is
-        *      write-protected, -ENOSYS if the driver does not implement this,
-        *      other -ve value on error
-        */
-       int (*get_sw_write_prot)(struct udevice *dev);
 };
 
 /* Access the serial operations for a device */
 #define sf_get_ops(dev) ((struct dm_spi_flash_ops *)(dev)->driver->ops)
 
-#ifdef CONFIG_DM_SPI_FLASH
+#if CONFIG_IS_ENABLED(DM_SPI_FLASH)
 /**
  * spi_flash_read_dm() - Read data from SPI flash
  *
@@ -88,18 +77,16 @@ int spi_flash_write_dm(struct udevice *dev, u32 offset, size_t len,
 int spi_flash_erase_dm(struct udevice *dev, u32 offset, size_t len);
 
 /**
- * spl_flash_get_sw_write_prot() - Check state of software write-protect feature
+ * spi_flash_std_probe() - Probe a SPI flash device
  *
- * SPI flash chips can lock a region of the flash defined by a
- * 'protected area'. This function checks if this protected area is
- * defined.
+ * This is the standard internal method for probing a SPI flash device to
+ * determine its type. It can be used in chip-specific drivers which need to
+ * do this, typically with of-platdata
  *
- * @dev:       SPI flash device
- * @return 0 if no region is write-protected, 1 if a region is
- *     write-protected, -ENOSYS if the driver does not implement this,
- *     other -ve value on error
+ * @dev: SPI-flash device to probe
+ * @return 0 if OK, -ve on error
  */
-int spl_flash_get_sw_write_prot(struct udevice *dev);
+int spi_flash_std_probe(struct udevice *dev);
 
 int spi_flash_probe_bus_cs(unsigned int busnum, unsigned int cs,
                           unsigned int max_hz, unsigned int spi_mode,