From d671ea1f72528990881aa7b75c022a3c89a64a0e Mon Sep 17 00:00:00 2001 From: Dominik Sliwa Date: Thu, 26 Apr 2018 18:11:08 +0200 Subject: apalis-tk1: fix issues when using eDP display-out Signed-off-by: Dominik Sliwa Acked-by: Marcel Ziswiler --- .../tegra124-apalis-displays.dtsi | 6 ++- .../tegra124-apalis-v1.2-displays.dtsi | 7 +++- arch/arm/boot/dts/tegra124-soc.dtsi | 8 ++++ drivers/video/tegra/dc/dp.c | 49 +++++++++++++++++----- drivers/video/tegra/dc/mode.c | 6 ++- drivers/video/tegra/dc/of_dc.c | 5 +++ 6 files changed, 66 insertions(+), 15 deletions(-) diff --git a/arch/arm/boot/dts/tegra124-platforms/tegra124-apalis-displays.dtsi b/arch/arm/boot/dts/tegra124-platforms/tegra124-apalis-displays.dtsi index a951d3e21927..0ef2503b7e77 100644 --- a/arch/arm/boot/dts/tegra124-platforms/tegra124-apalis-displays.dtsi +++ b/arch/arm/boot/dts/tegra124-platforms/tegra124-apalis-displays.dtsi @@ -7,6 +7,10 @@ status = "okay"; }; + dpaux { + status = "okay"; + }; + lvds:lvds { status = "okay"; display { @@ -61,7 +65,7 @@ }; edp:edp { - status = "disabled"; + status = "okay"; nvidia,hpd-gpio = <&gpio TEGRA_GPIO(FF, 0) 1>; display { status = "okay"; diff --git a/arch/arm/boot/dts/tegra124-platforms/tegra124-apalis-v1.2-displays.dtsi b/arch/arm/boot/dts/tegra124-platforms/tegra124-apalis-v1.2-displays.dtsi index 7a86968c51f3..da0f82024ce0 100644 --- a/arch/arm/boot/dts/tegra124-platforms/tegra124-apalis-v1.2-displays.dtsi +++ b/arch/arm/boot/dts/tegra124-platforms/tegra124-apalis-v1.2-displays.dtsi @@ -7,6 +7,10 @@ status = "okay"; }; + dpaux { + status = "okay"; + }; + lvds:lvds { status = "okay"; display { @@ -61,7 +65,7 @@ }; edp:edp { - status = "disabled"; + status = "okay"; nvidia,hpd-gpio = <&gpio TEGRA_GPIO(FF, 0) 1>; display { status = "okay"; @@ -203,6 +207,7 @@ nvidia,fb-flags = ; avdd_hdmi-supply = <&as3722_sd4>; }; + }; hdmi_ddc: i2c@7000c700 { diff --git a/arch/arm/boot/dts/tegra124-soc.dtsi b/arch/arm/boot/dts/tegra124-soc.dtsi index ed90ecf7725e..838030355705 100644 --- a/arch/arm/boot/dts/tegra124-soc.dtsi +++ b/arch/arm/boot/dts/tegra124-soc.dtsi @@ -585,9 +585,17 @@ sor { compatible = "nvidia,tegra124-lvds"; reg = <0x54540000 0x00040000>; + interrupts = <0 76 0x04>; status = "disabled"; }; + dpaux { + compatible = "nvidia,tegra124-dpaux"; + reg = <0x545c0000 0x00040000>; + interrupts = <0 159 0x04>; + status = "disabled"; + }; + vic { compatible = "nvidia,tegra124-vic"; reg = <0x54340000 0x00040000>; diff --git a/drivers/video/tegra/dc/dp.c b/drivers/video/tegra/dc/dp.c index 943e3f115d80..304cb89dfc5f 100644 --- a/drivers/video/tegra/dc/dp.c +++ b/drivers/video/tegra/dc/dp.c @@ -24,6 +24,8 @@ #include #include #include +#include +#include #include #include @@ -1403,24 +1405,49 @@ static int tegra_dc_dp_init(struct tegra_dc *dc) struct clk *parent_clk; int err; u32 irq; + struct resource dpaux_res; + struct device_node *np = dc->ndev->dev.of_node; +#ifdef CONFIG_USE_OF + struct device_node *np_dpaux = + of_find_node_by_path("/host1x/dpaux"); +#else + struct device_node *np_dpaux = NULL; +#endif dp = kzalloc(sizeof(*dp), GFP_KERNEL); if (!dp) return -ENOMEM; - irq = platform_get_irq_byname(dc->ndev, "irq_dp"); - if (irq <= 0) { - dev_err(&dc->ndev->dev, "dp: no irq\n"); - err = -ENOENT; - goto err_free_dp; - } + if (np) { + if (np_dpaux && of_device_is_available(np_dpaux)) { + irq = irq_of_parse_and_map(np_dpaux, 0); + if (irq <= 0) { + dev_err(&dc->ndev->dev, "dp: no irq\n"); + err = -ENOENT; + goto err_free_dp; + } + of_address_to_resource(np_dpaux, 0, &dpaux_res); + res = &dpaux_res; + } else { + err = -ENOENT; + goto err_free_dp; + } + } else { + irq = platform_get_irq_byname(dc->ndev, "irq_dp"); + if (irq <= 0) { + dev_err(&dc->ndev->dev, "dp: no irq\n"); + err = -ENOENT; + goto err_free_dp; + } - res = platform_get_resource_byname(dc->ndev, IORESOURCE_MEM, "dpaux"); - if (!res) { - dev_err(&dc->ndev->dev, "dp: no mem resources for dpaux\n"); - err = -EFAULT; - goto err_free_dp; + res = platform_get_resource_byname(dc->ndev, IORESOURCE_MEM, + "dpaux"); + if (!res) { + dev_err(&dc->ndev->dev, "dp: no mem for dpaux\n"); + err = -EFAULT; + goto err_free_dp; + } } base_res = request_mem_region(res->start, resource_size(res), diff --git a/drivers/video/tegra/dc/mode.c b/drivers/video/tegra/dc/mode.c index ab8907815749..39e8279859bb 100644 --- a/drivers/video/tegra/dc/mode.c +++ b/drivers/video/tegra/dc/mode.c @@ -574,7 +574,8 @@ int tegra_dc_var_to_dc_mode(struct tegra_dc *dc, struct fb_var_screeninfo *var, mode->h_front_porch = var->right_margin; mode->v_front_porch = var->lower_margin; mode->stereo_mode = stereo_mode; - if (dc->out->type == TEGRA_DC_OUT_HDMI) { + if (dc->out->type == TEGRA_DC_OUT_HDMI || + dc->out->type == TEGRA_DC_OUT_DP) { /* HDMI controller requires h_ref=1, v_ref=1 */ mode->h_ref_to_sync = 1; mode->v_ref_to_sync = 1; @@ -771,7 +772,8 @@ int tegra_dc_set_fb_mode(struct tegra_dc *dc, return -EINVAL; #endif - if (dc->out->type == TEGRA_DC_OUT_HDMI) { + if (dc->out->type == TEGRA_DC_OUT_HDMI || + dc->out->type == TEGRA_DC_OUT_DP) { /* HDMI controller requires h_ref=1, v_ref=1 */ mode.h_ref_to_sync = 1; mode.v_ref_to_sync = 1; diff --git a/drivers/video/tegra/dc/of_dc.c b/drivers/video/tegra/dc/of_dc.c index 1f38c3e8e36b..aed0fda91299 100644 --- a/drivers/video/tegra/dc/of_dc.c +++ b/drivers/video/tegra/dc/of_dc.c @@ -1812,6 +1812,7 @@ struct tegra_dc_platform_data pdata->default_out->disable = dc_dp_disable; pdata->default_out->postsuspend = dc_dp_postsuspend; + np_target_disp = of_get_child_by_name(dc_connection, "display"); if (!np_target_disp || @@ -1819,6 +1820,10 @@ struct tegra_dc_platform_data pr_err("dp/display node is NOT valid\n"); goto fail_parse; } + err = parse_dp_lt_config(ndev, np_target_disp, + pdata->default_out); + if (err) + goto fail_parse; } default_out_np = of_get_child_by_name(np_target_disp, -- cgit v1.2.3