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

Commit 8e8bc409 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: fsm9900: Add mapping for the MPM_PSHOLD region"

parents b9e8985e f922f807

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

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

#define FSM9900_TLMM_SIZE	SZ_16K



#define FSM9900_MPM2_PSHOLD_PHYS	0xFC4AB000

#define FSM9900_MPM2_PSHOLD_SIZE	SZ_4K



#ifdef CONFIG_DEBUG_FSM9900_UART

#define MSM_DEBUG_UART_BASE	IOMEM(0xFA760000)

#define MSM_DEBUG_UART_PHYS	0xF9960000

arch/arm/mach-msm/io.c

+1 −0
Original line number Diff line number Diff line
@@ -414,6 +414,7 @@ void __init msm_map_fsm9xxx_io(void) 
static struct map_desc fsm9900_io_desc[] __initdata = {

	MSM_CHIP_DEVICE(QGIC_DIST, FSM9900),

	MSM_CHIP_DEVICE(TLMM, FSM9900),

	MSM_CHIP_DEVICE(MPM2_PSHOLD, FSM9900),

	{

		.virtual =  (unsigned long) MSM_SHARED_RAM_BASE,

		.length =   MSM_SHARED_RAM_SIZE,