FreeCalypso > hg > fc-magnetite

changeset 685:3fb7384e820d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tpudrv12.h: FCDEV3B goes back to being itself A while back we had the idea of a FreeCalypso modem family whereby our current fcdev3b target would some day morph into fcmodem, with multiple FC modem family products, potentially either triband or quadband, being firmware-compatible with each other and with our original FCDEV3B. But in light of the discovery of Tango modules that earlier idea is now being withdrawn: instead the already existing Tango hw is being adopted into our FreeCalypso family. Tango cannot be firmware-compatible with triband OM/FCDEV3B targets because the original quadband RFFE on Tango modules is wired in TI's original Leonardo arrangement. Because this Leonardo/Tango way is now becoming the official FreeCalypso way of driving quadband RFFEs thanks to the adoption of Tango into our FC family, our earlier idea of extending FIC's triband RFFE control signals with TSPACT5 no longer makes much sense - we will probably never produce any new hardware with that once-proposed arrangement. Therefore, that triband-or-quadband FCFAM provision is being removed from the code base, and FCDEV3B goes back to being treated the same way as CONFIG_TARGET_GTAMODEM for RFFE control purposes.
author Mychaela Falconia <falcon@freecalypso.org>
date Thu, 24 Sep 2020 21:03:08 +0000
parents 269554439ace
children 59f07d67eb45
files src/cs/layer1/tpu_drivers/source0/tpudrv12.h
diffstat 1 files changed, 1 insertions(+), 55 deletions(-) [+]
line wrap: on
line diff
--- a/src/cs/layer1/tpu_drivers/source0/tpudrv12.h	Thu Sep 24 20:21:51 2020 +0000
+++ b/src/cs/layer1/tpu_drivers/source0/tpudrv12.h	Thu Sep 24 21:03:08 2020 +0000
@@ -275,7 +275,7 @@
   #define TU_1900    ( PA_HI_BAND | FEM_PINS ^ FEM_8 )
   #define TD_1900    ( PA_OFF     | FEM_PINS ^ 0     )
 
-#elif defined(CONFIG_TARGET_GTAMODEM)
+#elif defined(CONFIG_TARGET_GTAMODEM) || defined(CONFIG_TARGET_FCDEV3B)
 
   // Openmoko's triband configuration is a bastardized version
   // of TI's quadband one from Leonardo/E-Sample
@@ -317,60 +317,6 @@
   #define TU_1900    ( PA_HI_BAND | FEM_PINS ^ FEM_7 )
   #define TD_1900    ( PA_OFF     | FEM_PINS ^ 0     )
 
-#elif defined(CONFIG_TARGET_FCFAM)
-
-  /*
-   * In our FreeCalypso hw family, we would like to be able to use
-   * both triband and quadband RFFEs.  Our current FCDEV3B is triband,
-   * copied from Openmoko, and the same is expected to be the case for
-   * future low-budget designs, but if someone pays for a new RF layout,
-   * we can use a quadband RFFE instead.  If we ever have two different
-   * hw platforms or variants that differ in the RFFE but are otherwise
-   * firmware-compatible, we would like to have the same fw build
-   * work with both triband and quadband RFFEs.  How is it possible?
-   * The trick is that we define our set of TSPACT RFFE control signals
-   * starting with our current OM-based triband version, and add one
-   * more signal to support potential future quadband designs.
-   */
-
-  #define FEM_RX_1900   BIT_1     // act1
-  #define FEM_TX_HIGH   BIT_2     // act2
-  #define FEM_TX_LOW    BIT_4     // act4
-  #define FEM_RX_850    BIT_5     // act5
-
-  #define PA_HI_BAND    BIT_3   // act3
-  #define PA_LO_BAND    0
-  #define PA_OFF        0
-
-  #define FEM_PINS (FEM_TX_LOW | FEM_TX_HIGH | FEM_RX_850 | FEM_RX_1900)
-
-  #define FEM_OFF    ( FEM_PINS ^ 0 )
-
-  #define FEM_SLEEP  ( 0 )  
-
-  // This configuration is always inverted.
-
-  // RX_UP/DOWN and TX_UP/DOWN
-  #define RU_900     ( PA_OFF     | FEM_PINS ^ 0          )
-  #define RD_900     ( PA_OFF     | FEM_PINS ^ 0          )
-  #define TU_900     ( PA_LO_BAND | FEM_PINS ^ FEM_TX_LOW )
-  #define TD_900     ( PA_OFF     | FEM_PINS ^ 0          )
-
-  #define RU_850     ( PA_OFF     | FEM_PINS ^ FEM_RX_850 )
-  #define RD_850     ( PA_OFF     | FEM_PINS ^ 0          )
-  #define TU_850     ( PA_LO_BAND | FEM_PINS ^ FEM_TX_LOW )
-  #define TD_850     ( PA_OFF     | FEM_PINS ^ 0          )
-
-  #define RU_1800    ( PA_OFF     | FEM_PINS ^ 0           )
-  #define RD_1800    ( PA_OFF     | FEM_PINS ^ 0           )
-  #define TU_1800    ( PA_HI_BAND | FEM_PINS ^ FEM_TX_HIGH )
-  #define TD_1800    ( PA_OFF     | FEM_PINS ^ 0           )
-
-  #define RU_1900    ( PA_OFF     | FEM_PINS ^ FEM_RX_1900 )
-  #define RD_1900    ( PA_OFF     | FEM_PINS ^ 0           )
-  #define TU_1900    ( PA_HI_BAND | FEM_PINS ^ FEM_TX_HIGH )
-  #define TD_1900    ( PA_OFF     | FEM_PINS ^ 0           )
-
 #elif defined(CONFIG_TARGET_MGC2GSMT)
 
   /*