Merge tag 'block-5.14-2021-08-07' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / arch / arm / boot / dts / tegra20-acer-a500-picasso.dts

diff --git a/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts b/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts
index 2298fc0..1976c38 100644 (file)
--- a/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts
+++ b/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts
@@ -420,11 +420,14 @@
                        reg = <0x1a>;
 
                        interrupt-parent = <&gpio>;
-                       interrupts = <TEGRA_GPIO(X, 3) IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <TEGRA_GPIO(X, 3) IRQ_TYPE_EDGE_BOTH>;
 
                        gpio-controller;
                        #gpio-cells = <2>;
 
+                       micdet-cfg = <0>;
+                       micdet-delay = <100>;
+
                        gpio-cfg = <
                                0x0000 /* MIC_LR_OUT#    GPIO, output, low */
                                0x0000 /* FM2018-enable  GPIO, output, low */
@@ -759,7 +762,7 @@
 
                mmc-pwrseq = <&brcm_wifi_pwrseq>;
                vmmc-supply = <&vdd_3v3_sys>;
-               vqmmc-supply = <&vdd_3v3_sys>;
+               vqmmc-supply = <&vdd_1v8_sys>;
 
                /* Azurewave AW-NH611 BCM4329 */
                wifi@1 {
@@ -1030,7 +1033,7 @@
                nvidia,audio-codec = <&wm8903>;
 
                nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>;
-               nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_HIGH>;
+               nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>;
                nvidia,int-mic-en-gpios = <&wm8903 1 GPIO_ACTIVE_HIGH>;
                nvidia,headset;
 
@@ -1056,15 +1059,15 @@
 
                        trips {
                                trip0: cpu-alert0 {
-                                       /* start throttling at 50C */
-                                       temperature = <50000>;
+                                       /* start throttling at 60C */
+                                       temperature = <60000>;
                                        hysteresis = <200>;
                                        type = "passive";
                                };
 
                                trip1: cpu-crit {
-                                       /* shut down at 60C */
-                                       temperature = <60000>;
+                                       /* shut down at 70C */
+                                       temperature = <70000>;
                                        hysteresis = <2000>;
                                        type = "critical";
                                };
@@ -1085,6 +1088,7 @@
 
                emc-tables@0 {
                        nvidia,ram-code = <0>; /* elpida-8gb */
+                       reg = <0>;
 
                        #address-cells = <1>;
                        #size-cells = <0>;
@@ -1182,6 +1186,7 @@
 
                emc-tables@1 {
                        nvidia,ram-code = <1>; /* elpida-4gb */
+                       reg = <1>;
 
                        #address-cells = <1>;
                        #size-cells = <0>;
@@ -1279,6 +1284,7 @@
 
                emc-tables@2 {
                        nvidia,ram-code = <2>; /* hynix-8gb */
+                       reg = <2>;
 
                        #address-cells = <1>;
                        #size-cells = <0>;
@@ -1376,6 +1382,7 @@
 
                emc-tables@3 {
                        nvidia,ram-code = <3>; /* hynix-4gb */
+                       reg = <3>;
 
                        #address-cells = <1>;
                        #size-cells = <0>;