station-m2: fix sata
This commit is contained in:
chainsx
Igor
parent
36a50552b5
commit
fdc58def79
@ -1,11 +1,11 @@
|
|||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
From: chainsx <chainsx@outlook.com>
|
From: chainsx <chainsx@outlook.com>
|
||||||
Date: Fri, 21 Feb 2025 19:36:41 +0800
|
Date: Tue, 24 Feb 2026 01:59:21 +0800
|
||||||
Subject: fix rk3566-roc-pc
|
Subject: fix rk3566-roc-pc
|
||||||
|
|
||||||
---
|
---
|
||||||
arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts | 110 +++++++---
|
arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts | 114 +++++++++++++-----
|
||||||
1 file changed, 80 insertions(+), 30 deletions(-)
|
1 file changed, 84 insertions(+), 30 deletions(-)
|
||||||
|
|
||||||
diff --git a/arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts
|
||||||
index 111111111111..222222222222 100644
|
index 111111111111..222222222222 100644
|
||||||
@ -146,15 +146,15 @@ index 111111111111..222222222222 100644
|
|||||||
- rockchip,pins = <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
|
- rockchip,pins = <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||||
+ vcc5v0_usb30_host_en_h: vcc5v0-usb30-host-en-h {
|
+ vcc5v0_usb30_host_en_h: vcc5v0-usb30-host-en-h {
|
||||||
+ rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
|
+ rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ vcc5v0_usb_otg_en_h: vcc5v0-usb-otg-en-h {
|
|
||||||
+ rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
|
|
||||||
};
|
};
|
||||||
+ };
|
|
||||||
|
|
||||||
- vcc5v0_usb_otg_en_h: vcc5v0-usb-otg-en_h {
|
- vcc5v0_usb_otg_en_h: vcc5v0-usb-otg-en_h {
|
||||||
- rockchip,pins = <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
|
- rockchip,pins = <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||||
|
+ vcc5v0_usb_otg_en_h: vcc5v0-usb-otg-en-h {
|
||||||
|
+ rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||||
|
+ };
|
||||||
|
+ };
|
||||||
|
+
|
||||||
+ headphone {
|
+ headphone {
|
||||||
+ hp_det: hp-det {
|
+ hp_det: hp-det {
|
||||||
+ rockchip,pins = <2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_up>;
|
+ rockchip,pins = <2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_up>;
|
||||||
@ -173,7 +173,7 @@ index 111111111111..222222222222 100644
|
|||||||
&sdhci {
|
&sdhci {
|
||||||
bus-width = <8>;
|
bus-width = <8>;
|
||||||
mmc-hs200-1_8v;
|
mmc-hs200-1_8v;
|
||||||
@@ -600,28 +629,36 @@ &sdmmc1 {
|
@@ -600,28 +629,40 @@ &sdmmc1 {
|
||||||
bus-width = <4>;
|
bus-width = <4>;
|
||||||
cap-sd-highspeed;
|
cap-sd-highspeed;
|
||||||
cap-sdio-irq;
|
cap-sdio-irq;
|
||||||
@ -209,6 +209,10 @@ index 111111111111..222222222222 100644
|
|||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
+&sata2 {
|
||||||
|
+ target-supply = <&vcc3v3_pcie>;
|
||||||
|
+};
|
||||||
|
+
|
||||||
&uart1 {
|
&uart1 {
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
- pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;
|
- pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;
|
||||||
@ -216,7 +220,7 @@ index 111111111111..222222222222 100644
|
|||||||
status = "okay";
|
status = "okay";
|
||||||
uart-has-rtscts;
|
uart-has-rtscts;
|
||||||
|
|
||||||
@@ -653,6 +690,11 @@ &usb2phy0_otg {
|
@@ -653,6 +694,11 @@ &usb2phy0_otg {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -228,7 +232,7 @@ index 111111111111..222222222222 100644
|
|||||||
&usb2phy1_otg {
|
&usb2phy1_otg {
|
||||||
phy-supply = <&vcc5v0_usb30_host>;
|
phy-supply = <&vcc5v0_usb30_host>;
|
||||||
status = "okay";
|
status = "okay";
|
||||||
@@ -682,6 +724,14 @@ &usb_host0_ohci {
|
@@ -682,6 +728,14 @@ &usb_host0_ohci {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -1,11 +1,11 @@
|
|||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
From: chainsx <chainsx@outlook.com>
|
From: chainsx <chainsx@outlook.com>
|
||||||
Date: Fri, 21 Feb 2025 19:36:41 +0800
|
Date: Tue, 24 Feb 2026 01:59:21 +0800
|
||||||
Subject: fix rk3566-roc-pc
|
Subject: fix rk3566-roc-pc
|
||||||
|
|
||||||
---
|
---
|
||||||
arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts | 110 +++++++---
|
arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts | 114 +++++++++++++-----
|
||||||
1 file changed, 80 insertions(+), 30 deletions(-)
|
1 file changed, 84 insertions(+), 30 deletions(-)
|
||||||
|
|
||||||
diff --git a/arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts
|
||||||
index 111111111111..222222222222 100644
|
index 111111111111..222222222222 100644
|
||||||
@ -146,15 +146,15 @@ index 111111111111..222222222222 100644
|
|||||||
- rockchip,pins = <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
|
- rockchip,pins = <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||||
+ vcc5v0_usb30_host_en_h: vcc5v0-usb30-host-en-h {
|
+ vcc5v0_usb30_host_en_h: vcc5v0-usb30-host-en-h {
|
||||||
+ rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
|
+ rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ vcc5v0_usb_otg_en_h: vcc5v0-usb-otg-en-h {
|
|
||||||
+ rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
|
|
||||||
};
|
};
|
||||||
+ };
|
|
||||||
|
|
||||||
- vcc5v0_usb_otg_en_h: vcc5v0-usb-otg-en_h {
|
- vcc5v0_usb_otg_en_h: vcc5v0-usb-otg-en_h {
|
||||||
- rockchip,pins = <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
|
- rockchip,pins = <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||||
|
+ vcc5v0_usb_otg_en_h: vcc5v0-usb-otg-en-h {
|
||||||
|
+ rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||||
|
+ };
|
||||||
|
+ };
|
||||||
|
+
|
||||||
+ headphone {
|
+ headphone {
|
||||||
+ hp_det: hp-det {
|
+ hp_det: hp-det {
|
||||||
+ rockchip,pins = <2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_up>;
|
+ rockchip,pins = <2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_up>;
|
||||||
@ -173,7 +173,7 @@ index 111111111111..222222222222 100644
|
|||||||
&sdhci {
|
&sdhci {
|
||||||
bus-width = <8>;
|
bus-width = <8>;
|
||||||
mmc-hs200-1_8v;
|
mmc-hs200-1_8v;
|
||||||
@@ -600,28 +629,36 @@ &sdmmc1 {
|
@@ -600,28 +629,40 @@ &sdmmc1 {
|
||||||
bus-width = <4>;
|
bus-width = <4>;
|
||||||
cap-sd-highspeed;
|
cap-sd-highspeed;
|
||||||
cap-sdio-irq;
|
cap-sdio-irq;
|
||||||
@ -209,6 +209,10 @@ index 111111111111..222222222222 100644
|
|||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
+&sata2 {
|
||||||
|
+ target-supply = <&vcc3v3_pcie>;
|
||||||
|
+};
|
||||||
|
+
|
||||||
&uart1 {
|
&uart1 {
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
- pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;
|
- pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;
|
||||||
@ -216,7 +220,7 @@ index 111111111111..222222222222 100644
|
|||||||
status = "okay";
|
status = "okay";
|
||||||
uart-has-rtscts;
|
uart-has-rtscts;
|
||||||
|
|
||||||
@@ -653,6 +690,11 @@ &usb2phy0_otg {
|
@@ -653,6 +694,11 @@ &usb2phy0_otg {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -228,7 +232,7 @@ index 111111111111..222222222222 100644
|
|||||||
&usb2phy1_otg {
|
&usb2phy1_otg {
|
||||||
phy-supply = <&vcc5v0_usb30_host>;
|
phy-supply = <&vcc5v0_usb30_host>;
|
||||||
status = "okay";
|
status = "okay";
|
||||||
@@ -682,6 +724,14 @@ &usb_host0_ohci {
|
@@ -682,6 +728,14 @@ &usb_host0_ohci {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user