diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-25 08:59:42 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-25 08:59:42 -0700 |
commit | 22e12bbc9bc38c6d0bd541d061a0f547596fc19d (patch) | |
tree | 39b93f43b482c5b4cb9d99933384a8a7fcb85d71 /arch/powerpc/boot/dts/mpc8313erdb.dts | |
parent | 19426a8f810752b4218e59b1e2187f33e255f7bc (diff) | |
parent | 86ff9baadf16c8a1b452d72f5585be63457d9b15 (diff) | |
download | kernel_samsung_smdk4412-22e12bbc9bc38c6d0bd541d061a0f547596fc19d.zip kernel_samsung_smdk4412-22e12bbc9bc38c6d0bd541d061a0f547596fc19d.tar.gz kernel_samsung_smdk4412-22e12bbc9bc38c6d0bd541d061a0f547596fc19d.tar.bz2 |
Merge branch 'timers-ptp-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-ptp-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
ptp: Fix dp83640 build warning when building statically
ptp: Added a clock driver for the National Semiconductor PHYTER.
ptp: Added a clock driver for the IXP46x.
ptp: Added a clock that uses the eTSEC found on the MPC85xx.
ptp: Added a brand new class driver for ptp clocks.
Diffstat (limited to 'arch/powerpc/boot/dts/mpc8313erdb.dts')
-rw-r--r-- | arch/powerpc/boot/dts/mpc8313erdb.dts | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/powerpc/boot/dts/mpc8313erdb.dts b/arch/powerpc/boot/dts/mpc8313erdb.dts index 761faa7..ac1eb32 100644 --- a/arch/powerpc/boot/dts/mpc8313erdb.dts +++ b/arch/powerpc/boot/dts/mpc8313erdb.dts @@ -176,6 +176,19 @@ sleep = <&pmc 0x00300000>; }; + ptp_clock@24E00 { + compatible = "fsl,etsec-ptp"; + reg = <0x24E00 0xB0>; + interrupts = <12 0x8 13 0x8>; + interrupt-parent = < &ipic >; + fsl,tclk-period = <10>; + fsl,tmr-prsc = <100>; + fsl,tmr-add = <0x999999A4>; + fsl,tmr-fiper1 = <0x3B9AC9F6>; + fsl,tmr-fiper2 = <0x00018696>; + fsl,max-adj = <659999998>; + }; + enet0: ethernet@24000 { #address-cells = <1>; #size-cells = <1>; |