imx233: rewrite audioout using new register headers

Change-Id: I20dddec437187c0974ac16027548dbe3dd097c59

1 files changed, 1 insertions, 96 deletions

diff --git a/firmware/target/arm/imx233/audioout-imx233.h b/firmware/target/arm/imx233/audioout-imx233.h
index fbc0827be2..20ff7737e1 100644
--- a/firmware/target/arm/imx233/audioout-imx233.h
+++ b/firmware/target/arm/imx233/audioout-imx233.h
@@ -25,102 +25,7 @@
 #include "cpu.h"
 #include "system.h"
 
-#define HW_AUDIOOUT_BASE       0x80048000 
-
-#define HW_AUDIOOUT_CTRL        (*(volatile uint32_t *)(HW_AUDIOOUT_BASE + 0x0))
-#define HW_AUDIOOUT_CTRL__RUN                   (1 << 0)
-#define HW_AUDIOOUT_CTRL__FIFO_ERROR_IRQ_EN     (1 << 1)
-#define HW_AUDIOOUT_CTRL__FIFO_OVERFLOW_IRQ     (1 << 2)
-#define HW_AUDIOOUT_CTRL__FIFO_UNDERFLOW_IRQ    (1 << 3)
-#define HW_AUDIOOUT_CTRL__WORD_LENGTH           (1 << 6)
-#define HW_AUDIOOUT_CTRL__SS3D_EFFECT_BP        8
-#define HW_AUDIOOUT_CTRL__SS3D_EFFECT_BM        (3 << 8)
-#define HW_AUDIOOUT_CTRL__SS3D_EFFECT_OFF       (0 << 8)
-#define HW_AUDIOOUT_CTRL__SS3D_EFFECT_3         (1 << 8)
-#define HW_AUDIOOUT_CTRL__SS3D_EFFECT_4P5       (2 << 8)
-#define HW_AUDIOOUT_CTRL__SS3D_EFFECT_6         (3 << 8)
-#define HW_AUDIOOUT_CTRL__DMAWAIT_COUNT_BP      16
-#define HW_AUDIOOUT_CTRL__DMAWAIT_COUNT_BM      (0x1f << 16)
-
-#define HW_AUDIOOUT_DACSRR      (*(volatile uint32_t *)(HW_AUDIOOUT_BASE + 0x20))
-#define HW_AUDIOOUT_DACSRR__SRC_FRAC_BP 0
-#define HW_AUDIOOUT_DACSRR__SRC_FRAC_BM (0x1ff << 0)
-#define HW_AUDIOOUT_DACSRR__SRC_INT_BP 16
-#define HW_AUDIOOUT_DACSRR__SRC_INT_BM (0x1f << 16)
-#define HW_AUDIOOUT_DACSRR__SRC_HOLD_BP 24
-#define HW_AUDIOOUT_DACSRR__SRC_HOLD_BM (0x7 << 24)
-#define HW_AUDIOOUT_DACSRR__BASEMULT_BP 28
-#define HW_AUDIOOUT_DACSRR__BASEMULT_BM (0x7 << 28)
-#define HW_AUDIOOUT_DACSRR__OSR (1 << 31)
-
-#define HW_AUDIOOUT_DACVOLUME   (*(volatile uint32_t *)(HW_AUDIOOUT_BASE + 0x30))
-#define HW_AUDIOOUT_DACVOLUME__VOLUME_RIGHT_BP  0
-#define HW_AUDIOOUT_DACVOLUME__VOLUME_RIGHT_BM  0xff
-#define HW_AUDIOOUT_DACVOLUME__MUTE_RIGHT       (1 << 8)
-#define HW_AUDIOOUT_DACVOLUME__VOLUME_UPDATE_RIGHT  (1 << 12)
-#define HW_AUDIOOUT_DACVOLUME__VOLUME_LEFT_BP   16
-#define HW_AUDIOOUT_DACVOLUME__VOLUME_LEFT_BM   (0xff << 16)
-#define HW_AUDIOOUT_DACVOLUME__MUTE_LEFT        (1 << 24)
-#define HW_AUDIOOUT_DACVOLUME__EN_ZCD           (1 << 25)
-#define HW_AUDIOOUT_DACVOLUME__VOLUME_UPDATE_LEFT   (1 << 28)
-
-#define HW_AUDIOOUT_DACDEBUG    (*(volatile uint32_t *)(HW_AUDIOOUT_BASE + 0x40))
-#define HW_AUDIOOUT_DACDEBUG__FIFO_STATUS   1
-
-
-#define HW_AUDIOOUT_HPVOL       (*(volatile uint32_t *)(HW_AUDIOOUT_BASE + 0x50))
-#define HW_AUDIOOUT_HPVOL__VOL_RIGHT_BP     0
-#define HW_AUDIOOUT_HPVOL__VOL_RIGHT_BM     (0x7f << 0)
-#define HW_AUDIOOUT_HPVOL__VOL_LEFT_BP      8
-#define HW_AUDIOOUT_HPVOL__VOL_LEFT_BM      (0x7f << 8)
-#define HW_AUDIOOUT_HPVOL__SELECT           (1 << 16)
-#define HW_AUDIOOUT_HPVOL__MUTE             (1 << 24)
-#define HW_AUDIOOUT_HPVOL__EN_MSTR_ZCD      (1 << 25)
-
-#define HW_AUDIOOUT_PWRDN       (*(volatile uint32_t *)(HW_AUDIOOUT_BASE + 0x70))
-#define HW_AUDIOOUT_PWRDN__HEADPHONE        (1 << 0)
-#define HW_AUDIOOUT_PWRDN__CAPLESS          (1 << 4)
-#define HW_AUDIOOUT_PWRDN__ADC              (1 << 8)
-#define HW_AUDIOOUT_PWRDN__DAC              (1 << 12)
-#define HW_AUDIOOUT_PWRDN__RIGHT_ADC        (1 << 16)
-#define HW_AUDIOOUT_PWRDN__SPEAKER          (1 << 24)
-
-#define HW_AUDIOOUT_REFCTRL     (*(volatile uint32_t *)(HW_AUDIOOUT_BASE + 0x80))
-#define HW_AUDIOOUT_REFCTRL__BIAS_CTRL_BP   16
-#define HW_AUDIOOUT_REFCTRL__BIAS_CTRL_BM   (3 << 16)
-#define HW_AUDIOOUT_REFCTRL__LOW_PWR        (1 << 19)
-#define HW_AUDIOOUT_REFCTRL__VBG_ADJ_BP     20
-#define HW_AUDIOOUT_REFCTRL__VBG_ADJ_BM     (3 << 20)
-#define HW_AUDIOOUT_REFCTRL__XTAL_BGR_BIAS  (1 << 24)
-#define HW_AUDIOOUT_REFCTRL__RAISE_REF      (1 << 25)
-
-#define HW_AUDIOOUT_ANACTRL     (*(volatile uint32_t *)(HW_AUDIOOUT_BASE + 0x90))
-#define HW_AUDIOOUT_ANACTRL__HP_CLASSAB         (1 << 4)
-#define HW_AUDIOOUT_ANACTRL__HP_HOLD_GND        (1 << 5)
-#define HW_AUDIOOUT_ANACTRL__SHORTMODE_LR_BP    17
-#define HW_AUDIOOUT_ANACTRL__SHORTMODE_LR_BM    (3 << 17)
-#define HW_AUDIOOUT_ANACTRL__SHORTMODE_CM_BP    20
-#define HW_AUDIOOUT_ANACTRL__SHORTMODE_CM_BM    (3 << 20)
-#define HW_AUDIOOUT_ANACTRL__SHORT_LR_STS       (1 << 24)
-#define HW_AUDIOOUT_ANACTRL__SHORT_CM_STS       (1 << 28)
-
-#define HW_AUDIOOUT_TEST        (*(volatile uint32_t *)(HW_AUDIOOUT_BASE + 0xa0))
-#define HW_AUDIOOUT_TEST__HP_I1_ADJ_BM      (3 << 22)
-#define HW_AUDIOOUT_TEST__HP_I1_ADJ_BP      22
-#define HW_AUDIOOUT_TEST__HP_I1_ADJ_NOMINAL (0 << 22)
-#define HW_AUDIOOUT_TEST__HP_I1_ADJ_M_50    (1 << 22)
-#define HW_AUDIOOUT_TEST__HP_I1_ADJ_P_100   (2 << 22)
-#define HW_AUDIOOUT_TEST__HP_I1_ADJ_P_50    (3 << 22)
-
-#define HW_AUDIOOUT_ANACLKCTRL  (*(volatile uint32_t *)(HW_AUDIOOUT_BASE + 0xe0))
-#define HW_AUDIOOUT_ANACLKCTRL__DACDIV_BP   0
-#define HW_AUDIOOUT_ANACLKCTRL__DACDIV_BM   (7 << 0)
-#define HW_AUDIOOUT_ANACLKCTRL__CLKGATE     (1 << 31)
-
-#define HW_AUDIOOUT_DATA        (*(volatile uint32_t *)(HW_AUDIOOUT_BASE + 0xf0))
-
-#define HW_AUDIOOUT_VERSION     (*(volatile uint32_t *)(HW_AUDIOOUT_BASE + 0x200))
-
+#include "regs/regs-audioout.h"
 
 void imx233_audioout_preinit(void);
 void imx233_audioout_postinit(void);