mirror of https://github.com/armbian/build.git
rockchip64-6.14: rebase/rewrite patches against 6.14 final
This commit is contained in:
parent
ff5470d6d8
commit
4c65fbfb6b
|
@ -1,5 +1,19 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Milivoje Legenovic <m.legenovic@gmail.com>
|
||||
Date: Sat, 22 Mar 2025 13:46:35 +0100
|
||||
Subject: [ARCHEOLOGY] Fix for ethernet warnings in dmesg output
|
||||
|
||||
> X-Git-Archeology: - Revision 896a8090c1c194999591326b1dcb55b377e4460c: https://github.com/armbian/build/commit/896a8090c1c194999591326b1dcb55b377e4460c
|
||||
> X-Git-Archeology: Date: Sat, 22 Mar 2025 13:46:35 +0100
|
||||
> X-Git-Archeology: From: Milivoje Legenovic <m.legenovic@gmail.com>
|
||||
> X-Git-Archeology: Subject: Fix for ethernet warnings in dmesg output
|
||||
> X-Git-Archeology:
|
||||
---
|
||||
arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts | 14 ++++++++--
|
||||
1 file changed, 12 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts b/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts
|
||||
index 8f034c6d494c..ef0f4280048d 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts
|
||||
@@ -229,9 +229,9 @@ &cpu_l3 {
|
||||
|
@ -45,3 +59,6 @@ index 8f034c6d494c..ef0f4280048d 100644
|
|||
usb {
|
||||
usb2_host_pwren: usb2-host-pwren {
|
||||
rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
--
|
||||
Armbian
|
||||
|
||||
|
|
|
@ -13,8 +13,8 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi b/arch/arm64/boo
|
|||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
|
||||
@@ -663,6 +663,7 @@ &pcie0 {
|
||||
pinctrl-0 = <&pcie_perst>;
|
||||
@@ -677,6 +677,7 @@ &pcie0 {
|
||||
vpcie1v8-supply = <&vcca_1v8>;
|
||||
vpcie12v-supply = <&vcc12v_dcin>;
|
||||
vpcie3v3-supply = <&vcc3v3_pcie>;
|
||||
+ bus-scan-delay-ms = <1000>;
|
||||
|
|
|
@ -12,7 +12,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi b/arch/arm64/boo
|
|||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
|
||||
@@ -307,7 +307,7 @@ &gmac {
|
||||
@@ -317,7 +317,7 @@ &gmac {
|
||||
snps,reset-active-low;
|
||||
snps,reset-delays-us = <0 10000 50000>;
|
||||
tx_delay = <0x28>;
|
||||
|
|
|
@ -20,7 +20,7 @@ index 111111111111..222222222222 100644
|
|||
stdout-path = "serial2:1500000n8";
|
||||
};
|
||||
|
||||
@@ -815,6 +816,7 @@ &sdmmc {
|
||||
@@ -829,6 +830,7 @@ &sdmmc {
|
||||
|
||||
&sdhci {
|
||||
bus-width = <8>;
|
||||
|
|
|
@ -12,7 +12,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi b/arch/arm64/boo
|
|||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
|
||||
@@ -838,7 +838,7 @@ &spi1 {
|
||||
@@ -852,7 +852,7 @@ &spi1 {
|
||||
flash@0 {
|
||||
compatible = "jedec,spi-nor";
|
||||
reg = <0>;
|
||||
|
|
|
@ -265,7 +265,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts b/arch/arm64/boo
|
|||
index 111111111111..222222222222 100644
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts
|
||||
@@ -264,7 +264,7 @@ hdmi0_out_con: endpoint {
|
||||
@@ -266,7 +266,7 @@ hdmi0_out_con: endpoint {
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
@ -69,7 +69,7 @@ index 111111111111..222222222222 100644
|
|||
&i2c0 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&i2c0m2_xfer>;
|
||||
@@ -1209,3 +1243,18 @@ &usbdp_phy1 {
|
||||
@@ -1208,3 +1242,18 @@ &usbdp_phy1 {
|
||||
rockchip,dp-lane-mux = <2 3>;
|
||||
status = "okay";
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue