summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAl Stone <ahs3@redhat.com>2013-08-12 20:20:05 -0600
committerGraeme Gregory <graeme.gregory@linaro.org>2013-08-13 14:43:15 +0100
commit02bfaa73c42bed07cbe30b6b8beb0291f21c403f (patch)
tree1447cb95aa51519eea9ab66600f12b67c02d7627
parent3baf3d4b0719fdf4dda0a45d9f6ff6d9b943865a (diff)
ARM: EXYNOS: Set 64-bit DMA mask for EXYNOS5250acpi-ltfixes
This patch is a re-submittal of a previous patch from the Samsung LT, specifically 5bf534ab87a62e717771d5548b66296ca8e9fbe5. It has been redone to fit the acpi-ltfixes branch of acpi.git, and is needed to prevent DMA errors from occurring. This is required when LPAE is enabled. Signed-off-by: Tushar Behera <tushar.behera@linaro.org> Signed-off-by: Al Stone <al.stone@linaro.org>
-rw-r--r--arch/arm/mach-exynos/mach-exynos5-dt.c24
1 files changed, 24 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c
index f874b773ca13..863042d720a7 100644
--- a/arch/arm/mach-exynos/mach-exynos5-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos5-dt.c
@@ -14,6 +14,7 @@
#include <linux/memblock.h>
#include <linux/io.h>
#include <linux/clocksource.h>
+#include <linux/dma-mapping.h>
#include <asm/mach/arch.h>
#include <mach/regs-pmu.h>
@@ -23,6 +24,26 @@
#include "common.h"
+static u64 dma_mask64 = DMA_BIT_MASK(64);
+
+static int exynos5250_platform_notifier(struct notifier_block *nb,
+ unsigned long event, void *__dev)
+{
+ struct device *dev = __dev;
+
+ if (event != BUS_NOTIFY_ADD_DEVICE)
+ return NOTIFY_DONE;
+
+ dev->dma_mask = &dma_mask64;
+ dev->coherent_dma_mask = DMA_BIT_MASK(64);
+
+ return NOTIFY_OK;
+}
+
+static struct notifier_block exynos5250_platform_nb = {
+ .notifier_call = exynos5250_platform_notifier,
+};
+
static void __init exynos5_dt_machine_init(void)
{
struct device_node *i2c_np;
@@ -47,6 +68,9 @@ static void __init exynos5_dt_machine_init(void)
}
}
+ if (of_machine_is_compatible("samsung,exynos5250"))
+ bus_register_notifier(&platform_bus_type, &exynos5250_platform_nb);
+
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}