Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

451ce7f9 · Linus Torvalds <[email protected]> · 2012-07-23 16:04:15 -07:00

Pull general arm-soc cleanups from Arnd Bergmann:
 "These are all boring changes, moving stuff around or renaming things
  mostly, and also getting rid of stuff that is duplicate or should not
  be there to start with.  Platform-wise this is all over the place,
  mainly omap, samsung, at91, imx and tegra."

Resolve trivial conflict in arch/arm/mach-omap2/clockdomains3xxx_data.c

* tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (67 commits)
  ARM: clps711x: Remove the setting of the time
  ARM: clps711x: Removed superfluous transform virt_to_bus and related functions
  ARM: clps711x/p720t: Replace __initcall by .init_early call
  ARM: S3C24XX: Remove unused GPIO definitions for Openmoko GTA02 board
  ARM: S3C24XX: Remove unused GPIO definitions for port J
  ARM: S3C24XX: Remove unused GPA, GPE, GPH bank GPIO aliases
  ARM: S3C24XX: Convert the touchscreen setup code to common GPIO API
  ARM: S3C24XX: Convert the PM code to gpiolib API
  ARM: S3C24XX: Convert QT2410 board file to the gpiolib API
  ARM: S3C24XX: Convert SMDK board file to the gpiolib API
  ARM: S3C24XX: Free the backlight gpio requested in Mini2440 board code
  ARM: imx: remove unused pdata from device macros
  ARM: imx: Kconfig: Remove IMX_HAVE_PLATFORM_IMX_SSI from MACH_MX25_3DS
  ARM: at91: fix new build errors
  ARM: at91: add AIC5 support
  ARM: at91: remove mach/irqs.h
  ARM: at91: sparse irq support
  ARM: at91: at91 based machines specify their own irq handler at run time
  ARM: at91: remove static irq priorities for sam9x5
  ARM: at91: add of irq priorities support
  ...

Commit: 451ce7f9cf2d17e34d5d64b76cac047a2a1a3b89
Parents: b85c14fb · 1a33a4eb

Merge commit. Changes below are compared with the first parent: b85c14fb.

Changes

227 files changed · +1793 −2504

