Skip to content

Commit 2c92ea7

Browse files
albertofloydandrewboie
authored andcommitted
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>
1 parent 385bd2a commit 2c92ea7

File tree

3 files changed

+44
-9
lines changed

3 files changed

+44
-9
lines changed

mec/mec1501/component/ecia.h

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -122,14 +122,14 @@
122122
#define MCHP_GIRQ17_ZID9u
123123
#define MCHP_GIRQ18_ZID10u
124124
#define MCHP_GIRQ19_ZID11u
125-
#define MCHP_GIRQ20_ZID12u
125+
#define MCHP_GIRQ20_ZID12u /* Nothing in datasheet */
126126
#define MCHP_GIRQ21_ZID13u
127-
#define MCHP_GIRQ22_ZID14u
128-
#define MCHP_GIRQ23_ZID15u
129-
#define MCHP_GIRQ24_ZID16u
130-
#define MCHP_GIRQ25_ZID17u
131-
#define MCHP_GIRQ26_ZID18u
132-
#define MCHP_GIRQ_ZID_MAX19u
127+
128+
#define MCHP_GIRQ23_ZID14u /* Adjust per datasheet */
129+
#define MCHP_GIRQ24_ZID15u
130+
#define MCHP_GIRQ25_ZID16u
131+
#define MCHP_GIRQ26_ZID17u
132+
#define MCHP_GIRQ_ZID_MAX18u
133133

134134
#define MCHP_ECIA_BLK_ENSET_OFS0x200ul
135135
#define MCHP_ECIA_BLK_ENCLR_OFS0x204ul
@@ -321,14 +321,18 @@ enum MCHP_GIRQ_IDS {
321321
MCHP_GIRQ19_ID,
322322
MCHP_GIRQ20_ID,
323323
MCHP_GIRQ21_ID,
324-
MCHP_GIRQ22_ID,
324+
325325
MCHP_GIRQ23_ID,
326326
MCHP_GIRQ24_ID,
327327
MCHP_GIRQ25_ID,
328328
MCHP_GIRQ26_ID,
329329
MCHP_GIRQ_ID_MAX,
330330
};
331331

332+
/* GIRQ Source, Enable_Set/Clr, Result registers bit positions */
333+
#define MCHP_PORT80_DEBUG0_GIRQ_VAL(1ul << 22)
334+
#define MCHP_PORT80_DEBUG1_GIRQ_VAL(1ul << 23)
335+
332336
/**
333337
* @brief EC Interrupt Aggregator (ECIA)
334338
*/

mec/mec1501/component/espi_vw.h

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,35 @@
198198
#define MEC_ESPI_MSVW06_SRC2_POS 26u
199199
#define MEC_ESPI_MSVW06_SRC3_POS 27u
200200

