Support for pin groups added

Author: danieldegrasse

tools/rt_cfg_utils.py

@@ -5,6 +5,7 @@
 """
 
 
+from collections import defaultdict
 import xml.etree.ElementTree as ET
 import datetime
 import re
@@ -227,13 +228,12 @@ def get_pin_property_default(self, prop):
 
     def get_pin_defaults(self):
         """
-        Gets mapping of all pin property names to default values
+        Gets mapping of all pin property names to default value names
         """
         pin_defaults = {}
         for prop in self.get_pin_properties():
             pin_default = self.get_pin_property_default(prop)
-            pin_default_val = self.get_pin_property_value(prop, pin_default)
-            pin_defaults[prop] = pin_default_val
+            pin_defaults[prop] = pin_default
         return pin_defaults
 
     def get_pin_property_value(self, prop, selection):
@@ -605,7 +605,7 @@ def write_pinctrl_overrides(self, mexfile, outputfile):
             dts_file.write(dts_entry)
         # DTS file write is done, close it
         dts_file.close()
-    
+
     def write_pinctrl_groups(self, mexfile, outputfile):
         """
         Write pinctrl groups to disk as a parsed DTS file. Intended for use
@@ -636,17 +636,35 @@ def write_pinctrl_groups(self, mexfile, outputfile):
             pins = pin_groups[pin_group]
             # Write pin group name
             dts_file.write(f"\t{pin_group}: {pin_group} {{\n")
-            for pin in sorted(pins.keys()):
+            # First step- take all pin configurations, and generate zephyr
+            # dts strings. Use those strings as keys in a dictionary to identify
+            # pins in the pin group with the same configuration
+            cfg_dict = defaultdict(lambda: [])
+            for pin in pins.keys():
                 props = pins[pin]
                 iomux = props['mux']
                 overrides = props['overrides']
                 defaults = props['defaults']
-                dts_entry = f"\t\t{pin}: {pin} {{\n"
-                dts_entry += f"\t\t\tpinmux = <{iomux.get_name()}>;\n"
                 dts_strings = self._props_to_dts(overrides, defaults)
-                for entry in sorted(dts_strings):
-                    dts_entry += f"\t\t\t{entry};\n"
-                dts_entry += "\t\t};\n\n"
+                cfg_dict[dts_strings].append(iomux.get_name())
+            sorted_keys = sorted(cfg_dict.keys())
+            # Second step- take each dictionary, and write out all pinmuxes
+            # as well as their shared configuration into a group
+            for idx in range(len(cfg_dict.keys())):
+                pinmuxes = cfg_dict[sorted_keys[idx]]
+                pinmux_str = ""
+                for mux in pinmuxes:
+                    pinmux_str += f"<{mux}>,\n\t\t\t\t"
+                pinmux_str = pinmux_str.strip(',\n\t\t\t\t')
+                # Name of group
+                dts_entry = f"\t\tgroup{idx} {{\n"
+                # Pinmuxes for group
+                dts_entry += f"\t\t\tpins = {pinmux_str};\n"
+                # Properties of group
+                for prop in sorted_keys[idx]:
+                    dts_entry += f"\t\t\t{prop};\n"
+                # Closing brace of group
+                dts_entry += "\t\t};\n"
                 dts_file.write(dts_entry)
             # Write closing brace of pin group
             dts_file.write("\t};\n\n")
@@ -692,8 +710,7 @@ def _generate_pin_overrides(self, signal_pin, pin):
                 # Get bit field value of feature
                 name = feature.attrib['name']
                 value = feature.attrib['value']
-                bit_value = signal_pin.get_pin_property_value(name, value)
-                overrides[name] = bit_value
+                overrides[name] = value
         return overrides
 
     def _props_to_dts(self, props, defaults):
