Raspberries/mraa
Private
Public Access
2
0
Fork 0
Code Activity

spi.c: make use of no_bus_mux flag

Browse Source 
This patch makes use of no_bus_mux flag in mraa_board_t to skip
unnessary mux checks.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Srinivas Kandagatla
2015-12-11 16:28:10 +00:00
committed by Brendan Le Foll
parent b2e8af641b
commit 5e0c6d3807
1 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/spi/spi.c
View File

@@ -77,35 +77,37 @@ mraa_spi_init(int bus)
} }
} }
int pos = plat->spi_bus[bus].sclk; if (!plat->no_bus_mux) {
if (plat->pins[pos].spi.mux_total > 0) { int pos = plat->spi_bus[bus].sclk;
if (mraa_setup_mux_mapped(plat->pins[pos].spi) != MRAA_SUCCESS) { if (plat->pins[pos].spi.mux_total > 0) {
syslog(LOG_ERR, "spi: failed to set-up spi sclk multiplexer"); if (mraa_setup_mux_mapped(plat->pins[pos].spi) != MRAA_SUCCESS) {
return NULL; syslog(LOG_ERR, "spi: failed to set-up spi sclk multiplexer");
return NULL;
}
} }
}
pos = plat->spi_bus[bus].mosi; pos = plat->spi_bus[bus].mosi;
if (plat->pins[pos].spi.mux_total > 0) { if (plat->pins[pos].spi.mux_total > 0) {
if (mraa_setup_mux_mapped(plat->pins[pos].spi) != MRAA_SUCCESS) { if (mraa_setup_mux_mapped(plat->pins[pos].spi) != MRAA_SUCCESS) {
syslog(LOG_ERR, "spi: failed to set-up spi mosi multiplexer"); syslog(LOG_ERR, "spi: failed to set-up spi mosi multiplexer");
return NULL; return NULL;
}
} }
}
pos = plat->spi_bus[bus].miso; pos = plat->spi_bus[bus].miso;
if (plat->pins[pos].spi.mux_total > 0) { if (plat->pins[pos].spi.mux_total > 0) {
if (mraa_setup_mux_mapped(plat->pins[pos].spi) != MRAA_SUCCESS) { if (mraa_setup_mux_mapped(plat->pins[pos].spi) != MRAA_SUCCESS) {
syslog(LOG_ERR, "spi: failed to set-up spi miso multiplexer"); syslog(LOG_ERR, "spi: failed to set-up spi miso multiplexer");
return NULL; return NULL;
}
} }
}
pos = plat->spi_bus[bus].cs; pos = plat->spi_bus[bus].cs;
if (plat->pins[pos].spi.mux_total > 0) { if (plat->pins[pos].spi.mux_total > 0) {
if (mraa_setup_mux_mapped(plat->pins[pos].spi) != MRAA_SUCCESS) { if (mraa_setup_mux_mapped(plat->pins[pos].spi) != MRAA_SUCCESS) {
syslog(LOG_ERR, "spi: failed to set-up spi cs multiplexer"); syslog(LOG_ERR, "spi: failed to set-up spi cs multiplexer");
return NULL; return NULL;
}
} }
} }
mraa_spi_context dev = mraa_spi_init_raw(plat->spi_bus[bus].bus_id, plat->spi_bus[bus].slave_s); mraa_spi_context dev = mraa_spi_init_raw(plat->spi_bus[bus].bus_id, plat->spi_bus[bus].slave_s);