Merge branch '2019-10-11-master-imports'

[oweals/u-boot.git] / drivers / spi / ich.h

diff --git a/drivers/spi/ich.h b/drivers/spi/ich.h
index a974241f98d8628fbd40f9017edc23e6450e969e..3dfb2aaff15fd0213d4bc0bb46378f39431731b1 100644 (file)
--- a/drivers/spi/ich.h
+++ b/drivers/spi/ich.h
@@ -100,13 +100,8 @@ enum {
        HSFC_FSMIE =            0x8000
 };
 
-enum {
-       ICH_MAX_CMD_LEN         = 5,
-};
-
 struct spi_trans {
-       uint8_t cmd[ICH_MAX_CMD_LEN];
-       int cmd_len;
+       uint8_t cmd;
        const uint8_t *out;
        uint32_t bytesout;
        uint8_t *in;
@@ -166,6 +161,8 @@ struct spi_trans {
 #define SPI_OPMENU_LOWER ((SPI_OPMENU_3 << 24) | (SPI_OPMENU_2 << 16) | \
                          (SPI_OPMENU_1 <<  8) | (SPI_OPMENU_0 <<  0))
 
+#define ICH_BOUNDARY   0x1000
+
 enum ich_version {
        ICHV_7,
        ICHV_9,