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

Commit 6cf6dfef authored by Steve Muckle's avatar Steve Muckle Committed by Daniel Walker
Browse files

msm: io: MSM8X60 io support 



MSM8X60 has different IO mappings than previous MSMs.

Signed-off-by: default avatarSteve Muckle <smuckle@codeaurora.org>
Signed-off-by: default avatarDaniel Walker <dwalker@codeaurora.org>
parent c8aabaeb

arch/arm/mach-msm/include/mach/io.h

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ void __iomem *__msm_ioremap(unsigned long phys_addr, size_t size, unsigned int m 


void msm_map_qsd8x50_io(void);

void msm_map_msm7x30_io(void);

void msm_map_msm8x60_io(void);



extern unsigned int msm_shared_ram_phys;

arch/arm/mach-msm/include/mach/msm_iomap-8x60.h

+19 −0
Original line number Diff line number Diff line
@@ -35,8 +35,27 @@ 
 *

 */



#define MSM_QGIC_DIST_BASE	IOMEM(0xF0000000)

#define MSM_QGIC_DIST_PHYS	0x02080000

#define MSM_QGIC_DIST_SIZE	SZ_4K



#define MSM_QGIC_CPU_BASE	IOMEM(0xF0001000)

#define MSM_QGIC_CPU_PHYS	0x02081000

#define MSM_QGIC_CPU_SIZE	SZ_4K



#define MSM_ACC_BASE		IOMEM(0xF0002000)

#define MSM_ACC_PHYS		0x02001000

#define MSM_ACC_SIZE		SZ_4K



#define MSM_GCC_BASE		IOMEM(0xF0003000)

#define MSM_GCC_PHYS		0x02082000

#define MSM_GCC_SIZE		SZ_4K



#define MSM_TLMM_BASE		IOMEM(0xF0004000)

#define MSM_TLMM_PHYS		0x00800000

#define MSM_TLMM_SIZE		SZ_16K



#define MSM_SHARED_RAM_BASE	IOMEM(0xF0100000)

#define MSM_SHARED_RAM_SIZE	SZ_1M



#endif

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

+2 −0
Original line number Diff line number Diff line
@@ -53,4 +53,6 @@ 
#include "msm_iomap-7x00.h"

#endif







#endif

arch/arm/mach-msm/io.c

+15 −0
Original line number Diff line number Diff line
@@ -100,6 +100,21 @@ void __init msm_map_qsd8x50_io(void) 
}

#endif /* CONFIG_ARCH_QSD8X50 */



#ifdef CONFIG_ARCH_MSM8X60

static struct map_desc msm8x60_io_desc[] __initdata = {

	MSM_DEVICE(QGIC_DIST),

	MSM_DEVICE(QGIC_CPU),

	MSM_DEVICE(TMR),

	MSM_DEVICE(ACC),

	MSM_DEVICE(GCC),

};



void __init msm_map_msm8x60_io(void)

{

	iotable_init(msm8x60_io_desc, ARRAY_SIZE(msm8x60_io_desc));

}

#endif /* CONFIG_ARCH_MSM8X60 */



#ifdef CONFIG_ARCH_MSM7X30

static struct map_desc msm7x30_io_desc[] __initdata = {

	MSM_DEVICE(VIC),