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

[PATCH v3 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.

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/include/mach/map.h            |    2 +
 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 -
 17 files changed, 126 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 v3 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/include/mach/map.h            |    1 +
 arch/arm/mach-exynos/mach-exynos5-dt.c             |    2 +
 5 files changed, 35 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..8b0fa7c
--- /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>;
+	};
\ No newline at end of file
diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index a352df4..0d51678 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@14530000 {
+		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..ec7ea2d 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -492,4 +492,10 @@
 			#gpio-cells = <4>;
 		};
 	};
+
+	hdmi@14530000 {
+		compatible = "samsung,exynos5-hdmi";
+		reg = <0x14530000 0x100000>;
+		interrupts = <0 95 0>;
+	};
 };
diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h
index 5edbbe9..7b9efb2 100644
--- a/arch/arm/mach-exynos/include/mach/map.h
+++ b/arch/arm/mach-exynos/include/mach/map.h
@@ -201,6 +201,7 @@
 #define EXYNOS4_PA_SDO			0x12C20000
 #define EXYNOS4_PA_HDMI			0x12D00000
 #define EXYNOS4_PA_IIC_HDMIPHY		0x138E0000
+#define EXYNOS5_PA_HDMI		0x14530000
 
 #define EXYNOS4_PA_IIC(x)		(0x13860000 + ((x) * 0x10000))
 #define EXYNOS5_PA_IIC(x)		(0x12C60000 + ((x) * 0x10000))
diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c
index ce82f30..43449fb 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", EXYNOS5_PA_HDMI,
+				"exynos5-hdmi", NULL),
 	{},
 };
 
-- 
1.7.0.4

[PATCH v3 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/include/mach/map.h            |    1 +
 arch/arm/mach-exynos/mach-exynos5-dt.c             |    2 ++
 4 files changed, 24 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..05e4731
--- /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>;
+	};
\ No newline at end of file
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index ec7ea2d..4064b6a 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@14450000 {
+		compatible = "samsung,exynos5-mixer";
+		reg = <0x14450000 0x10000>;
+		interrupts = <0 94 0>;
+	};
 };
diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h
index 7b9efb2..314ee75 100644
--- a/arch/arm/mach-exynos/include/mach/map.h
+++ b/arch/arm/mach-exynos/include/mach/map.h
@@ -201,6 +201,7 @@
 #define EXYNOS4_PA_SDO			0x12C20000
 #define EXYNOS4_PA_HDMI			0x12D00000
 #define EXYNOS4_PA_IIC_HDMIPHY		0x138E0000
+#define EXYNOS5_PA_MIXER		0x14450000
 #define EXYNOS5_PA_HDMI		0x14530000
 
 #define EXYNOS4_PA_IIC(x)		(0x13860000 + ((x) * 0x10000))
diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c
index 43449fb..cdad7c1 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", EXYNOS5_PA_HDMI,
 				"exynos5-hdmi", NULL),
+	OF_DEV_AUXDATA("samsung,exynos5-mixer", EXYNOS5_PA_MIXER,
+				"exynos5-mixer", NULL),
 	{},
 };
 
-- 
1.7.0.4

[PATCH v3 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..c4face5
--- /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>;
+	};
\ No newline at end of file
diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index 0d51678..18ac213 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 4064b6a..242079a 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 cdad7c1..3f129db 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 v3 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..c408892
--- /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>;
+	};
\ No newline at end of file
diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index 18ac213..f7b4fc4 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 3f129db..003963c 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 v3 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 v3 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 v3 3/6] dts: exynos: add device tree support for exynos5 hdmiphy

[Tomasz Figa]

[-- Attachment #1.1: Type: text/plain, Size: 3221 bytes --]

Hi,

On Tuesday 16 of October 2012 05:00:31 Rahul Sharma wrote:
> This patch adds support for device tree based discovery for exynos5
> hdmiphy.
> 
> Signed-off-by: Rahul Sharma <rahul.sharma-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
> ---
>  .../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..c4face5
> --- /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>;
> +	};
> \ No newline at end of file
> diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts
> b/arch/arm/boot/dts/exynos5250-smdk5250.dts index 0d51678..18ac213
> 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 4064b6a..242079a 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 cdad7c1..3f129db 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,

Looks fine.

Reviewed-by: Tomasz Figa <t.figa-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>

Best regards,
-- 
Tomasz Figa
Samsung Poland R&D Center

