From 80465bece44a6280e4e8050fb4d92112fa49457a Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Wed, 21 May 2014 12:08:08 +1000 Subject: zynq7-base.dtsi: Merge gem dts properties * Merge the contents of zynq7-mainline-gem.dtsi into the base * Default to the macb driver by default * Backwards compatible with emacps (linux-xlnx only driver) Signed-off-by: Nathan Rossi --- conf/machine/boards/common/zynq7-base.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/conf/machine/boards/common/zynq7-base.dtsi b/conf/machine/boards/common/zynq7-base.dtsi index ab109355..4c528a5a 100644 --- a/conf/machine/boards/common/zynq7-base.dtsi +++ b/conf/machine/boards/common/zynq7-base.dtsi @@ -256,9 +256,9 @@ ps7_ethernet_0: ps7-ethernet@e000b000 { #address-cells = <1>; #size-cells = <0>; - clock-names = "ref_clk", "aper_clk"; - clocks = <&clkc 13>, <&clkc 30>; - compatible = "xlnx,ps7-ethernet-1.00.a"; + clock-names = "ref_clk", "aper_clk", "pclk", "hclk", "tx_clk"; + clocks = <&clkc 13>, <&clkc 30>, <&clkc 30>, <&clkc 30>, <&clkc 13>; + compatible = "cdns,gem", "xlnx,ps7-ethernet-1.00.a"; interrupt-parent = <&ps7_scugic_0>; interrupts = <0 22 4>; local-mac-address = [ 00 0a 35 00 00 00 ]; @@ -275,9 +275,9 @@ ps7_ethernet_1: ps7-ethernet@e000c000 { #address-cells = <1>; #size-cells = <0>; - clock-names = "ref_clk", "aper_clk"; - clocks = <&clkc 14>, <&clkc 31>; - compatible = "xlnx,ps7-ethernet-1.00.a"; + clock-names = "ref_clk", "aper_clk", "pclk", "hclk", "tx_clk"; + clocks = <&clkc 14>, <&clkc 31>, <&clkc 31>, <&clkc 31>, <&clkc 14>; + compatible = "cdns,gem", "xlnx,ps7-ethernet-1.00.a"; interrupt-parent = <&ps7_scugic_0>; interrupts = <0 45 4>; local-mac-address = [ 00 0a 35 00 00 01 ]; -- cgit v1.2.3-54-g00ecf