From 2c2bf15133b73c4e7fe68764b1e6906c66331987 Mon Sep 17 00:00:00 2001 From: Min-wuk Lee Date: Tue, 15 Apr 2014 16:14:08 +0900 Subject: video: tegra: dc: nvidia,dc-connection property nvidia,dc-connection property will indicate if target dc device is used for internal lcd or external display. For internal lcd, it will get dc output type from selected panel node among device tree multiple panel nodes: It can be TEGRA_DC_OUT_DSI or TEGRA_DC_OUT_DP, etc. For external display, dc output type will be set to TEGRA_DC_OUT_HDMI. Bug 1371533 Change-Id: I94f7f0a2e93c5550aa2ea8f7e2069e52bdc799df Signed-off-by: Min-wuk Lee Reviewed-on: http://git-master/r/395028 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Animesh Kishore Reviewed-by: Venkat Moganty --- Documentation/devicetree/bindings/video/nvidia,tegra114-dc.txt | 6 +++--- Documentation/devicetree/bindings/video/nvidia,tegra114-dsi.txt | 7 +++---- Documentation/devicetree/bindings/video/nvidia,tegra114-hdmi.txt | 2 ++ Documentation/devicetree/bindings/video/nvidia,tegra124-dc.txt | 6 +++--- Documentation/devicetree/bindings/video/nvidia,tegra124-dsi.txt | 7 +++---- Documentation/devicetree/bindings/video/nvidia,tegra124-hdmi.txt | 2 ++ 6 files changed, 16 insertions(+), 14 deletions(-) (limited to 'Documentation') diff --git a/Documentation/devicetree/bindings/video/nvidia,tegra114-dc.txt b/Documentation/devicetree/bindings/video/nvidia,tegra114-dc.txt index 1e1330b89b00..c96d6d8f7d2b 100644 --- a/Documentation/devicetree/bindings/video/nvidia,tegra114-dc.txt +++ b/Documentation/devicetree/bindings/video/nvidia,tegra114-dc.txt @@ -17,7 +17,7 @@ NVIDIA Tegra114 Display Controller - nvidia,cmu-enable: Toggle switch for color management unit. - nvidia,low-v-win: If low_v_win is set, we can lower vdd_core when that windows is the only one active. - - nvidia,out-type: Output type. Should be TEGRA_DC_OUT_DSI or TEGRA_DC_OUT_HDMI. + - nvidia,dc-connection: dc connection. Should be internal-lcd or external-display. - nvidia,out-rotation: It specifies panel rotation in degree. - nvidia,fb-bpp: Bits per pixel of fb. - nvidia,fb-flags: Window is updated in display controller device probe. Should be TEGRA_FB_FLIP_ON_PROBE, @@ -41,7 +41,7 @@ Example nvidia,emc-clk-rate = <204000000>; nvidia,cmu-enable = <1>; nvidia,low-v-win = <0x2>; - nvidia,out-type = ; + nvidia,dc-connection = "internal-lcd"; nvidia,fb-bpp = <32>; /* bits per pixel */ nvidia,fb-flags = ; }; @@ -54,7 +54,7 @@ Example nvidia,memory-clients = <3>; nvidia,dc-flags = ; nvidia,emc-clk-rate = <300000000>; - nvidia,out-type = ; + nvidia,dc-connection = "external-display"; nvidia,fb-bpp = <32>; /* bits per pixel */ nvidia,fb-flags = ; avdd_hdmi-supply = <&palmas_ldoln>; diff --git a/Documentation/devicetree/bindings/video/nvidia,tegra114-dsi.txt b/Documentation/devicetree/bindings/video/nvidia,tegra114-dsi.txt index 03c7c4986158..9a00dcb0f3d1 100644 --- a/Documentation/devicetree/bindings/video/nvidia,tegra114-dsi.txt +++ b/Documentation/devicetree/bindings/video/nvidia,tegra114-dsi.txt @@ -92,8 +92,7 @@ NVIDIA TEGRA114 Display Serial Interface 1.A.i.x) NVIDIA Display Controller Mode timing This must be contained in display-timings parent node. This contains mode settings, including - display timings. For hdmi out-type case, display-timings properties are only valid in case of - hdmi fb console mode. + display timings. Required properties: - name: Can be arbitrary, but each sibling node should have unique name. @@ -113,6 +112,7 @@ NVIDIA TEGRA114 Display Serial Interface Required properties: - name: Should be "disp-default-out". + - nvidia,out-type: Output type. Should be TEGRA_DC_OUT_DSI. - 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-flags: One item or an array of several tuples items can be chosen. @@ -131,8 +131,6 @@ NVIDIA TEGRA114 Display Serial Interface BASE_COLOR_SIZE111, BASE_COLOR_SIZE222, BASE_COLOR_SIZE332, BASE_COLOR_SIZE333, BASE_COLOR_SIZE444, BASE_COLOR_SIZE555, BASE_COLOR_SIZE565, BASE_COLOR_SIZE666, and BASE_COLOR_SIZE888, respectively. In default, BASE_COLOR_SIZE888 is chosen. - For hdmi out-type case, depth selection is only valid for hdmi fb console mode, - otherwise, BASE_COLOR_SIZE888 is chosen as a default. - nvidia,out-xres: Visible resolution for width. - nvidia,out-yres: Visible resolution for height. @@ -221,6 +219,7 @@ Example , ; disp-default-out { + nvidia,out-type = ; nvidia,out-width = <217>; nvidia,out-height = <135>; nvidia,out-flags = ; diff --git a/Documentation/devicetree/bindings/video/nvidia,tegra114-hdmi.txt b/Documentation/devicetree/bindings/video/nvidia,tegra114-hdmi.txt index 76197a49bc46..e523d21eb633 100644 --- a/Documentation/devicetree/bindings/video/nvidia,tegra114-hdmi.txt +++ b/Documentation/devicetree/bindings/video/nvidia,tegra114-hdmi.txt @@ -59,6 +59,7 @@ NVIDIA TEGRA114 High Definition Multimedia Interface Required properties: - name: Should be "disp-default-out". + - nvidia,out-type: Output type. Should be TEGRA_DC_OUT_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-flags: One item or an array of several tuples items can be chosen. @@ -175,6 +176,7 @@ Example hdmi-display { status = "okay"; disp-default-out { + nvidia,out-type = ; nvidia,out-flags = ; nvidia,out-parent-clk = "pll_d2"; nvidia,out-max-pixclk = <3367>; /* KHZ2PICOS(297000) */ diff --git a/Documentation/devicetree/bindings/video/nvidia,tegra124-dc.txt b/Documentation/devicetree/bindings/video/nvidia,tegra124-dc.txt index 940e9e058063..52b8af222014 100644 --- a/Documentation/devicetree/bindings/video/nvidia,tegra124-dc.txt +++ b/Documentation/devicetree/bindings/video/nvidia,tegra124-dc.txt @@ -17,7 +17,7 @@ NVIDIA Tegra124 Display Controller - nvidia,cmu-enable: Toggle switch for color management unit. - nvidia,low-v-win: If low_v_win is set, we can lower vdd_core when that windows is the only one active. - - nvidia,out-type: Output type. Should be TEGRA_DC_OUT_DSI or TEGRA_DC_OUT_HDMI. + - nvidia,dc-connection: dc connection. Should be internal-lcd or external-display. - nvidia,out-rotation: It specifies panel rotation in degree. - nvidia,fb-bpp: Bits per pixel of fb. - nvidia,fb-flags: Window is updated in display controller device probe. Should be TEGRA_FB_FLIP_ON_PROBE, @@ -41,7 +41,7 @@ Example nvidia,emc-clk-rate = <204000000>; nvidia,cmu-enable = <1>; nvidia,low-v-win = <0x2>; - nvidia,out-type = ; + nvidia,dc-connection = "internal-lcd"; nvidia,fb-bpp = <32>; /* bits per pixel */ nvidia,fb-flags = ; }; @@ -54,7 +54,7 @@ Example nvidia,memory-clients = <3>; nvidia,dc-flags = ; nvidia,emc-clk-rate = <300000000>; - nvidia,out-type = ; + nvidia,dc-connection = "external-display"; nvidia,fb-bpp = <32>; /* bits per pixel */ nvidia,fb-flags = ; avdd_hdmi-supply = <&palmas_ldoln>; diff --git a/Documentation/devicetree/bindings/video/nvidia,tegra124-dsi.txt b/Documentation/devicetree/bindings/video/nvidia,tegra124-dsi.txt index d8f946bad110..e899f00d4fe5 100644 --- a/Documentation/devicetree/bindings/video/nvidia,tegra124-dsi.txt +++ b/Documentation/devicetree/bindings/video/nvidia,tegra124-dsi.txt @@ -92,8 +92,7 @@ NVIDIA TEGRA124 Display Serial Interface 1.A.i.x) NVIDIA Display Controller Mode timing This must be contained in display-timings parent node. This contains mode settings, including - display timings. For hdmi out-type case, display-timings properties are only valid in case of - hdmi fb console mode. + display timings. Required properties: - name: Can be arbitrary, but each sibling node should have unique name. @@ -113,6 +112,7 @@ NVIDIA TEGRA124 Display Serial Interface Required properties: - name: Should be "disp-default-out". + - nvidia,out-type: Output type. Should be TEGRA_DC_OUT_DSI. - 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-flags: One item or an array of several tuples items can be chosen. @@ -131,8 +131,6 @@ NVIDIA TEGRA124 Display Serial Interface BASE_COLOR_SIZE111, BASE_COLOR_SIZE222, BASE_COLOR_SIZE332, BASE_COLOR_SIZE333, BASE_COLOR_SIZE444, BASE_COLOR_SIZE555, BASE_COLOR_SIZE565, BASE_COLOR_SIZE666, and BASE_COLOR_SIZE888, respectively. In default, BASE_COLOR_SIZE888 is chosen. - For hdmi out-type case, depth selection is only valid for hdmi fb console mode, - otherwise, BASE_COLOR_SIZE888 is chosen as a default. - nvidia,out-xres: Visible resolution for width. - nvidia,out-yres: Visible resolution for height. @@ -221,6 +219,7 @@ Example , ; disp-default-out { + nvidia,out-type = ; nvidia,out-width = <217>; nvidia,out-height = <135>; nvidia,out-flags = ; diff --git a/Documentation/devicetree/bindings/video/nvidia,tegra124-hdmi.txt b/Documentation/devicetree/bindings/video/nvidia,tegra124-hdmi.txt index 4cee05b19ebb..f269b06948a7 100644 --- a/Documentation/devicetree/bindings/video/nvidia,tegra124-hdmi.txt +++ b/Documentation/devicetree/bindings/video/nvidia,tegra124-hdmi.txt @@ -59,6 +59,7 @@ NVIDIA TEGRA124 High Definition Multimedia Interface Required properties: - name: Should be "disp-default-out". + - nvidia,out-type: Output type. Should be TEGRA_DC_OUT_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-flags: One item or an array of several tuples items can be chosen. @@ -175,6 +176,7 @@ Example hdmi-display { status = "okay"; disp-default-out { + nvidia,out-type = ; nvidia,out-flags = ; nvidia,out-parent-clk = "pll_d2"; nvidia,out-max-pixclk = <3367>; /* KHZ2PICOS(297000) */ -- cgit v1.2.3