diff options
5 files changed, 14 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/video/nvidia,tegra114-dc.txt b/Documentation/devicetree/bindings/video/nvidia,tegra114-dc.txt index 6a055fefeadb..fe3a300ce5cf 100644 --- a/Documentation/devicetree/bindings/video/nvidia,tegra114-dc.txt +++ b/Documentation/devicetree/bindings/video/nvidia,tegra114-dc.txt @@ -59,6 +59,7 @@ NVIDIA Tegra114 Display Controller - nvidia,out-type: Output type. Should be "dsi" or "hdmi". - nvidia,out-width: Width in struct fb_var_screeninfo. width of picture in mm. - nvidia,out-height: Height in struct fb_var_screeninfo. height of picture in mm. + - nvidia,out-rotation: It specifies panel rotation in degree. - nvidia,out-flags: Should be "continuous" or "oneshot" or "hotplug_high" or "hotplug_low" or "continuous_initialized" or "oneshot_initialized" - nvidia,out-parent-clk: Parent clk for display controller. diff --git a/Documentation/devicetree/bindings/video/nvidia,tegra114-dsi.txt b/Documentation/devicetree/bindings/video/nvidia,tegra114-dsi.txt index fc16f67c0fd5..c826f37bad8f 100644 --- a/Documentation/devicetree/bindings/video/nvidia,tegra114-dsi.txt +++ b/Documentation/devicetree/bindings/video/nvidia,tegra114-dsi.txt @@ -39,6 +39,7 @@ NVIDIA TEGRA114 Display Serial Interface - nvidia,dsi-instance: Should be 0 or 1: DSI controller or DSIB controller. - nvidia,dsi-panel-reset: Indicate if dsi output device requires hardware reset or not. - nvidia,dsi-power-saving-suspend: With enabled, set dsi controller ultra low power mode in suspend. + - nvidia,dsi-ulpm-not-support: With enabled, do not enter dsi ulpm mode. - nvidia,dsi-video-data-type: The DSI operates in two transmission modes: video and host/command. Write 0, 1 for TEGRA_DSI_VIDEO_TYPE_VIDEO_MODE, TEGRA_DSI_VIDEO_TYPE_COMMAND_MODE, respectively. - nvidia,dsi-video-clock-mode: Control for the hs clock lane. Continuous means hs clock on all the time. diff --git a/Documentation/devicetree/bindings/video/nvidia,tegra124-dc.txt b/Documentation/devicetree/bindings/video/nvidia,tegra124-dc.txt index e91b7c3f5998..bd3c499b1fba 100644 --- a/Documentation/devicetree/bindings/video/nvidia,tegra124-dc.txt +++ b/Documentation/devicetree/bindings/video/nvidia,tegra124-dc.txt @@ -59,6 +59,7 @@ NVIDIA Tegra124 Display Controller - nvidia,out-type: Output type. Should be "dsi" or "hdmi". - nvidia,out-width: Width in struct fb_var_screeninfo. width of picture in mm. - nvidia,out-height: Height in struct fb_var_screeninfo. height of picture in mm. + - nvidia,out-rotation: It specifies panel rotation in degree. - nvidia,out-flags: Should be "continuous" or "oneshot" or "hotplug_high" or "hotplug_low" or "continuous_initialized" or "oneshot_initialized" - nvidia,out-parent-clk: Parent clk for display controller. diff --git a/Documentation/devicetree/bindings/video/nvidia,tegra124-dsi.txt b/Documentation/devicetree/bindings/video/nvidia,tegra124-dsi.txt index 3b37ec66b16f..4a7add0de5fa 100644 --- a/Documentation/devicetree/bindings/video/nvidia,tegra124-dsi.txt +++ b/Documentation/devicetree/bindings/video/nvidia,tegra124-dsi.txt @@ -39,6 +39,7 @@ NVIDIA TEGRA124 Display Serial Interface - nvidia,dsi-instance: Should be 0 or 1: DSI controller or DSIB controller. - nvidia,dsi-panel-reset: Indicate if dsi output device requires hardware reset or not. - nvidia,dsi-power-saving-suspend: With enabled, set dsi controller ultra low power mode in suspend. + - nvidia,dsi-ulpm-not-support: With enabled, do not enter dsi ulpm mode. - nvidia,dsi-video-data-type: The DSI operates in two transmission modes: video and host/command. Write 0, 1 for TEGRA_DSI_VIDEO_TYPE_VIDEO_MODE, TEGRA_DSI_VIDEO_TYPE_COMMAND_MODE, respectively. - nvidia,dsi-video-clock-mode: Control for the hs clock lane. Continuous means hs clock on all the time. diff --git a/drivers/video/tegra/dc/of_dc.c b/drivers/video/tegra/dc/of_dc.c index 77b09e9d2db1..ff1ab674eb1c 100644 --- a/drivers/video/tegra/dc/of_dc.c +++ b/drivers/video/tegra/dc/of_dc.c @@ -260,6 +260,10 @@ static int parse_dc_default_out(struct platform_device *ndev, default_out->height = (unsigned) temp; OF_DC_LOG("out_height %d\n", default_out->height); } + if (!of_property_read_u32(np, "nvidia,out-rotation", &temp)) { + default_out->rotation = (unsigned) temp; + OF_DC_LOG("out_rotation %d\n", default_out->rotation); + } if (np_hdmi && of_device_is_available(np_hdmi) && (default_out->type == TEGRA_DC_OUT_HDMI)) { int id; @@ -1061,6 +1065,12 @@ int parse_dsi_settings(struct platform_device *ndev, dsi->power_saving_suspend); } if (!of_property_read_u32(np_panel, + "nvidia,dsi-ulpm-not-support", &temp)) { + dsi->ulpm_not_supported = (bool)temp; + OF_DC_LOG("dsi ulpm_not_supported %d\n", + dsi->ulpm_not_supported); + } + if (!of_property_read_u32(np_panel, "nvidia,dsi-video-data-type", &temp)) { dsi->video_data_type = (u8)temp; if (temp == TEGRA_DSI_VIDEO_TYPE_VIDEO_MODE) |