diff options
author | Tom Rini <trini@ti.com> | 2014-06-20 20:03:51 -0400 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-06-20 20:03:51 -0400 |
commit | 39b6d07fd7e692736cdb05a000b1c84ab43de4fb (patch) | |
tree | 72b3530f77de13dab378b5be9789edd952bc9e03 /arch/arm/dts/tegra114.dtsi | |
parent | 45f0ad9545578b4436fdf04ba25a10173bcb75ef (diff) | |
parent | 22ec136325fdfc805b1e48e5ac8e17f23b4e9fc6 (diff) | |
download | blackbird-obmc-uboot-39b6d07fd7e692736cdb05a000b1c84ab43de4fb.tar.gz blackbird-obmc-uboot-39b6d07fd7e692736cdb05a000b1c84ab43de4fb.zip |
Merge branch 'master' of git://git.denx.de/u-boot-dm
Diffstat (limited to 'arch/arm/dts/tegra114.dtsi')
-rw-r--r-- | arch/arm/dts/tegra114.dtsi | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/arch/arm/dts/tegra114.dtsi b/arch/arm/dts/tegra114.dtsi index f52fcf14dd..59434e0a8f 100644 --- a/arch/arm/dts/tegra114.dtsi +++ b/arch/arm/dts/tegra114.dtsi @@ -1,3 +1,6 @@ +#include <dt-bindings/gpio/tegra-gpio.h> +#include <dt-bindings/interrupt-controller/arm-gic.h> + #include "skeleton.dtsi" / { @@ -46,17 +49,17 @@ 0 143 0x04>; }; - gpio: gpio { + gpio: gpio@6000d000 { compatible = "nvidia,tegra114-gpio", "nvidia,tegra30-gpio"; reg = <0x6000d000 0x1000>; - interrupts = <0 32 0x04 - 0 33 0x04 - 0 34 0x04 - 0 35 0x04 - 0 55 0x04 - 0 87 0x04 - 0 89 0x04 - 0 125 0x04>; + interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>; #gpio-cells = <2>; gpio-controller; #interrupt-cells = <2>; |