diff options
| author | Stephen Warren <swarren@nvidia.com> | 2012-05-14 10:48:24 -0600 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2012-05-14 10:48:24 -0600 |
| commit | 4b7e870590f65f4e8bb3cdb7f382e1a9dd17dad5 (patch) | |
| tree | 1c7fe0106ace9c86cc5a671e1dd00d49d259a643 /arch/arm/boot/dts/tegra-ventana.dts | |
| parent | d9e33b593bceb62075225a4a5122bbb4803a8705 (diff) | |
| parent | 22bfe102c0c39f0bac24950b875e7bfdeb329dd9 (diff) | |
Merge branch 'for-3.5/dt' into for-3.5/dt2-new
Diffstat (limited to 'arch/arm/boot/dts/tegra-ventana.dts')
| -rw-r--r-- | arch/arm/boot/dts/tegra-ventana.dts | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/tegra-ventana.dts b/arch/arm/boot/dts/tegra-ventana.dts index bd074cfb338f..c20d5e93f9c9 100644 --- a/arch/arm/boot/dts/tegra-ventana.dts +++ b/arch/arm/boot/dts/tegra-ventana.dts @@ -256,6 +256,14 @@ micdet-delay = <100>; gpio-cfg = < 0xffffffff 0xffffffff 0 0xffffffff 0xffffffff >; }; + + /* ALS and proximity sensor */ + isl29018@44 { + compatible = "isil,isl29018"; + reg = <0x44>; + interrupt-parent = <&gpio>; + interrupts = <202 0x04>; /*gpio PZ2 */ + }; }; i2c@7000c400 { |