@@ -705,44 +722,69 @@ def _props_to_dts(self, props, defaults):
         @return array of strings suitable for writing to DTS
         """
         zephyr_props = []
+        # Lambda to convert property names to zephyr formatted strings
+        sanitize = lambda x : "\"" + re.sub(r'[\W_]', '-', x).lower() + "\""
         # Check pin defaults and overrides to see if the pin will have a pull or keeper
         if 'pull_keeper_enable' in props:
-            pull_keeper = props['pull_keeper_enable'] == 1
+            pull_keeper = props['pull_keeper_enable'] == 'Enable'
         else:
-            pull_keeper = defaults['pull_keeper_enable'] == 1
+            pull_keeper = defaults['pull_keeper_enable'] == 'Enable'
         keeper = False
         if pull_keeper:
             # Determine if pull or keeper is selected
             if 'pull_keeper_select' in props:
-                keeper = props['pull_keeper_select'] == 0
+                keeper = props['pull_keeper_select'] == 'Keeper'
             else:
-                keeper = defaults['pull_keeper_select'] == 0
+                keeper = defaults['pull_keeper_select'] == 'Keeper'
         if keeper:
             zephyr_props.append('bias-bus-hold')
-        for (prop, value) in props.items():
-            if prop == 'drive_strength':
-                zephyr_props.append(f"drive-strength = <{value}>")
-            elif prop == 'hysteresis_enable' and value == 1:
-                zephyr_props.append('input-schmitt-enable')
-            elif prop == 'open_drain' and value == 1:
-                zephyr_props.append('drive-open-drain')
-            elif prop == 'pull_up_down_config':
-                if value == 0 and (pull_keeper and not keeper):
-                    # Pull down the pin
-                    zephyr_props.append('bias-pull-down')
-                elif (pull_keeper and not keeper):
-                    # Pull up the pin
-                    zephyr_props.append(f"bias-pull-up = <{value}>")
-            elif prop == 'slew_rate':
-                zephyr_props.append(f"slew-rate = <{value}>")
-            elif prop == 'speed':
-                zephyr_props.append(f"nxp,speed = <{value}>")
-            elif prop == 'software_input_on' and value == 1:
+        # For each property, append the provided override or the default
+        if 'drive_strength' in props:
+            zephyr_props.append(f"drive-strength = {sanitize(props['drive_strength'])}")
+        else:
+            zephyr_props.append(f"drive-strength = {sanitize(defaults['drive_strength'])}")
+        if 'hysteresis_enable' in props and props['hysteresis_enable'] == 'Enable':
+            zephyr_props.append('input-schmitt-enable')
+        elif defaults['hysteresis_enable'] == 'Enable':
+            zephyr_props.append('input-schmitt-enable')
+        if 'open_drain' in props and props['open_drain'] == 'Enable':
+            zephyr_props.append('drive-open-drain')
+        elif defaults['open_drain'] == 'Enable':
+            zephyr_props.append('drive-open-drain')
+        if 'pull_up_down_config' in props:
+            if (props['pull_up_down_config'] == 'Pull_Down_100K_Ohm'
+                and (pull_keeper and not keeper)):
+                # Pull down the pin
+                zephyr_props.append('bias-pull-down')
+                zephyr_props.append(f"bias-pull-down-value = {sanitize(props['pull_up_down_config'])}")
+            elif (pull_keeper and not keeper):
+                # Pull up the pin
+                zephyr_props.append('bias-pull-up')
+                zephyr_props.append(f"bias-pull-up-value = {sanitize(props['pull_up_down_config'])}")
+        else:
+            if (defaults['pull_up_down_config'] == 'Pull_Down_100K_Ohm'
+                and (pull_keeper and not keeper)):
+                # Pull down the pin
+                zephyr_props.append('bias-pull-down')
+                zephyr_props.append(f"bias-pull-down-value = {sanitize(defaults['pull_up_down_config'])}")
+            elif (pull_keeper and not keeper):
+                # Pull up the pin
+                zephyr_props.append('bias-pull-up')
+                zephyr_props.append(f"bias-pull-up-value = {sanitize(defaults['bias-pull-up'])}")
+        if 'slew_rate' in props:
+            zephyr_props.append(f"slew-rate = {sanitize(props['slew_rate'])}")
+        else:
+            zephyr_props.append(f"slew-rate = {sanitize(defaults['slew_rate'])}")
+        if 'speed' in props:
+            zephyr_props.append(f"nxp,speed = {sanitize(props['speed'])}")
+        elif 'speed' in defaults:
+            zephyr_props.append(f"nxp,speed = {sanitize(defaults['speed'])}")
+        if 'software_input_on' in props and props['software_input_on'] == 'Enable':
+            zephyr_props.append('input-enable')
+        elif 'software_input_on' in defaults:
+            if defaults['software_input_on'] == 'Enable':
                 zephyr_props.append('input-enable')
-            elif prop == 'pull_keeper_enable' or prop == 'pull_keeper_select':
-                continue
-
-        return zephyr_props
+        return tuple(zephyr_props)
 
     def _parse_mex_cfg(self, mex_xml, pin_mapping):
         """