projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 dcb8a9048f86960bb24eff93804e35383c9b5382..3dfb2aaff15fd0213d4bc0bb46378f39431731b1 100644
(file)
--- a/
drivers/spi/ich.h
+++ b/
drivers/spi/ich.h
@@
-1,8
+1,7
@@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2011 The Chromium OS Authors.
*
/*
* Copyright (c) 2011 The Chromium OS Authors.
*
- * SPDX-License-Identifier: GPL-2.0+
- *
* This file is derived from the flashrom project.
*/
* This file is derived from the flashrom project.
*/
@@
-101,13
+100,8
@@
enum {
HSFC_FSMIE = 0x8000
};
HSFC_FSMIE = 0x8000
};
-enum {
- ICH_MAX_CMD_LEN = 5,
-};
-
struct spi_trans {
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;
const uint8_t *out;
uint32_t bytesout;
uint8_t *in;
@@
-167,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 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,
enum ich_version {
ICHV_7,
ICHV_9,
@@
-174,11
+170,10
@@
enum ich_version {
struct ich_spi_platdata {
enum ich_version ich_version; /* Controller version, 7 or 9 */
struct ich_spi_platdata {
enum ich_version ich_version; /* Controller version, 7 or 9 */
+ bool lockdown; /* lock down controller settings? */
};
struct ich_spi_priv {
};
struct ich_spi_priv {
- int ichspi_lock;
- int locked;
int opmenu;
int menubytes;
void *base; /* Base of register set */
int opmenu;
int menubytes;
void *base; /* Base of register set */