Merge tag 'docs-5.11-2' of git://git.lwn.net/linux

[linux-2.6-microblaze.git] / arch / arm / boot / dts / tegra30-asus-nexus7-grouper-common.dtsi

diff --git a/arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi b/arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi
index 88ca03f..ac1c1a6 100644 (file)
--- a/arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi
+++ b/arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi
@@ -75,7 +75,7 @@
        };
 
        gpio@6000d000 {
-               init-mode {
+               init-mode-hog {
                        gpio-hog;
                        gpios = <TEGRA_GPIO(DD, 7) GPIO_ACTIVE_HIGH>,
                                <TEGRA_GPIO(CC, 6) GPIO_ACTIVE_HIGH>,
@@ -83,7 +83,7 @@
                        output-low;
                };
 
-               init-low-power-mode {
+               init-low-power-mode-hog {
                        gpio-hog;
                        gpios = <TEGRA_GPIO(I, 6) GPIO_ACTIVE_HIGH>;
                        input;
@@ -1073,8 +1073,16 @@
        };
 
        display-panel {
-               compatible = "hydis,hv070wx2-1e0", "chunghwa,claa070wp03xg",
-                            "panel-lvds";
+               /*
+                * Nexus 7 supports two compatible panel models:
+                *
+                *  1. hydis,hv070wx2-1e0
+                *  2. chunghwa,claa070wp03xg
+                *
+                * We want to use timing which is optimized for Nexus 7,
+                * hence we need to customize the timing.
+                */
+               compatible = "panel-lvds";
 
                power-supply = <&vdd_pnl>;
                backlight = <&backlight>;
@@ -1145,6 +1153,7 @@
                compatible = "ti,sn75lvds83", "lvds-encoder";
 
                powerdown-gpios = <&gpio TEGRA_GPIO(N, 6) GPIO_ACTIVE_LOW>;
+               power-supply = <&vdd_3v3_sys>;
 
                ports {
                        #address-cells = <1>;
@@ -1240,14 +1249,14 @@
        };
 
        thermal-zones {
-               nct72-local {
+               skin-thermal {
                        polling-delay-passive = <1000>; /* milliseconds */
                        polling-delay = <0>; /* milliseconds */
 
                        thermal-sensors = <&nct72 0>;
                };
 
-               nct72-remote {
+               cpu-thermal {
                        polling-delay-passive = <1000>; /* milliseconds */
                        polling-delay = <5000>; /* milliseconds */
 
@@ -1255,9 +1264,9 @@
 
                        trips {
                                trip0: cpu-alert0 {
-                                       /* start throttling at 50C */
-                                       temperature = <50000>;
-                                       hysteresis = <3000>;
+                                       /* throttle at 57C until temperature drops to 56.8C */
+                                       temperature = <57000>;
+                                       hysteresis = <200>;
                                        type = "passive";
                                };