Merge branch 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[linux-2.6-microblaze.git] / arch / arm / boot / dts / tegra124-venice2.dts

diff --git a/arch/arm/boot/dts/tegra124-venice2.dts b/arch/arm/boot/dts/tegra124-venice2.dts
index 32d9079..89bcc17 100644 (file)
--- a/arch/arm/boot/dts/tegra124-venice2.dts
+++ b/arch/arm/boot/dts/tegra124-venice2.dts
@@ -613,7 +613,7 @@
                        compatible = "maxim,max98090";
                        reg = <0x10>;
                        interrupt-parent = <&gpio>;
-                       interrupts = <TEGRA_GPIO(H, 4) GPIO_ACTIVE_HIGH>;
+                       interrupts = <TEGRA_GPIO(H, 4) IRQ_TYPE_EDGE_FALLING>;
                };
        };
 
@@ -859,7 +859,7 @@
                                        reg = <0x9>;
                                        interrupt-parent = <&gpio>;
                                        interrupts = <TEGRA_GPIO(J, 0)
-                                                       GPIO_ACTIVE_HIGH>;
+                                                       IRQ_TYPE_EDGE_BOTH>;
                                        ti,ac-detect-gpios = <&gpio
                                                        TEGRA_GPIO(J, 0)
                                                        GPIO_ACTIVE_HIGH>;
@@ -956,11 +956,6 @@
                                                nvidia,function = "usb3-ss";
                                                status = "okay";
                                        };
-
-                                       pcie-1 {
-                                               nvidia,function = "usb3-ss";
-                                               status = "okay";
-                                       };
                                };
                        };
                };