[PATCH 0/5] add dt based support for iommu for hdmi

[PATCH 0/5] add dt based support for iommu for hdmi

[Rahul Sharma]

This patchset enables the DT based iommu support for exynos5 platform
and iommu for drm hdmi driver. it
1) Adds iommu support for Exynos5250_DT platform.
2) Enables helper functions for dt platforms
3) Adds support for TV Iommu device for hdmi

based on "for-next" branch at
http://git.kernel.org/?p=linux/kernel/git/kgene/linux-samsung.git

Rahul Sharma (5):
  arm: exynos5: add tv iommu device to aux data lookup table
  arm: exynos5: add clock information for tv iommu device
  dts: exynos5: add dt node for tv iommu device
  arm: exynos5: add iommu support for exynos5250_DT platform
  arm: exynos: enable helper functions for dt based platforms

 arch/arm/boot/dts/exynos5250.dtsi          |   10 ++++++++++
 arch/arm/mach-exynos/Kconfig               |    1 +
 arch/arm/mach-exynos/clock-exynos5.c       |    4 ++--
 arch/arm/mach-exynos/include/mach/sysmmu.h |    9 +++++----
 arch/arm/mach-exynos/mach-exynos5-dt.c     |    2 ++
 5 files changed, 20 insertions(+), 6 deletions(-)

[PATCH 1/5] arm: exynos5: add tv iommu device to aux data lookup table

[Rahul Sharma]

This patch adds tv iommu device information in the lookup table for
renaming it to meet with the iommu driver expactation.

Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com>
---
 arch/arm/mach-exynos/mach-exynos5-dt.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c
