imx233: generate register headers using headergen_v2 and update code for it

NOTE: this commit does not introduce any change, ideally even the binary should
be almost the same. I checked the disassembly by hand and there are only a few
differences here and there, mostly the compiler decides to compile very close
expressions slightly differently. I tried to run the new code on several targets
to make sure and saw no difference.

The major syntax changes of the new headers are as follows:
- BF_{WR,SET,CLR} are now superpowerful and allows to set several fileds at once:
  BF_WR(reg, field1(value1), field2(value2), ...)
- BF_CS (use like BF_WR) does a write to reg_CLR and then reg_SET instead of RMW
- there is no more need for macros like BF_{WR_,SET,CLR}_V, since one can simply
  BF_WR with field_V(name)
- the old BF_SETV macro has no trivial equivalent and is replaced with its
  its equivalent for BF_WR(reg_SET, ...)

I also rename the register headers: "regs/regs-x.h" -> "regs/x.h" to avoid the
redundant "regs".

Final note: the registers were generated using the following command:
./headergen_v2 -g imx -o ../../firmware/target/arm/imx233/regs/ desc/regs-stmp3{600,700,780}.xml

Change-Id: I7485e8b4315a0929a8edb63e7fa1edcaa54b1edc

1 files changed, 14 insertions, 13 deletions

diff --git a/firmware/target/arm/imx233/powermgmt-imx233.c b/firmware/target/arm/imx233/powermgmt-imx233.c
index 01d0e3eae1..5db03d4127 100644
--- a/firmware/target/arm/imx233/powermgmt-imx233.c
+++ b/firmware/target/arm/imx233/powermgmt-imx233.c
@@ -28,6 +28,8 @@
 #include "logf.h"
 #include "powermgmt-imx233.h"
 
+#include "regs/power.h"
+
 #if !defined(IMX233_CHARGE_CURRENT) || !defined(IMX233_STOP_CURRENT) \
     || !defined(IMX233_CHARGING_TIMEOUT) || !defined(IMX233_TOPOFF_TIMEOUT)
 #error You must define IMX233_CHARGE_CURRENT, IMX233_STOP_CURRENT, \
@@ -52,17 +54,16 @@ void imx233_powermgmt_init(void)
     imx233_power_set_stop_current(IMX233_STOP_CURRENT);
 #if IMX233_SUBTARGET >= 3700
     /* assume that adc_init was called and battery monitoring via LRADC setup */
-    BF_WR(POWER_BATTMONITOR, EN_BATADJ, 1);
+    BF_WR(POWER_BATTMONITOR, EN_BATADJ(1));
     /* setup linear regulator offsets to 25 mV below to prevent contention between
      * linear regulators and DCDC */
-    BF_WR(POWER_VDDDCTRL, LINREG_OFFSET, 2);
-    BF_WR(POWER_VDDACTRL, LINREG_OFFSET, 2);
-    BF_WR(POWER_VDDIOCTRL, LINREG_OFFSET, 2);
+    BF_WR(POWER_VDDDCTRL, LINREG_OFFSET(2));
+    BF_WR(POWER_VDDACTRL, LINREG_OFFSET(2));
+    BF_WR(POWER_VDDIOCTRL, LINREG_OFFSET(2));
     /* enable a few bits controlling the DC-DC as recommended by Freescale */
     BF_SET(POWER_LOOPCTRL, TOGGLE_DIF);
     BF_SET(POWER_LOOPCTRL, EN_CM_HYST);
-    BF_CLR(POWER_LOOPCTRL, EN_RCSCALE);
-    BF_SETV(POWER_LOOPCTRL, EN_RCSCALE, 1);
+    BF_CS(POWER_LOOPCTRL, EN_RCSCALE(1));
 #else
     BF_SET(POWER_5VCTRL, LINREG_OFFSET);
 #endif
@@ -86,9 +87,9 @@ void charging_algorithm_step(void)
         /* 5V has been lost: disable 4p2 power rail */
         BF_SET(POWER_CHARGE, PWD_BATTCHRG);
 #if IMX233_SUBTARGET >= 3780
-        BF_WR(POWER_DCDC4P2, ENABLE_DCDC, 0);
-        BF_WR(POWER_DCDC4P2, ENABLE_4P2, 0);
-        BF_WR(POWER_5VCTRL, CHARGE_4P2_ILIMIT, 1);
+        BF_WR(POWER_DCDC4P2, ENABLE_DCDC(0));
+        BF_WR(POWER_DCDC4P2, ENABLE_4P2(0));
+        BF_WR(POWER_5VCTRL, CHARGE_4P2_ILIMIT(1));
         BF_SET(POWER_5VCTRL, PWD_CHARGE_4P2);
 #endif
         charge_state = DISCHARGING;
@@ -105,10 +106,10 @@ void charging_algorithm_step(void)
          * we must *NOT* disable it or this will shutdown the device. This procedure
          * is safe: it will never disable the DCDC and will not reduce the charge
          * limit on the 4P2 rail. */
-        BF_WR(POWER_DCDC4P2, ENABLE_4P2, 1);
+        BF_WR(POWER_DCDC4P2, ENABLE_4P2(1));
         BF_SET(POWER_CHARGE, ENABLE_LOAD);
         BF_CLR(POWER_5VCTRL, PWD_CHARGE_4P2);// FIXME: manual error ?
-        BF_WR(POWER_DCDC4P2, ENABLE_DCDC, 1);
+        BF_WR(POWER_DCDC4P2, ENABLE_DCDC(1));
 #endif
         timeout_4p2_ilimit_increase = current_tick + HZ / 100;
         charge_state = TRICKLE;
@@ -132,8 +133,8 @@ void charging_algorithm_step(void)
             logf("pwrmgmt: trickle -> charging");
 #if IMX233_SUBTARGET >= 3780
             /* adjust arbitration between 4.2 and battery */
-            BF_WR(POWER_DCDC4P2, CMPTRIP, 0); /* 85% */
-            BF_WR(POWER_DCDC4P2, DROPOUT_CTRL, 0xe); /* select greater, 200 mV drop */
+            BF_WR(POWER_DCDC4P2, CMPTRIP(0)); /* 85% */
+            BF_WR(POWER_DCDC4P2, DROPOUT_CTRL(0xe)); /* select greater, 200 mV drop */
 #endif
             /* switch to DCDC */
             BF_CLR(POWER_5VCTRL, DCDC_XFER);