Commit 9b742024 authored by Jon Medhurst's avatar Jon Medhurst
Browse files

ARM: mach-shmobile: Setup consistent dma size at boot time


Signed-off-by: default avatarJon Medhurst <tixy@yxit.co.uk>
CC: Paul Mundt <lethal@linux-sh.org>
CC: Magnus Damm <magnus.damm@gmail.com>
parent 2d5e975b
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include <linux/mmc/sh_mobile_sdhi.h> #include <linux/mmc/sh_mobile_sdhi.h>
#include <linux/mfd/tmio.h> #include <linux/mfd/tmio.h>
#include <linux/sh_clk.h> #include <linux/sh_clk.h>
#include <linux/dma-mapping.h>
#include <video/sh_mobile_lcdc.h> #include <video/sh_mobile_lcdc.h>
#include <video/sh_mipi_dsi.h> #include <video/sh_mipi_dsi.h>
#include <sound/sh_fsi.h> #include <sound/sh_fsi.h>
...@@ -446,6 +447,8 @@ static struct map_desc ag5evm_io_desc[] __initdata = { ...@@ -446,6 +447,8 @@ static struct map_desc ag5evm_io_desc[] __initdata = {
static void __init ag5evm_map_io(void) static void __init ag5evm_map_io(void)
{ {
iotable_init(ag5evm_io_desc, ARRAY_SIZE(ag5evm_io_desc)); iotable_init(ag5evm_io_desc, ARRAY_SIZE(ag5evm_io_desc));
/* DMA memory at 0xf6000000 - 0xffdfffff */
init_consistent_dma_size(158 << 20);
/* setup early devices and console here as well */ /* setup early devices and console here as well */
sh73a0_add_early_devices(); sh73a0_add_early_devices();
......
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
#include <linux/leds.h> #include <linux/leds.h>
#include <linux/input/sh_keysc.h> #include <linux/input/sh_keysc.h>
#include <linux/usb/r8a66597.h> #include <linux/usb/r8a66597.h>
#include <linux/dma-mapping.h>
#include <media/sh_mobile_ceu.h> #include <media/sh_mobile_ceu.h>
#include <media/sh_mobile_csi2.h> #include <media/sh_mobile_csi2.h>
...@@ -1170,6 +1171,8 @@ static struct map_desc ap4evb_io_desc[] __initdata = { ...@@ -1170,6 +1171,8 @@ static struct map_desc ap4evb_io_desc[] __initdata = {
static void __init ap4evb_map_io(void) static void __init ap4evb_map_io(void)
{ {
iotable_init(ap4evb_io_desc, ARRAY_SIZE(ap4evb_io_desc)); iotable_init(ap4evb_io_desc, ARRAY_SIZE(ap4evb_io_desc));
/* DMA memory at 0xf6000000 - 0xffdfffff */
init_consistent_dma_size(158 << 20);
/* setup early devices and console here as well */ /* setup early devices and console here as well */
sh7372_add_early_devices(); sh7372_add_early_devices();
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/input.h> #include <linux/input.h>
#include <linux/input/sh_keysc.h> #include <linux/input/sh_keysc.h>
#include <linux/dma-mapping.h>
#include <mach/sh7367.h> #include <mach/sh7367.h>
#include <mach/common.h> #include <mach/common.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
...@@ -260,6 +261,8 @@ static struct map_desc g3evm_io_desc[] __initdata = { ...@@ -260,6 +261,8 @@ static struct map_desc g3evm_io_desc[] __initdata = {
static void __init g3evm_map_io(void) static void __init g3evm_map_io(void)
{ {
iotable_init(g3evm_io_desc, ARRAY_SIZE(g3evm_io_desc)); iotable_init(g3evm_io_desc, ARRAY_SIZE(g3evm_io_desc));
/* DMA memory at 0xf6000000 - 0xffdfffff */
init_consistent_dma_size(158 << 20);
/* setup early devices and console here as well */ /* setup early devices and console here as well */
sh7367_add_early_devices(); sh7367_add_early_devices();
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include <linux/mmc/host.h> #include <linux/mmc/host.h>
#include <linux/mmc/sh_mobile_sdhi.h> #include <linux/mmc/sh_mobile_sdhi.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/dma-mapping.h>
#include <mach/sh7377.h> #include <mach/sh7377.h>
#include <mach/common.h> #include <mach/common.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
...@@ -274,6 +275,8 @@ static struct map_desc g4evm_io_desc[] __initdata = { ...@@ -274,6 +275,8 @@ static struct map_desc g4evm_io_desc[] __initdata = {
static void __init g4evm_map_io(void) static void __init g4evm_map_io(void)
{ {
iotable_init(g4evm_io_desc, ARRAY_SIZE(g4evm_io_desc)); iotable_init(g4evm_io_desc, ARRAY_SIZE(g4evm_io_desc));
/* DMA memory at 0xf6000000 - 0xffdfffff */
init_consistent_dma_size(158 << 20);
/* setup early devices and console here as well */ /* setup early devices and console here as well */
sh7377_add_early_devices(); sh7377_add_early_devices();
......
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
#include <linux/tca6416_keypad.h> #include <linux/tca6416_keypad.h>
#include <linux/usb/r8a66597.h> #include <linux/usb/r8a66597.h>
#include <linux/usb/renesas_usbhs.h> #include <linux/usb/renesas_usbhs.h>
#include <linux/dma-mapping.h>
#include <video/sh_mobile_hdmi.h> #include <video/sh_mobile_hdmi.h>
#include <video/sh_mobile_lcdc.h> #include <video/sh_mobile_lcdc.h>
...@@ -1377,6 +1378,8 @@ static struct map_desc mackerel_io_desc[] __initdata = { ...@@ -1377,6 +1378,8 @@ static struct map_desc mackerel_io_desc[] __initdata = {
static void __init mackerel_map_io(void) static void __init mackerel_map_io(void)
{ {
iotable_init(mackerel_io_desc, ARRAY_SIZE(mackerel_io_desc)); iotable_init(mackerel_io_desc, ARRAY_SIZE(mackerel_io_desc));
/* DMA memory at 0xf6000000 - 0xffdfffff */
init_consistent_dma_size(158 << 20);
/* setup early devices and console here as well */ /* setup early devices and console here as well */
sh7372_add_early_devices(); sh7372_add_early_devices();
......
...@@ -4,7 +4,4 @@ ...@@ -4,7 +4,4 @@
#define PLAT_PHYS_OFFSET UL(CONFIG_MEMORY_START) #define PLAT_PHYS_OFFSET UL(CONFIG_MEMORY_START)
#define MEM_SIZE UL(CONFIG_MEMORY_SIZE) #define MEM_SIZE UL(CONFIG_MEMORY_SIZE)
/* DMA memory at 0xf6000000 - 0xffdfffff */
#define CONSISTENT_DMA_SIZE (158 << 20)
#endif /* __ASM_MACH_MEMORY_H */ #endif /* __ASM_MACH_MEMORY_H */
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment