Index: firmware/DG.dil
===================================================================
diff -u -r3ae0b1ecc324220e3f82106a09384ae2826e012e -rf28e189c8ced9f3dc7e36c586bc7e11cae1ca81a
--- firmware/DG.dil	(.../DG.dil)	(revision 3ae0b1ecc324220e3f82106a09384ae2826e012e)
+++ firmware/DG.dil	(.../DG.dil)	(revision f28e189c8ced9f3dc7e36c586bc7e11cae1ca81a)
@@ -6229,9 +6229,15 @@
 DRIVER.HET.VAR.HET2_BIT17_PSL.VALUE=0x00000000
 DRIVER.HET.VAR.HET2_BIT14_DOUT.VALUE=0
 DRIVER.HET.VAR.HET1_PWM3_PERIOD.VALUE=1000.000
+<<<<<<< HEAD
+DRIVER.HET.VAR.HET2_PWM5_DUTY_PRESCALER.VALUE=51968
+DRIVER.HET.VAR.HET1_PWM1_PERIOD_PRESCALER.VALUE=103296
+DRIVER.HET.VAR.HET1_BIT10_DIR.VALUE=0x00000400
+=======
 DRIVER.HET.VAR.HET2_PWM5_DUTY_PRESCALER.VALUE=52224
 DRIVER.HET.VAR.HET1_PWM1_PERIOD_PRESCALER.VALUE=103936
 DRIVER.HET.VAR.HET1_BIT10_DIR.VALUE=0x00000000
+>>>>>>> DEN-8886-hd_dg_dev-self-tests-2-of-2
 DRIVER.HET.VAR.HET2_CAP4_POLARITY.VALUE=0
 DRIVER.HET.VAR.HET2_BIT8_XORSHARE.VALUE=0x00000000
 DRIVER.HET.VAR.HET2_BIT4_PULDIS.VALUE=0x00000000
@@ -6427,7 +6433,11 @@
 DRIVER.HET.VAR.HET2_BIT10_PULDIS.VALUE=0x00000000
 DRIVER.HET.VAR.HET1_CAP2_PIN_SELECT.VALUE=4
 DRIVER.HET.VAR.HET1_BIT11_PSL.VALUE=0x00000000
+<<<<<<< HEAD
+DRIVER.HET.VAR.HET2_PWM2_DUTYTIME.VALUE=501.669
+=======
 DRIVER.HET.VAR.HET2_PWM2_DUTYTIME.VALUE=500.923
+>>>>>>> DEN-8886-hd_dg_dev-self-tests-2-of-2
 DRIVER.HET.VAR.HET2_PWM0_DUTY_LVL.VALUE=0x00000000
 DRIVER.HET.VAR.HET1_BIT31_DIR.VALUE=0x80000000
 DRIVER.HET.VAR.HET1_BIT23_DIR.VALUE=0x00000000
@@ -7278,7 +7288,7 @@
 DRIVER.PINMUX.VAR.DMA_PRITY_1_VALUE.VALUE=0x0001
 DRIVER.PINMUX.VAR.PINMUX11.VALUE=PINMUX_PIN_91_HET1_24
 DRIVER.PINMUX.VAR.DMA_PRITY_12.VALUE=FIXED
-DRIVER.PINMUX.VAR.PINMUX20.VALUE=PINMUX_PIN_130_MIBSPI1NCS_1
+DRIVER.PINMUX.VAR.PINMUX20.VALUE=PINMUX_PIN_130_HET1_17
 DRIVER.PINMUX.VAR.PINMUX12.VALUE="PINMUX_PIN_92_HET1_26 | PINMUX_PIN_96_MIBSPI1NENA | PINMUX_PIN_97_MIBSPI5NENA"
 DRIVER.PINMUX.VAR.DMA_PRITY_13.VALUE=FIXED
 DRIVER.PINMUX.VAR.PINMUX21.VALUE=PINMUX_PIN_133_GIOB_1
@@ -7402,7 +7412,7 @@
 DRIVER.PINMUX.VAR.MUX75_OPTION4.VALUE=0
 DRIVER.PINMUX.VAR.MUX67_OPTION4.VALUE=0
 DRIVER.PINMUX.VAR.MUX59_OPTION4.VALUE=0
-DRIVER.PINMUX.VAR.MUX6_OPTION0.VALUE=0
+DRIVER.PINMUX.VAR.MUX6_OPTION0.VALUE=1
 DRIVER.PINMUX.VAR.DMA_CHANNEL_29.VALUE=CHANNEL0
 DRIVER.PINMUX.VAR.DMA_FIDXS_7.VALUE=0
 DRIVER.PINMUX.VAR.DMA_AIM_7.VALUE=ENABLED
