[PATCH 1/2] ARM: tegra: Mark Tegra124 HDMI compatible with Tegra114

[PATCH 1/2] ARM: tegra: Mark Tegra124 HDMI compatible with Tegra114

[Dylan Reid]

The HDMI driver that handles Tegra114 can handle Tegra124 as well,
mark Tegra124 as compatible.  This makes HDMI output work on Venice2.

Signed-off-by: Dylan Reid <dgreid@chromium.org>
---
 arch/arm/boot/dts/tegra124.dtsi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi
index 197e848..fbaf985 100644
--- a/arch/arm/boot/dts/tegra124.dtsi
+++ b/arch/arm/boot/dts/tegra124.dtsi
@@ -52,7 +52,8 @@
 		};
 
 		hdmi at 0,54280000 {
-			compatible = "nvidia,tegra124-hdmi";
+			compatible = "nvidia,tegra124-hdmi",
+				     "nvidia,tegra114-hdmi";
 			reg = <0x0 0x54280000 0x0 0x00040000>;
 			interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&tegra_car TEGRA124_CLK_HDMI>,
-- 
1.8.1.3.605.g02339dd

[PATCH 2/2] drm/tegra: Enable HDMI_5V_CON regulator

[Dylan Reid]

The DDC bus uses this for it's supply, enable it so EDID can be read.
This eliminates I2C read timeouts on Venice2 and EDID can be verified
with i2cdump.

Signed-off-by: Dylan Reid <dgreid@chromium.org>
---
 drivers/gpu/drm/tegra/hdmi.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
index 6928015..3d3cd7e 100644
--- a/drivers/gpu/drm/tegra/hdmi.c
+++ b/drivers/gpu/drm/tegra/hdmi.c
@@ -44,6 +44,7 @@ struct tegra_hdmi {
 
 	struct regulator *vdd;
 	struct regulator *pll;
+	struct regulator *hdmi_5v;
 
 	void __iomem *regs;
 	unsigned int irq;
@@ -1263,6 +1264,13 @@ static int tegra_hdmi_init(struct host1x_client *client)
 		return err;
 	}
 
+	err = regulator_enable(hdmi->hdmi_5v);
+	if (err < 0) {
+		dev_err(client->dev, "failed to enable HDMI 5V regulator: %d\n",
+			err);
+		return err;
+	}
+
 	hdmi->output.type = TEGRA_OUTPUT_HDMI;
 	hdmi->output.dev = client->dev;
 	hdmi->output.ops = &hdmi_ops;
@@ -1307,6 +1315,7 @@ static int tegra_hdmi_exit(struct host1x_client *client)
 	}
 
 	regulator_disable(hdmi->vdd);
+	regulator_disable(hdmi->hdmi_5v);
 
 	return 0;
 }
@@ -1411,6 +1420,12 @@ static int tegra_hdmi_probe(struct platform_device *pdev)
 		return PTR_ERR(hdmi->pll);
 	}
 
+	hdmi->hdmi_5v = devm_regulator_get(&pdev->dev, "hdmi");
+	if (IS_ERR(hdmi->hdmi_5v)) {
+		dev_err(&pdev->dev, "failed to get HDMI 5V regulator\n");
+		return PTR_ERR(hdmi->hdmi_5v);
+	}
+
 	hdmi->output.dev = &pdev->dev;
 
 	err = tegra_output_probe(&hdmi->output);
-- 
1.8.1.3.605.g02339dd

[PATCH 2/2] drm/tegra: Enable HDMI_5V_CON regulator

[Thierry Reding]

On Sat, May 17, 2014 at 11:21:21AM -0700, Dylan Reid wrote:
> The DDC bus uses this for it's supply, enable it so EDID can be read.
> This eliminates I2C read timeouts on Venice2 and EDID can be verified
> with i2cdump.
> 
> Signed-off-by: Dylan Reid <dgreid@chromium.org>
> ---
>  drivers/gpu/drm/tegra/hdmi.c | 15 +++++++++++++++
>  1 file changed, 15 insertions(+)

Like I said in reply to 1/2, this should be fixed by:

	0d6696438d2c drm/tegra: hdmi - Add connector supply support

Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140517/1b4883bf/attachment.sig>

[PATCH 1/2] ARM: tegra: Mark Tegra124 HDMI compatible with Tegra114

[Thierry Reding]

On Sat, May 17, 2014 at 11:21:20AM -0700, Dylan Reid wrote:
> The HDMI driver that handles Tegra114 can handle Tegra124 as well,
> mark Tegra124 as compatible.  This makes HDMI output work on Venice2.
> 
> Signed-off-by: Dylan Reid <dgreid@chromium.org>
> ---
>  arch/arm/boot/dts/tegra124.dtsi | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

These patches don't seem to be based on linux-next. There are a couple
of patches in linux-next (queued for 3.16) that should fix these, in
particular:

	4b9701e02b3b drm/tegra: hdmi - Add Tegra124 support
	0d6696438d2c drm/tegra: hdmi - Add connector supply support

Could you try a recent linux-next to see if that fixes the issues you
are seeing? Note that Tegra doesn't boot on linux-next from the last few
days because of some cgroup regressions, but a fix was merged and should
be in Monday's linux-next, so unless new regressions are introduced that
would be a good candidate to test.

Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140517/9f5c0b36/attachment.sig>

[PATCH 1/2] ARM: tegra: Mark Tegra124 HDMI compatible with Tegra114

[Dylan Reid]

On Sat, May 17, 2014 at 2:33 PM, Thierry Reding
<thierry.reding@gmail.com> wrote:
> On Sat, May 17, 2014 at 11:21:20AM -0700, Dylan Reid wrote:
>> The HDMI driver that handles Tegra114 can handle Tegra124 as well,
>> mark Tegra124 as compatible.  This makes HDMI output work on Venice2.
>>
>> Signed-off-by: Dylan Reid <dgreid@chromium.org>
>> ---
>>  arch/arm/boot/dts/tegra124.dtsi | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> These patches don't seem to be based on linux-next. There are a couple
> of patches in linux-next (queued for 3.16) that should fix these, in
> particular:
>
>         4b9701e02b3b drm/tegra: hdmi - Add Tegra124 support
>         0d6696438d2c drm/tegra: hdmi - Add connector supply support
>
> Could you try a recent linux-next to see if that fixes the issues you
> are seeing? Note that Tegra doesn't boot on linux-next from the last few
> days because of some cgroup regressions, but a fix was merged and should
> be in Monday's linux-next, so unless new regressions are introduced that
> would be a good candidate to test.

Those look like they'll do the trick.  I'll give it a try on Monday.
Thanks Thierry.

>
> Thierry