Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Final parts to allow msm8660 and msm8960 to build into the same

Browse source 
kernel.  This won't work without the changes from msm-dt-for-3.7.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
 iQIcBAABAgAGBQJQUiV9AAoJEOa6n1xeVN+CEUMP/1bKEYGlM2+xLJHgUBlvLdvB
 RkP7z5NSjCWPbVPROUV9ywdwX+GjFK8BJvGj+94iKLpfRuppp/fOvDfSYKGrwTyK
 KFpjwP1WCq7hHJqRzkUbqMJ0wvFBDmL67VQqM+JjqDLEhN3zxP6ZS+kI+nXRqh1+
 zdCj3+cSfnx918ftAOsPf01OMPZbFP1JbztBbnYIb8Z63LDeSnwGN1qcTVueFPIu
 yFgl2UBm0GdcmGIjzAKQ/igfSqZ0LZV9qg1DWGi3a7WaBqXyCCFxM3GsEPCuN7Tl
 nhbZ6StjaowsQ/NVSCFNZJCt4R0csCWtvvtth0lKlbuxFNq8TGI0Z2jgJXbbMF05
 YergDDI/xW3LvYnzVyTqDv5Aupy9LNUwYRXpvtXKTg5jKI2afC6Had2A9i/M3HhS
 Dqf8NQsOWrOYSbMIeSTAVQYwDQGDmr6OzmR92Itx7aUsyPySZ/QHjLzWmp01dcG5
 NWOcUynX4GyXKi0KcV5ETKQvJ64rWCCJzNiBmRKKYUAoYsUhJi/VahR1KAfzlipO
 nKdEJZLTvfHlD4iXvhI9oOXnXn6BZSfQZxt9cXRC7opUuAEKJY+OjFlM3ShQruNZ
 Q5pzF6YduihzTkuPbP+HseMaIkmAfvrBzaq93/lK2ZjLebA2DnZ+Z+sQuqV07uH/
 5ABireTMSlrd1F17eld0
 =zaul
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Olof Johansson 2012-09-16 17:39:21 -07:00
commit 0e7d35c1fb
4 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/arm/mach-msm/Kconfig
View file

@ -1,8 +1,12 @@
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

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

@ -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

3
arch/arm/mach-msm/include/mach/msm_iomap.h
View file

@ -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

2
arch/arm/mach-msm/io.c
View file

@ -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