File	Status	Add	Del	Content
Documentation/devicetree/bindings/arm/atmel-aic.txt	modified	+6	−3	View file
Documentation/devicetree/bindings/arm/tegra/emc.txt → Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-emc.txt	renamed	+1	−1	View file
Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-mc.txt	modified	+1	−1	View file
Documentation/devicetree/bindings/arm/tegra/nvidia,tegra30-mc.txt	modified	+1	−1	View file
Documentation/devicetree/bindings/gpio/gpio_nvidia.txt → Documentation/devicetree/bindings/gpio/nvidia,tegra20-gpio.txt	renamed	+0	−0	View file
Documentation/devicetree/bindings/input/tegra-kbc.txt → Documentation/devicetree/bindings/input/nvidia,tegra20-kbc.txt	renamed	+0	−0	View file
Documentation/devicetree/bindings/mmc/nvidia-sdhci.txt → Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.txt	renamed	+0	−0	View file
Documentation/devicetree/bindings/nvec/nvec_nvidia.txt → Documentation/devicetree/bindings/nvec/nvidia,nvec.txt	renamed	+0	−0	View file
Documentation/devicetree/bindings/sound/tegra-audio-alc5632.txt → Documentation/devicetree/bindings/sound/nvidia,tegra-audio-alc5632.txt	renamed	+0	−0	View file
Documentation/devicetree/bindings/sound/tegra-audio-trimslice.txt → Documentation/devicetree/bindings/sound/nvidia,tegra-audio-trimslice.txt	renamed	+0	−0	View file
Documentation/devicetree/bindings/sound/tegra-audio-wm8753.txt → Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8753.txt	renamed	+0	−0	View file
Documentation/devicetree/bindings/sound/tegra-audio-wm8903.txt → Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8903.txt	renamed	+0	−0	View file
Documentation/devicetree/bindings/sound/tegra20-das.txt → Documentation/devicetree/bindings/sound/nvidia,tegra20-das.txt	renamed	+0	−0	View file
Documentation/devicetree/bindings/sound/tegra20-i2s.txt → Documentation/devicetree/bindings/sound/nvidia,tegra20-i2s.txt	renamed	+0	−0	View file
Documentation/devicetree/bindings/spi/spi_nvidia.txt → Documentation/devicetree/bindings/spi/nvidia,tegra20-spi.txt	renamed	+0	−0	View file
Documentation/devicetree/bindings/usb/tegra-usb.txt → Documentation/devicetree/bindings/usb/nvidia,tegra20-ehci.txt	renamed	+0	−0	View file
arch/arm/boot/dts/at91sam9260.dtsi	modified	+19	−18	View file
arch/arm/boot/dts/at91sam9263.dtsi	modified	+16	−15	View file
arch/arm/boot/dts/at91sam9g45.dtsi	modified	+20	−19	View file
arch/arm/boot/dts/at91sam9n12.dtsi	modified	+15	−15	View file
arch/arm/boot/dts/at91sam9x5.dtsi	modified	+20	−19	View file
arch/arm/boot/dts/tegra-harmony.dts → arch/arm/boot/dts/tegra20-harmony.dts	renamed	+0	−1	View file
arch/arm/boot/dts/tegra-paz00.dts → arch/arm/boot/dts/tegra20-paz00.dts	renamed	+0	−1	View file
arch/arm/boot/dts/tegra-seaboard.dts → arch/arm/boot/dts/tegra20-seaboard.dts	renamed	+1	−2	View file
arch/arm/boot/dts/tegra-trimslice.dts → arch/arm/boot/dts/tegra20-trimslice.dts	renamed	+0	−0	View file
arch/arm/boot/dts/tegra-ventana.dts → arch/arm/boot/dts/tegra20-ventana.dts	renamed	+0	−1	View file
arch/arm/boot/dts/tegra20.dtsi	modified	+20	−20	View file
arch/arm/boot/dts/tegra-cardhu.dts → arch/arm/boot/dts/tegra30-cardhu.dts	renamed	+0	−1	View file
arch/arm/boot/dts/tegra30.dtsi	modified	+20	−20	View file
arch/arm/kernel/irq.c	modified	+0	−10	View file
arch/arm/mach-at91/Kconfig	modified	+6	−0	View file
arch/arm/mach-at91/at91rm9200.c	modified	+1	−0	View file
arch/arm/mach-at91/at91rm9200_devices.c	modified	+42	−42	View file
arch/arm/mach-at91/at91sam9260.c	modified	+1	−0	View file
arch/arm/mach-at91/at91sam9260_devices.c	modified	+46	−46	View file
arch/arm/mach-at91/at91sam9261.c	modified	+1	−0	View file
arch/arm/mach-at91/at91sam9261_devices.c	modified	+34	−34	View file
arch/arm/mach-at91/at91sam9263.c	modified	+1	−0	View file
arch/arm/mach-at91/at91sam9263_devices.c	modified	+40	−40	View file
arch/arm/mach-at91/at91sam926x_time.c	modified	+1	−1	View file
arch/arm/mach-at91/at91sam9g45.c	modified	+1	−0	View file
arch/arm/mach-at91/at91sam9g45_devices.c	modified	+54	−54	View file
arch/arm/mach-at91/at91sam9rl.c	modified	+1	−0	View file
arch/arm/mach-at91/at91sam9rl_devices.c	modified	+38	−38	View file
arch/arm/mach-at91/at91sam9x5.c	modified	+0	−40	View file
arch/arm/mach-at91/at91x40.c	modified	+2	−0	View file
arch/arm/mach-at91/board-1arm.c	modified	+2	−0	View file
arch/arm/mach-at91/board-afeb-9260v1.c	modified	+2	−0	View file
arch/arm/mach-at91/board-cam60.c	modified	+2	−0	View file
arch/arm/mach-at91/board-carmeva.c	modified	+2	−0	View file
arch/arm/mach-at91/board-cpu9krea.c	modified	+2	−0	View file
arch/arm/mach-at91/board-cpuat91.c	modified	+2	−0	View file
arch/arm/mach-at91/board-csb337.c	modified	+2	−0	View file
arch/arm/mach-at91/board-csb637.c	modified	+2	−0	View file
arch/arm/mach-at91/board-dt.c	modified	+2	−0	View file
arch/arm/mach-at91/board-eb01.c	modified	+2	−0	View file
arch/arm/mach-at91/board-eb9200.c	modified	+2	−0	View file
arch/arm/mach-at91/board-ecbat91.c	modified	+2	−0	View file
arch/arm/mach-at91/board-eco920.c	modified	+2	−0	View file
arch/arm/mach-at91/board-flexibity.c	modified	+2	−0	View file
arch/arm/mach-at91/board-foxg20.c	modified	+2	−0	View file
arch/arm/mach-at91/board-gsia18s.c	modified	+2	−0	View file
arch/arm/mach-at91/board-kafa.c	modified	+2	−0	View file
arch/arm/mach-at91/board-kb9202.c	modified	+2	−0	View file
arch/arm/mach-at91/board-neocore926.c	modified	+2	−0	View file
arch/arm/mach-at91/board-pcontrol-g20.c	modified	+2	−0	View file
arch/arm/mach-at91/board-picotux200.c	modified	+2	−0	View file
arch/arm/mach-at91/board-qil-a9260.c	modified	+2	−0	View file
arch/arm/mach-at91/board-rm9200dk.c	modified	+2	−0	View file
arch/arm/mach-at91/board-rm9200ek.c	modified	+2	−0	View file
arch/arm/mach-at91/board-rsi-ews.c	modified	+2	−0	View file
arch/arm/mach-at91/board-sam9-l9260.c	modified	+2	−0	View file
arch/arm/mach-at91/board-sam9260ek.c	modified	+2	−0	View file
arch/arm/mach-at91/board-sam9261ek.c	modified	+2	−0	View file
arch/arm/mach-at91/board-sam9263ek.c	modified	+2	−0	View file
arch/arm/mach-at91/board-sam9g20ek.c	modified	+3	−0	View file
arch/arm/mach-at91/board-sam9m10g45ek.c	modified	+2	−0	View file
arch/arm/mach-at91/board-sam9rlek.c	modified	+2	−0	View file
arch/arm/mach-at91/board-snapper9260.c	modified	+2	−0	View file
arch/arm/mach-at91/board-stamp9g20.c	modified	+3	−0	View file
arch/arm/mach-at91/board-usb-a926x.c	modified	+4	−0	View file
arch/arm/mach-at91/board-yl-9200.c	modified	+2	−0	View file
arch/arm/mach-at91/generic.h	modified	+2	−0	View file
arch/arm/mach-at91/gpio.c	modified	+5	−4	View file
arch/arm/mach-at91/include/mach/at91_aic.h	modified	+35	−1	View file
arch/arm/mach-at91/include/mach/at91_spi.h	deleted	+0	−81	View before deletion
arch/arm/mach-at91/include/mach/at91_ssc.h	deleted	+0	−106	View before deletion
arch/arm/mach-at91/include/mach/entry-macro.S	deleted	+0	−27	View before deletion
arch/arm/mach-at91/include/mach/irqs.h	deleted	+0	−48	View before deletion
arch/arm/mach-at91/irq.c	modified	+357	−57	View file
arch/arm/mach-at91/pm.c	modified	+1	−0	View file
arch/arm/mach-clps711x/common.c	modified	+0	−6	View file
arch/arm/mach-clps711x/include/mach/memory.h	modified	+0	−37	View file
arch/arm/mach-clps711x/p720t.c	modified	+15	−19	View file
arch/arm/mach-davinci/include/mach/dm365.h	deleted	+0	−1	View before deletion
arch/arm/mach-davinci/include/mach/dm646x.h	deleted	+0	−1	View before deletion
arch/arm/mach-exynos/common.c	modified	+0	−25	View file
arch/arm/mach-exynos/include/mach/spi-clocks.h	deleted	+0	−16	View before deletion
arch/arm/mach-exynos/mach-nuri.c	modified	+0	−1	View file
arch/arm/mach-exynos/mach-origen.c	modified	+0	−1	View file
arch/arm/mach-exynos/mach-smdkv310.c	modified	+0	−1	View file
arch/arm/mach-exynos/mach-universal_c210.c	modified	+0	−1	View file
arch/arm/mach-imx/Kconfig	modified	+0	−1	View file
arch/arm/mach-imx/clk-imx6q.c	modified	+0	−3	View file
arch/arm/mach-imx/devices-imx21.h	modified	+2	−2	View file
arch/arm/mach-imx/devices-imx25.h	modified	+2	−2	View file
arch/arm/mach-imx/devices-imx27.h	modified	+3	−3	View file
arch/arm/mach-imx/devices-imx31.h	modified	+3	−3	View file
arch/arm/mach-imx/devices-imx35.h	modified	+2	−2	View file
arch/arm/mach-imx/devices-imx51.h	modified	+1	−1	View file
arch/arm/mach-imx/devices-imx53.h	modified	+1	−1	View file
arch/arm/mach-imx/imx27-dt.c	modified	+1	−1	View file
arch/arm/mach-imx/mach-cpuimx27.c	modified	+6	−6	View file
arch/arm/mach-imx/mach-cpuimx35.c	modified	+5	−5	View file
arch/arm/mach-imx/mach-cpuimx51sd.c	modified	+5	−5	View file
arch/arm/mach-imx/mach-eukrea_cpuimx25.c	modified	+6	−6	View file
arch/arm/mach-imx/mach-imx27ipcam.c	modified	+1	−1	View file
arch/arm/mach-imx/mach-mx25_3ds.c	modified	+2	−2	View file
arch/arm/mach-imx/mach-mx27_3ds.c	modified	+5	−5	View file
arch/arm/mach-imx/mach-mx27ads.c	modified	+1	−1	View file
arch/arm/mach-imx/mach-mx31_3ds.c	modified	+5	−5	View file
arch/arm/mach-imx/mach-mx31moboard.c	modified	+1	−1	View file
arch/arm/mach-imx/mach-mx35_3ds.c	modified	+5	−5	View file
arch/arm/mach-imx/mach-mx51_3ds.c	modified	+1	−1	View file
arch/arm/mach-imx/mach-mx51_babbage.c	modified	+5	−5	View file
arch/arm/mach-imx/mach-mx53_ard.c	modified	+1	−1	View file
arch/arm/mach-imx/mach-mx53_evk.c	modified	+1	−1	View file
arch/arm/mach-imx/mach-mx53_loco.c	modified	+1	−1	View file
arch/arm/mach-imx/mach-mx53_smd.c	modified	+1	−1	View file
arch/arm/mach-imx/mach-pca100.c	modified	+6	−6	View file
arch/arm/mach-imx/mach-pcm037.c	modified	+6	−6	View file
arch/arm/mach-imx/mach-pcm038.c	modified	+2	−2	View file
arch/arm/mach-imx/mach-pcm043.c	modified	+5	−5	View file
arch/arm/mach-imx/mach-qong.c	modified	+1	−1	View file
arch/arm/mach-imx/mach-vpr200.c	modified	+1	−1	View file
arch/arm/mach-imx/mx31lite-db.c	modified	+2	−2	View file
arch/arm/mach-omap1/board-ams-delta.c	modified	+1	−1	View file
arch/arm/mach-omap1/board-generic.c	modified	+3	−1	View file
arch/arm/mach-omap1/board-h2.c	modified	+1	−1	View file
arch/arm/mach-omap1/board-h3.c	modified	+1	−1	View file
arch/arm/mach-omap1/board-htcherald.c	modified	+1	−1	View file
arch/arm/mach-omap1/board-innovator.c	modified	+1	−1	View file
arch/arm/mach-omap1/board-nokia770.c	modified	+1	−1	View file
arch/arm/mach-omap1/board-osk.c	modified	+1	−1	View file
arch/arm/mach-omap1/board-palmte.c	modified	+1	−1	View file
arch/arm/mach-omap1/board-palmtt.c	modified	+1	−1	View file
arch/arm/mach-omap1/board-palmz71.c	modified	+1	−1	View file
arch/arm/mach-omap1/board-sx1.c	modified	+1	−1	View file
arch/arm/mach-omap1/board-voiceblue.c	modified	+2	−1	View file
arch/arm/mach-omap1/clock_data.c	modified	+2	−1	View file
arch/arm/mach-omap1/include/mach/usb.h	added	+165	−0	View file
arch/arm/mach-omap1/usb.c	modified	+115	−1	View file
arch/arm/mach-omap2/Kconfig	modified	+0	−3	View file
arch/arm/mach-omap2/Makefile	modified	+0	−4	View file
arch/arm/mach-omap2/board-2430sdp.c	modified	+0	−11	View file
arch/arm/mach-omap2/board-apollon.c	modified	+0	−18	View file
arch/arm/mach-omap2/board-h4.c	modified	+0	−13	View file
arch/arm/mach-omap2/clock2420_data.c	modified	+0	−4	View file
arch/arm/mach-omap2/clock2430_data.c	modified	+0	−10	View file
arch/arm/mach-omap2/clock3xxx_data.c	modified	+0	−10	View file
arch/arm/mach-omap2/clockdomain.h	modified	+0	−2	View file
arch/arm/mach-omap2/clockdomains2420_data.c	modified	+0	−2	View file
arch/arm/mach-omap2/clockdomains2430_data.c	modified	+0	−2	View file
arch/arm/mach-omap2/clockdomains3xxx_data.c	modified	+0	−2	View file
arch/arm/mach-omap2/clockdomains44xx_data.c	modified	+0	−2	View file
arch/arm/mach-omap2/clockdomains_common_data.c	deleted	+0	−24	View before deletion
arch/arm/mach-omap2/control.c	modified	+43	−0	View file
arch/arm/mach-omap2/control.h	modified	+2	−0	View file
arch/arm/mach-omap2/dsp.c	modified	+4	−0	View file
arch/arm/mach-omap2/include/mach/ctrl_module_core_44xx.h	modified	+1	−0	View file
arch/arm/mach-omap2/omap_hwmod.c	modified	+304	−123	View file
arch/arm/mach-omap2/omap_hwmod_2420_data.c	modified	+10	−0	View file
arch/arm/mach-omap2/omap_hwmod_2430_data.c	modified	+16	−0	View file
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c	modified	+23	−0	View file
arch/arm/mach-omap2/omap_hwmod_44xx_data.c	modified	+1	−3	View file
arch/arm/mach-omap2/usb-fs.c	deleted	+0	−359	View before deletion
arch/arm/mach-s3c24xx/common-smdk.c	modified	+11	−9	View file
arch/arm/mach-s3c24xx/common.c	modified	+0	−1	View file
arch/arm/mach-s3c24xx/include/mach/bast-pmu.h	deleted	+0	−40	View before deletion
arch/arm/mach-s3c24xx/include/mach/gpio-nrs.h	modified	+0	−21	View file
arch/arm/mach-s3c24xx/include/mach/gta02.h	modified	+0	−69	View file
arch/arm/mach-s3c24xx/include/mach/regs-gpio.h	modified	+15	−2	View file
arch/arm/mach-s3c24xx/include/mach/regs-gpioj.h	deleted	+0	−70	View before deletion
arch/arm/mach-s3c24xx/mach-gta02.c	modified	+0	−1	View file
arch/arm/mach-s3c24xx/mach-mini2440.c	modified	+2	−2	View file
arch/arm/mach-s3c24xx/mach-qt2410.c	modified	+3	−3	View file
arch/arm/mach-s3c24xx/mach-rx1950.c	modified	+0	−1	View file
arch/arm/mach-s3c24xx/pm-s3c2410.c	modified	+8	−4	View file
arch/arm/mach-s3c24xx/pm-s3c2412.c	modified	+0	−1	View file
arch/arm/mach-s3c24xx/s3c2412.c	modified	+0	−1	View file
arch/arm/mach-s3c24xx/s3c244x.c	modified	+0	−1	View file
arch/arm/mach-s3c24xx/setup-ts.c	modified	+1	−5	View file
arch/arm/mach-s3c64xx/include/mach/spi-clocks.h	deleted	+0	−18	View before deletion
arch/arm/mach-s5p64x0/dma.c	modified	+0	−2	View file
arch/arm/mach-s5p64x0/include/mach/spi-clocks.h	deleted	+0	−20	View before deletion
arch/arm/mach-s5pc100/dma.c	modified	+0	−2	View file
arch/arm/mach-s5pc100/include/mach/spi-clocks.h	deleted	+0	−18	View before deletion
arch/arm/mach-s5pv210/include/mach/spi-clocks.h	deleted	+0	−17	View before deletion
arch/arm/mach-tegra/Kconfig	modified	+0	−3	View file
arch/arm/mach-tegra/Makefile	modified	+1	−1	View file
arch/arm/mach-tegra/Makefile.boot	modified	+6	−6	View file
arch/arm/mach-tegra/cpuidle.c	modified	+3	−3	View file
arch/arm/mach-tegra/sleep.S	modified	+0	−29	View file
arch/arm/plat-omap/Makefile	modified	+1	−1	View file
arch/arm/plat-omap/dma.c	modified	+28	−31	View file
arch/arm/plat-omap/include/plat/board.h	modified	+0	−38	View file
arch/arm/plat-omap/include/plat/clock.h	modified	+0	−2	View file
arch/arm/plat-omap/include/plat/dsp.h	modified	+3	−0	View file
arch/arm/plat-omap/include/plat/omap_hwmod.h	modified	+2	−0	View file
arch/arm/plat-omap/include/plat/usb.h	modified	+2	−194	View file
arch/arm/plat-omap/usb.c	deleted	+0	−145	View before deletion
arch/arm/plat-samsung/Kconfig	modified	+0	−8	View file
arch/arm/plat-samsung/Makefile	modified	+0	−4	View file
arch/arm/plat-samsung/include/plat/devs.h	modified	+0	−1	View file
arch/arm/plat-samsung/include/plat/fb.h	modified	+0	−1	View file
arch/arm/plat-samsung/include/plat/pd.h	deleted	+0	−30	View before deletion
arch/arm/plat-samsung/pd.c	deleted	+0	−95	View before deletion
arch/arm/plat-samsung/pwm.c	modified	+0	−4	View file
drivers/amba/tegra-ahb.c	modified	+0	−6	View file
drivers/mmc/host/sdhci-tegra.c	modified	+4	−1	View file
drivers/rtc/rtc-at91rm9200.c	modified	+1	−0	View file
drivers/usb/gadget/Kconfig	modified	+1	−1	View file
drivers/usb/gadget/omap_udc.c	modified	+2	−1	View file
drivers/usb/host/Kconfig	modified	+1	−1	View file
drivers/usb/host/ohci-omap.c	modified	+4	−3	View file
drivers/usb/otg/isp1301_omap.c	modified	+1	−1	View file
sound/soc/tegra/Kconfig	modified	+1	−9	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/devicetree/bindings/arm/atmel-aic.txt

