|
@@ -173,6 +173,7 @@ struct tegra_sor {
|
|
|
struct clk *clk_parent;
|
|
|
struct clk *clk_brick;
|
|
|
struct clk *clk_safe;
|
|
|
+ struct clk *clk_src;
|
|
|
struct clk *clk_dp;
|
|
|
struct clk *clk;
|
|
|
|
|
@@ -2101,7 +2102,11 @@ static void tegra_sor_hdmi_enable(struct drm_encoder *encoder)
|
|
|
tegra_sor_writel(sor, 0x00000000, SOR_XBAR_POL);
|
|
|
|
|
|
/* switch to parent clock */
|
|
|
- err = tegra_sor_set_parent_clock(sor, sor->clk_parent);
|
|
|
+ err = clk_set_parent(sor->clk_src, sor->clk_parent);
|
|
|
+ if (err < 0)
|
|
|
+ dev_err(sor->dev, "failed to set source clock: %d\n", err);
|
|
|
+
|
|
|
+ err = tegra_sor_set_parent_clock(sor, sor->clk_src);
|
|
|
if (err < 0)
|
|
|
dev_err(sor->dev, "failed to set parent clock: %d\n", err);
|
|
|
|
|
@@ -2595,6 +2600,16 @@ static int tegra_sor_probe(struct platform_device *pdev)
|
|
|
goto remove;
|
|
|
}
|
|
|
|
|
|
+ if (sor->soc->supports_hdmi || sor->soc->supports_dp) {
|
|
|
+ sor->clk_src = devm_clk_get(&pdev->dev, "source");
|
|
|
+ if (IS_ERR(sor->clk_src)) {
|
|
|
+ err = PTR_ERR(sor->clk_src);
|
|
|
+ dev_err(sor->dev, "failed to get source clock: %d\n",
|
|
|
+ err);
|
|
|
+ goto remove;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
sor->clk_parent = devm_clk_get(&pdev->dev, "parent");
|
|
|
if (IS_ERR(sor->clk_parent)) {
|
|
|
err = PTR_ERR(sor->clk_parent);
|