diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-11-28 14:56:14 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-28 14:56:14 +0100 |
| commit | ea4409cc44e8f0f36182fcc22eb48b15ed61dd16 (patch) | |
| tree | 1edc32a56fe62d017672495fdb326f180bc16064 /arch/arm/boot/dts/omap3-n900.dts | |
| parent | bcc8cef7c43c46ca0467be725d677e2a8da806c0 (diff) | |
| parent | f80ecaf55b4982a888272790743dabf2c715dc10 (diff) | |
| download | op-kernel-dev-ea4409cc44e8f0f36182fcc22eb48b15ed61dd16.zip op-kernel-dev-ea4409cc44e8f0f36182fcc22eb48b15ed61dd16.tar.gz | |
Merge tag 'omap-for-v3.19/dt-part2-updated' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
Pull "More dts changes for omaps to add support for new devices" from Tony Lindgren:
- Add DCAN support am335x, am437x and dra7
- Add devices for sb-t3x computers
- Add support for NovaTech OrionLXm
- Add n900 battery and si4713 support
* tag 'omap-for-v3.19/dt-part2-updated' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (26 commits)
ARM: dts: am335x-evm: Add DCAN1 details
ARM: dts: am33xx: Update DCAN nodes
ARM: dts: am33xx: Add control module syscon node
ARM: dts: am437x-gp: Add dcan support
ARM: dts: am4372: Add DCAN nodes
ARM: dts: am4372: Add control module syscon node
ARM: dts: dra72-evm: Add CAN support
ARM: dts: dra7-evm: Add CAN support
ARM: dts: DRA7: Add DCAN nodes
ARM: dts: dra7: Add syscon regmap for CORE CONTROL area
ARM: dts: sbc-t3x30: add audio support
ARM: dts: sbc-t3x: add TV out display alias
ARM: dts: cm-t3x: add TV out support
ARM: dts: cm-t3x: add I2C1 pinmux
ARM: dts: AM43xx: add tscadc DT entries for am437x-evm and am43x-epos-evm
ARM: dts: cm-t3x30: add keypad support
ARM: dts: sb-t35: add EEPROM support
ARM: dts: cm-t3x: add EEPROM support
ARM: OMAP2+: remove cm-t3x touchscreen pdata quirk
ARM: dts: cm-t3x: add ADS7846 touchscreen support
...
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/omap3-n900.dts')
| -rw-r--r-- | arch/arm/boot/dts/omap3-n900.dts | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts index 08ef71f..53f3ca0 100644 --- a/arch/arm/boot/dts/omap3-n900.dts +++ b/arch/arm/boot/dts/omap3-n900.dts @@ -115,6 +115,12 @@ eci-switch-gpios = <&gpio6 22 GPIO_ACTIVE_HIGH>; /* 182 */ speaker-amplifier-gpios = <&twl_gpio 7 GPIO_ACTIVE_HIGH>; }; + + battery: n900-battery { + compatible = "nokia,n900-battery"; + io-channels = <&twl_madc 0>, <&twl_madc 4>, <&twl_madc 12>; + io-channel-names = "temp", "bsi", "vbat"; + }; }; &omap3_pmx_core { @@ -567,6 +573,16 @@ power-gpio = <&gpio4 2 GPIO_ACTIVE_HIGH>; /* 98 */ }; + si4713: si4713@63 { + compatible = "silabs,si4713"; + reg = <0x63>; + + interrupts-extended = <&gpio2 21 IRQ_TYPE_EDGE_FALLING>; /* 53 */ + reset-gpios = <&gpio6 3 GPIO_ACTIVE_HIGH>; /* 163 */ + vio-supply = <&vio>; + vdd-supply = <&vaux1>; + }; + bq24150a: bq24150a@6b { compatible = "ti,bq24150a"; reg = <0x6b>; |
