Merge https://gitlab.denx.de/u-boot/custodians/u-boot-i2c

[oweals/u-boot.git] / arch / arm / dts / tegra20.dtsi

diff --git a/arch/arm/dts/tegra20.dtsi b/arch/arm/dts/tegra20.dtsi
index 5b14be4fc54d7113286108e0a87898da29828dbc..275b3432bd88f111672a3f5161def625a6e686bf 100644 (file)
--- a/arch/arm/dts/tegra20.dtsi
+++ b/arch/arm/dts/tegra20.dtsi
@@ -145,7 +145,7 @@
                interrupt-parent = <&intc>;
                reg = <0x50040600 0x20>;
                interrupts = <GIC_PPI 13
-                       (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;
+                       (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_EDGE_RISING)>;
                clocks = <&tegra_car TEGRA20_CLK_TWD>;
        };
 
@@ -309,7 +309,7 @@
         * driver and APB DMA based serial driver for higher baudrate
         * and performace. To enable the 8250 based driver, the compatible
         * is "nvidia,tegra20-uart" and to enable the APB DMA based serial
-        * driver, the comptible is "nvidia,tegra20-hsuart".
+        * driver, the compatible is "nvidia,tegra20-hsuart".
         */
        uarta: serial@70006000 {
                compatible = "nvidia,tegra20-uart";
@@ -580,7 +580,7 @@
                reset-names = "fuse";
        };
 
-       pcie-controller@80003000 {
+       pcie@80003000 {
                compatible = "nvidia,tegra20-pcie";
                device_type = "pci";
                reg = <0x80003000 0x00000800   /* PADS registers */