arm64: t210: he: disable smartdimmer on boot

bug 200190968

Do not enable smartdimmer from DTB. Let the user-mode
take control of enable/disable.

Change-Id: I37c207d79850fac23a8ed256feda3442ce4c1ab6
Signed-off-by: Prafull Suryawanshi <prafulls@nvidia.com>
Signed-off-by: Daniel Solomon <daniels@nvidia.com>
Reviewed-on: http://git-master/r/1128859
(cherry picked from commit e222957ca997a4fb5b9d6756c24751dee903a9b3)
Reviewed-on: http://git-master/r/1132708
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

diff --git a/Documentation/devicetree/bindings/video/nvidia,tegra114-dsi.txt b/Documentation/devicetree/bindings/video/nvidia,tegra114-dsi.txt
index 28904ef15b119e7ba56de263055f69d0a56136b8..120235f7394401aefe82ead8e926e62b3e3c80bb 100644 (file)
--- a/Documentation/devicetree/bindings/video/nvidia,tegra114-dsi.txt
+++ b/Documentation/devicetree/bindings/video/nvidia,tegra114-dsi.txt
@@ -197,6 +197,10 @@ NVIDIA TEGRA114 Display Serial Interface
  - nvidia,use-vpulse2: With enabled, run histogram on vpulse2 rather than vsync.
  - nvidia,bl-device-name: Backlight device name.
 
+ Optional properties:
+ - nvidia,sd-enable: By default, smartdimmer will be enabled if its device tree node
+   is present. This node can be used to override it by specifiying a value of 0.
+
 1.A.l) NVIDIA Display Controller Color Management Unit Settings
  This must be contained in dsi parent node. This is color management unit settings.
 

diff --git a/Documentation/devicetree/bindings/video/nvidia,tegra114-hdmi.txt b/Documentation/devicetree/bindings/video/nvidia,tegra114-hdmi.txt
index 3b946a9594770c42a410abe873b87481fe667abf..e33ede7fcd9af3a3e2864c23c33dacb485151f60 100644 (file)
--- a/Documentation/devicetree/bindings/video/nvidia,tegra114-hdmi.txt
+++ b/Documentation/devicetree/bindings/video/nvidia,tegra114-hdmi.txt
@@ -139,6 +139,10 @@ NVIDIA TEGRA114 High Definition Multimedia Interface
  - nvidia,use-vpulse2: With enabled, run histogram on vpulse2 rather than vsync.
  - nvidia,bl-device-name: Backlight device name.
 
+ Optional properties:
+ - nvidia,sd-enable: By default, smartdimmer will be enabled if its device tree node
+   is present. This node can be used to override it by specifiying a value of 0.
+
  1.A.l) NVIDIA Display Controller Color Management Unit Settings
  This must be contained in hdmi-display node. This is color management unit settings.
 

diff --git a/Documentation/devicetree/bindings/video/nvidia,tegra124-dsi.txt b/Documentation/devicetree/bindings/video/nvidia,tegra124-dsi.txt
index 2dcb1c8c7aa34c1bd7de3ce70238cf977948703d..e33fe2a6055df99abf3092d027c9ddf104985faf 100644 (file)
--- a/Documentation/devicetree/bindings/video/nvidia,tegra124-dsi.txt
+++ b/Documentation/devicetree/bindings/video/nvidia,tegra124-dsi.txt
@@ -197,6 +197,10 @@ NVIDIA TEGRA124 Display Serial Interface
  - nvidia,use-vpulse2: With enabled, run histogram on vpulse2 rather than vsync.
  - nvidia,bl-device-name: Backlight device name.
 
+ Optional properties:
+ - nvidia,sd-enable: By default, smartdimmer will be enabled if its device tree node
+   is present. This node can be used to override it by specifiying a value of 0.
+
 1.A.l) NVIDIA Display Controller Color Management Unit Settings
  This must be contained in dsi parent node. This is color management unit settings.
 

diff --git a/Documentation/devicetree/bindings/video/nvidia,tegra124-hdmi.txt b/Documentation/devicetree/bindings/video/nvidia,tegra124-hdmi.txt
index e17980bd8431451475e83e147a43ff3ccd4ddfd9..a203adbdc8733b05b64615a1cb6b5233cde785f4 100644 (file)
--- a/Documentation/devicetree/bindings/video/nvidia,tegra124-hdmi.txt
+++ b/Documentation/devicetree/bindings/video/nvidia,tegra124-hdmi.txt
@@ -139,6 +139,10 @@ NVIDIA TEGRA124 High Definition Multimedia Interface
  - nvidia,use-vpulse2: With enabled, run histogram on vpulse2 rather than vsync.
  - nvidia,bl-device-name: Backlight device name.
 
