hc
2023-12-11 1f93a7dfd1f8d5ff7a5c53246c7534fe2332d6f4
kernel/arch/arm64/boot/dts/marvell/armada-8040-db.dts
....@@ -27,6 +27,8 @@
2727 ethernet1 = &cp0_eth2;
2828 ethernet2 = &cp1_eth0;
2929 ethernet3 = &cp1_eth1;
30
+ i2c1 = &cp0_i2c0;
31
+ i2c2 = &cp1_i2c0;
3032 };
3133
3234 cp0_reg_usb3_0_vbus: cp0-usb3-0-vbus {
....@@ -52,11 +54,6 @@
5254 vcc-supply = <&cp0_reg_usb3_0_vbus>;
5355 };
5456
55
- cp0_usb3_1_phy: cp0-usb3-1-phy {
56
- compatible = "usb-nop-xceiv";
57
- vcc-supply = <&cp0_reg_usb3_1_vbus>;
58
- };
59
-
6057 cp1_reg_usb3_0_vbus: cp1-usb3-0-vbus {
6158 compatible = "regulator-fixed";
6259 regulator-name = "cp1-usb3h0-vbus";
....@@ -72,17 +69,10 @@
7269 };
7370 };
7471
75
-&i2c0 {
76
- status = "okay";
77
- clock-frequency = <100000>;
78
-};
79
-
8072 &spi0 {
8173 status = "okay";
8274
8375 spi-flash@0 {
84
- #address-cells = <1>;
85
- #size-cells = <1>;
8676 compatible = "jedec,spi-nor";
8777 reg = <0>;
8878 spi-max-frequency = <10000000>;
....@@ -113,11 +103,15 @@
113103
114104 /* CON6 on CP0 expansion */
115105 &cp0_pcie0 {
106
+ phys = <&cp0_comphy0 0>;
107
+ phy-names = "cp0-pcie0-x1-phy";
116108 status = "okay";
117109 };
118110
119111 /* CON5 on CP0 expansion */
120112 &cp0_pcie2 {
113
+ phys = <&cp0_comphy5 2>;
114
+ phy-names = "cp0-pcie2-x1-phy";
121115 status = "okay";
122116 };
123117
....@@ -148,6 +142,15 @@
148142 /* CON4 on CP0 expansion */
149143 &cp0_sata0 {
150144 status = "okay";
145
+
146
+ sata-port@0 {
147
+ phys = <&cp0_comphy1 0>;
148
+ phy-names = "cp0-sata0-0-phy";
149
+ };
150
+ sata-port@1 {
151
+ phys = <&cp0_comphy3 1>;
152
+ phy-names = "cp0-sata0-1-phy";
153
+ };
151154 };
152155
153156 /* CON9 on CP0 expansion */
....@@ -156,9 +159,17 @@
156159 status = "okay";
157160 };
158161
162
+&cp0_comphy4 {
163
+ cp0_usbh1_con: connector {
164
+ compatible = "usb-a-connector";
165
+ phy-supply = <&cp0_reg_usb3_1_vbus>;
166
+ };
167
+};
168
+
159169 /* CON10 on CP0 expansion */
160170 &cp0_usb3_1 {
161
- usb-phy = <&cp0_usb3_1_phy>;
171
+ phys = <&cp0_comphy4 1>;
172
+ phy-names = "cp0-usb3h1-comphy";
162173 status = "okay";
163174 };
164175
....@@ -192,16 +203,22 @@
192203
193204 /* CON6 on CP1 expansion */
194205 &cp1_pcie0 {
206
+ phys = <&cp1_comphy0 0>;
207
+ phy-names = "cp1-pcie0-x1-phy";
195208 status = "okay";
196209 };
197210
198211 /* CON7 on CP1 expansion */
199212 &cp1_pcie1 {
213
+ phys = <&cp1_comphy4 1>;
214
+ phy-names = "cp1-pcie1-x1-phy";
200215 status = "okay";
201216 };
202217
203218 /* CON5 on CP1 expansion */
204219 &cp1_pcie2 {
220
+ phys = <&cp1_comphy5 2>;
221
+ phy-names = "cp1-pcie2-x1-phy";
205222 status = "okay";
206223 };
207224
....@@ -214,8 +231,6 @@
214231 status = "okay";
215232
216233 spi-flash@0 {
217
- #address-cells = <0x1>;
218
- #size-cells = <0x1>;
219234 compatible = "jedec,spi-nor";
220235 reg = <0x0>;
221236 spi-max-frequency = <20000000>;
....@@ -280,6 +295,15 @@
280295 /* CON4 on CP1 expansion */
281296 &cp1_sata0 {
282297 status = "okay";
298
+
299
+ sata-port@0 {
300
+ phys = <&cp1_comphy1 0>;
301
+ phy-names = "cp1-sata0-0-phy";
302
+ };
303
+ sata-port@1 {
304
+ phys = <&cp1_comphy3 1>;
305
+ phy-names = "cp1-sata0-1-phy";
306
+ };
283307 };
284308
285309 /* CON9 on CP1 expansion */