[PATCH v4 0/6] arm: exynos: add dt based support for exynos5 hdmi

[PATCH v4 0/6] arm: exynos: add dt based support for exynos5 hdmi

[Rahul Sharma]

This patch set adds the DT based support for Samsung's Exynos5250. It adds
device tree nodes for hdmi, mixer, hdmiphy and hdmiddc. The name of these
devices are changed to the one matching with drivers. Exynos-drm and exynos
hdmi-drm-commmon devices are removed from machine init code.

Exynos-drm and exynos hdmi-drm-commmon devices are removed from machine
init code. Patch set which adds this code is posted to dri-devel list at
http://comments.gmane.org/gmane.comp.video.dri.devel/75121.

This patchset is based on linux v3.6-rc6, branch v3.7-next/dt-samsung at
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git

v1:
- dropped patch for hpd gpio initialisation from machine init.
- dropped patch for platform device registration.
- removed platform device registration from non-dt platforms.

v2:
- removed version information from hdmi, mixer dt nodes.
- added DT binding documentation for hdmi, mixer, hdmiphy and hdmiddc.

v3:
- corrected indentations.
- changed dt node names to name@address format.

v4:
- added newline at end of device-tree binding document files.
- removes macros for mixer, hdmi physical addresses.
- removed @address from mixer and hdmi DT nodes.

Rahul Sharma (6):
  dts: exynos: add device tree support for exynos5 hdmi
  dts: exynos: add device tree support for exynos5 mixer
  dts: exynos: add device tree support for exynos5 hdmiphy
  dts: exynos: add device tree support for exynos5 hdmiddc
  arm: exynos: add clocks for exynos5 hdmi
  arm: exynos: removing exynos-drm device registration from non-dt
    platforms

 .../devicetree/bindings/drm/exynos/hdmi.txt        |   22 +++++++++++++++
 .../devicetree/bindings/drm/exynos/hdmiddc.txt     |   12 ++++++++
 .../devicetree/bindings/drm/exynos/hdmiphy.txt     |   12 ++++++++
 .../devicetree/bindings/drm/exynos/mixer.txt       |   15 ++++++++++
 arch/arm/boot/dts/exynos5250-smdk5250.dts          |   24 +++++++++++++++-
 arch/arm/boot/dts/exynos5250.dtsi                  |   20 +++++++++++++
 arch/arm/mach-exynos/Makefile                      |    1 -
 arch/arm/mach-exynos/clock-exynos5.c               |   14 ++++++++-
 arch/arm/mach-exynos/dev-drm.c                     |   29 --------------------
 arch/arm/mach-exynos/mach-exynos5-dt.c             |    8 +++++
 arch/arm/mach-exynos/mach-nuri.c                   |    3 --
 arch/arm/mach-exynos/mach-origen.c                 |    3 --
 arch/arm/mach-exynos/mach-smdk4x12.c               |    3 --
 arch/arm/mach-exynos/mach-smdkv310.c               |    3 --
 arch/arm/mach-exynos/mach-universal_c210.c         |    3 --
 arch/arm/plat-samsung/include/plat/devs.h          |    2 -
 16 files changed, 124 insertions(+), 50 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/drm/exynos/hdmi.txt
 create mode 100644 Documentation/devicetree/bindings/drm/exynos/hdmiddc.txt
 create mode 100644 Documentation/devicetree/bindings/drm/exynos/hdmiphy.txt
 create mode 100644 Documentation/devicetree/bindings/drm/exynos/mixer.txt
 delete mode 100644 arch/arm/mach-exynos/dev-drm.c

[PATCH v4 1/6] dts: exynos: add device tree support for exynos5 hdmi

[Rahul Sharma]

This patch adds support for device tree based discovery for exynos5
hdmi. Hdmi node is also renamed with "exynos5-hdmi".

Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com>
---
 .../devicetree/bindings/drm/exynos/hdmi.txt        |   22 ++++++++++++++++++++
 arch/arm/boot/dts/exynos5250-smdk5250.dts          |    4 +++
 arch/arm/boot/dts/exynos5250.dtsi                  |    6 +++++
 arch/arm/mach-exynos/mach-exynos5-dt.c             |    2 +
 4 files changed, 34 insertions(+), 0 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/drm/exynos/hdmi.txt