+ Optional properties:
+ - nvidia,sd-enable: By default, smartdimmer will be enabled if its device tree node
+   is present. This node can be used to override it by specifiying a value of 0.
+
  1.A.l) NVIDIA Display Controller Color Management Unit Settings
  This must be contained in hdmi-display node. This is color management unit settings.
 

diff --git a/Documentation/devicetree/bindings/video/nvidia,tegra210-dsi.txt b/Documentation/devicetree/bindings/video/nvidia,tegra210-dsi.txt
index a42c54f8db10939298e65c0c86bc83b0e6578da6..a69f0b42c485bb4c1ca3407531c0b7f64735efa5 100644 (file)
--- a/Documentation/devicetree/bindings/video/nvidia,tegra210-dsi.txt
+++ b/Documentation/devicetree/bindings/video/nvidia,tegra210-dsi.txt
@@ -197,6 +197,10 @@ NVIDIA TEGRA210 Display Serial Interface
  - nvidia,use-vpulse2: With enabled, run histogram on vpulse2 rather than vsync.
  - nvidia,bl-device-name: Backlight device name.
 
+ Optional properties:
+ - nvidia,sd-enable: By default, smartdimmer will be enabled if its device tree node
+   is present. This node can be used to override it by specifiying a value of 0.
+
 1.A.l) NVIDIA Display Controller Color Management Unit Settings
  This must be contained in dsi parent node. This is color management unit settings.
 

diff --git a/Documentation/devicetree/bindings/video/nvidia,tegra210-hdmi.txt b/Documentation/devicetree/bindings/video/nvidia,tegra210-hdmi.txt
index e33924d8b5cd87f4d96dff091f3faa620c6d7c5a..90baba1edc553c66aeb5a111e884ae2eb12d0264 100644 (file)
--- a/Documentation/devicetree/bindings/video/nvidia,tegra210-hdmi.txt
+++ b/Documentation/devicetree/bindings/video/nvidia,tegra210-hdmi.txt
@@ -139,6 +139,10 @@ NVIDIA TEGRA210 High Definition Multimedia Interface
  - nvidia,use-vpulse2: With enabled, run histogram on vpulse2 rather than vsync.
  - nvidia,bl-device-name: Backlight device name.
 
+ Optional properties:
+ - nvidia,sd-enable: By default, smartdimmer will be enabled if its device tree node
+   is present. This node can be used to override it by specifiying a value of 0.
+
  1.A.l) NVIDIA Display Controller Color Management Unit Settings
  This must be contained in hdmi-display node. This is color management unit settings.
 

diff --git a/arch/arm64/boot/dts/tegra210-hawkeye-p2290-common.dtsi b/arch/arm64/boot/dts/tegra210-hawkeye-p2290-common.dtsi
index 53d5da7e6cd29c952c436a082d21274c092772c0..9523f8e29499fad4bd145e5e3d17a75720927abb 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-hawkeye-p2290-common.dtsi
+++ b/arch/arm64/boot/dts/tegra210-hawkeye-p2290-common.dtsi
@@ -1189,6 +1189,9 @@
                                disp-default-out {
                                        nvidia,out-rotation = <180>;
                                };
+                               smartdimmer {
+                                       nvidia,sd-enable = <0>;
+                               };
                        };
                        panel-s-wuxga-7-0 {
                                nvidia,dsi-dpd-pads = <DSIC_DPD_EN DSID_DPD_EN>;
@@ -1217,6 +1220,9 @@
                                                nvidia,v-ref-to-sync = <11>;
                                        };
                                };
+                               smartdimmer {
+                                       nvidia,sd-enable = <0>;
+                               };
                        };
                        panel-s-wuxga-8-0 {
                                nvidia,dsi-dpd-pads = <DSIC_DPD_EN DSID_DPD_EN>;
@@ -1248,6 +1254,9 @@
                                                nvidia,v-ref-to-sync = <11>;
                                        };
                                };
+                               smartdimmer {
+                                       nvidia,sd-enable = <0>;
+                               };
                        };
                };
                sor1 {