From 0e8d41c1cb0461e2bd9f4c1c895d0d600930faae Mon Sep 17 00:00:00 2001
From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Sat, 29 Aug 2015 10:43:13 +0200
Subject: [PATCH] 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.
---
 rpp/include/drv/port.h                |  1 +
 rpp/src/drv/_tms570_hydctr/port_def.c | 12 ++++++------
 rpp/src/drv/_tms570_rpp/port_def.c    | 16 ++++++++--------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/rpp/include/drv/port.h b/rpp/include/drv/port.h
index 3a3e28c..66e70f0 100644
--- 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 a146817..b268683 100644
--- 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 4810776..1716dd9 100644
--- 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",
-- 
2.39.2