View file

diff --git a/Documentation/devicetree/bindings/arm/atmel-aic.txt b/Documentation/devicetree/bindings/arm/atmel-aic.txt
index aabca4f..19078bf 100644
--- a/Documentation/devicetree/bindings/arm/atmel-aic.txt
+++ b/Documentation/devicetree/bindings/arm/atmel-aic.txt
@@ -4,7 +4,7 @@ Required properties:
 - compatible: Should be "atmel,<chip>-aic"
 - interrupt-controller: Identifies the node as an interrupt controller.
 - interrupt-parent: For single AIC system, it is an empty property.
-- #interrupt-cells: The number of cells to define the interrupts. It sould be 2.
+- #interrupt-cells: The number of cells to define the interrupts. It sould be 3.
   The first cell is the IRQ number (aka "Peripheral IDentifier" on datasheet).
   The second cell is used to specify flags:
     bits[3:0] trigger type and level flags:
@@ -14,7 +14,10 @@ Required properties:
       8 = active low level-sensitive.
       Valid combinations are 1, 2, 3, 4, 8.
       Default flag for internal sources should be set to 4 (active high).
+  The third cell is used to specify the irq priority from 0 (lowest) to 7
+  (highest).
 - reg: Should contain AIC registers location and length
+- atmel,external-irqs: u32 array of external irqs.
 
 Examples:
 	/*
@@ -24,7 +27,7 @@ Examples:
 		compatible = "atmel,at91rm9200-aic";
 		interrupt-controller;
 		interrupt-parent;
-		#interrupt-cells = <2>;
+		#interrupt-cells = <3>;
 		reg = <0xfffff000 0x200>;
 	};
 
@@ -34,5 +37,5 @@ Examples:
 	dma: dma-controller@ffffec00 {
 		compatible = "atmel,at91sam9g45-dma";
 		reg = <0xffffec00 0x200>;
-		interrupts = <21 4>;
+		interrupts = <21 4 5>;
 	};

Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-emc.txt

View file

diff --git a/Documentation/devicetree/bindings/arm/tegra/emc.txt b/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-emc.txt
similarity index 98%
rename from Documentation/devicetree/bindings/arm/tegra/emc.txt
rename to Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-emc.txt
index 09335f8..4c33b29 100644
--- a/Documentation/devicetree/bindings/arm/tegra/emc.txt
+++ b/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-emc.txt
@@ -15,7 +15,7 @@ Child device nodes describe the memory settings for different configurations and
 
 Example:
 
-	emc@7000f400 {
+	memory-controller@7000f400 {
 		#address-cells = < 1 >;
 		#size-cells = < 0 >;
 		compatible = "nvidia,tegra20-emc";

Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-mc.txt

View file

diff --git a/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-mc.txt b/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-mc.txt
index c25a0a5..866d934 100644
--- a/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-mc.txt
+++ b/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-mc.txt
@@ -8,7 +8,7 @@ Required properties:
 - interrupts : Should contain MC General interrupt.
 
 Example:
-	mc {
+	memory-controller@0x7000f000 {
 		compatible = "nvidia,tegra20-mc";
 		reg = <0x7000f000 0x024
 		       0x7000f03c 0x3c4>;

Documentation/devicetree/bindings/arm/tegra/nvidia,tegra30-mc.txt

View file

diff --git a/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra30-mc.txt b/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra30-mc.txt
index e47e73f..bdf1a61 100644
--- a/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra30-mc.txt
+++ b/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra30-mc.txt
@@ -8,7 +8,7 @@ Required properties:
 - interrupts : Should contain MC General interrupt.
 
 Example:
-	mc {
+	memory-controller {
 		compatible = "nvidia,tegra30-mc";
 		reg = <0x7000f000 0x010
 		       0x7000f03c 0x1b4

Documentation/devicetree/bindings/gpio/nvidia,tegra20-gpio.txt

View file

diff --git a/Documentation/devicetree/bindings/gpio/gpio_nvidia.txt b/Documentation/devicetree/bindings/gpio/nvidia,tegra20-gpio.txt
similarity index 100%
rename from Documentation/devicetree/bindings/gpio/gpio_nvidia.txt
rename to Documentation/devicetree/bindings/gpio/nvidia,tegra20-gpio.txt

Documentation/devicetree/bindings/input/nvidia,tegra20-kbc.txt

View file

diff --git a/Documentation/devicetree/bindings/input/tegra-kbc.txt b/Documentation/devicetree/bindings/input/nvidia,tegra20-kbc.txt
similarity index 100%
rename from Documentation/devicetree/bindings/input/tegra-kbc.txt
rename to Documentation/devicetree/bindings/input/nvidia,tegra20-kbc.txt

Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.txt

View file

diff --git a/Documentation/devicetree/bindings/mmc/nvidia-sdhci.txt b/Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.txt
similarity index 100%
rename from Documentation/devicetree/bindings/mmc/nvidia-sdhci.txt
rename to Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.txt

Documentation/devicetree/bindings/nvec/nvidia,nvec.txt

View file

diff --git a/Documentation/devicetree/bindings/nvec/nvec_nvidia.txt b/Documentation/devicetree/bindings/nvec/nvidia,nvec.txt
similarity index 100%
rename from Documentation/devicetree/bindings/nvec/nvec_nvidia.txt
rename to Documentation/devicetree/bindings/nvec/nvidia,nvec.txt

Documentation/devicetree/bindings/sound/nvidia,tegra-audio-alc5632.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/tegra-audio-alc5632.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-alc5632.txt
similarity index 100%
rename from Documentation/devicetree/bindings/sound/tegra-audio-alc5632.txt
rename to Documentation/devicetree/bindings/sound/nvidia,tegra-audio-alc5632.txt

Documentation/devicetree/bindings/sound/nvidia,tegra-audio-trimslice.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/tegra-audio-trimslice.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-trimslice.txt
similarity index 100%
rename from Documentation/devicetree/bindings/sound/tegra-audio-trimslice.txt
rename to Documentation/devicetree/bindings/sound/nvidia,tegra-audio-trimslice.txt

Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8753.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/tegra-audio-wm8753.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8753.txt
similarity index 100%
rename from Documentation/devicetree/bindings/sound/tegra-audio-wm8753.txt
rename to Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8753.txt

Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8903.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/tegra-audio-wm8903.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8903.txt
similarity index 100%
rename from Documentation/devicetree/bindings/sound/tegra-audio-wm8903.txt
rename to Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8903.txt

Documentation/devicetree/bindings/sound/nvidia,tegra20-das.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/tegra20-das.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra20-das.txt
similarity index 100%
rename from Documentation/devicetree/bindings/sound/tegra20-das.txt
rename to Documentation/devicetree/bindings/sound/nvidia,tegra20-das.txt

Documentation/devicetree/bindings/sound/nvidia,tegra20-i2s.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/tegra20-i2s.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra20-i2s.txt
similarity index 100%
rename from Documentation/devicetree/bindings/sound/tegra20-i2s.txt
rename to Documentation/devicetree/bindings/sound/nvidia,tegra20-i2s.txt

Documentation/devicetree/bindings/spi/nvidia,tegra20-spi.txt

View file

diff --git a/Documentation/devicetree/bindings/spi/spi_nvidia.txt b/Documentation/devicetree/bindings/spi/nvidia,tegra20-spi.txt
similarity index 100%
rename from Documentation/devicetree/bindings/spi/spi_nvidia.txt
rename to Documentation/devicetree/bindings/spi/nvidia,tegra20-spi.txt

Documentation/devicetree/bindings/usb/nvidia,tegra20-ehci.txt

View file

diff --git a/Documentation/devicetree/bindings/usb/tegra-usb.txt b/Documentation/devicetree/bindings/usb/nvidia,tegra20-ehci.txt
similarity index 100%
rename from Documentation/devicetree/bindings/usb/tegra-usb.txt
rename to Documentation/devicetree/bindings/usb/nvidia,tegra20-ehci.txt

arch/arm/boot/dts/at91sam9260.dtsi

View file

diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
index f449efc..66389c1 100644
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@ -52,10 +52,11 @@
 			ranges;
 
 			aic: interrupt-controller@fffff000 {
-				#interrupt-cells = <2>;
+				#interrupt-cells = <3>;
 				compatible = "atmel,at91rm9200-aic";
 				interrupt-controller;
 				reg = <0xfffff000 0x200>;
+				atmel,external-irqs = <29 30 31>;
 			};
 
 			ramc0: ramc@ffffea00 {
@@ -81,25 +82,25 @@
 			pit: timer@fffffd30 {
 				compatible = "atmel,at91sam9260-pit";
 				reg = <0xfffffd30 0xf>;
-				interrupts = <1 4>;
+				interrupts = <1 4 7>;
 			};
 
 			tcb0: timer@fffa0000 {
 				compatible = "atmel,at91rm9200-tcb";
 				reg = <0xfffa0000 0x100>;
-				interrupts = <17 4 18 4 19 4>;
+				interrupts = <17 4 0 18 4 0 19 4 0>;
 			};
 
 			tcb1: timer@fffdc000 {
 				compatible = "atmel,at91rm9200-tcb";
 				reg = <0xfffdc000 0x100>;
-				interrupts = <26 4 27 4 28 4>;
+				interrupts = <26 4 0 27 4 0 28 4 0>;
 			};
 
 			pioA: gpio@fffff400 {
 				compatible = "atmel,at91rm9200-gpio";
 				reg = <0xfffff400 0x100>;
-				interrupts = <2 4>;
+				interrupts = <2 4 1>;
 				#gpio-cells = <2>;
 				gpio-controller;
 				interrupt-controller;
@@ -108,7 +109,7 @@
 			pioB: gpio@fffff600 {
 				compatible = "atmel,at91rm9200-gpio";
 				reg = <0xfffff600 0x100>;
-				interrupts = <3 4>;
+				interrupts = <3 4 1>;
 				#gpio-cells = <2>;
 				gpio-controller;
 				interrupt-controller;
@@ -117,7 +118,7 @@
 			pioC: gpio@fffff800 {
 				compatible = "atmel,at91rm9200-gpio";
 				reg = <0xfffff800 0x100>;
-				interrupts = <4 4>;
+				interrupts = <4 4 1>;
 				#gpio-cells = <2>;
 				gpio-controller;
 				interrupt-controller;
@@ -126,14 +127,14 @@
 			dbgu: serial@fffff200 {
 				compatible = "atmel,at91sam9260-usart";
 				reg = <0xfffff200 0x200>;
-				interrupts = <1 4>;
+				interrupts = <1 4 7>;
 				status = "disabled";
 			};
 
 			usart0: serial@fffb0000 {
 				compatible = "atmel,at91sam9260-usart";
 				reg = <0xfffb0000 0x200>;
-				interrupts = <6 4>;
+				interrupts = <6 4 5>;
 				atmel,use-dma-rx;
 				atmel,use-dma-tx;
 				status = "disabled";
@@ -142,7 +143,7 @@
 			usart1: serial@fffb4000 {
 				compatible = "atmel,at91sam9260-usart";
 				reg = <0xfffb4000 0x200>;
-				interrupts = <7 4>;
+				interrupts = <7 4 5>;
 				atmel,use-dma-rx;
 				atmel,use-dma-tx;
 				status = "disabled";
@@ -151,7 +152,7 @@
 			usart2: serial@fffb8000 {
 				compatible = "atmel,at91sam9260-usart";
 				reg = <0xfffb8000 0x200>;
-				interrupts = <8 4>;
+				interrupts = <8 4 5>;
 				atmel,use-dma-rx;
 				atmel,use-dma-tx;
 				status = "disabled";
@@ -160,7 +161,7 @@
 			usart3: serial@fffd0000 {
 				compatible = "atmel,at91sam9260-usart";
 				reg = <0xfffd0000 0x200>;
-				interrupts = <23 4>;
+				interrupts = <23 4 5>;
 				atmel,use-dma-rx;
 				atmel,use-dma-tx;
 				status = "disabled";
@@ -169,7 +170,7 @@
 			usart4: serial@fffd4000 {
 				compatible = "atmel,at91sam9260-usart";
 				reg = <0xfffd4000 0x200>;
-				interrupts = <24 4>;
+				interrupts = <24 4 5>;
 				atmel,use-dma-rx;
 				atmel,use-dma-tx;
 				status = "disabled";
@@ -178,7 +179,7 @@
 			usart5: serial@fffd8000 {
 				compatible = "atmel,at91sam9260-usart";
 				reg = <0xfffd8000 0x200>;
-				interrupts = <25 4>;
+				interrupts = <25 4 5>;
 				atmel,use-dma-rx;
 				atmel,use-dma-tx;
 				status = "disabled";
@@ -187,21 +188,21 @@
 			macb0: ethernet@fffc4000 {
 				compatible = "cdns,at32ap7000-macb", "cdns,macb";
 				reg = <0xfffc4000 0x100>;
-				interrupts = <21 4>;
+				interrupts = <21 4 3>;
 				status = "disabled";
 			};
 
 			usb1: gadget@fffa4000 {
 				compatible = "atmel,at91rm9200-udc";
 				reg = <0xfffa4000 0x4000>;
-				interrupts = <10 4>;
+				interrupts = <10 4 2>;
 				status = "disabled";
 			};
 
 			adc0: adc@fffe0000 {
 				compatible = "atmel,at91sam9260-adc";
 				reg = <0xfffe0000 0x100>;
-				interrupts = <5 4>;
+				interrupts = <5 4 0>;
 				atmel,adc-use-external-triggers;
 				atmel,adc-channels-used = <0xf>;
 				atmel,adc-vref = <3300>;
@@ -253,7 +254,7 @@
 		usb0: ohci@00500000 {
 			compatible = "atmel,at91rm9200-ohci", "usb-ohci";
 			reg = <0x00500000 0x100000>;
-			interrupts = <20 4>;
+			interrupts = <20 4 2>;
 			status = "disabled";
 		};
 	};

arch/arm/boot/dts/at91sam9263.dtsi

View file

diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi
index 0209913..b460d6c 100644
--- a/arch/arm/boot/dts/at91sam9263.dtsi
+++ b/arch/arm/boot/dts/at91sam9263.dtsi
@@ -48,10 +48,11 @@
 			ranges;
 
 			aic: interrupt-controller@fffff000 {
-				#interrupt-cells = <2>;
+				#interrupt-cells = <3>;
 				compatible = "atmel,at91rm9200-aic";
 				interrupt-controller;
 				reg = <0xfffff000 0x200>;
+				atmel,external-irqs = <30 31>;
 			};
 
 			pmc: pmc@fffffc00 {
@@ -68,13 +69,13 @@
 			pit: timer@fffffd30 {
 				compatible = "atmel,at91sam9260-pit";
 				reg = <0xfffffd30 0xf>;
-				interrupts = <1 4>;
+				interrupts = <1 4 7>;
 			};
 
 			tcb0: timer@fff7c000 {
 				compatible = "atmel,at91rm9200-tcb";
 				reg = <0xfff7c000 0x100>;
-				interrupts = <19 4>;
+				interrupts = <19 4 0>;
 			};
 
 			rstc@fffffd00 {
@@ -90,7 +91,7 @@
 			pioA: gpio@fffff200 {
 				compatible = "atmel,at91rm9200-gpio";
 				reg = <0xfffff200 0x100>;
-				interrupts = <2 4>;
+				interrupts = <2 4 1>;
 				#gpio-cells = <2>;
 				gpio-controller;
 				interrupt-controller;
@@ -99,7 +100,7 @@
 			pioB: gpio@fffff400 {
 				compatible = "atmel,at91rm9200-gpio";
 				reg = <0xfffff400 0x100>;
-				interrupts = <3 4>;
+				interrupts = <3 4 1>;
 				#gpio-cells = <2>;
 				gpio-controller;
 				interrupt-controller;
@@ -108,7 +109,7 @@
 			pioC: gpio@fffff600 {
 				compatible = "atmel,at91rm9200-gpio";
 				reg = <0xfffff600 0x100>;
-				interrupts = <4 4>;
+				interrupts = <4 4 1>;
 				#gpio-cells = <2>;
 				gpio-controller;
 				interrupt-controller;
@@ -117,7 +118,7 @@
 			pioD: gpio@fffff800 {
 				compatible = "atmel,at91rm9200-gpio";
 				reg = <0xfffff800 0x100>;
-				interrupts = <4 4>;
+				interrupts = <4 4 1>;
 				#gpio-cells = <2>;
 				gpio-controller;
 				interrupt-controller;
@@ -126,7 +127,7 @@
 			pioE: gpio@fffffa00 {
 				compatible = "atmel,at91rm9200-gpio";
 				reg = <0xfffffa00 0x100>;
-				interrupts = <4 4>;
+				interrupts = <4 4 1>;
 				#gpio-cells = <2>;
 				gpio-controller;
 				interrupt-controller;
@@ -135,14 +136,14 @@
 			dbgu: serial@ffffee00 {
 				compatible = "atmel,at91sam9260-usart";
 				reg = <0xffffee00 0x200>;
-				interrupts = <1 4>;
+				interrupts = <1 4 7>;
 				status = "disabled";
 			};
 
 			usart0: serial@fff8c000 {
 				compatible = "atmel,at91sam9260-usart";
 				reg = <0xfff8c000 0x200>;
-				interrupts = <7 4>;
+				interrupts = <7 4 5>;
 				atmel,use-dma-rx;
 				atmel,use-dma-tx;
 				status = "disabled";
@@ -151,7 +152,7 @@
 			usart1: serial@fff90000 {
 				compatible = "atmel,at91sam9260-usart";
 				reg = <0xfff90000 0x200>;
-				interrupts = <8 4>;
+				interrupts = <8 4 5>;
 				atmel,use-dma-rx;
 				atmel,use-dma-tx;
 				status = "disabled";
@@ -160,7 +161,7 @@
 			usart2: serial@fff94000 {
 				compatible = "atmel,at91sam9260-usart";
 				reg = <0xfff94000 0x200>;
-				interrupts = <9 4>;
+				interrupts = <9 4 5>;
 				atmel,use-dma-rx;
 				atmel,use-dma-tx;
 				status = "disabled";
@@ -169,14 +170,14 @@
 			macb0: ethernet@fffbc000 {
 				compatible = "cdns,at32ap7000-macb", "cdns,macb";
 				reg = <0xfffbc000 0x100>;
-				interrupts = <21 4>;
+				interrupts = <21 4 3>;
 				status = "disabled";
 			};
 
 			usb1: gadget@fff78000 {
 				compatible = "atmel,at91rm9200-udc";
 				reg = <0xfff78000 0x4000>;
-				interrupts = <24 4>;
+				interrupts = <24 4 2>;
 				status = "disabled";
 			};
 		};
@@ -200,7 +201,7 @@
 		usb0: ohci@00a00000 {
 			compatible = "atmel,at91rm9200-ohci", "usb-ohci";
 			reg = <0x00a00000 0x100000>;
-			interrupts = <29 4>;
+			interrupts = <29 4 2>;
 			status = "disabled";
 		};
 	};

arch/arm/boot/dts/at91sam9g45.dtsi

View file

diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
index 7dbccaf..bafa880 100644
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -53,10 +53,11 @@
 			ranges;
 
 			aic: interrupt-controller@fffff000 {
-				#interrupt-cells = <2>;
+				#interrupt-cells = <3>;
 				compatible = "atmel,at91rm9200-aic";
 				interrupt-controller;
 				reg = <0xfffff000 0x200>;
+				atmel,external-irqs = <31>;
 			};
 
 			ramc0: ramc@ffffe400 {
@@ -78,7 +79,7 @@
 			pit: timer@fffffd30 {
 				compatible = "atmel,at91sam9260-pit";
 				reg = <0xfffffd30 0xf>;
-				interrupts = <1 4>;
+				interrupts = <1 4 7>;
 			};
 
 
@@ -90,25 +91,25 @@
 			tcb0: timer@fff7c000 {
 				compatible = "atmel,at91rm9200-tcb";
 				reg = <0xfff7c000 0x100>;
-				interrupts = <18 4>;
+				interrupts = <18 4 0>;
 			};
 
 			tcb1: timer@fffd4000 {
 				compatible = "atmel,at91rm9200-tcb";
 				reg = <0xfffd4000 0x100>;
-				interrupts = <18 4>;
+				interrupts = <18 4 0>;
 			};
 
 			dma: dma-controller@ffffec00 {
 				compatible = "atmel,at91sam9g45-dma";
 				reg = <0xffffec00 0x200>;
-				interrupts = <21 4>;
+				interrupts = <21 4 0>;
 			};
 
 			pioA: gpio@fffff200 {
 				compatible = "atmel,at91rm9200-gpio";
 				reg = <0xfffff200 0x100>;
-				interrupts = <2 4>;
+				interrupts = <2 4 1>;
 				#gpio-cells = <2>;
 				gpio-controller;
 				interrupt-controller;
@@ -117,7 +118,7 @@
 			pioB: gpio@fffff400 {
 				compatible = "atmel,at91rm9200-gpio";
 				reg = <0xfffff400 0x100>;
-				interrupts = <3 4>;
+				interrupts = <3 4 1>;
 				#gpio-cells = <2>;
 				gpio-controller;
 				interrupt-controller;
@@ -126,7 +127,7 @@
 			pioC: gpio@fffff600 {
 				compatible = "atmel,at91rm9200-gpio";
 				reg = <0xfffff600 0x100>;
-				interrupts = <4 4>;
+				interrupts = <4 4 1>;
 				#gpio-cells = <2>;
 				gpio-controller;
 				interrupt-controller;
@@ -135,7 +136,7 @@
 			pioD: gpio@fffff800 {
 				compatible = "atmel,at91rm9200-gpio";
 				reg = <0xfffff800 0x100>;
-				interrupts = <5 4>;
+				interrupts = <5 4 1>;
 				#gpio-cells = <2>;
 				gpio-controller;
 				interrupt-controller;
@@ -144,7 +145,7 @@
 			pioE: gpio@fffffa00 {
 				compatible = "atmel,at91rm9200-gpio";
 				reg = <0xfffffa00 0x100>;
-				interrupts = <5 4>;
+				interrupts = <5 4 1>;
 				#gpio-cells = <2>;
 				gpio-controller;
 				interrupt-controller;
@@ -153,14 +154,14 @@
 			dbgu: serial@ffffee00 {
 				compatible = "atmel,at91sam9260-usart";
 				reg = <0xffffee00 0x200>;
-				interrupts = <1 4>;
+				interrupts = <1 4 7>;
 				status = "disabled";
 			};
 
 			usart0: serial@fff8c000 {
 				compatible = "atmel,at91sam9260-usart";
 				reg = <0xfff8c000 0x200>;
-				interrupts = <7 4>;
+				interrupts = <7 4 5>;
 				atmel,use-dma-rx;
 				atmel,use-dma-tx;
 				status = "disabled";
@@ -169,7 +170,7 @@
 			usart1: serial@fff90000 {
 				compatible = "atmel,at91sam9260-usart";
 				reg = <0xfff90000 0x200>;
-				interrupts = <8 4>;
+				interrupts = <8 4 5>;
 				atmel,use-dma-rx;
 				atmel,use-dma-tx;
 				status = "disabled";
@@ -178,7 +179,7 @@
 			usart2: serial@fff94000 {
 				compatible = "atmel,at91sam9260-usart";
 				reg = <0xfff94000 0x200>;
-				interrupts = <9 4>;
+				interrupts = <9 4 5>;
 				atmel,use-dma-rx;
 				atmel,use-dma-tx;
 				status = "disabled";
@@ -187,7 +188,7 @@
 			usart3: serial@fff98000 {
 				compatible = "atmel,at91sam9260-usart";
 				reg = <0xfff98000 0x200>;
-				interrupts = <10 4>;
+				interrupts = <10 4 5>;
 				atmel,use-dma-rx;
 				atmel,use-dma-tx;
 				status = "disabled";
@@ -196,14 +197,14 @@
 			macb0: ethernet@fffbc000 {
 				compatible = "cdns,at32ap7000-macb", "cdns,macb";
 				reg = <0xfffbc000 0x100>;
-				interrupts = <25 4>;
+				interrupts = <25 4 3>;
 				status = "disabled";
 			};
 
 			adc0: adc@fffb0000 {
 				compatible = "atmel,at91sam9260-adc";
 				reg = <0xfffb0000 0x100>;
-				interrupts = <20 4>;
+				interrupts = <20 4 0>;
 				atmel,adc-use-external-triggers;
 				atmel,adc-channels-used = <0xff>;
 				atmel,adc-vref = <3300>;
@@ -257,14 +258,14 @@
 		usb0: ohci@00700000 {
 			compatible = "atmel,at91rm9200-ohci", "usb-ohci";
 			reg = <0x00700000 0x100000>;
-			interrupts = <22 4>;
+			interrupts = <22 4 2>;
 			status = "disabled";
 		};
 
 		usb1: ehci@00800000 {
 			compatible = "atmel,at91sam9g45-ehci", "usb-ehci";
 			reg = <0x00800000 0x100000>;
-			interrupts = <22 4>;
+			interrupts = <22 4 2>;
 			status = "disabled";
 		};
 	};