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

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

Merge "msm: iomap: 8084: Add mapping for the MPM_PSHOLD region"

parents 3026bbf1 3dcda5ab

arch/arm/mach-msm/include/mach/msm_iomap-8084.h

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ 
#define APQ8084_TLMM_PHYS	0xFD510000

#define APQ8084_TLMM_SIZE	SZ_16K



#define APQ8084_MPM2_PSHOLD_PHYS	0xFC4AB000

#define APQ8084_MPM2_PSHOLD_SIZE	SZ_4K



#ifdef CONFIG_DEBUG_APQ8084_UART

#define MSM_DEBUG_UART_BASE	IOMEM(0xFA75E000)

#define MSM_DEBUG_UART_PHYS	0xF995E000

arch/arm/mach-msm/io.c

+1 −0
Original line number Diff line number Diff line
@@ -328,6 +328,7 @@ void __init msm_map_8974_io(void) 
#ifdef CONFIG_ARCH_APQ8084

static struct map_desc msm_8084_io_desc[] __initdata = {

	MSM_CHIP_DEVICE(QGIC_DIST, APQ8084),

	MSM_CHIP_DEVICE(MPM2_PSHOLD, APQ8084),

	MSM_CHIP_DEVICE(TLMM, APQ8084),

	{

		.virtual =  (unsigned long) MSM_SHARED_RAM_BASE,