diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2015-08-27 20:13:12 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-08-27 20:13:12 +1000 |
| commit | 96983515657bfd532f4d2599df16c9d756de17ea (patch) | |
| tree | 48a6fa2b58ac65adca0649acf599b2ca8c925fd8 /arch/powerpc/boot/dts/t1024rdb.dts | |
| parent | d690740f22f6520873f96e66aae7119ec2215755 (diff) | |
| parent | 4524cd093fa8f03b198e095ebbb679c30839559c (diff) | |
| download | op-kernel-dev-96983515657bfd532f4d2599df16c9d756de17ea.zip op-kernel-dev-96983515657bfd532f4d2599df16c9d756de17ea.tar.gz | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next
Freescale updates from Scott:
"Highlights include 32-bit memcpy/memset optimizations, checksum
optimizations, 85xx config fragments and updates, device tree updates,
e6500 fixes for non-SMP, and misc cleanup and minor fixes."
Diffstat (limited to 'arch/powerpc/boot/dts/t1024rdb.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/t1024rdb.dts | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/powerpc/boot/dts/t1024rdb.dts b/arch/powerpc/boot/dts/t1024rdb.dts index 733e723..bf05e32 100644 --- a/arch/powerpc/boot/dts/t1024rdb.dts +++ b/arch/powerpc/boot/dts/t1024rdb.dts @@ -114,6 +114,12 @@ reg = <0x4c>; }; + current-sensor@40 { + compatible = "ti,ina220"; + reg = <0x40>; + shunt-resistor = <1000>; + }; + eeprom@50 { compatible = "atmel,24c256"; reg = <0x50>; |
