Merge tag 'tegra-for-4.9-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt

Pull "ARM: tegra: Device tree changes for v4.9-rc1" from Thierry Reding:

Contains a couple of cleanups for Tegra114 device trees.

* tag 'tegra-for-4.9-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: Correct polarity for Tegra114 PMIC interrupt
  ARM: tegra: Fix Tegra114 USB compatible values

4 files changed, 7 insertions, 7 deletions

diff --git a/arch/arm/boot/dts/tegra114-dalmore.dts b/arch/arm/boot/dts/tegra114-dalmore.dts
index 1dfc492cc004..1444fbd543e7 100644
--- a/arch/arm/boot/dts/tegra114-dalmore.dts
+++ b/arch/arm/boot/dts/tegra114-dalmore.dts
@@ -897,7 +897,7 @@
                 palmas: tps65913@58 {
                         compatible = "ti,palmas";
                         reg = <0x58>;
-                        interrupts = <0 86 IRQ_TYPE_LEVEL_LOW>;
+                        interrupts = <0 86 IRQ_TYPE_LEVEL_HIGH>;
 
                         #interrupt-cells = <2>;
                         interrupt-controller;
diff --git a/arch/arm/boot/dts/tegra114-roth.dts b/arch/arm/boot/dts/tegra114-roth.dts
index 70cf40996c3f..966a7fc044af 100644
--- a/arch/arm/boot/dts/tegra114-roth.dts
+++ b/arch/arm/boot/dts/tegra114-roth.dts
@@ -802,7 +802,7 @@
                 palmas: pmic@58 {
                         compatible = "ti,palmas";
                         reg = <0x58>;
-                        interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_LOW>;
+                        interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
 
                         #interrupt-cells = <2>;
                         interrupt-controller;
diff --git a/arch/arm/boot/dts/tegra114-tn7.dts b/arch/arm/boot/dts/tegra114-tn7.dts
index 17dd14545862..a161fa1dfb61 100644
--- a/arch/arm/boot/dts/tegra114-tn7.dts
+++ b/arch/arm/boot/dts/tegra114-tn7.dts
@@ -63,7 +63,7 @@
                 palmas: pmic@58 {
                         compatible = "ti,palmas";
                         reg = <0x58>;
-                        interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_LOW>;
+                        interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
 
                         #interrupt-cells = <2>;
                         interrupt-controller;
diff --git a/arch/arm/boot/dts/tegra114.dtsi b/arch/arm/boot/dts/tegra114.dtsi
index cb9393a53422..8932ea3afd5f 100644
--- a/arch/arm/boot/dts/tegra114.dtsi
+++ b/arch/arm/boot/dts/tegra114.dtsi
@@ -672,7 +672,7 @@
         };
 
         usb@7d000000 {
-                compatible = "nvidia,tegra30-ehci", "usb-ehci";
+                compatible = "nvidia,tegra114-ehci", "nvidia,tegra30-ehci", "usb-ehci";
                 reg = <0x7d000000 0x4000>;
                 interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
                 phy_type = "utmi";
@@ -684,7 +684,7 @@
         };
 
         phy1: usb-phy@7d000000 {
-                compatible = "nvidia,tegra30-usb-phy";
+                compatible = "nvidia,tegra114-usb-phy", "nvidia,tegra30-usb-phy";
                 reg = <0x7d000000 0x4000 0x7d000000 0x4000>;
                 phy_type = "utmi";
                 clocks = <&tegra_car TEGRA114_CLK_USBD>,
@@ -708,7 +708,7 @@
         };
 
         usb@7d008000 {
-                compatible = "nvidia,tegra30-ehci", "usb-ehci";
+                compatible = "nvidia,tegra114-ehci", "nvidia,tegra30-ehci", "usb-ehci";
                 reg = <0x7d008000 0x4000>;
                 interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
                 phy_type = "utmi";
@@ -720,7 +720,7 @@
         };
 
         phy3: usb-phy@7d008000 {
-                compatible = "nvidia,tegra30-usb-phy";
+                compatible = "nvidia,tegra114-usb-phy", "nvidia,tegra30-usb-phy";
                 reg = <0x7d008000 0x4000 0x7d000000 0x4000>;
                 phy_type = "utmi";
                 clocks = <&tegra_car TEGRA114_CLK_USB3>,