From c852685975007d9c32190e0986221ce8c4aad17b Mon Sep 17 00:00:00 2001 From: Thomas Ingleby Date: Thu, 30 Oct 2014 17:35:35 +0000 Subject: [PATCH] spi: expose defined CS Add missing information for Gen 2 CS info Signed-off-by: Thomas Ingleby --- src/intel_galileo_rev_g.c | 6 +++++- src/mraa.c | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/intel_galileo_rev_g.c b/src/intel_galileo_rev_g.c index d6e06ac..3e3fcb5 100644 --- a/src/intel_galileo_rev_g.c +++ b/src/intel_galileo_rev_g.c @@ -365,7 +365,7 @@ mraa_intel_galileo_gen2() b->pins[9].pwm.mux[1].value = 0; strncpy(b->pins[10].name, "IO10", 8); - b->pins[10].capabilites = (mraa_pincapabilities_t) {1,1,1,1,0,0,0}; + b->pins[10].capabilites = (mraa_pincapabilities_t) {1,1,1,1,1,0,0}; b->pins[10].gpio.pinmap = 10; b->pins[10].gpio.parent_id = 0; b->pins[10].gpio.mux_total = 1; @@ -392,6 +392,10 @@ mraa_intel_galileo_gen2() b->pins[10].mmap.gpio.mux[2].value = 0; b->pins[10].mmap.mem_sz = 0x1000; b->pins[10].mmap.bit_pos = 2; + b->pins[10].spi.parent_id = 1; + b->pins[10].spi.mux_total = 1; + b->pins[10].spi.mux[0].pin = 74; + b->pins[10].spi.mux[0].value = 0; strncpy(b->pins[11].name, "IO11", 8); b->pins[11].capabilites = (mraa_pincapabilities_t) {1,1,1,0,1,0,0}; diff --git a/src/mraa.c b/src/mraa.c index 0c6470d..11c21ac 100644 --- a/src/mraa.c +++ b/src/mraa.c @@ -269,6 +269,11 @@ mraa_setup_spi(int bus) if (mraa_setup_mux_mapped(plat->pins[pos].spi) != MRAA_SUCCESS) return NULL; + pos = plat->spi_bus[bus].cs; + if (plat->pins[pos].spi.mux_total > 0) + if (mraa_setup_mux_mapped(plat->pins[pos].spi) != MRAA_SUCCESS) + return NULL; + mraa_spi_bus_t *spi = &(plat->spi_bus[bus]); return spi; } -- 2.7.4