diff options
| author | Stephen Warren | 2012-05-14 18:48:24 +0200 |
|---|---|---|
| committer | Stephen Warren | 2012-05-14 18:48:24 +0200 |
| commit | 4b7e870590f65f4e8bb3cdb7f382e1a9dd17dad5 (patch) | |
| tree | 1c7fe0106ace9c86cc5a671e1dd00d49d259a643 /arch/arm/boot/dts/tegra-seaboard.dts | |
| parent | Merge branch 'for-3.5/usb-ulpi' into for-3.5/dt2-new (diff) | |
| parent | ARM: dt: tegra trimslice: add support for audio (diff) | |
| download | kernel-qcow2-linux-4b7e870590f65f4e8bb3cdb7f382e1a9dd17dad5.tar.gz kernel-qcow2-linux-4b7e870590f65f4e8bb3cdb7f382e1a9dd17dad5.tar.xz kernel-qcow2-linux-4b7e870590f65f4e8bb3cdb7f382e1a9dd17dad5.zip | |
Merge branch 'for-3.5/dt' into for-3.5/dt2-new
Diffstat (limited to 'arch/arm/boot/dts/tegra-seaboard.dts')
| -rw-r--r-- | arch/arm/boot/dts/tegra-seaboard.dts | 41 |
1 files changed, 37 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/tegra-seaboard.dts b/arch/arm/boot/dts/tegra-seaboard.dts index ed0a2f5bf918..c4d171ec9ee4 100644 --- a/arch/arm/boot/dts/tegra-seaboard.dts +++ b/arch/arm/boot/dts/tegra-seaboard.dts @@ -100,7 +100,7 @@ }; hdint { nvidia,pins = "hdint", "lpw0", "lpw2", "lsc1", - "lsck", "lsda", "pta"; + "lsck", "lsda"; nvidia,function = "hdmi"; }; i2cp { @@ -134,6 +134,10 @@ nvidia,pins = "pmc"; nvidia,function = "pwr_on"; }; + pta { + nvidia,pins = "pta"; + nvidia,function = "i2c2"; + }; rm { nvidia,pins = "rm"; nvidia,function = "i2c1"; @@ -270,10 +274,32 @@ 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 */ + }; + + gyrometer@68 { + compatible = "invn,mpu3050"; + reg = <0x68>; + interrupt-parent = <&gpio>; + interrupts = <204 0x04>; /* gpio PZ4 */ + }; }; i2c@7000c400 { - clock-frequency = <400000>; + clock-frequency = <100000>; + + smart-battery@b { + compatible = "ti,bq20z75", "smart-battery-1.1"; + reg = <0xb>; + ti,i2c-retry-count = <2>; + ti,poll-retry-count = <10>; + }; }; i2c@7000c500 { @@ -283,10 +309,17 @@ i2c@7000d000 { clock-frequency = <400000>; - adt7461@4c { - compatible = "adt7461"; + temperature-sensor@4c { + compatible = "nct1008"; reg = <0x4c>; }; + + magnetometer@c { + compatible = "ak8975"; + reg = <0xc>; + interrupt-parent = <&gpio>; + interrupts = <109 0x04>; /* gpio PN5 */ + }; }; i2s@70002a00 { |