bsp/tms570: update pinmux to provide support for initialization lists and clear of alt outputs.

1 files changed, 119 insertions, 4 deletions

diff --git a/c/src/lib/libbsp/arm/tms570/pinmux/pinmux.c b/c/src/lib/libbsp/arm/tms570/pinmux/pinmux.c
index fed23fa9ec..11e557910b 100644
--- a/c/src/lib/libbsp/arm/tms570/pinmux/pinmux.c
+++ b/c/src/lib/libbsp/arm/tms570/pinmux/pinmux.c
@@ -22,6 +22,10 @@
 
 #include <bsp/tms570.h>
 #include <bsp/tms570-pinmux.h>
+#include <bsp/irq.h>
+
+uint32_t tms570_bsp_pinmmr_kick_key0 = 0x83E70B13U;
+uint32_t tms570_bsp_pinmmr_kick_key1 = 0x95A4F1E0U;
 
 /**
  * @brief select desired function of pin/ball
@@ -29,14 +33,14 @@
  * The function setups multiplexer to interconnect pin with
  * specified function/peripheral. Pin number is index into pinmux
  * entries array. Predefined values for pins are in a format
- * TMS570_BALL_<column><row> (for example TMS570_BALL_N19).
+ * TMS570_BALL_ \c column \c row (for example \c TMS570_BALL_N19).
  * The multiplexer allows to interconnect one pin to multiple
  * signal sources/sinks in the theory but it is usually bad choice.
  * The function sets only specified function and clears all other
  * connections.
  *
- * @param[in] pin_num  pin/ball identifier (index into pinmux array)
- * @param[in] pin_fnc  function number 0 .. 7, if value TMS570_PIN_FNC_AUTO
+ * @param[in] pin_num  pin/ball identifier (index into pinmux array),
+ * @param[in] pin_fnc  function number 0 .. 7, if value \c TMS570_PIN_FNC_AUTO
  *                     is specified then pin function is extracted from
  *                     pin_num argument
  * @retval Void
@@ -61,7 +65,7 @@ tms570_bsp_pin_set_function(int pin_num, int pin_fnc)
  * of multiplexer setup intact.
  *
  * @param[in] pin_num  pin/ball identifier (index into pinmux array)
- * @param[in] pin_fnc  function number 0 .. 7, if value TMS570_PIN_FNC_AUTO
+ * @param[in] pin_fnc  function number 0 .. 7, if value \c TMS570_PIN_FNC_AUTO
  *                     is specified then pin function is extracted from
  *                     pin_num argument
  * @retval Void
@@ -78,3 +82,114 @@ tms570_bsp_pin_clear_function(int pin_num, int pin_fnc)
   tms570_bsp_pin_to_pinmmrx(&pinmmrx, &pin_shift, pin_num);
   *pinmmrx = *pinmmrx & ~(1 << (pin_fnc+pin_shift));
 }
+
+/**
+ * @brief configure one pin according to its function specification
+ *
+ * The function setups multiplexer to interconnect pin with
+ * specified function/peripheral. Predefined values for pins combined with
+ * function are in a format TMS570_BALL_ \c column \c row \c function
+ * (for example \c TMS570_BALL_W3_SCIRX).
+ * If the function can be connected to more pins then specification
+ * includes infomation which allows to disconnect alternative pin to peripheral
+ * input connection or switch input multiplexer to right pin.
+ *
+ * @param[in] pin_num_and_fnc pin function descriptor is build by macro
+ *               \c TMS570_PIN_AND_FNC which takes pin/pinmmr specification
+ *               build by \c TMS570_BALL_WITH_MMR and function index in output
+ *               multiplexer. If the peripheral can be connected to other input
+ *               alternative then actual pin description and alternative to
+ *               disconnected/reconnect are combined together by
+ *               \c TMS570_PIN_WITH_IN_ALT macro. If clear of alternative
+ *               connection is required then flag \c TMS570_PIN_CLEAR_RQ_MASK
+ *               is ored to alternative description.
+ *
+ * @retval Void
+ */
+void
+tms570_bsp_pin_config_one(uint32_t pin_num_and_fnc)
+{
+  rtems_interrupt_level intlev;
+  uint32_t pin_in_alt;
+
+  rtems_interrupt_disable(intlev);
+
+  TMS570_IOMM.KICK_REG0 = tms570_bsp_pinmmr_kick_key0;
+  TMS570_IOMM.KICK_REG1 = tms570_bsp_pinmmr_kick_key1;
+
+  pin_in_alt = pin_num_and_fnc & TMS570_PIN_IN_ALT_MASK;
+  if ( pin_in_alt ) {
+    pin_in_alt >>= TMS570_PIN_IN_ALT_SHIFT;
+    if ( pin_in_alt & TMS570_PIN_CLEAR_RQ_MASK ) {
+      tms570_bsp_pin_clear_function(pin_in_alt, TMS570_PIN_FNC_AUTO);
+    } else {
+      tms570_bsp_pin_set_function(pin_in_alt, TMS570_PIN_FNC_AUTO);
+    }
+  }
+
+  pin_num_and_fnc &= TMS570_PIN_NUM_FNC_MASK;
+  if ( pin_num_and_fnc & TMS570_PIN_CLEAR_RQ_MASK ) {
+    tms570_bsp_pin_clear_function(pin_num_and_fnc, TMS570_PIN_FNC_AUTO);
+  } else {
+    tms570_bsp_pin_set_function(pin_num_and_fnc, TMS570_PIN_FNC_AUTO);
+  }
+
+  TMS570_IOMM.KICK_REG0 = 0;
+  TMS570_IOMM.KICK_REG1 = 0;
+
+  rtems_interrupt_enable(intlev);
+}
+
+/**
+ * @brief configure block or whole pin multiplexer
+ *
+ * Function change multiplexer content. It is intended for initial
+ * chip setup and does not use locking. If complete reconfiguration
+ * is required at runtime then it is application responsibility
+ * to protect and serialize change with peripherals drivers
+ * and parallel calls
+ *
+ * @param[in] pinmmr_values pointer to array with required multiplexer setup
+ * @param[in] reg_start starting register, this allows to configure non-consecutive
+ *                      registers groups found on some MCU family members
+ * @param[in] reg_count number of words in initialization array to set
+ *                      to corresponding registers
+ *
+ * @retval Void
+ */
+void
+tms570_bsp_pinmmr_config(const uint32_t *pinmmr_values, int reg_start, int reg_count)
+{
+  volatile uint32_t *pinmmrx;
+  const uint32_t *pval;
+  int cnt;
+
+  if ( reg_count <= 0)
+    return;
+
+  TMS570_IOMM.KICK_REG0 = tms570_bsp_pinmmr_kick_key0;
+  TMS570_IOMM.KICK_REG1 = tms570_bsp_pinmmr_kick_key1;
+
+  pinmmrx = (&TMS570_IOMM.PINMUX.PINMMR0) + reg_start;
+  pval = pinmmr_values;
+  cnt = reg_count;
+
+  do {
+    *pinmmrx = *pinmmrx & *pval;
+    pinmmrx++;
+    pval++;
+  } while( --cnt );
+
+  pinmmrx = (&TMS570_IOMM.PINMUX.PINMMR0) + reg_start;
+  pval = pinmmr_values;
+  cnt = reg_count;
+
+  do {
+    *pinmmrx = *pval;
+    pinmmrx++;
+    pval++;
+  } while( --cnt );
+
+  TMS570_IOMM.KICK_REG0 = 0;
+  TMS570_IOMM.KICK_REG1 = 0;
+}