Skip to content

Commit 97d8aa3

Browse files
alvsunjhedberg
authored andcommitted
soc: npcx: update npck register structure checks for consistency
As title. Signed-off-by: Alvis Sun <[email protected]>
1 parent f0c6168 commit 97d8aa3

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

soc/nuvoton/npcx/common/npckn/registers.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,7 @@ NPCX_REG_OFFSET_CHECK(shm_reg, DP80BUF, 0x040);
102102
NPCX_REG_OFFSET_CHECK(shm_reg, DP80CTL, 0x044);
103103
NPCX_REG_OFFSET_CHECK(shm_reg, HOFS_STS, 0x048);
104104
NPCX_REG_OFFSET_CHECK(shm_reg, COFS1, 0x04c);
105-
#if defined(CONFIG_SOC_SERIES_NPCK3)
106105
NPCX_REG_OFFSET_CHECK(shm_reg, SHM_CTL2, 0x04e);
107-
#endif
108106

109107
/* KBC register structure check */
110108
NPCX_REG_SIZE_CHECK(kbc_reg, 0x00c);
@@ -168,24 +166,14 @@ NPCX_REG_OFFSET_CHECK(ps2_reg, PSISIG, 0x008);
168166
NPCX_REG_OFFSET_CHECK(ps2_reg, PSIEN, 0x00a);
169167

170168
/* FIU register structure check */
171-
#if defined(CONFIG_SOC_SERIES_NPCX9) || defined(CONFIG_SOC_SERIES_NPCX4)
172-
NPCX_REG_SIZE_CHECK(fiu_reg, 0x040);
173-
#elif defined(CONFIG_SOC_SERIES_NPCK3)
174169
NPCX_REG_SIZE_CHECK(fiu_reg, 0x044);
175-
#else
176-
NPCX_REG_SIZE_CHECK(fiu_reg, 0x034);
177-
#endif
178170
NPCX_REG_OFFSET_CHECK(fiu_reg, BURST_CFG, 0x001);
179171
NPCX_REG_OFFSET_CHECK(fiu_reg, SPI_FL_CFG, 0x014);
180172
NPCX_REG_OFFSET_CHECK(fiu_reg, UMA_CTS, 0x01e);
181173
NPCX_REG_OFFSET_CHECK(fiu_reg, CRCCON, 0x026);
182-
#if defined(CONFIG_SOC_SERIES_NPCK3)
183174
NPCX_REG_OFFSET_CHECK(fiu_reg, FIU_RD_CMD_BACK, 0x02E);
184175
NPCX_REG_OFFSET_CHECK(fiu_reg, FIU_RD_CMD_PVT, 0x030);
185176
NPCX_REG_OFFSET_CHECK(fiu_reg, FIU_RD_CMD_SHD, 0x031);
186-
#else
187-
NPCX_REG_OFFSET_CHECK(fiu_reg, FIU_RD_CMD, 0x030);
188-
#endif
189177
NPCX_REG_OFFSET_CHECK(fiu_reg, FIU_EXT_CFG, 0x033);
190178

191179
/* PECI register structure check */

0 commit comments

Comments
 (0)