diff --git a/Documentation/devicetree/bindings/drm/exynos/hdmi.txt b/Documentation/devicetree/bindings/drm/exynos/hdmi.txt
new file mode 100644
index 0000000..589edee
--- /dev/null
+++ b/Documentation/devicetree/bindings/drm/exynos/hdmi.txt
@@ -0,0 +1,22 @@
+Device-Tree bindings for drm hdmi driver
+
+Required properties:
+- compatible: value should be "samsung,exynos5-hdmi".
+- reg: physical base address of the hdmi and length of memory mapped
+	region.
+- interrupts: interrupt number to the cpu.
+- hpd-gpio: following information about the hotplug gpio pin.
+	a) phandle of the gpio controller node.
+	b) pin number within the gpio controller.
+	c) pin function mode.
+	d) optional flags and pull up/down.
+	e) drive strength.
+
+Example:
+
+	hdmi {
+		compatible = "samsung,exynos5-hdmi";
+		reg = <0x14530000 0x100000>;
+		interrupts = <0 95 0>;
+		hpd-gpio = <&gpx3 7 0xf 1 3>;
+	};
diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index a352df4..2a478ab 100644
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -166,4 +166,8 @@
 	spi_2: spi@12d40000 {
 		status = "disabled";
 	};
+
+	hdmi {
+		hpd-gpio = <&gpx3 7 0xf 1 3>;
+	};
 };
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index f69e389..e43b321 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -492,4 +492,10 @@
 			#gpio-cells = <4>;
 		};
 	};
+
+	hdmi {
+		compatible = "samsung,exynos5-hdmi";
+		reg = <0x14530000 0x100000>;
+		interrupts = <0 95 0>;
+	};
 };
diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c
index ce82f30..f37d676 100644
--- a/arch/arm/mach-exynos/mach-exynos5-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos5-dt.c
@@ -64,6 +64,8 @@ static const struct of_dev_auxdata exynos5250_auxdata_lookup[] __initconst = {
 	OF_DEV_AUXDATA("arm,pl330", EXYNOS5_PA_PDMA0, "dma-pl330.0", NULL),
 	OF_DEV_AUXDATA("arm,pl330", EXYNOS5_PA_PDMA1, "dma-pl330.1", NULL),
 	OF_DEV_AUXDATA("arm,pl330", EXYNOS5_PA_MDMA1, "dma-pl330.2", NULL),
+	OF_DEV_AUXDATA("samsung,exynos5-hdmi", 0x14530000,
+				"exynos5-hdmi", NULL),
 	{},
 };
 
-- 
1.7.0.4

[PATCH v4 2/6] dts: exynos: add device tree support for exynos5 mixer

[Rahul Sharma]

This patch adds support for device tree based discovery for exynos5
mixer. Mixer node is also renamed with "exynos5-mixer".

Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com>
---
 .../devicetree/bindings/drm/exynos/mixer.txt       |   15 +++++++++++++++
 arch/arm/boot/dts/exynos5250.dtsi                  |    6 ++++++
 arch/arm/mach-exynos/mach-exynos5-dt.c             |    2 ++
 3 files changed, 23 insertions(+), 0 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/drm/exynos/mixer.txt

diff --git a/Documentation/devicetree/bindings/drm/exynos/mixer.txt b/Documentation/devicetree/bindings/drm/exynos/mixer.txt
new file mode 100644
index 0000000..9b2ea03
--- /dev/null
+++ b/Documentation/devicetree/bindings/drm/exynos/mixer.txt
@@ -0,0 +1,15 @@
+Device-Tree bindings for mixer driver
+
+Required properties:
+- compatible: value should be "samsung,exynos5-mixer".
+- reg: physical base address of the mixer and length of memory mapped
+	region.
+- interrupts: interrupt number to the cpu.
+
+Example:
+
+	mixer {
+		compatible = "samsung,exynos5-mixer";
+		reg = <0x14450000 0x10000>;
+		interrupts = <0 94 0>;
+	};
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index e43b321..dd02b40 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -498,4 +498,10 @@
 		reg = <0x14530000 0x100000>;
 		interrupts = <0 95 0>;
 	};
