Reworked pin group generation to use induvidual mux fields

Author: danieldegrasse

tools/rt_cfg_utils.py

@@ -549,16 +549,20 @@ def write_pinctrl_header(self, outfile):
                 " */\n\n")
         for pin in sorted(self._signal_map.values()):
             for iomux_opt in sorted(pin.get_mux_options()):
+                header_block = ""
                 # Get iomuxc constant values
                 iomuxc_name = iomux_opt.get_name()
                 register = iomux_opt.get_mux_reg()
+                header_block += f"#define {iomuxc_name}_MUX 0x{register:x}\n"
                 mode = iomux_opt.get_mux_val()
+                header_block += f"#define {iomuxc_name}_MODE {mode:d}\n"
                 input_reg = iomux_opt.get_daisy_reg()
+                header_block += f"#define {iomuxc_name}_INPUT 0x{input_reg:x}\n"
                 input_daisy = iomux_opt.get_daisy_val()
+                header_block += f"#define {iomuxc_name}_DAISY {input_daisy:d}\n"
                 config_reg = iomux_opt.get_cfg_reg()
-                header_line = (f"#define {iomuxc_name} 0x{register:x} {mode:d}"
-                    f" 0x{input_reg:x} {input_daisy:d} 0x{config_reg:x}\n")
-                soc_header.write(header_line)
+                header_block += f"#define {iomuxc_name}_CFG 0x{config_reg:x}\n"
+                soc_header.write(header_block)
         soc_header.write("\n")
         soc_header.close()
 
@@ -652,14 +656,25 @@ def write_pinctrl_groups(self, mexfile, outputfile):
             # 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 = ""
+                # MUX REG, MUX MODE, DAISY REG, DAISY, CFG_REG
+                mux_props = ["", "" ,"", "", ""]
+                # Generate each named pinmux property
                 for mux in pinmuxes:
-                    pinmux_str += f"<{mux}>,\n\t\t\t\t"
-                pinmux_str = pinmux_str.strip(',\n\t\t\t\t')
+                    mux_props[0] += f"<{mux + '_MUX'}>,\n\t\t\t\t"
+                    mux_props[1] += f"<{mux + '_MODE'}>,\n\t\t\t\t"
+                    mux_props[2] += f"<{mux + '_INPUT'}>,\n\t\t\t\t"
+                    mux_props[3] += f"<{mux + '_DAISY'}>,\n\t\t\t\t"
+                    mux_props[4] += f"<{mux + '_CFG'}>,\n\t\t\t\t"
+                for i in range(len(mux_props)):
+                    mux_props[i] = re.sub(r',\n\t\t\t\t$','', mux_props[i])
                 # Name of group
                 dts_entry = f"\t\tgroup{idx} {{\n"
                 # Pinmuxes for group
-                dts_entry += f"\t\t\tpins = {pinmux_str};\n"
+                dts_entry += f"\t\t\tmux = {mux_props[0]};\n"
+                dts_entry += f"\t\t\tmode = {mux_props[1]};\n"
+                dts_entry += f"\t\t\tinput = {mux_props[2]};\n"
+                dts_entry += f"\t\t\tdaisy = {mux_props[3]};\n"
+                dts_entry += f"\t\t\tcfg = {mux_props[4]};\n"
                 # Properties of group
                 for prop in sorted_keys[idx]:
                     dts_entry += f"\t\t\t{prop};\n"