@@ -7422,7 +7432,7 @@
 DRIVER.PINMUX.VAR.MUX6_OPTION3.VALUE=0
 DRIVER.PINMUX.VAR.MUX60_OPTION0.VALUE=0
 DRIVER.PINMUX.VAR.MUX52_OPTION0.VALUE=0
-DRIVER.PINMUX.VAR.MUX44_OPTION0.VALUE=0
+DRIVER.PINMUX.VAR.MUX44_OPTION0.VALUE=1
 DRIVER.PINMUX.VAR.MUX36_OPTION0.VALUE=1
 DRIVER.PINMUX.VAR.MUX28_OPTION0.VALUE=1
 DRIVER.PINMUX.VAR.MUX6_OPTION4.VALUE=0
@@ -7498,7 +7508,7 @@
 DRIVER.PINMUX.VAR.DMA_CP0_IDADDR_16.VALUE=0
 DRIVER.PINMUX.VAR.DMA_STADD_2.VALUE=0
 DRIVER.PINMUX.VAR.MUX21_OPTION0.VALUE=1
-DRIVER.PINMUX.VAR.MUX13_OPTION0.VALUE=0
+DRIVER.PINMUX.VAR.MUX13_OPTION0.VALUE=1
 DRIVER.PINMUX.VAR.DMA_TTYPE_25.VALUE=FRAME_TRANSFER
 DRIVER.PINMUX.VAR.DMA_CP0_IDADDR_25.VALUE=0
 DRIVER.PINMUX.VAR.DMA_TTYPE_17.VALUE=FRAME_TRANSFER
@@ -7519,7 +7529,7 @@
 DRIVER.PINMUX.VAR.PIN_MUX_71_SELECT.VALUE=0
 DRIVER.PINMUX.VAR.PIN_MUX_63_SELECT.VALUE=0
 DRIVER.PINMUX.VAR.PIN_MUX_55_SELECT.VALUE=0
-DRIVER.PINMUX.VAR.PIN_MUX_47_SELECT.VALUE=0
+DRIVER.PINMUX.VAR.PIN_MUX_47_SELECT.VALUE=1
 DRIVER.PINMUX.VAR.PIN_MUX_39_SELECT.VALUE=0
 DRIVER.PINMUX.VAR.DMA_TTYPE_27.VALUE=FRAME_TRANSFER
 DRIVER.PINMUX.VAR.DMA_CP0_IDADDR_27.VALUE=0
@@ -7668,7 +7678,7 @@
 DRIVER.PINMUX.VAR.DMA_ADDMW_6.VALUE=CONSTANT
 DRIVER.PINMUX.VAR.DMA_INTFTCEN_2.VALUE=1
 DRIVER.PINMUX.VAR.MUX51_OPTION0.VALUE=0
-DRIVER.PINMUX.VAR.MUX43_OPTION0.VALUE=0
+DRIVER.PINMUX.VAR.MUX43_OPTION0.VALUE=1
 DRIVER.PINMUX.VAR.MUX35_OPTION0.VALUE=1
 DRIVER.PINMUX.VAR.MUX27_OPTION0.VALUE=1
 DRIVER.PINMUX.VAR.MUX19_OPTION0.VALUE=0
@@ -7737,7 +7747,7 @@
 DRIVER.PINMUX.VAR.DMA_INTMP_2_VALUE.VALUE=0x0001
 DRIVER.PINMUX.VAR.DMA_INTEN_16.VALUE=1
 DRIVER.PINMUX.VAR.MUX20_OPTION0.VALUE=0
-DRIVER.PINMUX.VAR.MUX12_OPTION0.VALUE=0
+DRIVER.PINMUX.VAR.MUX12_OPTION0.VALUE=1
 DRIVER.PINMUX.VAR.MUX20_OPTION1.VALUE=1
 DRIVER.PINMUX.VAR.MUX12_OPTION1.VALUE=0
 DRIVER.PINMUX.VAR.MUX20_OPTION2.VALUE=0
@@ -7872,7 +7882,7 @@
 DRIVER.PINMUX.VAR.MUX73_OPTION0.VALUE=0
 DRIVER.PINMUX.VAR.MUX65_OPTION0.VALUE=0
 DRIVER.PINMUX.VAR.MUX57_OPTION0.VALUE=0
-DRIVER.PINMUX.VAR.MUX49_OPTION0.VALUE=0
+DRIVER.PINMUX.VAR.MUX49_OPTION0.VALUE=1
 DRIVER.PINMUX.VAR.DMA_FIDXS_25.VALUE=0
 DRIVER.PINMUX.VAR.DMA_AIM_25.VALUE=ENABLED
 DRIVER.PINMUX.VAR.DMA_FIDXS_17.VALUE=0
