Merge tag 'for-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power...

[sfrench/cifs-2.6.git] / arch / arm64 / boot / dts / nvidia / tegra210-p2597.dtsi

diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi b/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi
index a96e6ee70c2152e878c2b537b9eb1df8575611f4..95e890d8a1192ec0f3f546029df15bb1b6c81edf 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi
@@ -1278,6 +1278,20 @@
                                nvidia,open-drain = <TEGRA_PIN_DISABLE>;
                        };
                };
+
+               dvfs_pwm_active_state: dvfs_pwm_active {
+                       dvfs_pwm_pbb1 {
+                               nvidia,pins = "dvfs_pwm_pbb1";
+                               nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                       };
+               };
+
+               dvfs_pwm_inactive_state: dvfs_pwm_inactive {
+                       dvfs_pwm_pbb1 {
+                               nvidia,pins = "dvfs_pwm_pbb1";
+                               nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                       };
+               };
        };
 
        pwm@7000a000 {
@@ -1303,6 +1317,16 @@
                clock-frequency = <100000>;
        };
 
+       sata@70020000 {
+               status = "okay";
+               phys = <&{/padctl@7009f000/pads/sata/lanes/sata-0}>;
+       };
+
+       hda@70030000 {
+               nvidia,model = "jetson-tx1-hda";
+               status = "okay";
+       };
+
        usb@70090000 {
                phys = <&{/padctl@7009f000/pads/usb2/lanes/usb2-0}>,
                       <&{/padctl@7009f000/pads/usb2/lanes/usb2-1}>,
@@ -1325,15 +1349,6 @@
                status = "okay";
        };
 
-       sata@70020000 {
-               status = "okay";
-               phys = <&{/padctl@7009f000/pads/sata/lanes/sata-0}>;
-       };
-
-       hda@70030000 {
-               status = "okay";
-       };
-
        padctl@7009f000 {
                status = "okay";