qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UPSTREAM: dm: spi: Clean up detection of sandbox SPI emulator 

Now that we don't have to deal with the command-line flag we can simplify
the code for detecting the emulator. Remove the lookup based on the SPI
specification, relying just on the device tree to locate the emulator.

Change-Id: I6dd9372cb74b8ee991e12314a02e928e3201ae3d
Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
(cherry picked from commit 66613f5dd25c4372b3f5ecb2f0c1d08b7f77b3a8)
This commit is contained in:
Simon Glass 2018-10-01 11:55:19 -06:00 committed by Kever Yang
parent 3f1540d653
commit 583deafe1b
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/sandbox/include/asm/state.h
View File

@ -35,7 +35,6 @@ enum state_terminal_raw {
};
struct sandbox_spi_info {
const char *spec;
struct udevice *emul;
};

18
drivers/mtd/spi/sandbox.c
View File

@ -117,24 +117,22 @@ static int sandbox_sf_probe(struct udevice *dev)
const struct spi_flash_info *data;
struct sandbox_spi_flash_plat_data *pdata = dev_get_platdata(dev);
struct sandbox_state *state = state_get_current();
struct dm_spi_slave_platdata *slave_plat;
struct udevice *bus = dev->parent;
const char *spec = NULL;
struct udevice *emul;
int ret = 0;
int cs = -1;
int i;
debug("%s: bus %d, looking for emul=%p: ", __func__, bus->seq, dev);
if (bus->seq >= 0 && bus->seq < CONFIG_SANDBOX_SPI_MAX_BUS) {
for (i = 0; i < CONFIG_SANDBOX_SPI_MAX_CS; i++) {
if (state->spi[bus->seq][i].emul == dev)
cs = i;
}
}
if (cs == -1) {
ret = sandbox_spi_get_emul(state, bus, dev, &emul);
if (ret) {
printf("Error: Unknown chip select for device '%s'\n",
dev->name);
return -EINVAL;
dev->name);
return ret;
}
slave_plat = dev_get_parent_platdata(dev);
cs = slave_plat->cs;
debug("found at cs %d\n", cs);
if (!pdata->filename) {