[PATCH 0/7] Exynos4: enable HDMI support for Odroid and UniversalC210

[PATCH 0/7] Exynos4: enable HDMI support for Odroid and UniversalC210

[Marek Szyprowski]

Hello,

This is a long awaited patch series enabling support for HDMI output
available on Exynos4412-based Odroid boards (X/X2/U2/U3/U3+) and
Exynos4210 Universal C210 board.

This patch consists of 3 groups of patches, which are aimed to be merged
to respective maintainer kernel trees.

First patch ("clk: exynos4: add support for MOUT_HDMI and MOUT_MIXER
clocks") adds missing device tree support for hdmi related clocks. It is
prepared for clk kernel tree.

Next two patches ("drm: exynos: hdmi: make 'hdmi-en' regulator optional
and keep it enabled" and "drm: hdmi/mixer: enable exynos 4210 and 4x12
soc support") add proper support for Exynos4 SoCs to Exynos DRM drivers.
Those patches should go to exynos-drm kernel tree.

Last patches ("Exynos: add support for 'domain-always-on' property",
"ARM: dts: exynos4: add hdmi related nodes", "ARM: dts:
exynos4412-odroid: enable hdmi support" and "ARM: dts:
exynos4210-universal_c210: enable hdmi support") adds changes to all DTS
files and adds 'domain-always-on' property to Exynos power-domain
driver. This property is needed to resolve the non-trivial dependences
between TV and LCD0 power domains and the power on/off sequence of the
TV and mixer modules.

Patches are prepared on top of v3.16-rc3 with '[PATCH v2 0/4] Add
Exynos4412 based Odroid X2 and U2/U3/U3+ support' series and '[PATCH]
ARM: dts: exynos4412-odroid: add support for GPIO buttons' patch
applied:
http://www.spinics.net/lists/linux-samsung-soc/msg33115.html
http://www.spinics.net/lists/linux-samsung-soc/msg33497.html

Kernel tree with all Odroid related patches is available at
http://git.linaro.org/git-ro/people/marek.szyprowski/linux-srpol.git
on v3.16-odroid branch.

Best regards
Marek Szyprowski
Samsung R&D Institute Poland

Marek Szyprowski (6):
  clk: exynos4: add support for MOUT_HDMI and MOUT_MIXER clocks
  drm: exynos: hdmi: make 'hdmi-en' regulator optional and keep it
    enabled
  drm: hdmi/mixer: enable exynos 4210 and 4x12 soc support
  Exynos: add support for 'domain-always-on' property
  ARM: dts: exynos4: add hdmi related nodes
  ARM: dts: exynos4412-odroid: enable hdmi support

Tomasz Stanislawski (1):
  ARM: dts: exynos4210-universal_c210: enable hdmi support

 .../bindings/arm/exynos/power_domain.txt           |  2 +
 .../devicetree/bindings/video/exynos_mixer.txt     |  5 +-
 arch/arm/boot/dts/exynos4.dtsi                     | 37 ++++++++++++
 arch/arm/boot/dts/exynos4210-universal_c210.dts    | 65 ++++++++++++++++++++++
 arch/arm/boot/dts/exynos4210.dtsi                  |  5 ++
 arch/arm/boot/dts/exynos4412-odroid-common.dtsi    | 52 +++++++++++++++++
 arch/arm/boot/dts/exynos4x12.dtsi                  | 10 ++++
 arch/arm/mach-exynos/pm_domains.c                  |  6 +-
 drivers/clk/samsung/clk-exynos4.c                  |  4 +-
 drivers/gpu/drm/exynos/exynos_hdmi.c               | 29 +++++++++-
 drivers/gpu/drm/exynos/exynos_mixer.c              | 51 ++++++++++++-----
 include/dt-bindings/clock/exynos4.h                |  2 +
 12 files changed, 247 insertions(+), 21 deletions(-)

-- 
1.9.2

[PATCH 1/7] clk: exynos4: add support for MOUT_HDMI and MOUT_MIXER clocks

[Marek Szyprowski]

This patch adds support for exporting mout_hdmi and mout_mixer to device
tree. Access to those clocks is required to correctly setup HDMI module
on Exynos 4210 and 4x12 SoCs.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
CC: Mike Turquette <mturquette@linaro.org>
CC: Tomasz Figa <t.figa@samsung.com>
---
 drivers/clk/samsung/clk-exynos4.c   | 4 ++--
 include/dt-bindings/clock/exynos4.h | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/clk/samsung/clk-exynos4.c b/drivers/clk/samsung/clk-exynos4.c
index 4f150c9dd38c..a30a779869eb 100644
--- a/drivers/clk/samsung/clk-exynos4.c
+++ b/drivers/clk/samsung/clk-exynos4.c
@@ -440,7 +440,7 @@ static struct samsung_fixed_rate_clock exynos4210_fixed_rate_clks[] __initdata =
 static struct samsung_mux_clock exynos4_mux_clks[] __initdata = {
 	MUX_FA(CLK_MOUT_APLL, "mout_apll", mout_apll_p, SRC_CPU, 0, 1,
 			CLK_SET_RATE_PARENT, 0, "mout_apll"),
-	MUX(0, "mout_hdmi", mout_hdmi_p, SRC_TV, 0, 1),
+	MUX(CLK_MOUT_HDMI, "mout_hdmi", mout_hdmi_p, SRC_TV, 0, 1),
 	MUX(0, "mout_mfc1", sclk_evpll_p, SRC_MFC, 4, 1),
 	MUX(0, "mout_mfc", mout_mfc_p, SRC_MFC, 8, 1),
 	MUX_F(CLK_MOUT_G3D1, "mout_g3d1", sclk_evpll_p, SRC_G3D, 4, 1,
@@ -463,7 +463,7 @@ static struct samsung_mux_clock exynos4210_mux_clks[] __initdata = {
 	MUX(0, "mout_aclk100", sclk_ampll_p4210, SRC_TOP0, 16, 1),
 	MUX(0, "mout_aclk160", sclk_ampll_p4210, SRC_TOP0, 20, 1),
 	MUX(0, "mout_aclk133", sclk_ampll_p4210, SRC_TOP0, 24, 1),
-	MUX(0, "mout_mixer", mout_mixer_p4210, SRC_TV, 4, 1),
+	MUX(CLK_MOUT_MIXER, "mout_mixer", mout_mixer_p4210, SRC_TV, 4, 1),
 	MUX(0, "mout_dac", mout_dac_p4210, SRC_TV, 8, 1),
 	MUX(0, "mout_g2d0", sclk_ampll_p4210, E4210_SRC_IMAGE, 0, 1),
 	MUX(0, "mout_g2d1", sclk_evpll_p, E4210_SRC_IMAGE, 4, 1),
diff --git a/include/dt-bindings/clock/exynos4.h b/include/dt-bindings/clock/exynos4.h
index 1106ca540a96..5bfb3509ee3c 100644
--- a/include/dt-bindings/clock/exynos4.h
+++ b/include/dt-bindings/clock/exynos4.h
@@ -229,6 +229,8 @@
 #define CLK_MOUT_G3D1		393
 #define CLK_MOUT_G3D		394
 #define CLK_ACLK400_MCUISP	395 /* Exynos4x12 only */
+#define CLK_MOUT_HDMI		396
+#define CLK_MOUT_MIXER		397
 
 /* div clocks */
 #define CLK_DIV_ISP0		450 /* Exynos4x12 only */
-- 
1.9.2

Re: [PATCH 1/7] clk: exynos4: add support for MOUT_HDMI and MOUT_MIXER clocks

[Tobias Jakobi]

Hello Marek,

I think this particular clock setup should already be handled by this patch:
http://www.spinics.net/lists/arm-kernel/msg320013.html

Or am I missing something here?

With best wishes,
Tobias


Marek Szyprowski wrote:
> This patch adds support for exporting mout_hdmi and mout_mixer to device
> tree. Access to those clocks is required to correctly setup HDMI module
> on Exynos 4210 and 4x12 SoCs.
> 
> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
> CC: Mike Turquette <mturquette@linaro.org>
> CC: Tomasz Figa <t.figa@samsung.com>
> ---
>  drivers/clk/samsung/clk-exynos4.c   | 4 ++--
>  include/dt-bindings/clock/exynos4.h | 2 ++
>  2 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/clk/samsung/clk-exynos4.c b/drivers/clk/samsung/clk-exynos4.c
> index 4f150c9dd38c..a30a779869eb 100644
> --- a/drivers/clk/samsung/clk-exynos4.c
> +++ b/drivers/clk/samsung/clk-exynos4.c
> @@ -440,7 +440,7 @@ static struct samsung_fixed_rate_clock exynos4210_fixed_rate_clks[] __initdata =
>  static struct samsung_mux_clock exynos4_mux_clks[] __initdata = {
>  	MUX_FA(CLK_MOUT_APLL, "mout_apll", mout_apll_p, SRC_CPU, 0, 1,
>  			CLK_SET_RATE_PARENT, 0, "mout_apll"),
> -	MUX(0, "mout_hdmi", mout_hdmi_p, SRC_TV, 0, 1),
> +	MUX(CLK_MOUT_HDMI, "mout_hdmi", mout_hdmi_p, SRC_TV, 0, 1),
>  	MUX(0, "mout_mfc1", sclk_evpll_p, SRC_MFC, 4, 1),
>  	MUX(0, "mout_mfc", mout_mfc_p, SRC_MFC, 8, 1),
>  	MUX_F(CLK_MOUT_G3D1, "mout_g3d1", sclk_evpll_p, SRC_G3D, 4, 1,
> @@ -463,7 +463,7 @@ static struct samsung_mux_clock exynos4210_mux_clks[] __initdata = {
>  	MUX(0, "mout_aclk100", sclk_ampll_p4210, SRC_TOP0, 16, 1),
>  	MUX(0, "mout_aclk160", sclk_ampll_p4210, SRC_TOP0, 20, 1),
>  	MUX(0, "mout_aclk133", sclk_ampll_p4210, SRC_TOP0, 24, 1),
> -	MUX(0, "mout_mixer", mout_mixer_p4210, SRC_TV, 4, 1),
> +	MUX(CLK_MOUT_MIXER, "mout_mixer", mout_mixer_p4210, SRC_TV, 4, 1),
>  	MUX(0, "mout_dac", mout_dac_p4210, SRC_TV, 8, 1),
>  	MUX(0, "mout_g2d0", sclk_ampll_p4210, E4210_SRC_IMAGE, 0, 1),
>  	MUX(0, "mout_g2d1", sclk_evpll_p, E4210_SRC_IMAGE, 4, 1),
> diff --git a/include/dt-bindings/clock/exynos4.h b/include/dt-bindings/clock/exynos4.h
> index 1106ca540a96..5bfb3509ee3c 100644
> --- a/include/dt-bindings/clock/exynos4.h
> +++ b/include/dt-bindings/clock/exynos4.h
> @@ -229,6 +229,8 @@
>  #define CLK_MOUT_G3D1		393
>  #define CLK_MOUT_G3D		394
>  #define CLK_ACLK400_MCUISP	395 /* Exynos4x12 only */
> +#define CLK_MOUT_HDMI		396
> +#define CLK_MOUT_MIXER		397
>  
>  /* div clocks */
>  #define CLK_DIV_ISP0		450 /* Exynos4x12 only */
> 

Re: [PATCH 1/7] clk: exynos4: add support for MOUT_HDMI and MOUT_MIXER clocks

[Marek Szyprowski]

Hello,

On 2014-07-01 10:46, Tobias Jakobi wrote:
> Hello Marek,
>
> I think this particular clock setup should already be handled by this patch:
> http://www.spinics.net/lists/arm-kernel/msg320013.html
>
> Or am I missing something here?

The patch you have pointed requires adding support for SET_PARENT_PARENT
feature to clock core, which has not been accepted yet. Only then Exynod
DRM drivers can be updated to correctly handle the changed clock tree.

My approach is to introduce minimal changes and use the code which is
already in the exynos drm/hdmi driver (it already manages 'mout_hdmi/mixer'
clocks). If other solution is finally accepted, the code can be simplified
and mout_hdmi/mixer clocks simply ignored. For now - my changes are needed
to get HDMI output working and have least dependencies.

Best regards
-- 
Marek Szyprowski, PhD
Samsung R&D Institute Poland

Re: [PATCH 1/7] clk: exynos4: add support for MOUT_HDMI and MOUT_MIXER clocks

[Tobias Jakobi]

Hi,


Marek Szyprowski wrote:
> Hello,
> 
> On 2014-07-01 10:46, Tobias Jakobi wrote:
>> Hello Marek,
>>
>> I think this particular clock setup should already be handled by this
>> patch:
>> http://www.spinics.net/lists/arm-kernel/msg320013.html
>>
>> Or am I missing something here?
> 
> The patch you have pointed requires adding support for SET_PARENT_PARENT
> feature to clock core, which has not been accepted yet. Only then Exynod
> DRM drivers can be updated to correctly handle the changed clock tree.
I'm aware of this, but my point is: Wouldn't it be better to get the
SET_PARENT_PARENT upstream instead of applying a work-around (I am
assuming of course that SET_PARENT_PARENT is the correct way of handling
these clocks), which would be reverted later anyway?

Also this looks like similar to the work duplication issue that was
raised before here on the ml. Different groups working on the same
thing, but with no or little coordination between them. Might be just me
though...


> My approach is to introduce minimal changes and use the code which is
> already in the exynos drm/hdmi driver (it already manages 'mout_hdmi/mixer'
> clocks). If other solution is finally accepted, the code can be simplified
> and mout_hdmi/mixer clocks simply ignored. For now - my changes are needed
> to get HDMI output working and have least dependencies.
> 
> Best regards


With best wishes,
Tobias

[PATCH 2/7] drm: exynos: hdmi: make 'hdmi-en' regulator optional and keep it enabled

[Marek Szyprowski]

HDMI_EN regulator is additional regulator for providing voltage source
for DCC lines available on HDMI connector. When there is no power
provided for DDC epprom, some TV-sets do not pulls up HPD (hot plug
detect) line, what causes HDMI block to stay turned off. This patch
enables HDMI_EN regulator (if available) on driver probe and keep it
enabled all the time to let TV-set correctly signal HPD event.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
---
 drivers/gpu/drm/exynos/exynos_hdmi.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index aa259b0a873a..a9a87d024c56 100644
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -84,6 +84,7 @@ struct hdmi_resources {
 	struct clk			*sclk_hdmiphy;
 	struct clk			*mout_hdmi;
 	struct regulator_bulk_data	*regul_bulk;
+	struct regulator		*reg_hdmi_en;
 	int				regul_count;
 };
 
@@ -2168,7 +2169,6 @@ static int hdmi_resources_init(struct hdmi_context *hdata)
 	struct device *dev = hdata->dev;
 	struct hdmi_resources *res = &hdata->res;
 	static char *supply[] = {
-		"hdmi-en",
 		"vdd",
 		"vdd_osc",
 		"vdd_pll",
@@ -2228,6 +2228,20 @@ static int hdmi_resources_init(struct hdmi_context *hdata)
 	}
 	res->regul_count = ARRAY_SIZE(supply);
 
+	res->reg_hdmi_en = devm_regulator_get(dev, "hdmi-en");
+	if (IS_ERR(res->reg_hdmi_en) && PTR_ERR(res->reg_hdmi_en) != -ENOENT) {
+		DRM_ERROR("failed to get hdmi-en regulator\n");
+		return PTR_ERR(res->reg_hdmi_en);
+	}
+	if (!IS_ERR(res->reg_hdmi_en)) {
+		ret = regulator_enable(res->reg_hdmi_en);
+		if (ret) {
+			DRM_ERROR("failed to enable hdmi-en regulator\n");
+			return ret;
+		}
+	} else
+		res->reg_hdmi_en = NULL;
+
 	return ret;
 fail:
 	DRM_ERROR("HDMI resource init - failed\n");
@@ -2494,6 +2508,9 @@ static int hdmi_remove(struct platform_device *pdev)
 
 	cancel_delayed_work_sync(&hdata->hotplug_work);
 
+	if (hdata->res.reg_hdmi_en)
+		regulator_disable(hdata->res.reg_hdmi_en);
+
 	put_device(&hdata->hdmiphy_port->dev);
 	put_device(&hdata->ddc_adpt->dev);
 
-- 
1.9.2

[PATCH 3/7] drm: hdmi/mixer: enable exynos 4210 and 4x12 soc support

[Marek Szyprowski]

Configuration sets for Exynos 4210 and 4x12 SoC were already defined in
Exynos HDMI and Mixed drivers, but they lacked proper linking to device
tree 'compatible' values. This patch fixes this issue adding support for
following compatible values: samsung,exynos4210-mixer,
samsung,exynos4212-mixer and samsung,exynos4210-hdmi. It also corrects
access to sclk_mixer clock, which is available only on Exynos 4210.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
---
 .../devicetree/bindings/video/exynos_mixer.txt     |  5 ++-
 drivers/gpu/drm/exynos/exynos_hdmi.c               | 10 +++++
 drivers/gpu/drm/exynos/exynos_mixer.c              | 51 +++++++++++++++-------
 3 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/Documentation/devicetree/bindings/video/exynos_mixer.txt b/Documentation/devicetree/bindings/video/exynos_mixer.txt
index 7bfde9c9d658..08b394b1edbf 100644
--- a/Documentation/devicetree/bindings/video/exynos_mixer.txt
+++ b/Documentation/devicetree/bindings/video/exynos_mixer.txt
@@ -4,8 +4,9 @@ Required properties:
 - compatible: value should be one of the following:
 	1) "samsung,exynos5-mixer" <DEPRECATED>
 	2) "samsung,exynos4210-mixer"
-	3) "samsung,exynos5250-mixer"
-	4) "samsung,exynos5420-mixer"
+	3) "samsung,exynos4212-mixer"
+	4) "samsung,exynos5250-mixer"
+	5) "samsung,exynos5420-mixer"
 
 - reg: physical base address of the mixer and length of memory mapped
 	region.
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index a9a87d024c56..7bd99939b984 100644
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -593,6 +593,13 @@ static struct hdmi_driver_data exynos4212_hdmi_driver_data = {
 	.is_apb_phy	= 0,
 };
 
+static struct hdmi_driver_data exynos4210_hdmi_driver_data = {
+	.type		= HDMI_TYPE13,
+	.phy_confs	= hdmiphy_v13_configs,
+	.phy_conf_count	= ARRAY_SIZE(hdmiphy_v13_configs),
+	.is_apb_phy	= 0,
+};
+
 static struct hdmi_driver_data exynos5_hdmi_driver_data = {
 	.type		= HDMI_TYPE14,
 	.phy_confs	= hdmiphy_v13_configs,
@@ -2277,6 +2284,9 @@ static struct of_device_id hdmi_match_types[] = {
 		.compatible = "samsung,exynos5-hdmi",
 		.data = &exynos5_hdmi_driver_data,
 	}, {
+		.compatible = "samsung,exynos4210-hdmi",
+		.data = &exynos4210_hdmi_driver_data,
+	}, {
 		.compatible = "samsung,exynos4212-hdmi",
 		.data = &exynos4212_hdmi_driver_data,
 	}, {
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
index 7529946d0a74..9d0c21a50a86 100644
--- a/drivers/gpu/drm/exynos/exynos_mixer.c
+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
@@ -76,7 +76,7 @@ struct mixer_resources {
 	struct clk		*vp;
 	struct clk		*sclk_mixer;
 	struct clk		*sclk_hdmi;
-	struct clk		*sclk_dac;
+	struct clk		*mout_mixer;
 };
 
 enum mixer_version_id {
@@ -93,6 +93,7 @@ struct mixer_context {
 	bool			interlace;
 	bool			powered;
 	bool			vp_enabled;
+	bool			has_sclk;
 	u32			int_en;
 
 	struct mutex		mixer_mutex;
@@ -106,6 +107,7 @@ struct mixer_context {
 struct mixer_drv_data {
 	enum mixer_version_id	version;
 	bool					is_vp_enabled;
+	bool					has_sclk;
 };
 
 static const u8 filter_y_horiz_tap8[] = {
@@ -809,19 +811,23 @@ static int vp_resources_init(struct mixer_context *mixer_ctx)
 		dev_err(dev, "failed to get clock 'vp'\n");
 		return -ENODEV;
 	}
-	mixer_res->sclk_mixer = devm_clk_get(dev, "sclk_mixer");
-	if (IS_ERR(mixer_res->sclk_mixer)) {
-		dev_err(dev, "failed to get clock 'sclk_mixer'\n");
-		return -ENODEV;
-	}
-	mixer_res->sclk_dac = devm_clk_get(dev, "sclk_dac");
-	if (IS_ERR(mixer_res->sclk_dac)) {
-		dev_err(dev, "failed to get clock 'sclk_dac'\n");
-		return -ENODEV;
-	}
 
-	if (mixer_res->sclk_hdmi)
-		clk_set_parent(mixer_res->sclk_mixer, mixer_res->sclk_hdmi);
+	if (mixer_ctx->has_sclk) {
+		mixer_res->sclk_mixer = devm_clk_get(dev, "sclk_mixer");
+		if (IS_ERR(mixer_res->sclk_mixer)) {
+			dev_err(dev, "failed to get clock 'sclk_mixer'\n");
+			return -ENODEV;
+		}
+		mixer_res->mout_mixer = devm_clk_get(dev, "mout_mixer");
+		if (IS_ERR(mixer_res->mout_mixer)) {
+			dev_err(dev, "failed to get clock 'mout_mixer'\n");
+			return -ENODEV;
+		}
+
+		if (mixer_res->sclk_hdmi && mixer_res->mout_mixer)
+			clk_set_parent(mixer_res->mout_mixer,
+				       mixer_res->sclk_hdmi);
+	}
 
 	res = platform_get_resource(mixer_ctx->pdev, IORESOURCE_MEM, 1);
 	if (res == NULL) {
@@ -1082,7 +1088,8 @@ static void mixer_poweron(struct exynos_drm_manager *mgr)
 	clk_prepare_enable(res->mixer);
 	if (ctx->vp_enabled) {
 		clk_prepare_enable(res->vp);
-		clk_prepare_enable(res->sclk_mixer);
+		if (ctx->has_sclk)
+			clk_prepare_enable(res->sclk_mixer);
 	}
 
 	mutex_lock(&ctx->mixer_mutex);
@@ -1121,7 +1128,8 @@ static void mixer_poweroff(struct exynos_drm_manager *mgr)
 	clk_disable_unprepare(res->mixer);
 	if (ctx->vp_enabled) {
 		clk_disable_unprepare(res->vp);
-		clk_disable_unprepare(res->sclk_mixer);
+		if (ctx->has_sclk)
+			clk_disable_unprepare(res->sclk_mixer);
 	}
 
 	pm_runtime_put_sync(ctx->dev);
@@ -1189,9 +1197,15 @@ static struct mixer_drv_data exynos5250_mxr_drv_data = {
 	.is_vp_enabled = 0,
 };
 
+static struct mixer_drv_data exynos4212_mxr_drv_data = {
+	.version = MXR_VER_0_0_0_16,
+	.is_vp_enabled = 1,
+};
+
 static struct mixer_drv_data exynos4210_mxr_drv_data = {
 	.version = MXR_VER_0_0_0_16,
 	.is_vp_enabled = 1,
+	.has_sclk = 1,
 };
 
 static struct platform_device_id mixer_driver_types[] = {
@@ -1208,6 +1222,12 @@ static struct platform_device_id mixer_driver_types[] = {
 
 static struct of_device_id mixer_match_types[] = {
 	{
+		.compatible = "samsung,exynos4210-mixer",
+		.data	= &exynos4210_mxr_drv_data,
+	}, {
+		.compatible = "samsung,exynos4212-mixer",
+		.data	= &exynos4212_mxr_drv_data,
+	}, {
 		.compatible = "samsung,exynos5-mixer",
 		.data	= &exynos5250_mxr_drv_data,
 	}, {
@@ -1251,6 +1271,7 @@ static int mixer_bind(struct device *dev, struct device *manager, void *data)
 	ctx->pdev = pdev;
 	ctx->dev = dev;
 	ctx->vp_enabled = drv->is_vp_enabled;
+	ctx->has_sclk = drv->has_sclk;
 	ctx->mxr_ver = drv->version;
 	init_waitqueue_head(&ctx->wait_vsync_queue);
 	atomic_set(&ctx->wait_vsync_event, 0);
-- 
1.9.2

[PATCH 4/7] Exynos: add support for 'domain-always-on' property

[Marek Szyprowski]

This patch adds support for domain-always-on property to Exynos power
domain driver. Domains with this property as always kept enabled.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
---
 Documentation/devicetree/bindings/arm/exynos/power_domain.txt | 2 ++
 arch/arm/mach-exynos/pm_domains.c                             | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/arm/exynos/power_domain.txt b/Documentation/devicetree/bindings/arm/exynos/power_domain.txt
index 5216b419016a..b25d9b1ce471 100644
--- a/Documentation/devicetree/bindings/arm/exynos/power_domain.txt
+++ b/Documentation/devicetree/bindings/arm/exynos/power_domain.txt
@@ -8,6 +8,8 @@ Required Properties:
     * samsung,exynos4210-pd - for exynos4210 type power domain.
 - reg: physical base address of the controller and length of memory mapped
     region.
+Optional properties:
+- domain-always-on:	keeps the domain always enabled
 
 Node of a device using power domains must have a samsung,power-domain property
 defined with a phandle to respective power domain.
diff --git a/arch/arm/mach-exynos/pm_domains.c b/arch/arm/mach-exynos/pm_domains.c
index fe6570ebbdde..279b008de02f 100644
--- a/arch/arm/mach-exynos/pm_domains.c
+++ b/arch/arm/mach-exynos/pm_domains.c
@@ -151,6 +151,7 @@ static __init int exynos4_pm_init_power_domain(void)
 	struct device_node *np;
 
 	for_each_compatible_node(np, NULL, "samsung,exynos4210-pd") {
+		struct dev_power_governor *gov = NULL;
 		struct exynos_pm_domain *pd;
 		int on;
 
@@ -163,6 +164,9 @@ static __init int exynos4_pm_init_power_domain(void)
 			return -ENOMEM;
 		}
 
+		if (of_property_read_bool(np, "domain-always-on"))
+			gov = &pm_domain_always_on_gov;
+
 		pd->pd.name = kstrdup(np->name, GFP_KERNEL);
 		pd->name = pd->pd.name;
 		pd->base = of_iomap(np, 0);
@@ -174,7 +178,7 @@ static __init int exynos4_pm_init_power_domain(void)
 
 		on = __raw_readl(pd->base + 0x4) & S5P_INT_LOCAL_PWR_EN;
 
-		pm_genpd_init(&pd->pd, NULL, !on);
+		pm_genpd_init(&pd->pd, gov, !on);
 	}
 
 	bus_register_notifier(&platform_bus_type, &platform_nb);
-- 
1.9.2

Re: [PATCH 4/7] Exynos: add support for 'domain-always-on' property

[Tobias Jakobi]

Hello Marek,

I think you had a similar patch in the tizen tree, but according to
Tomasz Figa, it was considered a hack. I don't quite see how this is
different.

Also, if I have been following the discussion correctly, then the
powerdomain issue essentially is about the question which SoC block
needs the LCD0 domain and how the proper power on/off sequences should
look like.

At least the mixer power issue, which I pointed out some time ago, seems
to be deal with now:
https://git.kernel.org/cgit/linux/kernel/git/daeinki/drm-exynos.git/commit/?h=exynos-drm-next&id=381be025ac1a6dc8efebdf146ced0d4a6007f77b

With best wishes,
Tobias




Marek Szyprowski wrote:
> This patch adds support for domain-always-on property to Exynos power
> domain driver. Domains with this property as always kept enabled.
> 
> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
> ---
>  Documentation/devicetree/bindings/arm/exynos/power_domain.txt | 2 ++
>  arch/arm/mach-exynos/pm_domains.c                             | 6 +++++-
>  2 files changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/Documentation/devicetree/bindings/arm/exynos/power_domain.txt b/Documentation/devicetree/bindings/arm/exynos/power_domain.txt
> index 5216b419016a..b25d9b1ce471 100644
> --- a/Documentation/devicetree/bindings/arm/exynos/power_domain.txt
> +++ b/Documentation/devicetree/bindings/arm/exynos/power_domain.txt
> @@ -8,6 +8,8 @@ Required Properties:
>      * samsung,exynos4210-pd - for exynos4210 type power domain.
>  - reg: physical base address of the controller and length of memory mapped
>      region.
> +Optional properties:
> +- domain-always-on:	keeps the domain always enabled
>  
>  Node of a device using power domains must have a samsung,power-domain property
>  defined with a phandle to respective power domain.
> diff --git a/arch/arm/mach-exynos/pm_domains.c b/arch/arm/mach-exynos/pm_domains.c
> index fe6570ebbdde..279b008de02f 100644
> --- a/arch/arm/mach-exynos/pm_domains.c
> +++ b/arch/arm/mach-exynos/pm_domains.c
> @@ -151,6 +151,7 @@ static __init int exynos4_pm_init_power_domain(void)
>  	struct device_node *np;
>  
>  	for_each_compatible_node(np, NULL, "samsung,exynos4210-pd") {
> +		struct dev_power_governor *gov = NULL;
>  		struct exynos_pm_domain *pd;
>  		int on;
>  
> @@ -163,6 +164,9 @@ static __init int exynos4_pm_init_power_domain(void)
>  			return -ENOMEM;
>  		}
>  
> +		if (of_property_read_bool(np, "domain-always-on"))
> +			gov = &pm_domain_always_on_gov;
> +
>  		pd->pd.name = kstrdup(np->name, GFP_KERNEL);
>  		pd->name = pd->pd.name;
>  		pd->base = of_iomap(np, 0);
> @@ -174,7 +178,7 @@ static __init int exynos4_pm_init_power_domain(void)
>  
>  		on = __raw_readl(pd->base + 0x4) & S5P_INT_LOCAL_PWR_EN;
>  
> -		pm_genpd_init(&pd->pd, NULL, !on);
> +		pm_genpd_init(&pd->pd, gov, !on);
>  	}
>  
>  	bus_register_notifier(&platform_bus_type, &platform_nb);
> 

Re: [PATCH 4/7] Exynos: add support for 'domain-always-on' property

[Marek Szyprowski]

Hello,

On 2014-07-01 10:52, Tobias Jakobi wrote:
> Hello Marek,
>
> I think you had a similar patch in the tizen tree, but according to
> Tomasz Figa, it was considered a hack. I don't quite see how this is
> different.
>
> Also, if I have been following the discussion correctly, then the
> powerdomain issue essentially is about the question which SoC block
> needs the LCD0 domain and how the proper power on/off sequences should
> look like.
>
> At least the mixer power issue, which I pointed out some time ago, seems
> to be deal with now:
> https://git.kernel.org/cgit/linux/kernel/git/daeinki/drm-exynos.git/commit/?h=exynos-drm-next&id=381be025ac1a6dc8efebdf146ced0d4a6007f77b

Well, that patch solves power on/off sequence issue with mixer and hdmi,
but it didn't solve the issue with additional managing of power domain
on/off. You can check that if you remove always on property, system will
freeze when hdmi cable is connected for the second time. I've investigated
it for some time, but right now I didn't find any 100% reliable solution
other than keeping the power domain enabled all the time. At least for
now, this patch lets you use HDMI without any stability issues.

I've only found that there are still at least 2 issues with power domains.
One is Mixer/Video Processor dependency on LCD0 domain, second is the proper
power on/off sequence of HDMI/Mixer and TV domain. Forcing both domains to
'always on' workarounds both issues for now. Right now I have no better
idea.

Later, once the proper sequence is found we can remove those properties
from Odroid DTS.

Best regards
-- 
Marek Szyprowski, PhD
Samsung R&D Institute Poland

Re: [PATCH 4/7] Exynos: add support for 'domain-always-on' property

[Tobias Jakobi]

Hi,


Marek Szyprowski wrote:
> Hello,
> 
> On 2014-07-01 10:52, Tobias Jakobi wrote:
>> Hello Marek,
>>
>> I think you had a similar patch in the tizen tree, but according to
>> Tomasz Figa, it was considered a hack. I don't quite see how this is
>> different.
>>
>> Also, if I have been following the discussion correctly, then the
>> powerdomain issue essentially is about the question which SoC block
>> needs the LCD0 domain and how the proper power on/off sequences should
>> look like.
>>
>> At least the mixer power issue, which I pointed out some time ago, seems
>> to be deal with now:
>> https://git.kernel.org/cgit/linux/kernel/git/daeinki/drm-exynos.git/commit/?h=exynos-drm-next&id=381be025ac1a6dc8efebdf146ced0d4a6007f77b
>>
> 
> Well, that patch solves power on/off sequence issue with mixer and hdmi,
> but it didn't solve the issue with additional managing of power domain
> on/off. You can check that if you remove always on property, system will
> freeze when hdmi cable is connected for the second time. I've investigated
> it for some time, but right now I didn't find any 100% reliable solution
> other than keeping the power domain enabled all the time. At least for
> now, this patch lets you use HDMI without any stability issues.
Hmm, I have also applied a similar hack to force TV and LCD0 pd on on my
system, but I didn't experience this behaviour (cable reconnecting).
Guess I have to recheck with some more recent tree to make sure.


> I've only found that there are still at least 2 issues with power domains.
> One is Mixer/Video Processor dependency on LCD0 domain, second is the
> proper
> power on/off sequence of HDMI/Mixer and TV domain. Forcing both domains to
> 'always on' workarounds both issues for now. Right now I have no better
> idea.
I had the impression that the patch from above, plus this one
https://git.kernel.org/cgit/linux/kernel/git/daeinki/drm-exynos.git/commit/?h=exynos-drm-next&id=245f98f269714c08dc6d66d021d166cf36059bc4
were supposed to fix these issues. I haven't tested them yet, because of
lack of time, but Rahul's patch appears to fix mixer poweroff, and
Inki's patch the sequencing (VP, Mixer and last but not least, the HDMI).


> Later, once the proper sequence is found we can remove those properties
> from Odroid DTS.
I dunno, because you would have to support the property to the end of
time then, even though it's not used anymore. Isn't that the kind of
thing that shouldn't end up in DT bindings specs?



> 
> Best regards


With best wishes,
Tobias

Re: [PATCH 4/7] Exynos: add support for 'domain-always-on' property

[Marek Szyprowski]

Hello,

On 2014-07-01 19:54, Tobias Jakobi wrote:
> Marek Szyprowski wrote:
>> On 2014-07-01 10:52, Tobias Jakobi wrote:
>>> I think you had a similar patch in the tizen tree, but according to
>>> Tomasz Figa, it was considered a hack. I don't quite see how this is
>>> different.
>>>
>>> Also, if I have been following the discussion correctly, then the
>>> powerdomain issue essentially is about the question which SoC block
>>> needs the LCD0 domain and how the proper power on/off sequences should
>>> look like.
>>>
>>> At least the mixer power issue, which I pointed out some time ago, seems
>>> to be deal with now:
>>> https://git.kernel.org/cgit/linux/kernel/git/daeinki/drm-exynos.git/commit/?h=exynos-drm-next&id=381be025ac1a6dc8efebdf146ced0d4a6007f77b
>> Well, that patch solves power on/off sequence issue with mixer and hdmi,
>> but it didn't solve the issue with additional managing of power domain
>> on/off. You can check that if you remove always on property, system will
>> freeze when hdmi cable is connected for the second time. I've investigated
>> it for some time, but right now I didn't find any 100% reliable solution
>> other than keeping the power domain enabled all the time. At least for
>> now, this patch lets you use HDMI without any stability issues.
> Hmm, I have also applied a similar hack to force TV and LCD0 pd on on my
> system, but I didn't experience this behaviour (cable reconnecting).
> Guess I have to recheck with some more recent tree to make sure.
>
>
>> I've only found that there are still at least 2 issues with power domains.
>> One is Mixer/Video Processor dependency on LCD0 domain, second is the
>> proper
>> power on/off sequence of HDMI/Mixer and TV domain. Forcing both domains to
>> 'always on' workarounds both issues for now. Right now I have no better
>> idea.
> I had the impression that the patch from above, plus this one
> https://git.kernel.org/cgit/linux/kernel/git/daeinki/drm-exynos.git/commit/?h=exynos-drm-next&id=245f98f269714c08dc6d66d021d166cf36059bc4
> were supposed to fix these issues. I haven't tested them yet, because of
> lack of time, but Rahul's patch appears to fix mixer poweroff, and
> Inki's patch the sequencing (VP, Mixer and last but not least, the HDMI).

You can check it directly from the git branch I've prepared:
https://git.linaro.org/people/marek.szyprowski/linux-srpol.git/shortlog/refs/heads/v3.16-odroid

If you disable this always-on property from tv pd domain (you can keep lcd0
domain enabled to simplify things), the system will freeze. I really have
no idea how to fix this.

>
>> Later, once the proper sequence is found we can remove those properties
>> from Odroid DTS.
> I dunno, because you would have to support the property to the end of
> time then, even though it's not used anymore. Isn't that the kind of
> thing that shouldn't end up in DT bindings specs?

I think that there have been recently similar issue with one of Exyno5 SoCs,
where one of the domain has been removed from DTS just to keep it enabled
all the time (assuming that bootloader left it enabled). See commit
8b3ca983a69ab28bab257bdbaa9eaa1b8830d7b7 ("ARM: dts: Remove g2d_pd node for
exynos5420"). So this property can be used for that case too.

Best regards
-- 
Marek Szyprowski, PhD
Samsung R&D Institute Poland

Re: [PATCH 4/7] Exynos: add support for 'domain-always-on' property

[Joonyoung Shim]

Hi Marek,

On 07/01/2014 06:08 PM, Marek Szyprowski wrote:
> Hello,
>
> On 2014-07-01 10:52, Tobias Jakobi wrote:
>> Hello Marek,
>>
>> I think you had a similar patch in the tizen tree, but according to
>> Tomasz Figa, it was considered a hack. I don't quite see how this is
>> different.
>>
>> Also, if I have been following the discussion correctly, then the
>> powerdomain issue essentially is about the question which SoC block
>> needs the LCD0 domain and how the proper power on/off sequences should
>> look like.
>>
>> At least the mixer power issue, which I pointed out some time ago, seems
>> to be deal with now:
>> https://git.kernel.org/cgit/linux/kernel/git/daeinki/drm-exynos.git/commit/?h=exynos-drm-next&id=381be025ac1a6dc8efebdf146ced0d4a6007f77b 
>>
>
> Well, that patch solves power on/off sequence issue with mixer and hdmi,
> but it didn't solve the issue with additional managing of power domain
> on/off. You can check that if you remove always on property, system will
> freeze when hdmi cable is connected for the second time. I've 
> investigated
> it for some time, but right now I didn't find any 100% reliable solution
> other than keeping the power domain enabled all the time. At least for
> now, this patch lets you use HDMI without any stability issues.
>
> I've only found that there are still at least 2 issues with power 
> domains.
> One is Mixer/Video Processor dependency on LCD0 domain, second is the 
> proper

To express dependency of LCD0 domain and TV domain, how about make
master and slave hierarchy between the pm domains using
pm_genpd_add_subdomain?

> power on/off sequence of HDMI/Mixer and TV domain. Forcing both 
> domains to
> 'always on' workarounds both issues for now. Right now I have no better
> idea.
>
> Later, once the proper sequence is found we can remove those properties
> from Odroid DTS.
>
> Best regards

[PATCH 5/7] ARM: dts: exynos4: add hdmi related nodes

[Marek Szyprowski]

This patch adds entries for HDMI, Mixer and i2c with hdmi-phy modules
found in Exynos 4210 and 4x12 SoCs.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
---
 arch/arm/boot/dts/exynos4.dtsi    | 37 +++++++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/exynos4210.dtsi |  5 +++++
 arch/arm/boot/dts/exynos4x12.dtsi | 10 ++++++++++
 3 files changed, 52 insertions(+)

diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index 933bd2141601..5b55c4de7e6f 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -38,6 +38,7 @@
 		i2c5 = &i2c_5;
 		i2c6 = &i2c_6;
 		i2c7 = &i2c_7;
+		i2c8 = &i2c_8;
 		csis0 = &csis_0;
 		csis1 = &csis_1;
 		fimc0 = &fimc_0;
@@ -527,6 +528,22 @@
 		status = "disabled";
 	};
 
+	i2c_8: i2c@138E0000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "samsung,s3c2440-hdmiphy-i2c";
+		reg = <0x138E0000 0x100>;
+		interrupts = <0 93 0>;
+		clocks = <&clock CLK_I2C_HDMI>;
+		clock-names = "i2c";
+		status = "disabled";
+
+		hdmi_i2c_phy: hdmiphy@38 {
+			compatible = "exynos4210-hdmiphy";
+			reg = <0x38>;
+		};
+	};
+
 	spi_0: spi@13920000 {
 		compatible = "samsung,exynos4210-spi";
 		reg = <0x13920000 0x100>;
@@ -634,4 +651,24 @@
 		samsung,power-domain = <&pd_lcd0>;
 		status = "disabled";
 	};
+
+	hdmi: hdmi@12D00000 {
+		compatible = "samsung,exynos4210-hdmi";
+		reg = <0x12D00000 0x70000>;
+		interrupts = <0 92 0>;
+		clock-names = "hdmi", "sclk_hdmi", "sclk_pixel", "sclk_hdmiphy", "mout_hdmi";
+		clocks = <&clock CLK_HDMI>, <&clock CLK_SCLK_HDMI>, <&clock CLK_SCLK_PIXEL>, <&clock CLK_SCLK_HDMIPHY>, <&clock CLK_MOUT_HDMI>;
+		phy = <&hdmi_i2c_phy>;
+		samsung,power-domain = <&pd_tv>;
+		samsung,syscon-phandle = <&pmu_system_controller>;
+		status = "disabled";
+	};
+
+	mixer: mixer@12C10000 {
+		compatible = "samsung,exynos4210-mixer";
+		interrupts = <0 91 0>;
+		reg = <0x12C10000 0x2100>, <0x12c00000 0x300>;
+		samsung,power-domain = <&pd_tv>;
+		status = "disabled";
+	};
 };
diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi
index ee3001f38821..d32063d00ad7 100644
--- a/arch/arm/boot/dts/exynos4210.dtsi
+++ b/arch/arm/boot/dts/exynos4210.dtsi
@@ -171,4 +171,9 @@
 			samsung,lcd-wb;
 		};
 	};
+
+	mixer: mixer@12C10000 {
+		clock-names = "mixer", "sclk_hdmi", "vp", "mout_mixer", "sclk_mixer";
+		clocks = <&clock CLK_MIXER>, <&clock CLK_SCLK_HDMI>, <&clock CLK_VP>, <&clock CLK_MOUT_MIXER>, <&clock CLK_SCLK_MIXER>;
+	};
 };
diff --git a/arch/arm/boot/dts/exynos4x12.dtsi b/arch/arm/boot/dts/exynos4x12.dtsi
index c5a943df1cd7..856cd45b696b 100644
--- a/arch/arm/boot/dts/exynos4x12.dtsi
+++ b/arch/arm/boot/dts/exynos4x12.dtsi
@@ -270,4 +270,14 @@
 		compatible = "samsung,exynos4x12-usb2-phy";
 		samsung,sysreg-phandle = <&sys_reg>;
 	};
+
+	hdmi: hdmi@12D00000 {
+		compatible = "samsung,exynos4212-hdmi";
+	};
+
+	mixer: mixer@12C10000 {
+		compatible = "samsung,exynos4212-mixer";
+		clock-names = "mixer", "sclk_hdmi", "vp";
+		clocks = <&clock CLK_MIXER>, <&clock CLK_SCLK_HDMI>, <&clock CLK_VP>;
+	};
 };
-- 
1.9.2

[PATCH 6/7] ARM: dts: exynos4412-odroid: enable hdmi support

[Marek Szyprowski]

This patch adds nodes specific to Exynos4412 based Odroid X/X2/U2/U3
boards required for enabling HDMI display.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
---
 arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 52 +++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
index d1b33a8efa9d..2856242d640a 100644
--- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
+++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
@@ -52,6 +52,14 @@
 		};
 	};
 
+	lcd0-power-domain@10023C80 {
+		domain-always-on;
+	};
+
+	tv-power-domain@10023C20 {
+		domain-always-on;
+	};
+
 	watchdog@10060000 {
 		status = "okay";
 	};
@@ -186,6 +194,20 @@
 					regulator-always-on;
 				};
 
