Commit 83a9660a authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'tegra-for-4.9-arm-dt' of...

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
parents 1f480960 7e9d4749
...@@ -897,7 +897,7 @@ ldo2 { ...@@ -897,7 +897,7 @@ ldo2 {
palmas: tps65913@58 { palmas: tps65913@58 {
compatible = "ti,palmas"; compatible = "ti,palmas";
reg = <0x58>; reg = <0x58>;
interrupts = <0 86 IRQ_TYPE_LEVEL_LOW>; interrupts = <0 86 IRQ_TYPE_LEVEL_HIGH>;
#interrupt-cells = <2>; #interrupt-cells = <2>;
interrupt-controller; interrupt-controller;
......
...@@ -802,7 +802,7 @@ regulator@43 { ...@@ -802,7 +802,7 @@ regulator@43 {
palmas: pmic@58 { palmas: pmic@58 {
compatible = "ti,palmas"; compatible = "ti,palmas";
reg = <0x58>; reg = <0x58>;
interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_LOW>; interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
#interrupt-cells = <2>; #interrupt-cells = <2>;
interrupt-controller; interrupt-controller;
......
...@@ -63,7 +63,7 @@ i2c@7000d000 { ...@@ -63,7 +63,7 @@ i2c@7000d000 {
palmas: pmic@58 { palmas: pmic@58 {
compatible = "ti,palmas"; compatible = "ti,palmas";
reg = <0x58>; reg = <0x58>;
interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_LOW>; interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
#interrupt-cells = <2>; #interrupt-cells = <2>;
interrupt-controller; interrupt-controller;
......
...@@ -672,7 +672,7 @@ sdhci@78000600 { ...@@ -672,7 +672,7 @@ sdhci@78000600 {
}; };
usb@7d000000 { usb@7d000000 {
compatible = "nvidia,tegra30-ehci", "usb-ehci"; compatible = "nvidia,tegra114-ehci", "nvidia,tegra30-ehci", "usb-ehci";
reg = <0x7d000000 0x4000>; reg = <0x7d000000 0x4000>;
interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
phy_type = "utmi"; phy_type = "utmi";
...@@ -684,7 +684,7 @@ usb@7d000000 { ...@@ -684,7 +684,7 @@ usb@7d000000 {
}; };
phy1: usb-phy@7d000000 { phy1: usb-phy@7d000000 {
compatible = "nvidia,tegra30-usb-phy"; compatible = "nvidia,tegra114-usb-phy", "nvidia,tegra30-usb-phy";
reg = <0x7d000000 0x4000 0x7d000000 0x4000>; reg = <0x7d000000 0x4000 0x7d000000 0x4000>;
phy_type = "utmi"; phy_type = "utmi";
clocks = <&tegra_car TEGRA114_CLK_USBD>, clocks = <&tegra_car TEGRA114_CLK_USBD>,
...@@ -708,7 +708,7 @@ phy1: usb-phy@7d000000 { ...@@ -708,7 +708,7 @@ phy1: usb-phy@7d000000 {
}; };
usb@7d008000 { usb@7d008000 {
compatible = "nvidia,tegra30-ehci", "usb-ehci"; compatible = "nvidia,tegra114-ehci", "nvidia,tegra30-ehci", "usb-ehci";
reg = <0x7d008000 0x4000>; reg = <0x7d008000 0x4000>;
interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
phy_type = "utmi"; phy_type = "utmi";
...@@ -720,7 +720,7 @@ usb@7d008000 { ...@@ -720,7 +720,7 @@ usb@7d008000 {
}; };
phy3: usb-phy@7d008000 { phy3: usb-phy@7d008000 {
compatible = "nvidia,tegra30-usb-phy"; compatible = "nvidia,tegra114-usb-phy", "nvidia,tegra30-usb-phy";
reg = <0x7d008000 0x4000 0x7d000000 0x4000>; reg = <0x7d008000 0x4000 0x7d000000 0x4000>;
phy_type = "utmi"; phy_type = "utmi";
clocks = <&tegra_car TEGRA114_CLK_USB3>, clocks = <&tegra_car TEGRA114_CLK_USB3>,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment