diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2014-11-18 16:58:15 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2014-11-18 17:00:38 +1100 |
| commit | 35891d40bfc4f41fc627abb757c0894c0028f3ab (patch) | |
| tree | beabb57ce8423538cd534a774fb5c0f8a3a8ec74 /arch/powerpc/boot/dts/p5040ds.dts | |
| parent | 80fa93fce37d3490f4bb0da8a5b239a6745bc744 (diff) | |
| parent | 76f3e2929bb6b476fb02b519ad953e2e29ee7bd5 (diff) | |
Merge remote-tracking branch 'scottwood/next' into next
Scott says:
"Highlights include a bunch of 8xx optimizations, device tree bindings
for Freescale BMan, QMan, and FMan datapath components, misc device tree
updates, and inbound rio window support."
Diffstat (limited to 'arch/powerpc/boot/dts/p5040ds.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/p5040ds.dts | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/arch/powerpc/boot/dts/p5040ds.dts b/arch/powerpc/boot/dts/p5040ds.dts index 860b5ccf76c0..7e04bf487c04 100644 --- a/arch/powerpc/boot/dts/p5040ds.dts +++ b/arch/powerpc/boot/dts/p5040ds.dts @@ -95,6 +95,26 @@ reg = <0x68>; interrupts = <0x1 0x1 0 0>; }; + ina220@40 { + compatible = "ti,ina220"; + reg = <0x40>; + shunt-resistor = <1000>; + }; + ina220@41 { + compatible = "ti,ina220"; + reg = <0x41>; + shunt-resistor = <1000>; + }; + ina220@44 { + compatible = "ti,ina220"; + reg = <0x44>; + shunt-resistor = <1000>; + }; + ina220@45 { + compatible = "ti,ina220"; + reg = <0x45>; + shunt-resistor = <1000>; + }; adt7461@4c { compatible = "adi,adt7461"; reg = <0x4c>; |