+				ldo8_reg: ldo@8 {
+					regulator-compatible = "LDO8";
+					regulator-name = "VDD10_HDMI_1.0V";
+					regulator-min-microvolt = <1000000>;
+					regulator-max-microvolt = <1000000>;
+				};
+
+				ldo10_reg: ldo@10 {
+					regulator-compatible = "LDO10";
+					regulator-name = "VDDQ_MIPIHSI_1.8V";
+					regulator-min-microvolt = <1800000>;
+					regulator-max-microvolt = <1800000>;
+				};
+
 				ldo11_reg: LDO11 {
 					regulator-name = "VDD18_ABB1_1.8V";
 					regulator-min-microvolt = <1800000>;
@@ -332,6 +354,31 @@
 	ehci: ehci@12580000 {
 		status = "okay";
 	};
+
+	mixer: mixer@12C10000 {
+		status = "okay";
+	};
+
+	hdmi@12D00000 {
+		hpd-gpio = <&gpx3 7 0>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&hdmi_hpd>;
+		vdd-supply = <&ldo8_reg>;
+		vdd_osc-supply = <&ldo10_reg>;
+		vdd_pll-supply = <&ldo8_reg>;
+		ddc = <&hdmi_ddc>;
+		status = "okay";
+	};
+
+	hdmi_ddc: i2c@13880000 {
+		status = "okay";
+		pinctrl-names = "default";
+		pinctrl-0 = <&i2c2_bus>;
+	};
+
+	i2c@138E0000 {
+		status = "okay";
+	};
 };
 
 &pinctrl_1 {
@@ -339,4 +386,9 @@
 		samsung,pins = "gpx1-3";
 		samsung,pin-pud = <0>;
 	};
