diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 21:48:30 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 21:48:30 -0400 |
commit | 95360fd63606918167a5365b770a6d28d333f0ed (patch) | |
tree | 37b2d868fb70d3ef214345e56d7993a0c73a0ddc /arch/arm/mach-msm | |
parent | 8f446a7a069e0af0639385f67c78ee2279bca04c (diff) | |
parent | e6ca4ae895e9fbf8b96d3ee1dd44ea96e95babad (diff) |
Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM soc board specific updates from Olof Johansson:
"Misc board updates:
- Greg added a handful of boards to KS8695 (since he has stepped up
to maintain it).
- Qualcomm has added DT-only board support for a couple of their
newer SoCs.
- misc other updates for Samsung and Freescale boards."
Fix up trivial conflict in arch/arm/mach-shmobile/board-armadillo800eva.c
due to gpio device data being added next to hdmi device data that got moved.
* tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: msm: Allow 8960 and 8660 to compile together
ARM: msm: Allow msm_iomap-8x60 and msm_iomap-8960 to coexist
ARM: EXYNOS: Add generic PWM lookup support for SMDKV310
ARM: EXYNOS: Add generic PWM lookup support for SMDK4X12
ARM: EXYNOS: Use generic pwm driver in Origen board
ARM: shmobile: armadillo800eva: Add support RTC
ARM: ks8695: add board support for the OpenGear boards based on the KS8695
ARM: ks8695: add board support for the SnapGear boards based on the KS8695
ARM: dts: Add heartbeat gpio-leds support to Origen
ARM: dts: Use active low flag for gpio-keys on Origen
ARM: shmobile: marzen: enable thermal sensor
ARM: shmobile: marzen: fixup regulator id for smsc911x
ARM: shmobile: marzen: add SDHI0 support
ARM: mmp: enable debug uart port in defconfig
ARM: mmp: implement DEBUG_LL port choice
ARM: S3C64XX: Register audio platform devices for Bells on Cragganmore
ARM: S3C64XX: Update configuration for WM5102 module on Cragganmore
ARM: mx27pdk: Add audio support
ARM: ttc_dkb: add nand support
Diffstat (limited to 'arch/arm/mach-msm')
-rw-r--r-- | arch/arm/mach-msm/Kconfig | 8 | ||||
-rw-r--r-- | arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 11 | ||||
-rw-r--r-- | arch/arm/mach-msm/include/mach/msm_iomap.h | 3 | ||||
-rw-r--r-- | arch/arm/mach-msm/io.c | 2 |
4 files changed, 7 insertions, 17 deletions
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig index b2740c800e8c..7902de151cc5 100644 --- a/arch/arm/mach-msm/Kconfig +++ b/arch/arm/mach-msm/Kconfig | |||
@@ -1,8 +1,12 @@ | |||
1 | if ARCH_MSM | 1 | if ARCH_MSM |
2 | 2 | ||
3 | comment "Qualcomm MSM SoC Type" | ||
4 | depends on (ARCH_MSM8X60 || ARCH_MSM8960) | ||
5 | |||
3 | choice | 6 | choice |
4 | prompt "Qualcomm MSM SoC Type" | 7 | prompt "Qualcomm MSM SoC Type" |
5 | default ARCH_MSM7X00A | 8 | default ARCH_MSM7X00A |
9 | depends on !(ARCH_MSM8X60 || ARCH_MSM8960) | ||
6 | 10 | ||
7 | config ARCH_MSM7X00A | 11 | config ARCH_MSM7X00A |
8 | bool "MSM7x00A / MSM7x01A" | 12 | bool "MSM7x00A / MSM7x01A" |
@@ -36,6 +40,8 @@ config ARCH_QSD8X50 | |||
36 | select GPIO_MSM_V1 | 40 | select GPIO_MSM_V1 |
37 | select MSM_PROC_COMM | 41 | select MSM_PROC_COMM |
38 | 42 | ||
43 | endchoice | ||
44 | |||
39 | config ARCH_MSM8X60 | 45 | config ARCH_MSM8X60 |
40 | bool "MSM8X60" | 46 | bool "MSM8X60" |
41 | select ARCH_MSM_SCORPIONMP | 47 | select ARCH_MSM_SCORPIONMP |
@@ -57,8 +63,6 @@ config ARCH_MSM8960 | |||
57 | select MSM_SCM if SMP | 63 | select MSM_SCM if SMP |
58 | select USE_OF | 64 | select USE_OF |
59 | 65 | ||
60 | endchoice | ||
61 | |||
62 | config MSM_HAS_DEBUG_UART_HS | 66 | config MSM_HAS_DEBUG_UART_HS |
63 | bool | 67 | bool |
64 | 68 | ||
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h b/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h index c6d38f1d0c98..199372e62def 100644 --- a/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h +++ b/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | |||
@@ -41,21 +41,10 @@ | |||
41 | #define MSM8X60_QGIC_CPU_PHYS 0x02081000 | 41 | #define MSM8X60_QGIC_CPU_PHYS 0x02081000 |
42 | #define MSM8X60_QGIC_CPU_SIZE SZ_4K | 42 | #define MSM8X60_QGIC_CPU_SIZE SZ_4K |
43 | 43 | ||
44 | #define MSM_ACC_BASE IOMEM(0xF0002000) | ||
45 | #define MSM_ACC_PHYS 0x02001000 | ||
46 | #define MSM_ACC_SIZE SZ_4K | ||
47 | |||
48 | #define MSM_GCC_BASE IOMEM(0xF0003000) | ||
49 | #define MSM_GCC_PHYS 0x02082000 | ||
50 | #define MSM_GCC_SIZE SZ_4K | ||
51 | |||
52 | #define MSM_TLMM_BASE IOMEM(0xF0004000) | 44 | #define MSM_TLMM_BASE IOMEM(0xF0004000) |
53 | #define MSM_TLMM_PHYS 0x00800000 | 45 | #define MSM_TLMM_PHYS 0x00800000 |
54 | #define MSM_TLMM_SIZE SZ_16K | 46 | #define MSM_TLMM_SIZE SZ_16K |
55 | 47 | ||
56 | #define MSM_SHARED_RAM_BASE IOMEM(0xF0100000) | ||
57 | #define MSM_SHARED_RAM_SIZE SZ_1M | ||
58 | |||
59 | #define MSM8X60_TMR_PHYS 0x02000000 | 48 | #define MSM8X60_TMR_PHYS 0x02000000 |
60 | #define MSM8X60_TMR_SIZE SZ_4K | 49 | #define MSM8X60_TMR_SIZE SZ_4K |
61 | 50 | ||
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap.h b/arch/arm/mach-msm/include/mach/msm_iomap.h index 00afdfb8c38f..2ab7cf0919b3 100644 --- a/arch/arm/mach-msm/include/mach/msm_iomap.h +++ b/arch/arm/mach-msm/include/mach/msm_iomap.h | |||
@@ -41,12 +41,11 @@ | |||
41 | #include "msm_iomap-7x30.h" | 41 | #include "msm_iomap-7x30.h" |
42 | #elif defined(CONFIG_ARCH_QSD8X50) | 42 | #elif defined(CONFIG_ARCH_QSD8X50) |
43 | #include "msm_iomap-8x50.h" | 43 | #include "msm_iomap-8x50.h" |
44 | #elif defined(CONFIG_ARCH_MSM8X60) | ||
45 | #include "msm_iomap-8x60.h" | ||
46 | #else | 44 | #else |
47 | #include "msm_iomap-7x00.h" | 45 | #include "msm_iomap-7x00.h" |
48 | #endif | 46 | #endif |
49 | 47 | ||
48 | #include "msm_iomap-8x60.h" | ||
50 | #include "msm_iomap-8960.h" | 49 | #include "msm_iomap-8960.h" |
51 | 50 | ||
52 | #define MSM_DEBUG_UART_SIZE SZ_4K | 51 | #define MSM_DEBUG_UART_SIZE SZ_4K |
diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c index 3854f6f20ce2..123ef9cbce1b 100644 --- a/arch/arm/mach-msm/io.c +++ b/arch/arm/mach-msm/io.c | |||
@@ -111,8 +111,6 @@ static struct map_desc msm8x60_io_desc[] __initdata = { | |||
111 | MSM_CHIP_DEVICE(QGIC_CPU, MSM8X60), | 111 | MSM_CHIP_DEVICE(QGIC_CPU, MSM8X60), |
112 | MSM_CHIP_DEVICE(TMR, MSM8X60), | 112 | MSM_CHIP_DEVICE(TMR, MSM8X60), |
113 | MSM_CHIP_DEVICE(TMR0, MSM8X60), | 113 | MSM_CHIP_DEVICE(TMR0, MSM8X60), |
114 | MSM_DEVICE(ACC), | ||
115 | MSM_DEVICE(GCC), | ||
116 | #ifdef CONFIG_DEBUG_MSM8660_UART | 114 | #ifdef CONFIG_DEBUG_MSM8660_UART |
117 | MSM_DEVICE(DEBUG_UART), | 115 | MSM_DEVICE(DEBUG_UART), |
118 | #endif | 116 | #endif |