diff options
author | Tony Lindgren <tony@atomide.com> | 2012-02-25 01:48:27 +0100 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-02-25 01:48:27 +0100 |
commit | ffd76d8be36da09f8456c55569c008f5aa93095e (patch) | |
tree | 4a5e537edcdd3be9197c5fb7af1b4f7e4780ef77 /arch/arm/boot/dts/omap4.dtsi | |
parent | ARM: OMAP2+: Set Kconfig dependencies for PROC_DEVICETREE (diff) | |
parent | arm/dts: Add support for TI OMAP3 EVM board (diff) | |
download | linux-ffd76d8be36da09f8456c55569c008f5aa93095e.tar.xz linux-ffd76d8be36da09f8456c55569c008f5aa93095e.zip |
Merge branch 'for_3.4/dts_updates' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into dt
Diffstat (limited to 'arch/arm/boot/dts/omap4.dtsi')
-rw-r--r-- | arch/arm/boot/dts/omap4.dtsi | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi index f40af046c1c3..3d35559e77bc 100644 --- a/arch/arm/boot/dts/omap4.dtsi +++ b/arch/arm/boot/dts/omap4.dtsi @@ -99,7 +99,7 @@ gic: interrupt-controller@48241000 { compatible = "arm,cortex-a9-gic"; interrupt-controller; - #interrupt-cells = <1>; + #interrupt-cells = <3>; reg = <0x48241000 0x1000>, <0x48240100 0x0100>; }; @@ -127,5 +127,33 @@ ti,hwmods = "uart4"; clock-frequency = <48000000>; }; + + i2c1: i2c@48070000 { + compatible = "ti,omap4-i2c"; + #address-cells = <1>; + #size-cells = <0>; + ti,hwmods = "i2c1"; + }; + + i2c2: i2c@48072000 { + compatible = "ti,omap4-i2c"; + #address-cells = <1>; + #size-cells = <0>; + ti,hwmods = "i2c2"; + }; + + i2c3: i2c@48060000 { + compatible = "ti,omap4-i2c"; + #address-cells = <1>; + #size-cells = <0>; + ti,hwmods = "i2c3"; + }; + + i2c4: i2c@48350000 { + compatible = "ti,omap4-i2c"; + #address-cells = <1>; + #size-cells = <0>; + ti,hwmods = "i2c4"; + }; }; }; |