+
+	hdmi_hpd: hdmi-hpd {
+		samsung,pins = "gpx3-7";
+		samsung,pin-pud = <1>;
+	};
 };
-- 
1.9.2

[PATCH 7/7] ARM: dts: exynos4210-universal_c210: enable hdmi support

[Marek Szyprowski]

From: Tomasz Stanislawski <t.stanislaws@samsung.com>

This patch adds configuration of hw modules required to enable HDMI
support on Universal C210 board.

Signed-off-by: Tomasz Stanislawski <t.stanislaws@samsung.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
---
 arch/arm/boot/dts/exynos4210-universal_c210.dts | 65 +++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/arch/arm/boot/dts/exynos4210-universal_c210.dts b/arch/arm/boot/dts/exynos4210-universal_c210.dts
index d50eb3aa708e..585082397d5a 100644
--- a/arch/arm/boot/dts/exynos4210-universal_c210.dts
+++ b/arch/arm/boot/dts/exynos4210-universal_c210.dts
@@ -43,6 +43,14 @@
 		};
 	};
 
+	lcd0-power-domain@10023C80 {
+		domain-always-on;
+	};
+
+	tv-power-domain@10023C20 {
+		domain-always-on;
+	};
+
 	mct@10050000 {
 		compatible = "none";
 	};
