forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-10 61598093bbdd283a7edc367d900f223070ead8d2
kernel/arch/arm64/boot/dts/marvell/armada-7040-db.dts
....@@ -28,6 +28,32 @@
2828 ethernet2 = &cp0_eth2;
2929 };
3030
31
+ cp0_exp_usb3_0_current_regulator: gpio-regulator {
32
+ compatible = "regulator-gpio";
33
+ regulator-name = "cp0-usb3-0-current-regulator";
34
+ regulator-type = "current";
35
+ regulator-min-microamp = <500000>;
36
+ regulator-max-microamp = <900000>;
37
+ gpios = <&expander0 4 GPIO_ACTIVE_HIGH>;
38
+ states = <500000 0x0
39
+ 900000 0x1>;
40
+ enable-active-high;
41
+ gpios-states = <0>;
42
+ };
43
+
44
+ cp0_exp_usb3_1_current_regulator: gpio-regulator {
45
+ compatible = "regulator-gpio";
46
+ regulator-name = "cp0-usb3-1-current-regulator";
47
+ regulator-type = "current";
48
+ regulator-min-microamp = <500000>;
49
+ regulator-max-microamp = <900000>;
50
+ gpios = <&expander0 5 GPIO_ACTIVE_HIGH>;
51
+ states = <500000 0x0
52
+ 900000 0x1>;
53
+ enable-active-high;
54
+ gpios-states = <0>;
55
+ };
56
+
3157 cp0_reg_usb3_0_vbus: cp0-usb3-0-vbus {
3258 compatible = "regulator-fixed";
3359 regulator-name = "usb3h0-vbus";
....@@ -35,6 +61,7 @@
3561 regulator-max-microvolt = <5000000>;
3662 enable-active-high;
3763 gpio = <&expander0 0 GPIO_ACTIVE_HIGH>;
64
+ vin-supply = <&cp0_exp_usb3_0_current_regulator>;
3865 };
3966
4067 cp0_reg_usb3_1_vbus: cp0-usb3-1-vbus {
....@@ -44,16 +71,7 @@
4471 regulator-max-microvolt = <5000000>;
4572 enable-active-high;
4673 gpio = <&expander0 1 GPIO_ACTIVE_HIGH>;
47
- };
48
-
49
- cp0_usb3_0_phy: cp0-usb3-0-phy {
50
- compatible = "usb-nop-xceiv";
51
- vcc-supply = <&cp0_reg_usb3_0_vbus>;
52
- };
53
-
54
- cp0_usb3_1_phy: cp0-usb3-1-phy {
55
- compatible = "usb-nop-xceiv";
56
- vcc-supply = <&cp0_reg_usb3_1_vbus>;
74
+ vin-supply = <&cp0_exp_usb3_1_current_regulator>;
5775 };
5876 };
5977
....@@ -66,8 +84,6 @@
6684 status = "okay";
6785
6886 spi-flash@0 {
69
- #address-cells = <1>;
70
- #size-cells = <1>;
7187 compatible = "jedec,spi-nor";
7288 reg = <0>;
7389 spi-max-frequency = <10000000>;
....@@ -98,6 +114,8 @@
98114
99115 &cp0_pcie2 {
100116 status = "okay";
117
+ phys = <&cp0_comphy5 2>;
118
+ phy-names = "cp0-pcie2-x1-phy";
101119 };
102120
103121 &cp0_i2c0 {
....@@ -169,8 +187,6 @@
169187 status = "okay";
170188
171189 spi-flash@0 {
172
- #address-cells = <0x1>;
173
- #size-cells = <0x1>;
174190 compatible = "jedec,spi-nor";
175191 reg = <0x0>;
176192 spi-max-frequency = <20000000>;
....@@ -195,15 +211,36 @@
195211
196212 &cp0_sata0 {
197213 status = "okay";
214
+
215
+ sata-port@1 {
216
+ phys = <&cp0_comphy3 1>;
217
+ phy-names = "cp0-sata0-1-phy";
218
+ };
219
+};
220
+
221
+&cp0_comphy1 {
222
+ cp0_usbh0_con: connector {
223
+ compatible = "usb-a-connector";
224
+ phy-supply = <&cp0_reg_usb3_0_vbus>;
225
+ };
198226 };
199227
200228 &cp0_usb3_0 {
201
- usb-phy = <&cp0_usb3_0_phy>;
229
+ phys = <&cp0_comphy1 0>;
230
+ phy-names = "cp0-usb3h0-comphy";
202231 status = "okay";
203232 };
204233
234
+&cp0_comphy4 {
235
+ cp0_usbh1_con: connector {
236
+ compatible = "usb-a-connector";
237
+ phy-supply = <&cp0_reg_usb3_1_vbus>;
238
+ };
239
+};
240
+
205241 &cp0_usb3_1 {
206
- usb-phy = <&cp0_usb3_1_phy>;
242
+ phys = <&cp0_comphy4 1>;
243
+ phy-names = "cp0-usb3h1-comphy";
207244 status = "okay";
208245 };
209246