+
+	mixer {
+		compatible = "samsung,exynos5-mixer";
+		reg = <0x14450000 0x10000>;
+		interrupts = <0 94 0>;
+	};
 };
diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c
index f37d676..bb2d1ae 100644
--- a/arch/arm/mach-exynos/mach-exynos5-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos5-dt.c
@@ -66,6 +66,8 @@ static const struct of_dev_auxdata exynos5250_auxdata_lookup[] __initconst = {
 	OF_DEV_AUXDATA("arm,pl330", EXYNOS5_PA_MDMA1, "dma-pl330.2", NULL),
 	OF_DEV_AUXDATA("samsung,exynos5-hdmi", 0x14530000,
 				"exynos5-hdmi", NULL),
+	OF_DEV_AUXDATA("samsung,exynos5-mixer", 0x14450000,
+				"exynos5-mixer", NULL),
 	{},
 };
 
-- 
1.7.0.4

[PATCH v4 3/6] dts: exynos: add device tree support for exynos5 hdmiphy

[Rahul Sharma]

This patch adds support for device tree based discovery for exynos5
hdmiphy.

Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com>
---
 .../devicetree/bindings/drm/exynos/hdmiphy.txt     |   12 ++++++++++++
 arch/arm/boot/dts/exynos5250-smdk5250.dts          |   10 ++++++++++
 arch/arm/boot/dts/exynos5250.dtsi                  |    8 ++++++++
 arch/arm/mach-exynos/mach-exynos5-dt.c             |    2 ++
 4 files changed, 32 insertions(+), 0 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/drm/exynos/hdmiphy.txt

diff --git a/Documentation/devicetree/bindings/drm/exynos/hdmiphy.txt b/Documentation/devicetree/bindings/drm/exynos/hdmiphy.txt
new file mode 100644
index 0000000..858f4f9
--- /dev/null
+++ b/Documentation/devicetree/bindings/drm/exynos/hdmiphy.txt
@@ -0,0 +1,12 @@
+Device-Tree bindings for hdmiphy driver
+
+Required properties:
+- compatible: value should be "samsung,exynos5-hdmiphy".
+- reg: I2C address of the hdmiphy device.
+
+Example:
+
+	hdmiphy {
+		compatible = "samsung,exynos5-hdmiphy";
+		reg = <0x38>;
+	};
diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index 2a478ab..7dc196f 100644
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -79,6 +79,16 @@
 		status = "disabled";
 	};
 
+	i2c@12CE0000 {
+		samsung,i2c-sda-delay = <100>;
+		samsung,i2c-max-bus-freq = <66000>;
+
+		hdmiphy@38 {
+			compatible = "samsung,exynos5-hdmiphy";
+			reg = <0x38>;
+		};
+	};
+
 	dwmmc_0: dwmmc0@12200000 {
 		num-slots = <1>;
 		supports-highspeed;
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index dd02b40..cc42bac 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -152,6 +152,14 @@
 		#size-cells = <0>;
 	};
 
+	i2c@12CE0000 {
+		compatible = "samsung,s3c2440-hdmiphy-i2c";
+		reg = <0x12CE0000 0x1000>;
+		interrupts = <0 64 0>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+	};
+
 	spi_0: spi@12d20000 {
 		compatible = "samsung,exynos4210-spi";
 		reg = <0x12d20000 0x100>;
diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c
index bb2d1ae..7d2bcf1 100644
--- a/arch/arm/mach-exynos/mach-exynos5-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos5-dt.c
@@ -47,6 +47,8 @@ static const struct of_dev_auxdata exynos5250_auxdata_lookup[] __initconst = {
 				"s3c2440-i2c.0", NULL),
 	OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(1),
 				"s3c2440-i2c.1", NULL),