@@ -487,6 +495,63 @@
 			status = "okay";
 		};
 	};
+
+	hdmi_en: voltage-regulator-hdmi-5v {
+	        compatible = "regulator-fixed";
+		regulator-name = "HDMI_5V";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		gpio = <&gpe0 1 0>;
+		enable-active-high;
+	};
+
+	hdmi_ddc: i2c-ddc {
+		compatible = "i2c-gpio";
+		gpios = <&gpe4 2 0 &gpe4 3 0>;
+		i2c-gpio,delay-us = <100>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		pinctrl-0 = <&i2c_ddc_bus>;
+		pinctrl-names = "default";
+		status = "okay";
+	};
+
+	mixer@12C10000 {
+		status = "okay";
+	};
+
+	hdmi@12D00000 {
+		hpd-gpio = <&gpx3 7 0>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&hdmi_hpd>;
+		hdmi-en-supply = <&hdmi_en>;
+		vdd-supply = <&ldo3_reg>;
+		vdd_osc-supply = <&ldo4_reg>;
+		vdd_pll-supply = <&ldo3_reg>;
+		ddc = <&hdmi_ddc>;
+		status = "okay";
+	};
+
+	i2c@138E0000 {
+		status = "okay";
+	};
+};
+
+&pinctrl_1 {
+	hdmi_hpd: hdmi-hpd {
+		samsung,pins = "gpx3-7";
+		samsung,pin-pud = <0>;
+	};
+};
+
+&pinctrl_0 {
+	i2c_ddc_bus: i2c-ddc-bus {
+		samsung,pins = "gpe4-2", "gpe4-3";
+		samsung,pin-function = <2>;
+		samsung,pin-pud = <3>;
+		samsung,pin-drv = <0>;
+	};
 };
 
 &mdma1 {
-- 
1.9.2

Re: [PATCH 0/7] Exynos4: enable HDMI support for Odroid and UniversalC210

[Inki Dae]

2014-07-01 17:10 GMT+09:00 Marek Szyprowski <m.szyprowski@samsung.com>:
> Hello,
>
> This is a long awaited patch series enabling support for HDMI output
> available on Exynos4412-based Odroid boards (X/X2/U2/U3/U3+) and
> Exynos4210 Universal C210 board.
>
> This patch consists of 3 groups of patches, which are aimed to be merged
> to respective maintainer kernel trees.
>
> First patch ("clk: exynos4: add support for MOUT_HDMI and MOUT_MIXER
> clocks") adds missing device tree support for hdmi related clocks. It is
> prepared for clk kernel tree.
>
> Next two patches ("drm: exynos: hdmi: make 'hdmi-en' regulator optional
> and keep it enabled" and "drm: hdmi/mixer: enable exynos 4210 and 4x12
> soc support") add proper support for Exynos4 SoCs to Exynos DRM drivers.
> Those patches should go to exynos-drm kernel tree.

Picked them up.

Thanks,
Inki Dae

>
> Last patches ("Exynos: add support for 'domain-always-on' property",
> "ARM: dts: exynos4: add hdmi related nodes", "ARM: dts:
> exynos4412-odroid: enable hdmi support" and "ARM: dts:
> exynos4210-universal_c210: enable hdmi support") adds changes to all DTS
> files and adds 'domain-always-on' property to Exynos power-domain
> driver. This property is needed to resolve the non-trivial dependences
> between TV and LCD0 power domains and the power on/off sequence of the
> TV and mixer modules.
>
> Patches are prepared on top of v3.16-rc3 with '[PATCH v2 0/4] Add
> Exynos4412 based Odroid X2 and U2/U3/U3+ support' series and '[PATCH]
> ARM: dts: exynos4412-odroid: add support for GPIO buttons' patch
> applied:
> http://www.spinics.net/lists/linux-samsung-soc/msg33115.html
> http://www.spinics.net/lists/linux-samsung-soc/msg33497.html
>
> Kernel tree with all Odroid related patches is available at
> http://git.linaro.org/git-ro/people/marek.szyprowski/linux-srpol.git
> on v3.16-odroid branch.
>
> Best regards
> Marek Szyprowski
> Samsung R&D Institute Poland
>
> Marek Szyprowski (6):
>   clk: exynos4: add support for MOUT_HDMI and MOUT_MIXER clocks
>   drm: exynos: hdmi: make 'hdmi-en' regulator optional and keep it
>     enabled
>   drm: hdmi/mixer: enable exynos 4210 and 4x12 soc support
>   Exynos: add support for 'domain-always-on' property
>   ARM: dts: exynos4: add hdmi related nodes
>   ARM: dts: exynos4412-odroid: enable hdmi support
>
> Tomasz Stanislawski (1):
>   ARM: dts: exynos4210-universal_c210: enable hdmi support
>
>  .../bindings/arm/exynos/power_domain.txt           |  2 +
>  .../devicetree/bindings/video/exynos_mixer.txt     |  5 +-
>  arch/arm/boot/dts/exynos4.dtsi                     | 37 ++++++++++++
>  arch/arm/boot/dts/exynos4210-universal_c210.dts    | 65 ++++++++++++++++++++++
>  arch/arm/boot/dts/exynos4210.dtsi                  |  5 ++
>  arch/arm/boot/dts/exynos4412-odroid-common.dtsi    | 52 +++++++++++++++++
>  arch/arm/boot/dts/exynos4x12.dtsi                  | 10 ++++
>  arch/arm/mach-exynos/pm_domains.c                  |  6 +-
>  drivers/clk/samsung/clk-exynos4.c                  |  4 +-
>  drivers/gpu/drm/exynos/exynos_hdmi.c               | 29 +++++++++-
>  drivers/gpu/drm/exynos/exynos_mixer.c              | 51 ++++++++++++-----
>  include/dt-bindings/clock/exynos4.h                |  2 +
>  12 files changed, 247 insertions(+), 21 deletions(-)
>
> --
> 1.9.2
>
> --
> 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 0/7] Exynos4: enable HDMI support for Odroid and UniversalC210

[Tomeu Vizoso]

On 1 July 2014 10:10, Marek Szyprowski <m.szyprowski@samsung.com> wrote:
> This is a long awaited patch series enabling support for HDMI output
> available on Exynos4412-based Odroid boards (X/X2/U2/U3/U3+) and
> Exynos4210 Universal C210 board.

Hello,

have tested a few of these patches on an Odroid-U2 on top of
linux/master (c8d6637):

1a8edf8 clk: exynos4: add support for MOUT_HDMI and MOUT_MIXER clocks
bb2561d drm: exynos: hdmi: make 'hdmi-en' regulator optional and keep it enabled
afe0bff Exynos: add support for 'domain-always-on' property
be421b7 ARM: dts: exynos4: add hdmi related nodes
1206d41 ARM: dts: exynos4412-odroid: enable hdmi support

Tested-by: Tomeu Vizoso <tomeu@tomeuvizoso.net>

I also needed these two patches from Daniel Drake:

64489ec ARM: dts: Enable PMIC interrupts on ODROID
ef009d7 ARM: dts: ODROID i2c improvements

HDMI worked just fine in the testing I did, I have pushed a branch here:

http://cgit.collabora.com/git/user/tomeu/linux.git/log/?h=odroid-hdmi

Marek, Daniel: would you like me to send a series with all the needed
patches together?

Thanks,

Tomeu

Re: [PATCH 0/7] Exynos4: enable HDMI support for Odroid and UniversalC210

[Marek Szyprowski]

Hello,

On 2014-08-12 15:00, Tomeu Vizoso wrote:
> On 1 July 2014 10:10, Marek Szyprowski <m.szyprowski@samsung.com> wrote:
>> This is a long awaited patch series enabling support for HDMI output
>> available on Exynos4412-based Odroid boards (X/X2/U2/U3/U3+) and
>> Exynos4210 Universal C210 board.
> Hello,
>
> have tested a few of these patches on an Odroid-U2 on top of
> linux/master (c8d6637):
>
> 1a8edf8 clk: exynos4: add support for MOUT_HDMI and MOUT_MIXER clocks
> bb2561d drm: exynos: hdmi: make 'hdmi-en' regulator optional and keep it enabled
> afe0bff Exynos: add support for 'domain-always-on' property
> be421b7 ARM: dts: exynos4: add hdmi related nodes
> 1206d41 ARM: dts: exynos4412-odroid: enable hdmi support
>
> Tested-by: Tomeu Vizoso <tomeu@tomeuvizoso.net>
>
> I also needed these two patches from Daniel Drake:
>
> 64489ec ARM: dts: Enable PMIC interrupts on ODROID
> ef009d7 ARM: dts: ODROID i2c improvements

Those 2 patches finally reached v3.17-rc2.

> HDMI worked just fine in the testing I did, I have pushed a branch here:
>
> http://cgit.collabora.com/git/user/tomeu/linux.git/log/?h=odroid-hdmi
>
> Marek, Daniel: would you like me to send a series with all the needed
> patches together?

I don't think it is needed now, especially taking into account that there
is no consensus on domain-always-on approach. Maybe I will try once again
to investigate the power on/off issue and check if it is possible to get
rid of it.

Best regards
-- 
Marek Szyprowski, PhD
Samsung R&D Institute Poland