diff options
| author | Nathan Rossi <nathan.rossi@xilinx.com> | 2014-05-21 12:08:08 +1000 |
|---|---|---|
| committer | Nathan Rossi <nathan.rossi@xilinx.com> | 2014-05-21 14:25:58 +1000 |
| commit | 80465bece44a6280e4e8050fb4d92112fa49457a (patch) | |
| tree | c1e3f77c6b2149568f892677969e718cbdd2da81 | |
| parent | 4082a1a645d26f7d1a5789c5cd415fc0eb73acca (diff) | |
| download | meta-xilinx-80465bece44a6280e4e8050fb4d92112fa49457a.tar.gz | |
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 <nathan.rossi@xilinx.com>
| -rw-r--r-- | conf/machine/boards/common/zynq7-base.dtsi | 12 |
1 files 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 @@ | |||
| 256 | ps7_ethernet_0: ps7-ethernet@e000b000 { | 256 | ps7_ethernet_0: ps7-ethernet@e000b000 { |
| 257 | #address-cells = <1>; | 257 | #address-cells = <1>; |
| 258 | #size-cells = <0>; | 258 | #size-cells = <0>; |
| 259 | clock-names = "ref_clk", "aper_clk"; | 259 | clock-names = "ref_clk", "aper_clk", "pclk", "hclk", "tx_clk"; |
| 260 | clocks = <&clkc 13>, <&clkc 30>; | 260 | clocks = <&clkc 13>, <&clkc 30>, <&clkc 30>, <&clkc 30>, <&clkc 13>; |
| 261 | compatible = "xlnx,ps7-ethernet-1.00.a"; | 261 | compatible = "cdns,gem", "xlnx,ps7-ethernet-1.00.a"; |
| 262 | interrupt-parent = <&ps7_scugic_0>; | 262 | interrupt-parent = <&ps7_scugic_0>; |
| 263 | interrupts = <0 22 4>; | 263 | interrupts = <0 22 4>; |
| 264 | local-mac-address = [ 00 0a 35 00 00 00 ]; | 264 | local-mac-address = [ 00 0a 35 00 00 00 ]; |
| @@ -275,9 +275,9 @@ | |||
| 275 | ps7_ethernet_1: ps7-ethernet@e000c000 { | 275 | ps7_ethernet_1: ps7-ethernet@e000c000 { |
| 276 | #address-cells = <1>; | 276 | #address-cells = <1>; |
| 277 | #size-cells = <0>; | 277 | #size-cells = <0>; |
| 278 | clock-names = "ref_clk", "aper_clk"; | 278 | clock-names = "ref_clk", "aper_clk", "pclk", "hclk", "tx_clk"; |
| 279 | clocks = <&clkc 14>, <&clkc 31>; | 279 | clocks = <&clkc 14>, <&clkc 31>, <&clkc 31>, <&clkc 31>, <&clkc 14>; |
| 280 | compatible = "xlnx,ps7-ethernet-1.00.a"; | 280 | compatible = "cdns,gem", "xlnx,ps7-ethernet-1.00.a"; |
| 281 | interrupt-parent = <&ps7_scugic_0>; | 281 | interrupt-parent = <&ps7_scugic_0>; |
| 282 | interrupts = <0 45 4>; | 282 | interrupts = <0 45 4>; |
| 283 | local-mac-address = [ 00 0a 35 00 00 01 ]; | 283 | local-mac-address = [ 00 0a 35 00 00 01 ]; |