From: Arnd Bergmann Date: Thu, 15 Mar 2012 17:26:43 +0000 (+0000) Subject: Merge branch 'renesas/fixes' into renesas/soc X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5cd9eb2736a572a9ef2689829f47ffd4262adc00;p=linux-beck.git 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 Signed-off-by: Arnd Bergmann --- 5cd9eb2736a572a9ef2689829f47ffd4262adc00 diff --cc arch/arm/mach-shmobile/board-mackerel.c index 55da7a115912,7b53cda41851..71d279150471 --- a/arch/arm/mach-shmobile/board-mackerel.c +++ b/arch/arm/mach-shmobile/board-mackerel.c @@@ -1335,6 -1337,31 +1335,15 @@@ static struct i2c_board_info i2c1_devic }, }; -static struct map_desc mackerel_io_desc[] __initdata = { - /* create a 1:1 entity map for 0xe6xxxxxx - * used by CPGA, INTC and PFC. - */ - { - .virtual = 0xe6000000, - .pfn = __phys_to_pfn(0xe6000000), - .length = 256 << 20, - .type = MT_DEVICE_NONSHARED - }, -}; - + static void __init mackerel_map_io(void) + { - iotable_init(mackerel_io_desc, ARRAY_SIZE(mackerel_io_desc)); ++ 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); - - /* setup early devices and console here as well */ - sh7372_add_early_devices(); - shmobile_setup_console(); + } + #define GPIO_PORT9CR 0xE6051009 #define GPIO_PORT10CR 0xE605100A #define GPIO_PORT167CR 0xE60520A7 @@@ -1553,9 -1577,21 +1562,9 @@@ static void __init mackerel_init(void pm_clk_add(&hdmi_lcdc_device.dev, "hdmi"); } -static void __init mackerel_timer_init(void) -{ - sh7372_clock_init(); - shmobile_timer.init(); - - /* External clock source */ - clk_set_rate(&sh7372_dv_clki_clk, 27000000); -} - -static struct sys_timer mackerel_timer = { - .init = mackerel_timer_init, -}; - 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, .init_machine = mackerel_init,