+	OF_DEV_AUXDATA("samsung,s3c2440-hdmiphy-i2c", EXYNOS5_PA_IIC(8),
+				"s3c2440-hdmiphy-i2c", NULL),
 	OF_DEV_AUXDATA("samsung,exynos5250-dw-mshc", EXYNOS5_PA_DWMCI0,
 				"dw_mmc.0", NULL),
 	OF_DEV_AUXDATA("samsung,exynos5250-dw-mshc", EXYNOS5_PA_DWMCI1,
-- 
1.7.0.4

[PATCH v4 4/6] dts: exynos: add device tree support for exynos5 hdmiddc

[Rahul Sharma]

This patch adds support for device tree based discovery for exynos5
hdmi ddc.

Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com>
---
 .../devicetree/bindings/drm/exynos/hdmiddc.txt     |   12 ++++++++++++
 arch/arm/boot/dts/exynos5250-smdk5250.dts          |   10 +++++++++-
 arch/arm/mach-exynos/mach-exynos5-dt.c             |    2 ++
 3 files changed, 23 insertions(+), 1 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/drm/exynos/hdmiddc.txt

diff --git a/Documentation/devicetree/bindings/drm/exynos/hdmiddc.txt b/Documentation/devicetree/bindings/drm/exynos/hdmiddc.txt
new file mode 100644
index 0000000..fa166d9
--- /dev/null
+++ b/Documentation/devicetree/bindings/drm/exynos/hdmiddc.txt
@@ -0,0 +1,12 @@
+Device-Tree bindings for hdmiddc driver
+
+Required properties:
+- compatible: value should be "samsung,exynos5-hdmiddc".
+- reg: I2C address of the hdmiddc device.
+
+Example:
+
+	hdmiddc {
+		compatible = "samsung,exynos5-hdmiddc";
+		reg = <0x50>;
+	};
diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index 7dc196f..7212d53 100644
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -56,7 +56,15 @@
 	};
 
 	i2c@12C80000 {
-		status = "disabled";
+		samsung,i2c-sda-delay = <100>;
+		samsung,i2c-max-bus-freq = <66000>;
+		gpios = <&gpa0 6 3 3 0>,
+			<&gpa0 7 3 3 0>;
+
+		hdmiddc@50 {
+			compatible = "samsung,exynos5-hdmiddc";
+			reg = <0x50>;
+		};
 	};
 
 	i2c@12C90000 {
diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c
index 7d2bcf1..9d6185f 100644
--- a/arch/arm/mach-exynos/mach-exynos5-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos5-dt.c
@@ -47,6 +47,8 @@ static const struct of_dev_auxdata exynos5250_auxdata_lookup[] __initconst = {
 				"s3c2440-i2c.0", NULL),
 	OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(1),
 				"s3c2440-i2c.1", NULL),
+	OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(2),
+				"s3c2440-i2c.2", NULL),
 	OF_DEV_AUXDATA("samsung,s3c2440-hdmiphy-i2c", EXYNOS5_PA_IIC(8),
 				"s3c2440-hdmiphy-i2c", NULL),
 	OF_DEV_AUXDATA("samsung,exynos5250-dw-mshc", EXYNOS5_PA_DWMCI0,
-- 
1.7.0.4

[PATCH v4 5/6] arm: exynos: add clocks for exynos5 hdmi

[Rahul Sharma]

This patch adds support for clocks for hdmi, hdmiphy and mixer.

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

diff --git a/arch/arm/mach-exynos/clock-exynos5.c b/arch/arm/mach-exynos/clock-exynos5.c
index 17e6c77..ec2a4da 100644
--- a/arch/arm/mach-exynos/clock-exynos5.c
+++ b/arch/arm/mach-exynos/clock-exynos5.c
@@ -201,6 +201,11 @@ static int exynos5_clk_ip_isp1_ctrl(struct clk *clk, int enable)
 	return s5p_gatectrl(EXYNOS5_CLKGATE_IP_ISP1, clk, enable);
 }
 
