Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable

1 files changed, 34 insertions, 0 deletions

diff --git a/arch/arm/plat-s5p/dev-csis1.c b/arch/arm/plat-s5p/dev-csis1.c
new file mode 100644
index 000000000000..e3053f27fbbf
--- /dev/null
+++ b/arch/arm/plat-s5p/dev-csis1.c
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2010 Samsung Electronics
+ *
+ * S5P series device definition for MIPI-CSIS channel 1
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#include <linux/kernel.h>
+#include <linux/interrupt.h>
+#include <linux/platform_device.h>
+#include <mach/map.h>
+
+static struct resource s5p_mipi_csis1_resource[] = {
+        [0] = {
+                .start = S5P_PA_MIPI_CSIS1,
+                .end   = S5P_PA_MIPI_CSIS1 + SZ_4K - 1,
+                .flags = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start = IRQ_MIPI_CSIS1,
+                .end   = IRQ_MIPI_CSIS1,
+                .flags = IORESOURCE_IRQ,
+        },
+};
+
+struct platform_device s5p_device_mipi_csis1 = {
+        .name             = "s5p-mipi-csis",
+        .id               = 1,
+        .num_resources    = ARRAY_SIZE(s5p_mipi_csis1_resource),
+        .resource         = s5p_mipi_csis1_resource,
+};