Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'zynq-dt-for-3.14' of git://git.xilinx.com/linux-xlnx into next/dt

From Michal Simek:

arm: Xilinx Zynq dt patches for v3.14

- Add gem support
- Add cpus node
- TTC cleanup

* tag 'zynq-dt-for-3.14' of git://git.xilinx.com/linux-xlnx:
arm: dt: zynq: Add 'cpus' node
arm: dt: zynq: Remove 'clock-ranges' from TTC nodes
ARM: zynq: add gem support

Signed-off-by: Olof Johansson <olof@lixom.net>

+52 -2
+37 -2
arch/arm/boot/dts/zynq-7000.dtsi
··· 15 15 / { 16 16 compatible = "xlnx,zynq-7000"; 17 17 18 + cpus { 19 + #address-cells = <1>; 20 + #size-cells = <0>; 21 + 22 + cpu@0 { 23 + compatible = "arm,cortex-a9"; 24 + device_type = "cpu"; 25 + reg = <0>; 26 + clocks = <&clkc 3>; 27 + }; 28 + 29 + cpu@1 { 30 + compatible = "arm,cortex-a9"; 31 + device_type = "cpu"; 32 + reg = <1>; 33 + clocks = <&clkc 3>; 34 + }; 35 + }; 36 + 18 37 pmu { 19 38 compatible = "arm,cortex-a9-pmu"; 20 39 interrupts = <0 5 4>, <0 6 4>; ··· 84 65 interrupts = <0 50 4>; 85 66 }; 86 67 68 + gem0: ethernet@e000b000 { 69 + compatible = "cdns,gem"; 70 + reg = <0xe000b000 0x4000>; 71 + status = "disabled"; 72 + interrupts = <0 22 4>; 73 + clocks = <&clkc 30>, <&clkc 30>, <&clkc 13>; 74 + clock-names = "pclk", "hclk", "tx_clk"; 75 + }; 76 + 77 + gem1: ethernet@e000c000 { 78 + compatible = "cdns,gem"; 79 + reg = <0xe000c000 0x4000>; 80 + status = "disabled"; 81 + interrupts = <0 45 4>; 82 + clocks = <&clkc 31>, <&clkc 31>, <&clkc 14>; 83 + clock-names = "pclk", "hclk", "tx_clk"; 84 + }; 85 + 87 86 slcr: slcr@f8000000 { 88 87 compatible = "xlnx,zynq-slcr"; 89 88 reg = <0xF8000000 0x1000>; ··· 143 106 compatible = "cdns,ttc"; 144 107 clocks = <&clkc 6>; 145 108 reg = <0xF8001000 0x1000>; 146 - clock-ranges; 147 109 }; 148 110 149 111 ttc1: ttc1@f8002000 { ··· 151 115 compatible = "cdns,ttc"; 152 116 clocks = <&clkc 6>; 153 117 reg = <0xF8002000 0x1000>; 154 - clock-ranges; 155 118 }; 156 119 scutimer: scutimer@f8f00600 { 157 120 interrupt-parent = <&intc>;
+5
arch/arm/boot/dts/zynq-zc702.dts
··· 29 29 30 30 }; 31 31 32 + &gem0 { 33 + status = "okay"; 34 + phy-mode = "rgmii"; 35 + }; 36 + 32 37 &uart1 { 33 38 status = "okay"; 34 39 };
+5
arch/arm/boot/dts/zynq-zc706.dts
··· 30 30 31 31 }; 32 32 33 + &gem0 { 34 + status = "okay"; 35 + phy-mode = "rgmii"; 36 + }; 37 + 33 38 &uart1 { 34 39 status = "okay"; 35 40 };
+5
arch/arm/boot/dts/zynq-zed.dts
··· 30 30 31 31 }; 32 32 33 + &gem0 { 34 + status = "okay"; 35 + phy-mode = "rgmii"; 36 + }; 37 + 33 38 &uart1 { 34 39 status = "okay"; 35 40 };