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/b4860emu.dts | |
| parent | 80fa93fce37d3490f4bb0da8a5b239a6745bc744 (diff) | |
| parent | 76f3e2929bb6b476fb02b519ad953e2e29ee7bd5 (diff) | |
| download | talos-op-linux-35891d40bfc4f41fc627abb757c0894c0028f3ab.tar.gz talos-op-linux-35891d40bfc4f41fc627abb757c0894c0028f3ab.zip | |
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/b4860emu.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/b4860emu.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/dts/b4860emu.dts b/arch/powerpc/boot/dts/b4860emu.dts index 85646b4f96e1..2aa5cd318ce8 100644 --- a/arch/powerpc/boot/dts/b4860emu.dts +++ b/arch/powerpc/boot/dts/b4860emu.dts @@ -193,9 +193,9 @@ fsl,liodn-bits = <12>; }; - clockgen: global-utilities@e1000 { +/include/ "fsl/qoriq-clockgen2.dtsi" + global-utilities@e1000 { compatible = "fsl,b4-clockgen", "fsl,qoriq-clockgen-2.0"; - reg = <0xe1000 0x1000>; }; /include/ "fsl/qoriq-dma-0.dtsi" |