+static int exynos5_clk_hdmiphy_ctrl(struct clk *clk, int enable)
+{
+	return s5p_gatectrl(S5P_HDMI_PHY_CONTROL, clk, enable);
+}
+
 /* Core list of CMU_CPU side */
 
 static struct clksrc_clk exynos5_clk_mout_apll = {
@@ -612,12 +617,17 @@ static struct clk exynos5_init_clocks_off[] = {
 		.ctrlbit	= (1 << 0),
 	}, {
 		.name		= "hdmi",
-		.devname	= "exynos4-hdmi",
+		.devname	= "exynos5-hdmi",
 		.enable		= exynos5_clk_ip_disp1_ctrl,
 		.ctrlbit	= (1 << 6),
 	}, {
+		.name		= "hdmiphy",
+		.devname	= "exynos5-hdmi",
+		.enable		= exynos5_clk_hdmiphy_ctrl,
+		.ctrlbit	= (1 << 0),
+	}, {
 		.name		= "mixer",
-		.devname	= "s5p-mixer",
+		.devname	= "exynos5-mixer",
 		.enable		= exynos5_clk_ip_disp1_ctrl,
 		.ctrlbit	= (1 << 5),
 	}, {
-- 
1.7.0.4

[PATCH v4 6/6] arm: exynos: removing exynos-drm device registration from non-dt platforms

[Rahul Sharma]

As exynos-drm is a software device, its registration is moved to the
exynos drm driver. This will provide generic solution for device registration
for dt and non-dt platforms. Corresponding patches are posted to dri-devel
list.

Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com>
---
 arch/arm/mach-exynos/Makefile              |    1 -
 arch/arm/mach-exynos/dev-drm.c             |   29 ----------------------------
 arch/arm/mach-exynos/mach-nuri.c           |    3 --
 arch/arm/mach-exynos/mach-origen.c         |    3 --
 arch/arm/mach-exynos/mach-smdk4x12.c       |    3 --
 arch/arm/mach-exynos/mach-smdkv310.c       |    3 --
 arch/arm/mach-exynos/mach-universal_c210.c |    3 --
 arch/arm/plat-samsung/include/plat/devs.h  |    2 -
 8 files changed, 0 insertions(+), 47 deletions(-)
 delete mode 100644 arch/arm/mach-exynos/dev-drm.c

diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile
index 9b58024..1797dee 100644
--- a/arch/arm/mach-exynos/Makefile
+++ b/arch/arm/mach-exynos/Makefile
@@ -53,7 +53,6 @@ obj-$(CONFIG_EXYNOS4_DEV_AHCI)		+= dev-ahci.o
 obj-$(CONFIG_EXYNOS4_DEV_DWMCI)		+= dev-dwmci.o
 obj-$(CONFIG_EXYNOS_DEV_DMA)		+= dma.o
 obj-$(CONFIG_EXYNOS4_DEV_USB_OHCI)	+= dev-ohci.o
-obj-$(CONFIG_EXYNOS_DEV_DRM)		+= dev-drm.o
 obj-$(CONFIG_EXYNOS_DEV_SYSMMU)		+= dev-sysmmu.o
 
 obj-$(CONFIG_ARCH_EXYNOS)		+= setup-i2c0.o
diff --git a/arch/arm/mach-exynos/dev-drm.c b/arch/arm/mach-exynos/dev-drm.c
deleted file mode 100644
index 17c9c6e..0000000
--- a/arch/arm/mach-exynos/dev-drm.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * linux/arch/arm/mach-exynos/dev-drm.c
- *
- * Copyright (c) 2012 Samsung Electronics Co., Ltd.
- *		http://www.samsung.com
- *
- * EXYNOS - core DRM device
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#include <linux/kernel.h>
-#include <linux/dma-mapping.h>
-#include <linux/platform_device.h>
-
-#include <plat/devs.h>
-
-static u64 exynos_drm_dma_mask = DMA_BIT_MASK(32);
-
-struct platform_device exynos_device_drm = {
-	.name	= "exynos-drm",
-	.dev	= {
-		.dma_mask		= &exynos_drm_dma_mask,
-		.coherent_dma_mask	= DMA_BIT_MASK(32),
-	}
-};
diff --git a/arch/arm/mach-exynos/mach-nuri.c b/arch/arm/mach-exynos/mach-nuri.c
index ea785fc..9267caf 100644
--- a/arch/arm/mach-exynos/mach-nuri.c
+++ b/arch/arm/mach-exynos/mach-nuri.c
@@ -1330,9 +1330,6 @@ static struct platform_device *nuri_devices[] __initdata = {
 	&cam_vdda_fixed_rdev,
 	&cam_8m_12v_fixed_rdev,
 	&exynos4_bus_devfreq,
-#ifdef CONFIG_DRM_EXYNOS
-	&exynos_device_drm,
-#endif
 };
 
 static void __init nuri_map_io(void)
diff --git a/arch/arm/mach-exynos/mach-origen.c b/arch/arm/mach-exynos/mach-origen.c
index b45600f..be8fac7 100644
--- a/arch/arm/mach-exynos/mach-origen.c
+++ b/arch/arm/mach-exynos/mach-origen.c
@@ -709,9 +709,6 @@ static struct platform_device *origen_devices[] __initdata = {
 	&s5p_device_mfc_l,
 	&s5p_device_mfc_r,
 	&s5p_device_mixer,
-#ifdef CONFIG_DRM_EXYNOS
-	&exynos_device_drm,
-#endif
 	&exynos4_device_ohci,
 	&origen_device_gpiokeys,
 	&origen_lcd_hv070wsa,
diff --git a/arch/arm/mach-exynos/mach-smdk4x12.c b/arch/arm/mach-exynos/mach-smdk4x12.c
index 81bf59c..f02ee11 100644
--- a/arch/arm/mach-exynos/mach-smdk4x12.c
+++ b/arch/arm/mach-exynos/mach-smdk4x12.c
@@ -317,9 +317,6 @@ static struct platform_device *smdk4x12_devices[] __initdata = {
 	&s5p_device_mfc,
 	&s5p_device_mfc_l,
 	&s5p_device_mfc_r,
-#ifdef CONFIG_DRM_EXYNOS
-	&exynos_device_drm,
-#endif
 	&samsung_device_keypad,
 };
 
diff --git a/arch/arm/mach-exynos/mach-smdkv310.c b/arch/arm/mach-exynos/mach-smdkv310.c
index 12a1db2..bffb1b2 100644
--- a/arch/arm/mach-exynos/mach-smdkv310.c
+++ b/arch/arm/mach-exynos/mach-smdkv310.c
@@ -300,9 +300,6 @@ static struct platform_device *smdkv310_devices[] __initdata = {
 	&s5p_device_fimc_md,
 	&s5p_device_g2d,
 	&s5p_device_jpeg,
-#ifdef CONFIG_DRM_EXYNOS
-	&exynos_device_drm,
-#endif
 	&exynos4_device_ac97,
 	&exynos4_device_i2s0,
 	&exynos4_device_ohci,
diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-exynos/mach-universal_c210.c
index 4d1f40d..f7b1337 100644
--- a/arch/arm/mach-exynos/mach-universal_c210.c
+++ b/arch/arm/mach-exynos/mach-universal_c210.c
@@ -1084,9 +1084,6 @@ static struct platform_device *universal_devices[] __initdata = {
 	&s5p_device_onenand,
 	&s5p_device_fimd0,
 	&s5p_device_jpeg,
-#ifdef CONFIG_DRM_EXYNOS
-	&exynos_device_drm,
-#endif
 	&s3c_device_usb_hsotg,
 	&s5p_device_mfc,
 	&s5p_device_mfc_l,
diff --git a/arch/arm/plat-samsung/include/plat/devs.h b/arch/arm/plat-samsung/include/plat/devs.h
index 5da4b4f..133e3e4 100644
--- a/arch/arm/plat-samsung/include/plat/devs.h
+++ b/arch/arm/plat-samsung/include/plat/devs.h
@@ -133,8 +133,6 @@ extern struct platform_device exynos4_device_pcm1;
 extern struct platform_device exynos4_device_pcm2;
 extern struct platform_device exynos4_device_spdif;
 
-extern struct platform_device exynos_device_drm;
-
 extern struct platform_device samsung_asoc_dma;
 extern struct platform_device samsung_asoc_idma;
 extern struct platform_device samsung_device_keypad;
-- 
1.7.0.4

RE: [PATCH v4 0/6] arm: exynos: add dt based support for exynos5 hdmi

[Kukjin Kim]

Rahul Sharma wrote:
> 
> This patch set adds the DT based support for Samsung's Exynos5250. It adds
> device tree nodes for hdmi, mixer, hdmiphy and hdmiddc. The name of these
> devices are changed to the one matching with drivers. Exynos-drm and
> exynos
> hdmi-drm-commmon devices are removed from machine init code.
> 
> Exynos-drm and exynos hdmi-drm-commmon devices are removed from machine
> init code. Patch set which adds this code is posted to dri-devel list at
> http://comments.gmane.org/gmane.comp.video.dri.devel/75121.
> 
> This patchset is based on linux v3.6-rc6, branch v3.7-next/dt-samsung at
> git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
> 
> v1:
> - dropped patch for hpd gpio initialisation from machine init.
> - dropped patch for platform device registration.
> - removed platform device registration from non-dt platforms.
> 
> v2:
> - removed version information from hdmi, mixer dt nodes.
> - added DT binding documentation for hdmi, mixer, hdmiphy and hdmiddc.
> 
> v3:
> - corrected indentations.
> - changed dt node names to name@address format.
> 
> v4:
> - added newline at end of device-tree binding document files.
> - removes macros for mixer, hdmi physical addresses.
> - removed @address from mixer and hdmi DT nodes.
> 
> Rahul Sharma (6):
>   dts: exynos: add device tree support for exynos5 hdmi
>   dts: exynos: add device tree support for exynos5 mixer
>   dts: exynos: add device tree support for exynos5 hdmiphy
>   dts: exynos: add device tree support for exynos5 hdmiddc
>   arm: exynos: add clocks for exynos5 hdmi
>   arm: exynos: removing exynos-drm device registration from non-dt
>     platforms
> 
>  .../devicetree/bindings/drm/exynos/hdmi.txt        |   22 +++++++++++++++
>  .../devicetree/bindings/drm/exynos/hdmiddc.txt     |   12 ++++++++
>  .../devicetree/bindings/drm/exynos/hdmiphy.txt     |   12 ++++++++
>  .../devicetree/bindings/drm/exynos/mixer.txt       |   15 ++++++++++
>  arch/arm/boot/dts/exynos5250-smdk5250.dts          |   24
+++++++++++++++-
>  arch/arm/boot/dts/exynos5250.dtsi                  |   20 +++++++++++++
>  arch/arm/mach-exynos/Makefile                      |    1 -
>  arch/arm/mach-exynos/clock-exynos5.c               |   14 ++++++++-
>  arch/arm/mach-exynos/dev-drm.c                     |   29
--------------------
>  arch/arm/mach-exynos/mach-exynos5-dt.c             |    8 +++++
>  arch/arm/mach-exynos/mach-nuri.c                   |    3 --
>  arch/arm/mach-exynos/mach-origen.c                 |    3 --
>  arch/arm/mach-exynos/mach-smdk4x12.c               |    3 --
>  arch/arm/mach-exynos/mach-smdkv310.c               |    3 --
>  arch/arm/mach-exynos/mach-universal_c210.c         |    3 --
>  arch/arm/plat-samsung/include/plat/devs.h          |    2 -
>  16 files changed, 124 insertions(+), 50 deletions(-)
>  create mode 100644 Documentation/devicetree/bindings/drm/exynos/hdmi.txt
>  create mode 100644
> Documentation/devicetree/bindings/drm/exynos/hdmiddc.txt
>  create mode 100644
> Documentation/devicetree/bindings/drm/exynos/hdmiphy.txt
>  create mode 100644 Documentation/devicetree/bindings/drm/exynos/mixer.txt
>  delete mode 100644 arch/arm/mach-exynos/dev-drm.c

Looks OK to me, will apply this whole series.

Inki, if you want to need a topic branch for this series, please let me
know. I will create it for you.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

RE: [PATCH v4 0/6] arm: exynos: add dt based support for exynos5 hdmi

[Inki Dae]

> -----Original Message-----
> From: Kukjin Kim [mailto:kgene.kim@samsung.com]
> Sent: Tuesday, October 23, 2012 11:08 PM
> To: 'Rahul Sharma'; linux-samsung-soc@vger.kernel.org; devicetree-
> discuss@lists.ozlabs.org
> Cc: tomasz.figa@gmail.com; t.stanislaws@samsung.com;
> sw0312.kim@samsung.com; inki.dae@samsung.com; jy0922.shim@samsung.com;
> kyungmin.park@samsung.com; thomas.ab@samsung.com; prashanth.g@samsung.com;
> joshi@samsung.com; s.shirish@samsung.com; r.sh.open@gmail.com
> Subject: RE: [PATCH v4 0/6] arm: exynos: add dt based support for exynos5
> hdmi
> 
> Rahul Sharma wrote:
> >
> > This patch set adds the DT based support for Samsung's Exynos5250. It
> adds
> > device tree nodes for hdmi, mixer, hdmiphy and hdmiddc. The name of
> these
> > devices are changed to the one matching with drivers. Exynos-drm and
> > exynos
> > hdmi-drm-commmon devices are removed from machine init code.
> >
> > Exynos-drm and exynos hdmi-drm-commmon devices are removed from machine
> > init code. Patch set which adds this code is posted to dri-devel list at
> > http://comments.gmane.org/gmane.comp.video.dri.devel/75121.
> >
> > This patchset is based on linux v3.6-rc6, branch v3.7-next/dt-samsung at
> > git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
> >
> > v1:
> > - dropped patch for hpd gpio initialisation from machine init.
> > - dropped patch for platform device registration.
> > - removed platform device registration from non-dt platforms.
> >
> > v2:
> > - removed version information from hdmi, mixer dt nodes.
> > - added DT binding documentation for hdmi, mixer, hdmiphy and hdmiddc.
> >
> > v3:
> > - corrected indentations.
> > - changed dt node names to name@address format.
> >
> > v4:
> > - added newline at end of device-tree binding document files.
> > - removes macros for mixer, hdmi physical addresses.
> > - removed @address from mixer and hdmi DT nodes.
> >
> > Rahul Sharma (6):
> >   dts: exynos: add device tree support for exynos5 hdmi
> >   dts: exynos: add device tree support for exynos5 mixer
> >   dts: exynos: add device tree support for exynos5 hdmiphy
> >   dts: exynos: add device tree support for exynos5 hdmiddc
> >   arm: exynos: add clocks for exynos5 hdmi
> >   arm: exynos: removing exynos-drm device registration from non-dt
> >     platforms
> >
> >  .../devicetree/bindings/drm/exynos/hdmi.txt        |   22
+++++++++++++++
> >  .../devicetree/bindings/drm/exynos/hdmiddc.txt     |   12 ++++++++
> >  .../devicetree/bindings/drm/exynos/hdmiphy.txt     |   12 ++++++++
> >  .../devicetree/bindings/drm/exynos/mixer.txt       |   15 ++++++++++
> >  arch/arm/boot/dts/exynos5250-smdk5250.dts          |   24
> +++++++++++++++-
> >  arch/arm/boot/dts/exynos5250.dtsi                  |   20 +++++++++++++
> >  arch/arm/mach-exynos/Makefile                      |    1 -
> >  arch/arm/mach-exynos/clock-exynos5.c               |   14 ++++++++-
> >  arch/arm/mach-exynos/dev-drm.c                     |   29
> --------------------
> >  arch/arm/mach-exynos/mach-exynos5-dt.c             |    8 +++++
> >  arch/arm/mach-exynos/mach-nuri.c                   |    3 --
> >  arch/arm/mach-exynos/mach-origen.c                 |    3 --
> >  arch/arm/mach-exynos/mach-smdk4x12.c               |    3 --
> >  arch/arm/mach-exynos/mach-smdkv310.c               |    3 --
> >  arch/arm/mach-exynos/mach-universal_c210.c         |    3 --
> >  arch/arm/plat-samsung/include/plat/devs.h          |    2 -
> >  16 files changed, 124 insertions(+), 50 deletions(-)
> >  create mode 100644
> Documentation/devicetree/bindings/drm/exynos/hdmi.txt
> >  create mode 100644
> > Documentation/devicetree/bindings/drm/exynos/hdmiddc.txt
> >  create mode 100644
> > Documentation/devicetree/bindings/drm/exynos/hdmiphy.txt
> >  create mode 100644
> Documentation/devicetree/bindings/drm/exynos/mixer.txt
> >  delete mode 100644 arch/arm/mach-exynos/dev-drm.c
> 
> Looks OK to me, will apply this whole series.
> 
> Inki, if you want to need a topic branch for this series, please let me
> know. I will create it for you.
> 

Please merge them. After that, we will. So no need any topic branch. We had
already been tested with the above patch set and worked fine.

Thanks,
Inki Dae

> Thanks.
> 
> Best regards,
> Kgene.
> --
> Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
> SW Solution Development Team, Samsung Electronics Co., Ltd.