Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b461af0 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: gsi: Remove duplicate registers defines"

parents 5e000c78 a1374d65

drivers/platform/msm/gsi/gsi.c

+3 −2
Original line number Diff line number Diff line
@@ -2758,9 +2758,10 @@ void gsi_get_inst_ram_offset_and_size(unsigned long *base_offset, 
		unsigned long *size)

{

	if (base_offset)

		*base_offset = GSI_GSI_INST_RAM_BASE_OFFS;

		*base_offset = GSI_GSI_INST_RAM_n_OFFS(0);

	if (size)

		*size = GSI_GSI_INST_RAM_SIZE;

		*size = GSI_GSI_INST_RAM_n_WORD_SZ *

			(GSI_GSI_INST_RAM_n_MAXn + 1);

}

EXPORT_SYMBOL(gsi_get_inst_ram_offset_and_size);

drivers/platform/msm/gsi/gsi_reg.h

+2 −3
Original line number Diff line number Diff line
@@ -688,8 +688,9 @@ 
#define GSI_GSI_IRAM_PTR_INT_MOD_STOPED_IRAM_PTR_BMSK 0xfff

#define GSI_GSI_IRAM_PTR_INT_MOD_STOPED_IRAM_PTR_SHFT 0x0



#define GSI_GSI_INST_RAM_n_WORD_SZ 0x4

#define GSI_GSI_INST_RAM_n_OFFS(n) \

	(GSI_GSI_REG_BASE_OFFS + 0x00004000 + 0x4 * (n))

	(GSI_GSI_REG_BASE_OFFS + 0x00004000 + GSI_GSI_INST_RAM_n_WORD_SZ * (n))

#define GSI_GSI_INST_RAM_n_RMSK 0xffffffff

#define GSI_GSI_INST_RAM_n_MAXn 4095

#define GSI_GSI_INST_RAM_n_INST_BYTE_3_BMSK 0xff000000
@@ -1842,7 +1843,5 @@ 
#define GSI_INTER_EE_n_SRC_EV_CH_IRQ_CLR_EV_CH_BIT_MAP_BMSK 0xffffffff

#define GSI_INTER_EE_n_SRC_EV_CH_IRQ_CLR_EV_CH_BIT_MAP_SHFT 0x0



#define GSI_GSI_INST_RAM_BASE_OFFS	0x4000

#define GSI_GSI_INST_RAM_SIZE		0x4000



#endif /* __GSI_REG_H__ */