ext: hal: mchp: Fix compilation for MEC1501 HAL macros

Correct HAL macros related to eSPI block
Add GIRQ bit definitions for VWires and some peripherals

Signed-off-by: Jose Alberto Meza <jose.a.meza.arellano@intel.com>
This commit is contained in:
Jose Alberto Meza 2019-05-10 15:56:53 -07:00 committed by Andrew Boie
parent 385bd2a669
commit 2c92ea7bc2
3 changed files with 44 additions and 9 deletions

View File

@ -122,14 +122,14 @@
#define MCHP_GIRQ17_ZID 9u
#define MCHP_GIRQ18_ZID 10u
#define MCHP_GIRQ19_ZID 11u
#define MCHP_GIRQ20_ZID 12u
#define MCHP_GIRQ20_ZID 12u /* Nothing in datasheet */
#define MCHP_GIRQ21_ZID 13u
#define MCHP_GIRQ22_ZID 14u
#define MCHP_GIRQ23_ZID 15u
#define MCHP_GIRQ24_ZID 16u
#define MCHP_GIRQ25_ZID 17u
#define MCHP_GIRQ26_ZID 18u
#define MCHP_GIRQ_ZID_MAX 19u
#define MCHP_GIRQ23_ZID 14u /* Adjust per datasheet */
#define MCHP_GIRQ24_ZID 15u
#define MCHP_GIRQ25_ZID 16u
#define MCHP_GIRQ26_ZID 17u
#define MCHP_GIRQ_ZID_MAX 18u
#define MCHP_ECIA_BLK_ENSET_OFS 0x200ul
#define MCHP_ECIA_BLK_ENCLR_OFS 0x204ul
@ -321,7 +321,7 @@ enum MCHP_GIRQ_IDS {
MCHP_GIRQ19_ID,
MCHP_GIRQ20_ID,
MCHP_GIRQ21_ID,
MCHP_GIRQ22_ID,
MCHP_GIRQ23_ID,
MCHP_GIRQ24_ID,
MCHP_GIRQ25_ID,
@ -329,6 +329,10 @@ enum MCHP_GIRQ_IDS {
MCHP_GIRQ_ID_MAX,
};
/* GIRQ Source, Enable_Set/Clr, Result registers bit positions */
#define MCHP_PORT80_DEBUG0_GIRQ_VAL (1ul << 22)
#define MCHP_PORT80_DEBUG1_GIRQ_VAL (1ul << 23)
/**
* @brief EC Interrupt Aggregator (ECIA)
*/

View File

@ -198,6 +198,35 @@
#define MEC_ESPI_MSVW06_SRC2_POS 26u
#define MEC_ESPI_MSVW06_SRC3_POS 27u
#define MEC_ESPI_MSVW00_SRC0_VAL (1 << MEC_ESPI_MSVW00_SRC0_POS)
#define MEC_ESPI_MSVW00_SRC1_VAL (1 << MEC_ESPI_MSVW00_SRC1_POS)
#define MEC_ESPI_MSVW00_SRC2_VAL (1 << MEC_ESPI_MSVW00_SRC2_POS)
#define MEC_ESPI_MSVW00_SRC3_VAL (1 << MEC_ESPI_MSVW00_SRC3_POS)
#define MEC_ESPI_MSVW01_SRC0_VAL (1 << MEC_ESPI_MSVW01_SRC0_POS)
#define MEC_ESPI_MSVW01_SRC1_VAL (1 << MEC_ESPI_MSVW01_SRC1_POS)
#define MEC_ESPI_MSVW01_SRC2_VAL (1 << MEC_ESPI_MSVW01_SRC2_POS)
#define MEC_ESPI_MSVW01_SRC3_VAL (1 << MEC_ESPI_MSVW01_SRC3_POS)
#define MEC_ESPI_MSVW02_SRC0_VAL (1 << MEC_ESPI_MSVW02_SRC0_POS)
#define MEC_ESPI_MSVW02_SRC1_VAL (1 << MEC_ESPI_MSVW02_SRC1_POS)
#define MEC_ESPI_MSVW02_SRC2_VAL (1 << MEC_ESPI_MSVW02_SRC2_POS)
#define MEC_ESPI_MSVW02_SRC3_VAL (1 << MEC_ESPI_MSVW02_SRC3_POS)
#define MEC_ESPI_MSVW03_SRC0_VAL (1 << MEC_ESPI_MSVW03_SRC0_POS)
#define MEC_ESPI_MSVW03_SRC1_VAL (1 << MEC_ESPI_MSVW03_SRC1_POS)
#define MEC_ESPI_MSVW03_SRC2_VAL (1 << MEC_ESPI_MSVW03_SRC2_POS)
#define MEC_ESPI_MSVW03_SRC3_VAL (1 << MEC_ESPI_MSVW03_SRC3_POS)
#define MEC_ESPI_MSVW04_SRC0_VAL (1 << MEC_ESPI_MSVW04_SRC0_POS)
#define MEC_ESPI_MSVW04_SRC1_VAL (1 << MEC_ESPI_MSVW04_SRC1_POS)
#define MEC_ESPI_MSVW04_SRC2_VAL (1 << MEC_ESPI_MSVW04_SRC2_POS)
#define MEC_ESPI_MSVW04_SRC3_VAL (1 << MEC_ESPI_MSVW04_SRC3_POS)
#define MEC_ESPI_MSVW05_SRC0_VAL (1 << MEC_ESPI_MSVW05_SRC0_POS)
#define MEC_ESPI_MSVW05_SRC1_VAL (1 << MEC_ESPI_MSVW05_SRC1_POS)
#define MEC_ESPI_MSVW05_SRC2_VAL (1 << MEC_ESPI_MSVW05_SRC2_POS)
#define MEC_ESPI_MSVW05_SRC3_VAL (1 << MEC_ESPI_MSVW05_SRC3_POS)
#define MEC_ESPI_MSVW06_SRC0_VAL (1 << MEC_ESPI_MSVW06_SRC0_POS)
#define MEC_ESPI_MSVW06_SRC1_VAL (1 << MEC_ESPI_MSVW06_SRC1_POS)
#define MEC_ESPI_MSVW06_SRC2_VAL (1 << MEC_ESPI_MSVW06_SRC2_POS)
#define MEC_ESPI_MSVW06_SRC3_VAL (1 << MEC_ESPI_MSVW06_SRC3_POS)
/*
* 0 <= v <= 6
* 0 <= s <= 3

View File

@ -121,7 +121,9 @@ typedef struct vbatr_regs
__IOM uint32_t PFRS; /*! (@ 0x00000000) VBATR Power Fail Reset Status */
uint8_t RSVD1[4];
__IOM uint32_t CLK32_EN; /*! (@ 0x00000008) VBATR 32K clock enable */
uint8_t RSVD2[20];
__IOM uint32_t SHDN_EN; /*! (@ 0x0000000C) VBATR SHD pin enable */
uint8_t RSVD2[12];
__IOM uint32_t CKK32_TRIM; /*! (@ 0x0000001C) VBATR 32 clock override */
__IOM uint32_t MCNT_LO; /*! (@ 0x00000020) VBATR monotonic count lo */
__IOM uint32_t MCNT_HI; /*! (@ 0x00000024) VBATR monotonic count hi */
} VBATR_Type;