OSDN Git Service

ARM: dts: socfpga: Drop gmac0 from CV dtsi
authorMarek Vasut <marex@denx.de>
Sat, 19 Mar 2016 23:57:05 +0000 (23:57 +0000)
committerDinh Nguyen <dinguyen@kernel.org>
Mon, 11 Apr 2016 19:00:30 +0000 (14:00 -0500)
commit702744ce8b3ef369ed8f8e257cbee4db44beb415
treece4018643d3db0c1e567df86cd39078ff188d93b
parentebaea3a7852e19bcffcbc8d7de055f2ebacda7ca
ARM: dts: socfpga: Drop gmac0 from CV dtsi

The socfpga_cyclone5.dtsi is included by all DTS files which describe boards
using the Cyclone V SoC. The Cyclone V SoC has two ethernet controllers and
different boards use none, one or both of them.

The /soc/ethernet@ff702000/{} node in socfpga_cyclone5.dtsi unconditionaly
enabled gmac0 interface, which is clearly wrong for those boards which use
gmac1 interface instead.

This patch removes the entire /soc/ethernet@ff702000/{} node from the
socfpga_cyclone5.dtsi file. This is correct, since all of the board which
include this file also have correct gmac0 or gmac1 node present in them.
Minor correction had to be done to EBV SoCrates, which didn't define PHY
mode explicitly, but inherited it from the socfpga_cyclone5.dtsi .

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
arch/arm/boot/dts/socfpga_cyclone5.dtsi
arch/arm/boot/dts/socfpga_cyclone5_socrates.dts