diff options
| author | Olof Johansson <olof@lixom.net> | 2012-06-23 16:11:50 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-06-23 16:11:50 -0700 |
| commit | e23d7096f9633d37aa35dffab9b0bd594ed64533 (patch) | |
| tree | 1de032158487c5ca078b7e08dad0e37ac970bfee /arch/arm/boot | |
| parent | 6355f25ed965421725d92cf719fc63008690ca1c (diff) | |
| parent | aef2b89662b8a7506846d0dc0df672d196ddf8d0 (diff) | |
| download | linux-e23d7096f9633d37aa35dffab9b0bd594ed64533.tar.gz linux-e23d7096f9633d37aa35dffab9b0bd594ed64533.tar.bz2 linux-e23d7096f9633d37aa35dffab9b0bd594ed64533.zip | |
Merge tag 'omap-fixes-for-v3.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
From Tony Lindgren:
"Here are a few fixes with the biggest one being fix for Beagle DVI
reset. All of them are regression fixes, except for the missing omap2
interrupt controller binding that somehow got missed earlier."
* tag 'omap-fixes-for-v3.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP: Fix Beagleboard DVI reset gpio
arm/dts: OMAP2: Fix interrupt controller binding
ARM: OMAP2: Fix tusb6010 GPIO interrupt for n8x0
ARM: OMAP2+: Fix MUSB ifdefs for platform init code
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/omap2.dtsi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/omap2.dtsi b/arch/arm/boot/dts/omap2.dtsi index f2ab4ea7cc0e..581cb081cb0f 100644 --- a/arch/arm/boot/dts/omap2.dtsi +++ b/arch/arm/boot/dts/omap2.dtsi @@ -44,6 +44,8 @@ compatible = "ti,omap2-intc"; interrupt-controller; #interrupt-cells = <1>; + ti,intc-size = <96>; + reg = <0x480FE000 0x1000>; }; uart1: serial@4806a000 { |