[-- Attachment #1.2: Type: text/html, Size: 18196 bytes --]

[-- Attachment #2: Type: text/plain, Size: 192 bytes --]

_______________________________________________
devicetree-discuss mailing list
devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org
https://lists.ozlabs.org/listinfo/devicetree-discuss

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

[Tomasz Figa]

[-- Attachment #1.1: Type: text/plain, Size: 2594 bytes --]

Hi,

On Tuesday 16 of October 2012 05:00:32 Rahul Sharma wrote:
> This patch adds support for device tree based discovery for exynos5
> hdmi ddc.
> 
> Signed-off-by: Rahul Sharma <rahul.sharma-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
> ---
>  .../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..c408892
> --- /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>;
> +	};
> \ No newline at end of file
> diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts
> b/arch/arm/boot/dts/exynos5250-smdk5250.dts index 18ac213..f7b4fc4
> 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 3f129db..003963c 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,

Looks fine.

Reviewed-by: Tomasz Figa <t.figa-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>

Best regards,
-- 
Tomasz Figa
Samsung Poland R&D Center

[-- Attachment #1.2: Type: text/html, Size: 14647 bytes --]

[-- Attachment #2: Type: text/plain, Size: 192 bytes --]

_______________________________________________
devicetree-discuss mailing list
devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org
https://lists.ozlabs.org/listinfo/devicetree-discuss

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

[Tomasz Figa]

[-- Attachment #1.1: Type: text/plain, Size: 3471 bytes --]

Hi Rahul,

On Tuesday 16 of October 2012 05:00:28 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.
> 
> 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/include/mach/map.h           
> |    2 +
>  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 -
>  17 files changed, 126 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

The patches look fine, but Kukjin's tree doesn't contain all the
dependencies for them to be usable.

Shouldn't they be based on exynos-drm-next branch of Kyungmin's tree at
infradead instead:

http://git.infradead.org/users/kmpark/linux-samsung/shortlog/refs/heads/exynos-drm-next

Best regards,
-- 
Tomasz Figa
Samsung Poland R&D Center

[-- Attachment #1.2: Type: text/html, Size: 15206 bytes --]

[-- Attachment #2: Type: text/plain, Size: 192 bytes --]

_______________________________________________
devicetree-discuss mailing list
devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org
https://lists.ozlabs.org/listinfo/devicetree-discuss

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

[Rahul Sharma]

Hi Mr. Park, Mr. Kim,

I had a suggestion here from Tomasz about dividing this patch-set into
2 portions:

1) DT related (patches 1-4) for samsung-dt branch.
2) Clocks, Arch data related to Exynos5. (patches 5,6) for
exynos-drm-fixes branch.

Rationale behind this is kgene tree with all 6 patches applied will
have broken drm
exynos4 and incomplete drm exynos5.

I want to know your opinion on this.

regards,
Rahul Sharma

On Tue, Oct 16, 2012 at 3:01 PM, Tomasz Figa <t.figa@samsung.com> wrote:
> Hi Rahul,
>
>
>
> On Tuesday 16 of October 2012 05:00:28 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.
>
>>
>
>> 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/include/mach/map.h
>
>> | 2 +
>
>> 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 -
>
>> 17 files changed, 126 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
>
>
>
> The patches look fine, but Kukjin's tree doesn't contain all the
>
> dependencies for them to be usable.
>
>
>
> Shouldn't they be based on exynos-drm-next branch of Kyungmin's tree at
>
> infradead instead:
>
>
>
> http://git.infradead.org/users/kmpark/linux-samsung/shortlog/refs/heads/exynos-drm-next
>
>
>
> Best regards,
>
> --
>
> Tomasz Figa
>
> Samsung Poland R&D Center
>
>

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

[Kyungmin Park]

Hi,

It's common case, one topic but two different tree.
So I suggest merge it at samsung sub-soc tree and drm parts will be
merged after arm-soc tree is merged. since arm-soc tree collect arm
soc-soc and merged early at merge window. then drm tree will be merged
later.
Until that time, drm patches are hold only at local git.

How do you think?

Thank you,
Kyungmin Park

On 10/16/12, Rahul Sharma <r.sh.open@gmail.com> wrote:
> Hi Mr. Park, Mr. Kim,
>
> I had a suggestion here from Tomasz about dividing this patch-set into
> 2 portions:
>
> 1) DT related (patches 1-4) for samsung-dt branch.
> 2) Clocks, Arch data related to Exynos5. (patches 5,6) for
> exynos-drm-fixes branch.
>
> Rationale behind this is kgene tree with all 6 patches applied will
> have broken drm
> exynos4 and incomplete drm exynos5.
>
> I want to know your opinion on this.
>
> regards,
> Rahul Sharma
>
> On Tue, Oct 16, 2012 at 3:01 PM, Tomasz Figa <t.figa@samsung.com> wrote:
>> Hi Rahul,
>>
>>
>>
>> On Tuesday 16 of October 2012 05:00:28 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.
>>
>>>
>>
>>> 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/include/mach/map.h
>>
>>> | 2 +
>>
>>> 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 -
>>
>>> 17 files changed, 126 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
>>
>>
>>
>> The patches look fine, but Kukjin's tree doesn't contain all the
>>
>> dependencies for them to be usable.
>>
>>
>>
>> Shouldn't they be based on exynos-drm-next branch of Kyungmin's tree at
>>
>> infradead instead:
>>
>>
>>
>> http://git.infradead.org/users/kmpark/linux-samsung/shortlog/refs/heads/exynos-drm-next
>>
>>
>>
>> Best regards,
>>
>> --
>>
>> Tomasz Figa
>>
>> Samsung Poland R&D Center
>>
>>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc"
> in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>

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

[Rahul Sharma]

Mr. Park,

Looks good to me.
Shall I divide the patch-set into two groups and re-post them?

regards,
Rahul Sharma.

On Wed, Oct 17, 2012 at 9:09 AM, Kyungmin Park
<kyungmin.park@samsung.com> wrote:
> Hi,
>
> It's common case, one topic but two different tree.
> So I suggest merge it at samsung sub-soc tree and drm parts will be
> merged after arm-soc tree is merged. since arm-soc tree collect arm
> soc-soc and merged early at merge window. then drm tree will be merged
> later.
> Until that time, drm patches are hold only at local git.
>
> How do you think?
>
> Thank you,
> Kyungmin Park
>
> On 10/16/12, Rahul Sharma <r.sh.open@gmail.com> wrote:
>> Hi Mr. Park, Mr. Kim,
>>
>> I had a suggestion here from Tomasz about dividing this patch-set into
>> 2 portions:
>>
>> 1) DT related (patches 1-4) for samsung-dt branch.
>> 2) Clocks, Arch data related to Exynos5. (patches 5,6) for
>> exynos-drm-fixes branch.
>>
>> Rationale behind this is kgene tree with all 6 patches applied will
>> have broken drm
>> exynos4 and incomplete drm exynos5.
>>
>> I want to know your opinion on this.
>>
>> regards,
>> Rahul Sharma
>>
>> On Tue, Oct 16, 2012 at 3:01 PM, Tomasz Figa <t.figa@samsung.com> wrote:
>>> Hi Rahul,
>>>
>>>
>>>
>>> On Tuesday 16 of October 2012 05:00:28 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.
>>>
>>>>
>>>
>>>> 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/include/mach/map.h
>>>
>>>> | 2 +
>>>
>>>> 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 -
>>>
>>>> 17 files changed, 126 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
>>>
>>>
>>>
>>> The patches look fine, but Kukjin's tree doesn't contain all the
>>>
>>> dependencies for them to be usable.
>>>
>>>
>>>
>>> Shouldn't they be based on exynos-drm-next branch of Kyungmin's tree at
>>>
>>> infradead instead:
>>>
>>>
>>>
>>> http://git.infradead.org/users/kmpark/linux-samsung/shortlog/refs/heads/exynos-drm-next
>>>
>>>
>>>
>>> Best regards,
>>>
>>> --
>>>
>>> Tomasz Figa
>>>
>>> Samsung Poland R&D Center
>>>
>>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc"
>> in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>>

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

[Kukjin Kim]

Rahul Sharma wrote:
> 
> 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-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
> ---
>  .../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/include/mach/map.h            |    1 +
>  arch/arm/mach-exynos/mach-exynos5-dt.c             |    2 +
>  5 files changed, 35 insertions(+), 0 deletions(-)
>  create mode 100644 Documentation/devicetree/bindings/drm/exynos/hdmi.txt
> 

[...]

> +	hdmi {
> +		compatible = "samsung,exynos5-hdmi";
> +		reg = <0x14530000 0x100000>;
> +		interrupts = <0 95 0>;
> +		hpd-gpio = <&gpx3 7 0xf 1 3>;
> +	};
> \ No newline at end of file

What's this?

[...]

> +	hdmi@14530000 {

+	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..ec7ea2d 100644
> --- a/arch/arm/boot/dts/exynos5250.dtsi
> +++ b/arch/arm/boot/dts/exynos5250.dtsi
> @@ -492,4 +492,10 @@
>  			#gpio-cells = <4>;
>  		};
>  	};
> +
> +	hdmi@14530000 {

Ditto.

[...]

> +#define EXYNOS5_PA_HDMI		0x14530000
> 

I think, we don't need this because see below.

[...]

> +	OF_DEV_AUXDATA("samsung,exynos5-hdmi", EXYNOS5_PA_HDMI,
> +				"exynos5-hdmi", NULL),

+	OF_DEV_AUXDATA("samsung,exynos5-hdmi", 0x14530000, "exynos5-hdmi",
NULL),

I think, if the address as defined above is used only here, let's just the
value because nobody don't know it is the address.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

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

[Kukjin Kim]

Rahul Sharma wrote:
> 
> 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/include/mach/map.h            |    1 +
>  arch/arm/mach-exynos/mach-exynos5-dt.c             |    2 ++
>  4 files changed, 24 insertions(+), 0 deletions(-)
>  create mode 100644 Documentation/devicetree/bindings/drm/exynos/mixer.txt
> 
Basically, same comments on your 1/6 patch.

Thanks.

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

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

[Kukjin Kim]

Rahul Sharma wrote:
> 
> Mr. Park,
> 
> Looks good to me.
> Shall I divide the patch-set into two groups and re-post them?
> 
No, you don't need to divide this series. It should be OK to be sent to
upstream via Samsung tree. But see my small comments on your patch before
that.

BTW, I'm not sure about 6th patch which removes to support non-DT for
exynos4210 in Samsung tree because as you commented on the patch, the
removed code should be replaced by corresponding patch is in exynos drm
driver. So I think, topic branch I will provide for exynos drm tree can be a
way to solve it. Or Kyungmin's suggestion can be a way for it too. Let you
know which one is better...when I pick this up in my tree.

> regards,
> Rahul Sharma.
> 
> On Wed, Oct 17, 2012 at 9:09 AM, Kyungmin Park
> <kyungmin.park@samsung.com> wrote:
> > Hi,
> >
> > It's common case, one topic but two different tree.
> > So I suggest merge it at samsung sub-soc tree and drm parts will be
> > merged after arm-soc tree is merged. since arm-soc tree collect arm
> > soc-soc and merged early at merge window. then drm tree will be merged
> > later.
> > Until that time, drm patches are hold only at local git.
> >
> > How do you think?
> >

Kyungmin, thanks for your suggestion :)

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

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

