diff options
author | Nathan Rossi <nathan@nathanrossi.com> | 2017-03-24 20:46:48 +1000 |
---|---|---|
committer | Nathan Rossi <nathan@nathanrossi.com> | 2017-03-31 22:33:15 +1000 |
commit | 1ddfc0ba94f597822e619395fa0b35fb322e26af (patch) | |
tree | 9cbc53497573b1f82169c8b4ad51699322bb50e1 | |
parent | 9304e43528faab0221ef35a3a129a438715c52b2 (diff) | |
download | meta-xilinx-morty.tar.gz |
device-tree/microzed-zynq7.dts: Replace with kernel source versionmorty
Replace the existing device tree content with the content of the
zynq-microzed.dts from the kernel source. Specifically based on commit
df2f3c48b9cd51e2612a1598342769d09d849f39.
This resolves the issues with the ethernet phy as well as adding pinctrl
for USB.
Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
-rw-r--r-- | recipes-bsp/device-tree/files/microzed/microzed-zynq7.dts | 82 |
1 files changed, 41 insertions, 41 deletions
diff --git a/recipes-bsp/device-tree/files/microzed/microzed-zynq7.dts b/recipes-bsp/device-tree/files/microzed/microzed-zynq7.dts index f0de60ee..b9376a49 100644 --- a/recipes-bsp/device-tree/files/microzed/microzed-zynq7.dts +++ b/recipes-bsp/device-tree/files/microzed/microzed-zynq7.dts | |||
@@ -1,10 +1,22 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2011 - 2014 Xilinx | ||
3 | * Copyright (C) 2016 Jagan Teki <jteki@openedev.com> | ||
4 | * | ||
5 | * This software is licensed under the terms of the GNU General Public | ||
6 | * License version 2, as published by the Free Software Foundation, and | ||
7 | * may be copied, distributed, and modified under those terms. | ||
8 | * | ||
9 | * This program is distributed in the hope that it will be useful, | ||
10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
12 | * GNU General Public License for more details. | ||
13 | */ | ||
1 | /dts-v1/; | 14 | /dts-v1/; |
2 | /include/ "zynq-7000.dtsi" | 15 | /include/ "zynq-7000.dtsi" |
3 | /include/ "zynq-7000-qspi-dummy.dtsi" | ||
4 | 16 | ||
5 | / { | 17 | / { |
6 | model = "Avnet microZed"; | 18 | model = "Zynq MicroZED Development Board"; |
7 | compatible = "avnet,microzed", "xlnx,zynq-7000"; | 19 | compatible = "xlnx,zynq-microzed", "xlnx,zynq-7000"; |
8 | 20 | ||
9 | aliases { | 21 | aliases { |
10 | ethernet0 = &gem0; | 22 | ethernet0 = &gem0; |
@@ -17,25 +29,26 @@ | |||
17 | }; | 29 | }; |
18 | 30 | ||
19 | chosen { | 31 | chosen { |
20 | bootargs = "earlyprintk"; | 32 | bootargs = "earlycon"; |
21 | stdout-path = "serial0:115200n8"; | 33 | stdout-path = "serial0:115200n8"; |
22 | }; | 34 | }; |
23 | 35 | ||
24 | usb_phy0: phy0 { | 36 | usb_phy0: phy0 { |
25 | compatible = "usb-nop-xceiv"; | 37 | compatible = "usb-nop-xceiv"; |
26 | #phy-cells = <0>; | 38 | #phy-cells = <0>; |
27 | reset-gpios = <&gpio0 7 1>; /* MIO 7, GPIO_ACTIVE_LOW */ | ||
28 | }; | 39 | }; |
29 | }; | 40 | }; |
30 | 41 | ||
42 | &clkc { | ||
43 | ps-clk-frequency = <33333333>; | ||
44 | }; | ||
45 | |||
31 | &gem0 { | 46 | &gem0 { |
32 | status = "okay"; | 47 | status = "okay"; |
33 | phy-mode = "rgmii-id"; | 48 | phy-mode = "rgmii-id"; |
34 | phy-handle = <ðernet_phy>; | 49 | phy-handle = <ðernet_phy>; |
35 | 50 | ||
36 | ethernet_phy: ethernet-phy@0 { | 51 | ethernet_phy: ethernet-phy@0 { |
37 | compatible = "marvell,88e1512"; | ||
38 | device_type = "ethernet-phy"; | ||
39 | reg = <0>; | 52 | reg = <0>; |
40 | }; | 53 | }; |
41 | }; | 54 | }; |
@@ -52,45 +65,32 @@ | |||
52 | status = "okay"; | 65 | status = "okay"; |
53 | dr_mode = "host"; | 66 | dr_mode = "host"; |
54 | usb-phy = <&usb_phy0>; | 67 | usb-phy = <&usb_phy0>; |
68 | pinctrl-names = "default"; | ||
69 | pinctrl-0 = <&pinctrl_usb0_default>; | ||
55 | }; | 70 | }; |
56 | 71 | ||
57 | &qspi { | 72 | &pinctrl0 { |
58 | status = "okay"; | 73 | pinctrl_usb0_default: usb0-default { |
59 | primary_flash: ps7-qspi@0 { | 74 | mux { |
60 | #address-cells = <1>; | 75 | groups = "usb0_0_grp"; |
61 | #size-cells = <1>; | 76 | function = "usb0"; |
62 | compatible = "micron,m25p80", "spansion,s25fl128s", "jedec,spi-nor"; | ||
63 | reg = <0x0>; | ||
64 | spi-max-frequency = <50000000>; | ||
65 | /* Example 16M partition table using U-Boot + U-Boot SPL */ | ||
66 | partition@0x0 { | ||
67 | label = "boot"; | ||
68 | reg = <0x0 0xe0000>; | ||
69 | }; | ||
70 | partition@0xe0000 { | ||
71 | label = "ubootenv"; | ||
72 | reg = <0xe0000 0x20000>; | ||
73 | }; | ||
74 | partition@0x100000 { | ||
75 | label = "uboot"; | ||
76 | reg = <0x100000 0x100000>; | ||
77 | }; | 77 | }; |
78 | partition@0x200000 { | 78 | |
79 | label = "kernel"; | 79 | conf { |
80 | reg = <0x200000 0x4f0000>; | 80 | groups = "usb0_0_grp"; |
81 | }; | 81 | slew-rate = <0>; |
82 | partition@0x6f0000 { | 82 | io-standard = <1>; |
83 | label = "devicetree"; | ||
84 | reg = <0x6f0000 0x10000>; | ||
85 | }; | 83 | }; |
86 | partition@0x700000 { | 84 | |
87 | label = "rootfs"; | 85 | conf-rx { |
88 | reg = <0x700000 0x400000>; | 86 | pins = "MIO29", "MIO31", "MIO36"; |
87 | bias-high-impedance; | ||
89 | }; | 88 | }; |
90 | partition@0xb00000 { | 89 | |
91 | label = "spare"; | 90 | conf-tx { |
92 | reg = <0xb00000 0x500000>; | 91 | pins = "MIO28", "MIO30", "MIO32", "MIO33", "MIO34", |
92 | "MIO35", "MIO37", "MIO38", "MIO39"; | ||
93 | bias-disable; | ||
93 | }; | 94 | }; |
94 | }; | 95 | }; |
95 | }; | 96 | }; |
96 | |||