--- a/src/cs/system/main/init.c	Sun Jun 28 23:54:05 2020 +0000
+++ b/src/cs/system/main/init.c	Mon Jun 29 00:27:13 2020 +0000
@@ -354,7 +354,8 @@
         #else
           #if (BOARD==35)
             *((volatile SYS_UWORD16 *) ASIC_CONF) = 0x2000;
-          #elif defined(CONFIG_TARGET_PIRELLI) || defined(CONFIG_TARGET_DSAMPLE)
+          #elif defined(CONFIG_TARGET_PIRELLI) || \
+                defined(CONFIG_TARGET_DSAMPLE) || defined(CONFIG_TARGET_TANGO)
             /*
              * Pirelli's version of this Init_Target() function
              * in their fw sets the ASIC_CONF register to 0x6050,
@@ -365,6 +366,10 @@
              * PWL and LPG pin configs on the D-Sample: the DS board
              * has LEDs for PWL and for LPG and they work as expected,
              * thus the board is clearly wired for this pin config.
+             *
+             * Finally, we set the same config on Tango targets:
+             * DSR_MODEM/LPG is configured as LPG in order to avoid
+             * the floating input, whereas LT/PWL works better as PWL.
              */
             *((volatile SYS_UWORD16 *) ASIC_CONF) = 0x6050;
           #elif defined(CONFIG_TARGET_GTAMODEM) || defined(CONFIG_TARGET_GTM900)
@@ -888,6 +893,10 @@
 	bspUicc_bootInit();
     #endif
   #endif
+
+  #ifdef CONFIG_TANGO_MODEM
+    AI_Init_Tango_pinmux();
+  #endif
 }
 
 /*