Merge branch 'for-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

[sfrench/cifs-2.6.git] / arch / arm64 / boot / dts / nvidia / tegra186-p2771-0000.dts

diff --git a/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts b/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts
index 65487eee2ce61d7aa587be9614d53f43d4dc7942..31457f32e4d08aaafffabf15bc17520070af3090 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts
+++ b/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts
@@ -26,7 +26,8 @@
                        reg = <0x74>;
 
                        interrupt-parent = <&gpio>;
-                       interrupts = <TEGRA_MAIN_GPIO(Y, 0) GPIO_ACTIVE_LOW>;
+                       interrupts = <TEGRA186_MAIN_GPIO(Y, 0)
+                                     GPIO_ACTIVE_LOW>;
 
                        #gpio-cells = <2>;
                        gpio-controller;
@@ -37,7 +38,8 @@
                        reg = <0x77>;
 
                        interrupt-parent = <&gpio>;
-                       interrupts = <TEGRA_MAIN_GPIO(Y, 6) GPIO_ACTIVE_LOW>;
+                       interrupts = <TEGRA186_MAIN_GPIO(Y, 6)
+                                     GPIO_ACTIVE_LOW>;
 
                        #gpio-cells = <2>;
                        gpio-controller;
@@ -52,6 +54,7 @@
        };
 
        hda@3510000 {
+               nvidia,model = "jetson-tx2-hda";
                status = "okay";
        };
 
@@ -108,7 +111,8 @@
                        hdmi-supply = <&vdd_hdmi>;
 
                        nvidia,ddc-i2c-bus = <&ddc>;
-                       nvidia,hpd-gpio = <&gpio TEGRA_MAIN_GPIO(P, 1) GPIO_ACTIVE_LOW>;
+                       nvidia,hpd-gpio = <&gpio TEGRA186_MAIN_GPIO(P, 1)
+                                                GPIO_ACTIVE_LOW>;
                };
 
                dpaux@155c0000 {
@@ -121,7 +125,7 @@
 
                power {
                        label = "Power";
-                       gpios = <&gpio_aon TEGRA_AON_GPIO(FF, 0)
+                       gpios = <&gpio_aon TEGRA186_AON_GPIO(FF, 0)
                                           GPIO_ACTIVE_LOW>;
                        linux,input-type = <EV_KEY>;
                        linux,code = <KEY_POWER>;
@@ -132,7 +136,7 @@
 
                volume-up {
                        label = "Volume Up";
-                       gpios = <&gpio_aon TEGRA_AON_GPIO(FF, 1)
+                       gpios = <&gpio_aon TEGRA186_AON_GPIO(FF, 1)
                                           GPIO_ACTIVE_LOW>;
                        linux,input-type = <EV_KEY>;
                        linux,code = <KEY_VOLUMEUP>;
@@ -141,7 +145,7 @@
 
                volume-down {
                        label = "Volume Down";
-                       gpios = <&gpio_aon TEGRA_AON_GPIO(FF, 2)
+                       gpios = <&gpio_aon TEGRA186_AON_GPIO(FF, 2)
                                           GPIO_ACTIVE_LOW>;
                        linux,input-type = <EV_KEY>;
                        linux,code = <KEY_VOLUMEDOWN>;
@@ -158,7 +162,8 @@
                        regulator-min-microvolt = <3300000>;
                        regulator-max-microvolt = <3300000>;
 
-                       gpio = <&gpio TEGRA_MAIN_GPIO(P, 6) GPIO_ACTIVE_HIGH>;
+                       gpio = <&gpio TEGRA186_MAIN_GPIO(P, 6)
+                                     GPIO_ACTIVE_HIGH>;
                        enable-active-high;
 
                        vin-supply = <&vdd_3v3_sys>;