201+
#define MEC_ESPI_MSVW00_SRC0_VAL (1 << MEC_ESPI_MSVW00_SRC0_POS)
202+
#define MEC_ESPI_MSVW00_SRC1_VAL (1 << MEC_ESPI_MSVW00_SRC1_POS)
203+
#define MEC_ESPI_MSVW00_SRC2_VAL (1 << MEC_ESPI_MSVW00_SRC2_POS)
204+
#define MEC_ESPI_MSVW00_SRC3_VAL (1 << MEC_ESPI_MSVW00_SRC3_POS)
205+
#define MEC_ESPI_MSVW01_SRC0_VAL (1 << MEC_ESPI_MSVW01_SRC0_POS)
206+
#define MEC_ESPI_MSVW01_SRC1_VAL (1 << MEC_ESPI_MSVW01_SRC1_POS)
207+
#define MEC_ESPI_MSVW01_SRC2_VAL (1 << MEC_ESPI_MSVW01_SRC2_POS)
208+
#define MEC_ESPI_MSVW01_SRC3_VAL (1 << MEC_ESPI_MSVW01_SRC3_POS)
209+
#define MEC_ESPI_MSVW02_SRC0_VAL (1 << MEC_ESPI_MSVW02_SRC0_POS)
210+
#define MEC_ESPI_MSVW02_SRC1_VAL (1 << MEC_ESPI_MSVW02_SRC1_POS)
211+
#define MEC_ESPI_MSVW02_SRC2_VAL (1 << MEC_ESPI_MSVW02_SRC2_POS)
212+
#define MEC_ESPI_MSVW02_SRC3_VAL (1 << MEC_ESPI_MSVW02_SRC3_POS)
213+
#define MEC_ESPI_MSVW03_SRC0_VAL (1 << MEC_ESPI_MSVW03_SRC0_POS)
214+
#define MEC_ESPI_MSVW03_SRC1_VAL (1 << MEC_ESPI_MSVW03_SRC1_POS)
215+
#define MEC_ESPI_MSVW03_SRC2_VAL (1 << MEC_ESPI_MSVW03_SRC2_POS)
216+
#define MEC_ESPI_MSVW03_SRC3_VAL (1 << MEC_ESPI_MSVW03_SRC3_POS)
217+
#define MEC_ESPI_MSVW04_SRC0_VAL (1 << MEC_ESPI_MSVW04_SRC0_POS)
218+
#define MEC_ESPI_MSVW04_SRC1_VAL (1 << MEC_ESPI_MSVW04_SRC1_POS)
219+
#define MEC_ESPI_MSVW04_SRC2_VAL (1 << MEC_ESPI_MSVW04_SRC2_POS)
220+
#define MEC_ESPI_MSVW04_SRC3_VAL (1 << MEC_ESPI_MSVW04_SRC3_POS)
221+
#define MEC_ESPI_MSVW05_SRC0_VAL (1 << MEC_ESPI_MSVW05_SRC0_POS)
222+
#define MEC_ESPI_MSVW05_SRC1_VAL (1 << MEC_ESPI_MSVW05_SRC1_POS)
223+
#define MEC_ESPI_MSVW05_SRC2_VAL (1 << MEC_ESPI_MSVW05_SRC2_POS)
224+
#define MEC_ESPI_MSVW05_SRC3_VAL (1 << MEC_ESPI_MSVW05_SRC3_POS)
225+
#define MEC_ESPI_MSVW06_SRC0_VAL (1 << MEC_ESPI_MSVW06_SRC0_POS)
226+
#define MEC_ESPI_MSVW06_SRC1_VAL (1 << MEC_ESPI_MSVW06_SRC1_POS)
227+
#define MEC_ESPI_MSVW06_SRC2_VAL (1 << MEC_ESPI_MSVW06_SRC2_POS)
228+
#define MEC_ESPI_MSVW06_SRC3_VAL (1 << MEC_ESPI_MSVW06_SRC3_POS)
229+
201230
/*
202231
* 0 <= v <= 6
203232
* 0 <= s <= 3

mec/mec1501/component/vbat.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,9 @@ typedef struct vbatr_regs
121121
__IOM uint32_t PFRS;/*! (@ 0x00000000) VBATR Power Fail Reset Status */
122122
uint8_t RSVD1[4];
123123
__IOM uint32_t CLK32_EN;/*! (@ 0x00000008) VBATR 32K clock enable */
124-
uint8_t RSVD2[20];
124+
__IOM uint32_t SHDN_EN;/*! (@ 0x0000000C) VBATR SHD pin enable */
125+
uint8_t RSVD2[12];
126+
__IOM uint32_t CKK32_TRIM;/*! (@ 0x0000001C) VBATR 32 clock override */
125127
__IOM uint32_t MCNT_LO;/*! (@ 0x00000020) VBATR monotonic count lo */
126128
__IOM uint32_t MCNT_HI;/*! (@ 0x00000024) VBATR monotonic count hi */
127129
} VBATR_Type;

0 commit comments

Comments
 (0)