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

Commit cb03af01 authored by Stephen Boyd's avatar Stephen Boyd Committed by David Brown
Browse files

ARM: msm: Allow msm_iomap-8x60 and msm_iomap-8960 to coexist 



Remove the unused GCC, ACC, and shared memory definitions in the
8660 static mappings. This allows the 8660 header file to be
included in msm_iomap.h unconditionally.

Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarDavid Brown <davidb@codeaurora.org>
parent 28a33cbc

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

+0 −11
Original line number Diff line number Diff line
@@ -41,21 +41,10 @@ 
#define MSM8X60_QGIC_CPU_PHYS	0x02081000

#define MSM8X60_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



#define MSM8X60_TMR_PHYS	0x02000000

#define MSM8X60_TMR_SIZE	SZ_4K

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

+1 −2
Original line number Diff line number Diff line
@@ -41,12 +41,11 @@ 
#include "msm_iomap-7x30.h"

#elif defined(CONFIG_ARCH_QSD8X50)

#include "msm_iomap-8x50.h"

#elif defined(CONFIG_ARCH_MSM8X60)

#include "msm_iomap-8x60.h"

#else

#include "msm_iomap-7x00.h"

#endif



#include "msm_iomap-8x60.h"

#include "msm_iomap-8960.h"



#define MSM_DEBUG_UART_SIZE	SZ_4K

arch/arm/mach-msm/io.c

+0 −2
Original line number Diff line number Diff line
@@ -109,8 +109,6 @@ static struct map_desc msm8x60_io_desc[] __initdata = { 
	MSM_CHIP_DEVICE(QGIC_CPU, MSM8X60),

	MSM_CHIP_DEVICE(TMR, MSM8X60),

	MSM_CHIP_DEVICE(TMR0, MSM8X60),

	MSM_DEVICE(ACC),

	MSM_DEVICE(GCC),

#ifdef CONFIG_DEBUG_MSM8660_UART

	MSM_DEVICE(DEBUG_UART),

#endif