diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 18:26:43 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 18:33:38 +0100 |
| commit | 5cd9eb2736a572a9ef2689829f47ffd4262adc00 (patch) | |
| tree | 380bcc1d77acc968e9ae9c8da9215b8b04edba1f /arch/arm/mach-shmobile/board-mackerel.c | |
| parent | ARM: shmobile: remove additional __io() macro use (diff) | |
| parent | ARM: mach-shmobile: ap4evb: fixup fsi2_ak4643_info typo (diff) | |
| download | linux-5cd9eb2736a572a9ef2689829f47ffd4262adc00.tar.xz linux-5cd9eb2736a572a9ef2689829f47ffd4262adc00.zip | |
Merge branch 'renesas/fixes' into renesas/soc
The fixes branch was merged into mainline just after v3.3-rc7,
I'm merging it into this branch to fix up a nontrivial merge
conflict. Unfortunately this means that we are now based on
a commit between -rc releases, which we normally try to avoid.
Conflicts:
arch/arm/mach-shmobile/board-mackerel.c
Resolution suggested by Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-shmobile/board-mackerel.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-mackerel.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c index 55da7a115912..71d279150471 100644 --- a/arch/arm/mach-shmobile/board-mackerel.c +++ b/arch/arm/mach-shmobile/board-mackerel.c @@ -1335,6 +1335,15 @@ static struct i2c_board_info i2c1_devices[] = { }, }; +static void __init mackerel_map_io(void) +{ + sh7372_map_io(); + /* DMA memory at 0xff200000 - 0xffdfffff. The default 2MB size isn't + * enough to allocate the frame buffer memory. + */ + init_consistent_dma_size(12 << 20); +} + #define GPIO_PORT9CR 0xE6051009 #define GPIO_PORT10CR 0xE605100A #define GPIO_PORT167CR 0xE60520A7 @@ -1554,7 +1563,7 @@ static void __init mackerel_init(void) } MACHINE_START(MACKEREL, "mackerel") - .map_io = sh7372_map_io, + .map_io = mackerel_map_io, .init_early = sh7372_add_early_devices, .init_irq = sh7372_init_irq, .handle_irq = shmobile_handle_irq_intc, |