index ed37273..6adbbce 100644
--- a/arch/arm/mach-exynos/mach-exynos5-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos5-dt.c
@@ -82,6 +82,8 @@ static const struct of_dev_auxdata exynos5250_auxdata_lookup[] __initconst = {
 	OF_DEV_AUXDATA("samsung,mfc-v6", 0x11000000, "s5p-mfc-v6", NULL),
 	OF_DEV_AUXDATA("samsung,exynos5250-tmu", 0x10060000,
 				"exynos-tmu", NULL),
+	OF_DEV_AUXDATA("samsung,exynos5-sysmmu", 0x14650000,
+				"exynos-sysmmu.28", NULL),
 	OF_DEV_AUXDATA("samsung,exynos5-hdmi", 0x14530000,
 				"exynos5-hdmi", NULL),
 	OF_DEV_AUXDATA("samsung,exynos5-mixer", 0x14450000,
-- 
1.7.0.4

[PATCH 2/5] arm: exynos5: add clock information for tv iommu device

[Rahul Sharma]

This patch correct the clock information for tv iommu device.
It was mentioned as iommu sub device id as 2 instead of 28.

Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com>
---
 arch/arm/mach-exynos/clock-exynos5.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-exynos/clock-exynos5.c b/arch/arm/mach-exynos/clock-exynos5.c
index a88e0d9..69c8501 100644
--- a/arch/arm/mach-exynos/clock-exynos5.c
+++ b/arch/arm/mach-exynos/clock-exynos5.c
@@ -863,9 +863,9 @@ static struct clk exynos5_init_clocks_off[] = {
 		.ctrlbit	= (1 << 2),
 	}, {
 		.name		= SYSMMU_CLOCK_NAME,
-		.devname	= SYSMMU_CLOCK_DEVNAME(tv, 2),
+		.devname	= SYSMMU_CLOCK_DEVNAME(tv, 28),
 		.enable		= &exynos5_clk_ip_disp1_ctrl,
-		.ctrlbit	= (1 << 9)
+		.ctrlbit	= (1 << 9),
 	}, {
 		.name		= SYSMMU_CLOCK_NAME,
 		.devname	= SYSMMU_CLOCK_DEVNAME(jpeg, 3),
-- 
1.7.0.4

[PATCH 3/5] dts: exynos5: add dt node for tv iommu device

[Rahul Sharma]

This patch adds device tree node for tv iommu device and sysmmu
property to its client that is hdmi dt node.

Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com>
Signed-off-by: Prathyush K <prathyush.k@samsung.com>
---
 arch/arm/boot/dts/exynos5250.dtsi |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index cf6a02d..928313a 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -545,11 +545,21 @@
 		compatible = "samsung,exynos5-hdmi";
 		reg = <0x14530000 0x100000>;
 		interrupts = <0 95 0>;
+		sysmmu = <&sysmmu_28>;
 	};
 
 	mixer {
 		compatible = "samsung,exynos5-mixer";
 		reg = <0x14450000 0x10000>;
 		interrupts = <0 94 0>;
+		sysmmu = <&sysmmu_28>;
+	};
+
+	sysmmu_28: sysmmu@0x14650000 {
+		compatible = "samsung,exynos5-sysmmu";
+		temp = "sysmmu@0x14650000";
+		reg = <0x14650000 0x100>;
+		interrupts = <7 4>;
+		interrupt-parent = <&combiner>;
 	};
 };
-- 
1.7.0.4

[PATCH 4/5] arm: exynos5: add iommu support for exynos5250_DT platform

[Rahul Sharma]

With this patch iommu support will be enabled for exynos 5250
platform with device tree enabled.

Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com>
---
 arch/arm/mach-exynos/Kconfig |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index bb3b09a..adff52e 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -422,6 +422,7 @@ config MACH_EXYNOS5_DT
 	select ARM_AMBA
 	select SOC_EXYNOS5250
 	select USE_OF
+	select ARM_DMA_USE_IOMMU
 	help
 	  Machine support for Samsung EXYNOS5 machine with device tree enabled.
 	  Select this if a fdt blob is available for the EXYNOS5 SoC based board.
-- 
1.7.0.4

[PATCH 5/5] arm: exynos: enable helper functions for dt based platforms

[Rahul Sharma]

This patch enables the support for helper function platform_set_sysmmu
for DT based platform which is defined under CONFIG_IOMMU_API. Earlier
CONFIG_EXYNOS_DEV_SYSMMU was restricting its usage for DT platforms like
exynos5250_DT.

Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com>
---
 arch/arm/mach-exynos/include/mach/sysmmu.h |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-exynos/include/mach/sysmmu.h b/arch/arm/mach-exynos/include/mach/sysmmu.h
index 88a4543..ad0f211 100644
--- a/arch/arm/mach-exynos/include/mach/sysmmu.h
+++ b/arch/arm/mach-exynos/include/mach/sysmmu.h
@@ -12,6 +12,8 @@
 #ifndef _ARM_MACH_EXYNOS_SYSMMU_H_
 #define _ARM_MACH_EXYNOS_SYSMMU_H_
 
+#include <linux/device.h>
+
 struct sysmmu_platform_data {
 	char *dbgname;
 	/* comma(,) separated list of clock names for clock gating */
@@ -24,7 +26,6 @@ struct sysmmu_platform_data {
 #define SYSMMU_CLOCK_NAME2 "sysmmu_mc"
 
 #ifdef CONFIG_EXYNOS_DEV_SYSMMU
-#include <linux/device.h>
 struct platform_device;
 
 #define SYSMMU_PLATDEV(ipname) exynos_device_sysmmu_##ipname
@@ -49,15 +50,15 @@ extern struct platform_device SYSMMU_PLATDEV(camif0);
 extern struct platform_device SYSMMU_PLATDEV(camif1);
 extern struct platform_device SYSMMU_PLATDEV(2d);
 
+#endif
+
 #ifdef CONFIG_IOMMU_API
 static inline void platform_set_sysmmu(
 				struct device *sysmmu, struct device *dev)
 {
 	dev->archdata.iommu = sysmmu;
 }
-#endif
-
-#else /* !CONFIG_EXYNOS_DEV_SYSMMU */
+#else /* !CONFIG_IOMMU_API */
 #define platform_set_sysmmu(sysmmu, dev) do { } while (0)
 #endif
 
-- 
1.7.0.4