@@ -7943,7 +7953,7 @@
 DRIVER.PINMUX.VAR.DMA_BYP_12.VALUE=1
 DRIVER.PINMUX.VAR.DMA_INTBTCEN_2.VALUE=1
 DRIVER.PINMUX.VAR.MUX50_OPTION0.VALUE=0
-DRIVER.PINMUX.VAR.MUX42_OPTION0.VALUE=0
+DRIVER.PINMUX.VAR.MUX42_OPTION0.VALUE=1
 DRIVER.PINMUX.VAR.MUX34_OPTION0.VALUE=1
 DRIVER.PINMUX.VAR.MUX26_OPTION0.VALUE=1
 DRIVER.PINMUX.VAR.MUX18_OPTION0.VALUE=0
@@ -8183,8 +8193,8 @@
 DRIVER.PINMUX.VAR.DMA_ADDMR_12.VALUE=CONSTANT
 DRIVER.PINMUX.VAR.DMA_INTEN_6.VALUE=1
 DRIVER.PINMUX.VAR.EMIF.VALUE=0
-DRIVER.PINMUX.VAR.MUX41_OPTION0.VALUE=0
-DRIVER.PINMUX.VAR.MUX33_OPTION0.VALUE=0
+DRIVER.PINMUX.VAR.MUX41_OPTION0.VALUE=1
+DRIVER.PINMUX.VAR.MUX33_OPTION0.VALUE=1
 DRIVER.PINMUX.VAR.MUX25_OPTION0.VALUE=0
 DRIVER.PINMUX.VAR.MUX17_OPTION0.VALUE=0
 DRIVER.PINMUX.VAR.MUX3_OPTION4.VALUE=0
@@ -8380,7 +8390,7 @@
 DRIVER.PINMUX.VAR.MUX94_OPTION4.VALUE=0
 DRIVER.PINMUX.VAR.MUX86_OPTION4.VALUE=0
 DRIVER.PINMUX.VAR.MUX78_OPTION4.VALUE=0
-DRIVER.PINMUX.VAR.MUX9_OPTION0.VALUE=0
+DRIVER.PINMUX.VAR.MUX9_OPTION0.VALUE=1
 DRIVER.PINMUX.VAR.MUX9_OPTION1.VALUE=0
 DRIVER.PINMUX.VAR.DMA_EIDXD_0.VALUE=0
 DRIVER.PINMUX.VAR.DMA_CHPR_10.VALUE=HIGH
@@ -8407,7 +8417,7 @@
 DRIVER.PINMUX.VAR.MUX71_OPTION1.VALUE=0
 DRIVER.PINMUX.VAR.MUX63_OPTION1.VALUE=0
 DRIVER.PINMUX.VAR.MUX55_OPTION1.VALUE=0
-DRIVER.PINMUX.VAR.MUX47_OPTION1.VALUE=0
+DRIVER.PINMUX.VAR.MUX47_OPTION1.VALUE=1
 DRIVER.PINMUX.VAR.MUX39_OPTION1.VALUE=0
 DRIVER.PINMUX.VAR.MUX9_OPTION5.VALUE=0
 DRIVER.PINMUX.VAR.DMA_ADDMW_10.VALUE=CONSTANT
@@ -8486,7 +8496,7 @@
 DRIVER.PINMUX.VAR.DMA_IET_COUNT_6.VALUE=0
 DRIVER.PINMUX.VAR.DMA_TRIG_12.VALUE=HARDWARE_TRIGGER
 DRIVER.PINMUX.VAR.MUX40_OPTION0.VALUE=0
-DRIVER.PINMUX.VAR.MUX32_OPTION0.VALUE=0
+DRIVER.PINMUX.VAR.MUX32_OPTION0.VALUE=1
 DRIVER.PINMUX.VAR.MUX24_OPTION0.VALUE=1
 DRIVER.PINMUX.VAR.MUX16_OPTION0.VALUE=0
 DRIVER.PINMUX.VAR.MUX2_OPTION4.VALUE=0
@@ -8691,7 +8701,7 @@
 DRIVER.PINMUX.VAR.MUX70_OPTION0.VALUE=0
 DRIVER.PINMUX.VAR.MUX62_OPTION0.VALUE=0
 DRIVER.PINMUX.VAR.MUX54_OPTION0.VALUE=0
-DRIVER.PINMUX.VAR.MUX46_OPTION0.VALUE=0
+DRIVER.PINMUX.VAR.MUX46_OPTION0.VALUE=1
 DRIVER.PINMUX.VAR.MUX38_OPTION0.VALUE=1
 DRIVER.PINMUX.VAR.MUX8_OPTION4.VALUE=0
 DRIVER.PINMUX.VAR.MUX70_OPTION1.VALUE=0