Add SPI chip name to port configuration

It wil help users of rpp-test-sw to figure out what data to send with
portval* command.

diff --git a/rpp/include/drv/port.h b/rpp/include/drv/port.h
index 3a3e28cc91feb0dc1ff67a74a5b132094e76e904..66e70f0752e158aa5c89d00fc4eb3ef1db6d893f 100644 (file)
--- a/rpp/include/drv/port.h
+++ b/rpp/include/drv/port.h
@@ -78,6 +78,7 @@ struct port_desc {
 #ifdef TARGET_HAS_SPI
                struct {
                        enum spi_device dev;
+                       const char *chip;
                } spi;
 #endif
                struct {

diff --git a/rpp/src/drv/_tms570_hydctr/port_def.c b/rpp/src/drv/_tms570_hydctr/port_def.c
index a146817af7e27e73a0ff315f38cbfd338d2f10d1..b268683a50a91b7b4909577e6e80e65d39dfde5d 100644 (file)
--- a/rpp/src/drv/_tms570_hydctr/port_def.c
+++ b/rpp/src/drv/_tms570_hydctr/port_def.c
@@ -80,7 +80,7 @@ const struct port_desc port_desc[] = {
                .bpch = 16,
                .get = NULL,
                .set = port_spi_set,
-               .cfg = { .spi = { .dev = SPIDEV_MCP6S93_TH1 }, },
+               .cfg = { .spi = { .dev = SPIDEV_MCP6S93_TH1, .chip = "MCP6S93" }, },
        },
        [PORT_ID_THERMISTOR2] = {
                .name = "THERM2",
@@ -88,7 +88,7 @@ const struct port_desc port_desc[] = {
                .bpch = 16,
                .get = NULL,
                .set = port_spi_set,
-               .cfg = { .spi = { .dev = SPIDEV_MCP6S93_TH2 }, },
+               .cfg = { .spi = { .dev = SPIDEV_MCP6S93_TH2, .chip = "MCP6S93" }, },
        },
        [PORT_ID_ADC_COND] = {
                .name = "ADCCND",
@@ -96,7 +96,7 @@ const struct port_desc port_desc[] = {
                .bpch = 16, /* 6 ICs in daisy chain */
                .get = NULL,
                .set = port_spi_set,
-               .cfg = { .spi = { .dev = SPIDEV_MCP6S93_6ADC }, },
+               .cfg = { .spi = { .dev = SPIDEV_MCP6S93_6ADC, .chip = "MCP6S93" }, },
        },
        [PORT_ID_POWER_SUPPLY] = {
                .name = "PWR",
@@ -104,7 +104,7 @@ const struct port_desc port_desc[] = {
                .bpch = 16,
                .get = NULL,
                .set = port_spi_set,
-               .cfg = { .spi = { .dev = SPIDEV_TPS65381_PWR }, },
+               .cfg = { .spi = { .dev = SPIDEV_TPS65381_PWR, .chip = "TPS65381" }, },
        },
        [PORT_ID_SENSOR_SUPPLY] = {
                .name = "SENSUP",
@@ -112,7 +112,7 @@ const struct port_desc port_desc[] = {
                .bpch = 16,
                .get = NULL,
                .set = port_spi_set,
-               .cfg = { .spi = { .dev = SPIDEV_MCP6S93_SENSUP }, },
+               .cfg = { .spi = { .dev = SPIDEV_MCP6S93_SENSUP, .chip = "MCP6S93" }, },
        },
        [PORT_ID_DAC_ADC_LOOPBACK] = {
                .name = "DACLBK",
@@ -120,6 +120,6 @@ const struct port_desc port_desc[] = {
                .bpch = 16,
                .get = NULL,
                .set = port_spi_set,
-               .cfg = { .spi = { .dev = SPIDEV_MCP6S93_DAC }, },
+               .cfg = { .spi = { .dev = SPIDEV_MCP6S93_DAC, .chip = "MCP6S93" }, },
        },
 };

diff --git a/rpp/src/drv/_tms570_rpp/port_def.c b/rpp/src/drv/_tms570_rpp/port_def.c
index 4810776c2e142077fb275ec1d5803e89bdf77da2..1716dd9913fd90bfcc65715916b2f50bf0ffe1f5 100644 (file)
--- a/rpp/src/drv/_tms570_rpp/port_def.c
+++ b/rpp/src/drv/_tms570_rpp/port_def.c
@@ -54,7 +54,7 @@ const struct port_desc port_desc[] = {
                .numchn = 1,
                .bpch = 24,
                .set = port_spi_set,
-               .cfg = { .spi = { .dev = SPIDEV_MC33972 } },
+               .cfg = { .spi = { .dev = SPIDEV_MC33972, .chip = "MC33972" } },
        },
        [PORT_ID_HOUTDIAG] = {
                .name = "HOUTDIAG",
@@ -94,7 +94,7 @@ const struct port_desc port_desc[] = {
                .bpch = 32,
                .get = NULL,
                .set = port_spi_set,
-               .cfg = { .spi = { .dev = SPIDEV_NCV7608_2x }, },
+               .cfg = { .spi = { .dev = SPIDEV_NCV7608_2x, .chip = "NCV7608" }, },
        },
        [PORT_ID_DAC1_2] = {
                .name = "DAC12",
@@ -102,7 +102,7 @@ const struct port_desc port_desc[] = {
                .bpch = 16,
                .get = NULL,
                .set = port_spi_set,
-               .cfg = { .spi = { .dev = SPIDEV_MCP4922_1 }, },
+               .cfg = { .spi = { .dev = SPIDEV_MCP4922_1, .chip = "MCP4922" }, },
        },
        [PORT_ID_DAC3_4] = {
                .name = "DAC34",
@@ -110,7 +110,7 @@ const struct port_desc port_desc[] = {
                .bpch = 16,
                .get = NULL,
                .set = port_spi_set,
-               .cfg = { .spi = { .dev = SPIDEV_MCP4922_2 }, },
+               .cfg = { .spi = { .dev = SPIDEV_MCP4922_2, .chip = "MCP4922" }, },
        },
        [PORT_ID_DACDREF] = {
                .name = "DACDREF",      /* Reference voltage for DIN */
@@ -118,7 +118,7 @@ const struct port_desc port_desc[] = {
                .bpch = 16,
                .get = NULL,
                .set = port_spi_set,
-               .cfg = { .spi = { .dev = SPIDEV_MCP4922_3 }, },
+               .cfg = { .spi = { .dev = SPIDEV_MCP4922_3, .chip = "MCP4922" }, },
        },
        [PORT_ID_HBR] = {
                .name = "HBR",
@@ -126,7 +126,7 @@ const struct port_desc port_desc[] = {
                .bpch = 16,
                .get = NULL,
                .set = port_spi_set,
-               .cfg = { .spi = { .dev = SPIDEV_L99H01 }, },
+               .cfg = { .spi = { .dev = SPIDEV_L99H01, .chip = "L99H01" }, },
        },
        [PORT_ID_FRAY1] = {
                .name = "FRAY1",
@@ -134,7 +134,7 @@ const struct port_desc port_desc[] = {
                .bpch = 16,
                .get = NULL,
                .set = port_spi_set,
-               .cfg = { .spi = { .dev = SPIDEV_TJA1082_1 }, },
+               .cfg = { .spi = { .dev = SPIDEV_TJA1082_1, .chip = "TJA1082" }, },
        },
        [PORT_ID_FRAY2] = {
                .name = "FRAY2",
@@ -142,7 +142,7 @@ const struct port_desc port_desc[] = {
                .bpch = 16,
                .get = NULL,
                .set = port_spi_set,
-               .cfg = { .spi = { .dev = SPIDEV_TJA1082_2 }, },
+               .cfg = { .spi = { .dev = SPIDEV_TJA1082_2, .chip = "TJA1082" }, },
        },
        [PORT_ID_MOUTEN] = {
                .name = "MOUTEN",