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

Commit 0e7d35c1 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'msm-board-for-3.7' of... 

Merge tag 'msm-board-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into next/boards

Final parts to allow msm8660 and msm8960 to build into the same
kernel.  This won't work without the changes from msm-dt-for-3.7.

* tag 'msm-board-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm:
  ARM: msm: Allow 8960 and 8660 to compile together
  ARM: msm: Allow msm_iomap-8x60 and msm_iomap-8960 to coexist
parents a838ef7c 33fcb13d

arch/arm/mach-msm/Kconfig

+6 −2
Original line number Diff line number Diff line 
if ARCH_MSM



comment "Qualcomm MSM SoC Type"

	depends on (ARCH_MSM8X60 || ARCH_MSM8960)



choice

	prompt "Qualcomm MSM SoC Type"

	default ARCH_MSM7X00A

	depends on !(ARCH_MSM8X60 || ARCH_MSM8960)



config ARCH_MSM7X00A

	bool "MSM7x00A / MSM7x01A"
@@ -36,6 +40,8 @@ config ARCH_QSD8X50 
	select GPIO_MSM_V1

	select MSM_PROC_COMM



endchoice



config ARCH_MSM8X60

	bool "MSM8X60"

	select MACH_MSM8X60_SURF if (!MACH_MSM8X60_RUMI3 && !MACH_MSM8X60_SIM \
@@ -58,8 +64,6 @@ config ARCH_MSM8960 
	select MSM_GPIOMUX

	select MSM_SCM if SMP



endchoice



config MSM_HAS_DEBUG_UART_HS

	bool

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