diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2016-03-14 10:05:14 +0100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-03-14 10:05:14 +0100 |
| commit | a1b5344620a3e6291afaf7542714ba9c391ef1c7 (patch) | |
| tree | b79b51bc4019ea50efbbac4a7f7717b6e6d749c0 /arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-4.dtsi | |
| parent | Merge branch 'topic/mprofile-kernel' into next (diff) | |
| parent | powerpc/fsl/dts: Add "jedec,spi-nor" flash compatible (diff) | |
| download | linux-a1b5344620a3e6291afaf7542714ba9c391ef1c7.tar.xz linux-a1b5344620a3e6291afaf7542714ba9c391ef1c7.zip | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next
Freescale updates from Scott:
"Highlights include 8xx optimizations, 32-bit checksum optimizations,
86xx consolidation, e5500/e6500 cpu hotplug, more fman and other dt
bits, and minor fixes/cleanup."
Diffstat (limited to 'arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-4.dtsi')
| -rw-r--r-- | arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-4.dtsi | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-4.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-4.dtsi index 821ed12225d4..4b2cfddd1b15 100644 --- a/arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-4.dtsi +++ b/arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-4.dtsi @@ -51,6 +51,7 @@ fman@500000 { reg = <0xe8000 0x1000>; fsl,fman-ports = <&fman1_rx_0x0c &fman1_tx_0x2c>; ptp-timer = <&ptp_timer1>; + pcsphy-handle = <&pcsphy12>; }; mdio@e9000 { @@ -58,5 +59,9 @@ fman@500000 { #size-cells = <0>; compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio"; reg = <0xe9000 0x1000>; + + pcsphy12: ethernet-phy@0 { + reg = <0x0>; + }; }; }; |