[Tomasz Figa]

[-- Attachment #1.1: Type: text/plain, Size: 2327 bytes --]

Hi Rahul, Kgene,

On Wednesday 17 of October 2012 20:32:05 Kukjin Kim wrote:
> Rahul Sharma wrote:
> > 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-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
> > ---
> > 
> >  .../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/include/mach/map.h            |    1 +
> >  arch/arm/mach-exynos/mach-exynos5-dt.c             |    2 +
> >  5 files changed, 35 insertions(+), 0 deletions(-)
> >  create mode 100644
> >  Documentation/devicetree/bindings/drm/exynos/hdmi.txt
> [...]
> 
> > +	hdmi {
> > +		compatible = "samsung,exynos5-hdmi";
> > +		reg = <0x14530000 0x100000>;
> > +		interrupts = <0 95 0>;
> > +		hpd-gpio = <&gpx3 7 0xf 1 3>;
> > +	};
> > \ No newline at end of file
> 
> What's this?
> 
> [...]
> 
> > +	hdmi@14530000 {
> 
> +	hdmi {
>

Isn't there a convention to use @ADDR whenever a node contains a reg 
property? Please see exynos4.dtsi, all the nodes with reg have @ADDR.

> > +		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..ec7ea2d 100644
> > --- a/arch/arm/boot/dts/exynos5250.dtsi
> > +++ b/arch/arm/boot/dts/exynos5250.dtsi
> > @@ -492,4 +492,10 @@
> > 
> >  			#gpio-cells = <4>;
> >  		
> >  		};
> >  	
> >  	};
> > 
> > +
> > +	hdmi@14530000 {
> 
> Ditto.
> 

Ditto.

> [...]
> 
> > +#define EXYNOS5_PA_HDMI		0x14530000
> 
> I think, we don't need this because see below.
> 
> [...]
> 
> > +	OF_DEV_AUXDATA("samsung,exynos5-hdmi", EXYNOS5_PA_HDMI,
> > +				"exynos5-hdmi", NULL),
> 
> +	OF_DEV_AUXDATA("samsung,exynos5-hdmi", 0x14530000, "exynos5-hdmi",
> NULL),
> 
> I think, if the address as defined above is used only here, let's just
> the value because nobody don't know it is the address.

I don't like the idea of having such magic numbers in code, but since the 
whole auxdata array is going to be removed in future anyway, I guess this 
is OK.

Best regards,
-- 
Tomasz Figa
Samsung Poland R&D Center

[-- Attachment #1.2: Type: text/html, Size: 16207 bytes --]

[-- Attachment #2: Type: text/plain, Size: 192 bytes --]

_______________________________________________
devicetree-discuss mailing list
devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org
https://lists.ozlabs.org/listinfo/devicetree-discuss