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-mmp | |
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-mmp')
-rw-r--r-- | arch/arm/mach-mmp/include/mach/debug-macro.S | 12 | ||||
-rw-r--r-- | arch/arm/mach-mmp/ttc_dkb.c | 10 |
2 files changed, 20 insertions, 2 deletions
diff --git a/arch/arm/mach-mmp/include/mach/debug-macro.S b/arch/arm/mach-mmp/include/mach/debug-macro.S index b6f14d203c25..5c3cc29688ab 100644 --- a/arch/arm/mach-mmp/include/mach/debug-macro.S +++ b/arch/arm/mach-mmp/include/mach/debug-macro.S | |||
@@ -9,13 +9,21 @@ | |||
9 | * published by the Free Software Foundation. | 9 | * published by the Free Software Foundation. |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #if defined(CONFIG_DEBUG_MMP_UART2) | ||
13 | #define MMP_UART_OFFSET 0x00017000 | ||
14 | #elif defined(CONFIG_DEBUG_MMP_UART3) | ||
15 | #define MMP_UART_OFFSET 0x00018000 | ||
16 | #else | ||
17 | #error "Select uart for DEBUG_LL" | ||
18 | #endif | ||
19 | |||
12 | #include <mach/addr-map.h> | 20 | #include <mach/addr-map.h> |
13 | 21 | ||
14 | .macro addruart, rp, rv, tmp | 22 | .macro addruart, rp, rv, tmp |
15 | ldr \rp, =APB_PHYS_BASE @ physical | 23 | ldr \rp, =APB_PHYS_BASE @ physical |
16 | ldr \rv, =APB_VIRT_BASE @ virtual | 24 | ldr \rv, =APB_VIRT_BASE @ virtual |
17 | orr \rp, \rp, #0x00017000 | 25 | orr \rp, \rp, #MMP_UART_OFFSET |
18 | orr \rv, \rv, #0x00017000 | 26 | orr \rv, \rv, #MMP_UART_OFFSET |
19 | .endm | 27 | .endm |
20 | 28 | ||
21 | #define UART_SHIFT 2 | 29 | #define UART_SHIFT 2 |
diff --git a/arch/arm/mach-mmp/ttc_dkb.c b/arch/arm/mach-mmp/ttc_dkb.c index 7a7de2b12a62..ce55fd8821c4 100644 --- a/arch/arm/mach-mmp/ttc_dkb.c +++ b/arch/arm/mach-mmp/ttc_dkb.c | |||
@@ -177,12 +177,22 @@ static struct mv_usb_platform_data ttc_usb_pdata = { | |||
177 | #endif | 177 | #endif |
178 | #endif | 178 | #endif |
179 | 179 | ||
180 | #ifdef CONFIG_MTD_NAND_PXA3xx | ||
181 | static struct pxa3xx_nand_platform_data dkb_nand_info = { | ||
182 | .enable_arbiter = 1, | ||
183 | .num_cs = 1, | ||
184 | }; | ||
185 | #endif | ||
186 | |||
180 | static void __init ttc_dkb_init(void) | 187 | static void __init ttc_dkb_init(void) |
181 | { | 188 | { |
182 | mfp_config(ARRAY_AND_SIZE(ttc_dkb_pin_config)); | 189 | mfp_config(ARRAY_AND_SIZE(ttc_dkb_pin_config)); |
183 | 190 | ||
184 | /* on-chip devices */ | 191 | /* on-chip devices */ |
185 | pxa910_add_uart(1); | 192 | pxa910_add_uart(1); |
193 | #ifdef CONFIG_MTD_NAND_PXA3xx | ||
194 | pxa910_add_nand(&dkb_nand_info); | ||
195 | #endif | ||
186 | 196 | ||
187 | /* off-chip devices */ | 197 | /* off-chip devices */ |
188 | pxa910_add_twsi(0, NULL, ARRAY_AND_SIZE(ttc_dkb_i2c_info)); | 198 | pxa910_add_twsi(0, NULL, ARRAY_AND_SIZE(ttc_dkb_i2c_info)); |