JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

rockchip64-6.13: rebase patches

Browse Source
This commit is contained in:
Muhammed Efe Cetin
2024-12-27 01:04:06 +03:00
committed by Jianfeng Liu
parent 7827caf238
commit d59b4e5c72
63 changed files with 320 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
patch/kernel/archive/rockchip64-6.13/add-board-helios64.patch
View File

@@ -10,8 +10,8 @@ is the complete set of changes actually done.
Signed-off-by: Aditya Prayoga <aditya@kobol.io>
---
arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts | 734 +++++++++-
1 file changed, 654 insertions(+), 80 deletions(-)
arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts | 714 ++++++++--
1 file changed, 634 insertions(+), 80 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
index 111111111111..222222222222 100644
@@ -95,7 +95,8 @@ index 111111111111..222222222222 100644
+ linux,default-trigger = "netdev";
+ default-state = "off";
+ };
+
- led-0 {
+ sata {
+ label = "helios64:blue:hdd-status";
+ gpios = <&gpio4 RK_PD4 GPIO_ACTIVE_HIGH>;
@@ -126,8 +127,7 @@ index 111111111111..222222222222 100644
+ gpios = <&gpio2 RK_PA5 GPIO_ACTIVE_HIGH>;
+ default-state = "keep";
+ };
- led-0 {
+
+ sata_err5 {
+ label = "helios64:red:ata5-err";
+ gpios = <&gpio2 RK_PA6 GPIO_ACTIVE_HIGH>;
@@ -180,7 +180,7 @@ index 111111111111..222222222222 100644
};
};
@@ -114,7 +221,7 @@ pcie_power: pcie-power {
@@ -114,7 +221,7 @@ pcie_power: regulator-pcie-power {
compatible = "regulator-fixed";
enable-active-high;
gpio = <&gpio1 RK_PD0 GPIO_ACTIVE_HIGH>;
@@ -189,7 +189,7 @@ index 111111111111..222222222222 100644
pinctrl-names = "default";
regulator-boot-on;
regulator-name = "pcie_power";
@@ -134,6 +241,7 @@ usblan_power: usblan-power {
@@ -134,6 +241,7 @@ usblan_power: regulator-usblan-power {
vin-supply = <&vcc5v0_usb>;
};
@@ -197,7 +197,7 @@ index 111111111111..222222222222 100644
vcc1v8_sys_s0: regulator-vcc1v8-sys-s0 {
compatible = "regulator-fixed";
regulator-name = "vcc1v8_sys_s0";
@@ -144,6 +252,16 @@ vcc1v8_sys_s0: vcc1v8-sys-s0 {
@@ -144,6 +252,16 @@ vcc1v8_sys_s0: regulator-vcc1v8-sys-s0 {
vin-supply = <&vcc1v8_sys_s3>;
};
@@ -214,7 +214,7 @@ index 111111111111..222222222222 100644
vcc3v0_sd: regulator-vcc3v0-sd {
compatible = "regulator-fixed";
enable-active-high;
@@ -209,6 +347,36 @@ vcc5v0_usb: vcc5v0-usb {
@@ -209,6 +327,36 @@ vcc5v0_usb: regulator-vcc5v0-usb {
vin-supply = <&vcc5v0_perdev>;
};
@@ -251,7 +251,7 @@ index 111111111111..222222222222 100644
vcc12v_dcin: regulator-vcc12v-dcin {
compatible = "regulator-fixed";
regulator-name = "vcc12v_dcin";
@@ -227,36 +395,60 @@ vcc12v_dcin_bkup: vcc12v-dcin-bkup {
@@ -227,36 +375,60 @@ vcc12v_dcin_bkup: regulator-vcc12v-dcin-bkup {
regulator-max-microvolt = <12000000>;
vin-supply = <&vcc12v_dcin>;
};
@@ -338,7 +338,7 @@ index 111111111111..222222222222 100644
};
&cpu_l0 {
@@ -275,6 +467,20 @@ &cpu_l3 {
@@ -275,6 +447,20 @@ &cpu_l3 {
cpu-supply = <&vdd_cpu_l>;
};
@@ -359,7 +359,7 @@ index 111111111111..222222222222 100644
&emmc_phy {
status = "okay";
};
@@ -295,6 +501,11 @@ &gmac {
@@ -295,6 +481,11 @@ &gmac {
status = "okay";
};
@@ -371,7 +371,7 @@ index 111111111111..222222222222 100644
&i2c0 {
clock-frequency = <400000>;
i2c-scl-rising-time-ns = <168>;
@@ -310,6 +521,7 @@ rk808: pmic@1b {
@@ -310,6 +501,7 @@ rk808: pmic@1b {
pinctrl-names = "default";
pinctrl-0 = <&pmic_int_l>;
system-power-controller;
@@ -379,7 +379,7 @@ index 111111111111..222222222222 100644
vcc1-supply = <&vcc5v0_sys>;
vcc2-supply = <&vcc5v0_sys>;
vcc3-supply = <&vcc5v0_sys>;
@@ -326,6 +538,19 @@ rk808: pmic@1b {
@@ -326,6 +518,19 @@ rk808: pmic@1b {
#clock-cells = <1>;
regulators {
@@ -399,7 +399,7 @@ index 111111111111..222222222222 100644
vdd_cpu_l: DCDC_REG2 {
regulator-name = "vdd_cpu_l";
regulator-always-on;
@@ -333,19 +558,48 @@ vdd_cpu_l: DCDC_REG2 {
@@ -333,19 +538,48 @@ vdd_cpu_l: DCDC_REG2 {
regulator-min-microvolt = <750000>;
regulator-max-microvolt = <1350000>;
regulator-ramp-delay = <6001>;
@@ -434,12 +434,12 @@ index 111111111111..222222222222 100644
+ vcc1v8_dvp: LDO_REG1 {
+ regulator-name = "vcc1v8_dvp";
+ };
+
+ /* not used */
+ vcc3v0_touch: LDO_REG2 {
+ regulator-name = "vcc3v0_touch";
+ };
+
+ vcc1v8_s3: LDO_REG3 {
+ regulator-name = "vcc1v8_s3";
+ regulator-always-on;
@@ -449,7 +449,7 @@ index 111111111111..222222222222 100644
regulator-state-mem {
regulator-on-in-suspend;
regulator-suspend-microvolt = <1800000>;
@@ -358,25 +612,61 @@ vcc_sdio_s0: LDO_REG4 {
@@ -358,25 +592,61 @@ vcc_sdio_s0: LDO_REG4 {
regulator-boot-on;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3000000>;
@@ -513,7 +513,7 @@ index 111111111111..222222222222 100644
};
};
@@ -384,12 +674,33 @@ vdd_cpu_b: regulator@40 {
@@ -384,12 +654,33 @@ vdd_cpu_b: regulator@40 {
compatible = "silergy,syr827";
reg = <0x40>;
fcs,suspend-voltage-selector = <1>;
@@ -547,7 +547,7 @@ index 111111111111..222222222222 100644
vin-supply = <&vcc5v0_sys>;
regulator-state-mem {
@@ -404,17 +715,101 @@ &i2c2 {
@@ -404,17 +695,101 @@ &i2c2 {
i2c-scl-falling-time-ns = <30>;
status = "okay";
@@ -651,7 +651,7 @@ index 111111111111..222222222222 100644
status = "okay";
};
@@ -427,6 +822,7 @@ &pcie0 {
@@ -427,6 +802,7 @@ &pcie0 {
max-link-speed = <2>;
num-lanes = <2>;
pinctrl-names = "default";
@@ -659,7 +659,7 @@ index 111111111111..222222222222 100644
status = "okay";
vpcie12v-supply = <&vcc12v_dcin>;
@@ -436,36 +832,116 @@ &pcie0 {
@@ -436,36 +812,116 @@ &pcie0 {
};
&pinctrl {
@@ -729,8 +729,10 @@ index 111111111111..222222222222 100644
+ system_led: sys-led {
+ rockchip,pins = <0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_down>,
+ <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_down>;
+ };
+
};
- sys_red_led_on: sys-red-led-on {
- rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_down>;
+ sata_err_led: sata-err-led {
+ rockchip,pins = <2 RK_PA2 RK_FUNC_GPIO &pcfg_pull_down>,
+ <2 RK_PA3 RK_FUNC_GPIO &pcfg_pull_down>,
@@ -743,10 +745,8 @@ index 111111111111..222222222222 100644
+ misc {
+ pca0_pins: pca0-pins {
+ rockchip,pins = <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
};
- sys_red_led_on: sys-red-led-on {
- rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_down>;
+ };
+
+ wake_on_lan: wake-on-lan {
+ rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
};
@@ -784,7 +784,7 @@ index 111111111111..222222222222 100644
hdd_a_power_en: hdd-a-power-en {
rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
};
@@ -485,7 +961,7 @@ usb_lan_en: usb-lan-en {
@@ -485,7 +941,7 @@ usb_lan_en: usb-lan-en {
vcc3v0-sd {
sdmmc0_pwr_h: sdmmc0-pwr-h {
@@ -793,7 +793,7 @@ index 111111111111..222222222222 100644
};
};
};
@@ -505,10 +981,29 @@ &pwm1 {
@@ -505,10 +961,29 @@ &pwm1 {
status = "okay";
};
@@ -823,7 +823,7 @@ index 111111111111..222222222222 100644
vqmmc-supply = <&vcc1v8_sys_s0>;
status = "okay";
};
@@ -516,8 +1011,9 @@ &sdhci {
@@ -516,8 +991,9 @@ &sdhci {
&sdmmc {
bus-width = <4>;
cap-sd-highspeed;
@@ -834,7 +834,7 @@ index 111111111111..222222222222 100644
pinctrl-names = "default";
pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
vmmc-supply = <&vcc3v0_sd>;
@@ -546,6 +1042,27 @@ &spi5 {
@@ -546,6 +1022,27 @@ &spi5 {
status = "okay";
};
@@ -862,7 +862,7 @@ index 111111111111..222222222222 100644
&tcphy1 {
/* phy for &usbdrd_dwc3_1 */
status = "okay";
@@ -559,61 +1076,118 @@ &tsadc {
@@ -559,61 +1056,118 @@ &tsadc {
status = "okay";
};

8
patch/kernel/archive/rockchip64-6.13/board-firefly-rk3399-dts.patch
View File

@@ -36,7 +36,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts b/arch/arm64/boot/d
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
@@ -216,7 +216,7 @@ vcc5v0_host: vcc5v0-host-regulator {
@@ -216,7 +216,7 @@ vcc5v0_host: regulator-vcc5v0-host {
enable-active-high;
gpio = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
@@ -45,9 +45,9 @@ index 111111111111..222222222222 100644
regulator-name = "vcc5v0_host";
regulator-always-on;
vin-supply = <&vcc_sys>;
@@ -235,8 +235,11 @@ vcc5v0_typec: vcc5v0-typec-regulator {
@@ -235,8 +235,11 @@ vcc5v0_typec: regulator-vcc5v0-typec {
vcc_sys: vcc-sys {
vcc_sys: regulator-vcc-sys {
compatible = "regulator-fixed";
+ enable-active-high;
+ gpio = <&gpio2 RK_PA6 GPIO_ACTIVE_HIGH>;
@@ -58,7 +58,7 @@ index 111111111111..222222222222 100644
regulator-boot-on;
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
@@ -253,6 +256,27 @@ vdd_log: vdd-log {
@@ -253,6 +256,27 @@ vdd_log: regulator-vdd-log {
regulator-min-microvolt = <430000>;
regulator-max-microvolt = <1400000>;
};

2
patch/kernel/archive/rockchip64-6.13/board-helios64-dts-fix-stability-issues.patch
View File

@@ -59,7 +59,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts b/arch/arm64
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
@@ -521,6 +521,7 @@ rk808: pmic@1b {
@@ -501,6 +501,7 @@ rk808: pmic@1b {
pinctrl-names = "default";
pinctrl-0 = <&pmic_int_l>;
system-power-controller;

2
patch/kernel/archive/rockchip64-6.13/board-helios64-remove-pcie-ep-gpios.patch
View File

@@ -12,7 +12,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts b/arch/arm64
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
@@ -819,7 +819,6 @@ &pcie_phy {
@@ -799,7 +799,6 @@ &pcie_phy {
};
&pcie0 {

2
patch/kernel/archive/rockchip64-6.13/board-nanopi-r2c-plus.patch
View File

@@ -16,7 +16,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2c-plus.dts b/arch/arm6
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2c-plus.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2c-plus.dts
@@ -27,7 +27,7 @@ &emmc {
@@ -28,7 +28,7 @@ &emmc {
non-removable;
pinctrl-names = "default";
pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;

35
patch/kernel/archive/rockchip64-6.13/board-nanopi-r2s.patch
View File

@@ -4,8 +4,9 @@ Date: Sat, 7 Jan 2023 11:59:47 +0000
Subject: rockchip64: consolidate nanopi r2s device trees
---
arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts | 481 ++++++----
1 file changed, 316 insertions(+), 165 deletions(-)
arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2.dtsi | 472 +++++++---
arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dtsi | 6 +-
2 files changed, 318 insertions(+), 160 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2.dtsi
index 111111111111..222222222222 100644
@@ -228,7 +229,7 @@ index 111111111111..222222222222 100644
};
};
@@ -121,31 +157,58 @@ &cpu0 {
@@ -118,31 +157,58 @@ &cpu0 {
cpu-supply = <&vdd_arm>;
};
@@ -298,7 +299,7 @@ index 111111111111..222222222222 100644
mdio {
compatible = "snps,dwmac-mdio";
@@ -170,36 +227,35 @@ rtl8211e: ethernet-phy@1 {
@@ -154,36 +220,35 @@ mdio {
&i2c1 {
status = "okay";
@@ -350,7 +351,7 @@ index 111111111111..222222222222 100644
regulator-state-mem {
regulator-on-in-suspend;
regulator-suspend-microvolt = <1000000>;
@@ -208,12 +264,11 @@ regulator-state-mem {
@@ -192,12 +257,11 @@ regulator-state-mem {
vdd_arm: DCDC_REG2 {
regulator-name = "vdd_arm";
@@ -366,7 +367,7 @@ index 111111111111..222222222222 100644
regulator-state-mem {
regulator-on-in-suspend;
regulator-suspend-microvolt = <950000>;
@@ -224,19 +279,17 @@ vcc_ddr: DCDC_REG3 {
@@ -208,19 +272,17 @@ vcc_ddr: DCDC_REG3 {
regulator-name = "vcc_ddr";
regulator-always-on;
regulator-boot-on;
@@ -390,7 +391,7 @@ index 111111111111..222222222222 100644
regulator-state-mem {
regulator-on-in-suspend;
regulator-suspend-microvolt = <3300000>;
@@ -245,11 +298,10 @@ regulator-state-mem {
@@ -229,11 +291,10 @@ regulator-state-mem {
vcc_18: LDO_REG1 {
regulator-name = "vcc_18";
@@ -404,7 +405,7 @@ index 111111111111..222222222222 100644
regulator-state-mem {
regulator-on-in-suspend;
regulator-suspend-microvolt = <1800000>;
@@ -258,11 +310,10 @@ regulator-state-mem {
@@ -242,11 +303,10 @@ regulator-state-mem {
vcc18_emmc: LDO_REG2 {
regulator-name = "vcc18_emmc";
@@ -418,7 +419,7 @@ index 111111111111..222222222222 100644
regulator-state-mem {
regulator-on-in-suspend;
regulator-suspend-microvolt = <1800000>;
@@ -271,11 +322,10 @@ regulator-state-mem {
@@ -255,11 +315,10 @@ regulator-state-mem {
vdd_10: LDO_REG3 {
regulator-name = "vdd_10";
@@ -432,7 +433,7 @@ index 111111111111..222222222222 100644
regulator-state-mem {
regulator-on-in-suspend;
regulator-suspend-microvolt = <1000000>;
@@ -286,20 +336,21 @@ regulator-state-mem {
@@ -270,20 +329,21 @@ regulator-state-mem {
};
&io_domains {
@@ -464,7 +465,7 @@ index 111111111111..222222222222 100644
};
};
@@ -309,61 +360,165 @@ eth_phy_reset_pin: eth-phy-reset-pin {
@@ -293,61 +353,165 @@ eth_phy_reset_pin: eth-phy-reset-pin {
};
};
@@ -656,7 +657,7 @@ index 111111111111..222222222222 100644
status = "okay";
};
@@ -379,13 +534,16 @@ &u2phy_otg {
@@ -363,13 +527,16 @@ &u2phy_otg {
status = "okay";
};
@@ -676,7 +677,7 @@ index 111111111111..222222222222 100644
};
&usbdrd3 {
@@ -394,17 +552,10 @@ &usbdrd3 {
@@ -378,17 +545,10 @@ &usbdrd3 {
#address-cells = <1>;
#size-cells = <0>;
@@ -697,14 +698,11 @@ index 111111111111..222222222222 100644
-&usb_host0_ohci {
- status = "okay";
-};
--
Armbian
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dtsi
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dtsi
@@ -156,11 +215,9 @@ mdio {
@@ -19,11 +19,9 @@ &gmac2io {
mdio {
rtl8211e: ethernet-phy@1 {
reg = <1>;
@@ -718,3 +716,6 @@ index 111111111111..222222222222 100644
};
};
};
--
Armbian

2
patch/kernel/archive/rockchip64-6.13/board-nanopi-r4s-pwmfan.patch
View File

@@ -11,7 +11,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dtsi b/arch/arm64/bo
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dtsi
@@ -62,6 +62,41 @@ vdd_5v: vdd-5v {
@@ -60,6 +60,41 @@ vdd_5v: regulator-vdd-5v {
regulator-always-on;
regulator-boot-on;
};

12
patch/kernel/archive/rockchip64-6.13/board-orangepi-r1-plus.patch
View File

@@ -125,7 +125,7 @@ index 111111111111..222222222222 100644
#include "rk3328.dtsi"
/ {
@@ -86,6 +87,33 @@ vdd_5v_lan: vdd-5v-lan-regulator {
@@ -83,6 +84,33 @@ vdd_5v_lan: regulator-vdd-5v-lan {
regulator-boot-on;
vin-supply = <&vcc_sys>;
};
@@ -159,7 +159,7 @@ index 111111111111..222222222222 100644
};
&cpu0 {
@@ -108,6 +136,16 @@ &display_subsystem {
@@ -105,6 +133,16 @@ &display_subsystem {
status = "disabled";
};
@@ -176,7 +176,7 @@ index 111111111111..222222222222 100644
&gmac2io {
assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>;
assigned-clock-parents = <&gmac_clk>, <&gmac_clk>;
@@ -138,6 +176,10 @@ rtl8211e: ethernet-phy@1 {
@@ -122,6 +160,10 @@ mdio {
};
};
@@ -187,7 +187,7 @@ index 111111111111..222222222222 100644
&i2c1 {
status = "okay";
@@ -167,6 +209,7 @@ vdd_log: DCDC_REG1 {
@@ -151,6 +193,7 @@ vdd_log: DCDC_REG1 {
regulator-name = "vdd_log";
regulator-always-on;
regulator-boot-on;
@@ -195,7 +195,7 @@ index 111111111111..222222222222 100644
regulator-min-microvolt = <712500>;
regulator-max-microvolt = <1450000>;
regulator-ramp-delay = <12500>;
@@ -181,6 +224,7 @@ vdd_arm: DCDC_REG2 {
@@ -165,6 +208,7 @@ vdd_arm: DCDC_REG2 {
regulator-name = "vdd_arm";
regulator-always-on;
regulator-boot-on;
@@ -203,7 +203,7 @@ index 111111111111..222222222222 100644
regulator-min-microvolt = <712500>;
regulator-max-microvolt = <1450000>;
regulator-ramp-delay = <12500>;
@@ -362,6 +406,7 @@ &usbdrd3 {
@@ -346,6 +390,7 @@ &usbdrd3 {
rtl8153: device@2 {
compatible = "usbbda,8153";
reg = <2>;

2
patch/kernel/archive/rockchip64-6.13/board-orangepi-rk3399-pcie.patch
View File

@@ -11,7 +11,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts b/arch/arm64/boot/
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts
@@ -123,6 +123,17 @@ vcc3v0_sd: vcc3v0-sd {
@@ -123,6 +123,17 @@ vcc3v0_sd: regulator-vcc3v0-sd {
vin-supply = <&vcc3v3_sys>;
};

38
patch/kernel/archive/rockchip64-6.13/board-pbp-add-dp-alt-mode.patch
View File

@@ -7,8 +7,8 @@ Subject: add-dp-alt-mode-to-PBP
arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts | 5 +
drivers/phy/rockchip/phy-rockchip-typec.c | 17 ++
drivers/usb/typec/altmodes/displayport.c | 52 +++-
drivers/usb/typec/tcpm/tcpm.c | 139 +++++++++-
4 files changed, 210 insertions(+), 3 deletions(-)
drivers/usb/typec/tcpm/tcpm.c | 138 +++++++++-
4 files changed, 209 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
index 111111111111..222222222222 100644
@@ -186,19 +186,19 @@ index 111111111111..222222222222 100644
#include <linux/hrtimer.h>
#include <linux/jiffies.h>
#include <linux/kernel.h>
@@ -552,6 +553,11 @@ struct tcpm_port {
*/
@@ -565,6 +566,11 @@ struct tcpm_port {
unsigned int message_id_prime;
unsigned int rx_msgid_prime;
+
+#ifdef CONFIG_EXTCON
+ struct extcon_dev *extcon;
+ unsigned int *extcon_cables;
+#endif
+
/* Timer deadline values configured at runtime */
struct pd_timings timings;
@@ -940,6 +947,35 @@ static void tcpm_ams_finish(struct tcpm_port *port)
#ifdef CONFIG_DEBUG_FS
@@ -955,6 +961,35 @@ static void tcpm_ams_finish(struct tcpm_port *port)
port->ams = NONE_AMS;
}
@@ -234,7 +234,7 @@ index 111111111111..222222222222 100644
static int tcpm_pd_transmit(struct tcpm_port *port,
enum tcpm_transmit_type tx_sop_type,
const struct pd_message *msg)
@@ -1179,6 +1215,8 @@ static int tcpm_set_roles(struct tcpm_port *port, bool attached,
@@ -1194,6 +1229,8 @@ static int tcpm_set_roles(struct tcpm_port *port, bool attached,
typec_set_data_role(port->typec_port, data);
typec_set_pwr_role(port->typec_port, role);
@@ -243,7 +243,7 @@ index 111111111111..222222222222 100644
return 0;
}
@@ -1734,7 +1772,7 @@ static void svdm_consume_modes(struct tcpm_port *port, const u32 *p, int cnt,
@@ -1749,7 +1786,7 @@ static void svdm_consume_modes(struct tcpm_port *port, const u32 *p, int cnt,
paltmode->mode = i;
paltmode->vdo = p[i];
@@ -252,7 +252,7 @@ index 111111111111..222222222222 100644
pmdata->altmodes, paltmode->svid,
paltmode->mode, paltmode->vdo);
@@ -1758,6 +1796,8 @@ static void tcpm_register_partner_altmodes(struct tcpm_port *port)
@@ -1773,6 +1810,8 @@ static void tcpm_register_partner_altmodes(struct tcpm_port *port)
tcpm_log(port, "Failed to register partner SVID 0x%04x",
modep->altmode_desc[i].svid);
altmode = NULL;
@@ -261,7 +261,7 @@ index 111111111111..222222222222 100644
}
port->partner_altmode[i] = altmode;
}
@@ -2134,11 +2174,13 @@ static int tcpm_pd_svdm(struct tcpm_port *port, struct typec_altmode *adev,
@@ -2149,11 +2188,13 @@ static int tcpm_pd_svdm(struct tcpm_port *port, struct typec_altmode *adev,
modep->svid_index++;
if (modep->svid_index < modep->nsvids) {
u16 svid = modep->svids[modep->svid_index];
@@ -275,7 +275,7 @@ index 111111111111..222222222222 100644
*response_tx_sop_type = TCPC_TX_SOP_PRIME;
response[0] = VDO(USB_SID_PD, 1,
typec_get_cable_svdm_version(typec),
@@ -4346,6 +4388,7 @@ static void tcpm_typec_disconnect(struct tcpm_port *port)
@@ -4361,6 +4402,7 @@ static void tcpm_typec_disconnect(struct tcpm_port *port)
port->cable = NULL;
if (port->connected) {
if (port->partner) {
@@ -283,7 +283,7 @@ index 111111111111..222222222222 100644
typec_partner_set_usb_power_delivery(port->partner, NULL);
typec_unregister_partner(port->partner);
port->partner = NULL;
@@ -4440,6 +4483,8 @@ static void tcpm_detach(struct tcpm_port *port)
@@ -4455,6 +4497,8 @@ static void tcpm_detach(struct tcpm_port *port)
}
tcpm_reset_port(port);
@@ -292,8 +292,8 @@ index 111111111111..222222222222 100644
}
static void tcpm_src_detach(struct tcpm_port *port)
@@ -7057,6 +7102,64 @@ static int tcpm_port_register_pd(struct tcpm_port *port)
return ret;
@@ -7111,6 +7155,64 @@ static void tcpm_fw_get_timings(struct tcpm_port *port, struct fwnode_handle *fw
port->timings.snk_bc12_cmpletion_time = val;
}
+unsigned int default_supported_cables[] = {
@@ -357,7 +357,7 @@ index 111111111111..222222222222 100644
static int tcpm_fw_get_caps(struct tcpm_port *port, struct fwnode_handle *fwnode)
{
struct fwnode_handle *capabilities, *child, *caps = NULL;
@@ -7070,6 +7173,23 @@ static int tcpm_fw_get_caps(struct tcpm_port *port, struct fwnode_handle *fwnode
@@ -7124,6 +7226,23 @@ static int tcpm_fw_get_caps(struct tcpm_port *port, struct fwnode_handle *fwnode
if (!fwnode)
return -EINVAL;
@@ -381,8 +381,8 @@ index 111111111111..222222222222 100644
/*
* This fwnode has a "compatible" property, but is never populated as a
* struct device. Instead we simply parse it to read the properties.
@@ -7615,6 +7735,17 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
goto out_destroy_wq;
@@ -7671,6 +7790,17 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
tcpm_fw_get_timings(port, tcpc->fwnode);
port->try_role = port->typec_caps.prefer_role;
+#ifdef CONFIG_EXTCON
@@ -399,7 +399,7 @@ index 111111111111..222222222222 100644
port->typec_caps.revision = 0x0120; /* Type-C spec release 1.2 */
port->typec_caps.pd_revision = 0x0300; /* USB-PD spec release 3.0 */
@@ -7658,6 +7789,12 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
@@ -7714,6 +7844,12 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
&tcpm_cable_ops);
port->registered = true;

2
patch/kernel/archive/rockchip64-6.13/board-radxa-e25-sdmmc0-fix.patch
View File

@@ -21,7 +21,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts b/arch/arm64/boot
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
@@ -198,7 +198,7 @@ &sdmmc0 {
@@ -203,7 +203,7 @@ &sdmmc0 {
disable-wp;
pinctrl-names = "default";
pinctrl-0 = <&sdmmc0_bus4 &sdmmc0_clk &sdmmc0_cmd>;

2
patch/kernel/archive/rockchip64-6.13/board-radxa-e25-usb3-and-emmc-fix.patch
View File

@@ -50,7 +50,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts b/arch/arm64/boot
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
@@ -213,6 +213,8 @@ &usb_host0_ohci {
@@ -218,6 +218,8 @@ &usb_host0_ohci {
};
&usb_host0_xhci {

8
patch/kernel/archive/rockchip64-6.13/board-rk3328-roc-cc-dts-enable-dmc.patch
View File

@@ -4,14 +4,14 @@ Date: Tue, 12 Oct 2021 18:31:28 +0000
Subject: enable roc-cc dmc
---
arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 38 ++++++++++
arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi | 38 ++++++++++
1 file changed, 38 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi
@@ -4,6 +4,7 @@
@@ -5,6 +5,7 @@
/dts-v1/;
@@ -19,7 +19,7 @@ index 111111111111..222222222222 100644
#include "rk3328.dtsi"
/ {
@@ -20,6 +21,32 @@ chosen {
@@ -18,6 +19,32 @@ chosen {
stdout-path = "serial2:1500000n8";
};
@@ -52,7 +52,7 @@ index 111111111111..222222222222 100644
gmac_clkin: external-gmac-clock {
compatible = "fixed-clock";
clock-frequency = <125000000>;
@@ -116,6 +143,17 @@ &codec {
@@ -111,6 +138,17 @@ &codec {
status = "okay";
};

76
patch/kernel/archive/rockchip64-6.13/board-rk3328-roc-pc.patch
View File

@@ -4,8 +4,8 @@ Date: Tue, 12 Oct 2021 19:34:29 +0000
Subject: enable dmc for rk3328-roc-pc
---
arch/arm64/boot/dts/rockchip/rk3328-roc-pc.dts | 525 ++++++++--
1 file changed, 466 insertions(+), 59 deletions(-)
arch/arm64/boot/dts/rockchip/rk3328-roc-pc.dts | 524 +++++++++-
1 file changed, 466 insertions(+), 58 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3328-roc-pc.dts
index 111111111111..222222222222 100644
@@ -40,7 +40,12 @@ index 111111111111..222222222222 100644
+ mmc0 = &sdmmc;
+ mmc1 = &emmc; /* MMC boot device */
+ };
+
- /* This button is unpopulated out of the factory. */
- button-recovery {
- label = "Recovery";
- linux,code = <KEY_VENDOR>;
- press-threshold-microvolt = <10000>;
+ gmac_clkin: external-gmac-clock {
+ compatible = "fixed-clock";
+ clock-frequency = <125000000>;
@@ -60,12 +65,7 @@ index 111111111111..222222222222 100644
+ sound-dai = <&codec>;
+ };
+ };
- /* This button is unpopulated out of the factory. */
- button-recovery {
- label = "Recovery";
- linux,code = <KEY_VENDOR>;
- press-threshold-microvolt = <10000>;
+
+ hdmi-sound {
+ compatible = "simple-audio-card";
+ simple-audio-card,format = "i2s";
@@ -73,17 +73,22 @@ index 111111111111..222222222222 100644
+ simple-audio-card,name = "rockchip,hdmi";
+ simple-audio-card,cpu {
+ sound-dai = <&i2s0>;
};
+ };
+ simple-audio-card,codec {
+ sound-dai = <&hdmi>;
+ };
+ };
+
};
};
- ir-receiver {
- compatible = "gpio-ir-receiver";
- gpios = <&gpio2 RK_PA2 GPIO_ACTIVE_LOW>;
- linux,rc-map-name = "rc-khadas";
+ vcc_host_5v: vcc-host-5v-regulator {
+ compatible = "regulator-fixed";
+ enable-active-high;
+ gpio = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>;
+ pinctrl-names = "default";
pinctrl-names = "default";
- pinctrl-0 = <&ir_int>;
+ pinctrl-0 = <&usb30_host_drv>;
+ regulator-name = "vcc_host_5v";
+ regulator-always-on;
@@ -98,31 +103,26 @@ index 111111111111..222222222222 100644
+ regulator-boot-on;
};
- ir-receiver {
- compatible = "gpio-ir-receiver";
- gpios = <&gpio2 RK_PA2 GPIO_ACTIVE_LOW>;
- linux,rc-map-name = "rc-khadas";
- sdio_pwrseq: sdio-pwrseq {
- compatible = "mmc-pwrseq-simple";
+ vcc_phy: vcc-phy-regulator {
+ compatible = "regulator-fixed";
+ enable-active-high;
+ gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
- pinctrl-0 = <&ir_int>;
- pinctrl-0 = <&wifi_en>, <&wifi_host_wake>;
- reset-gpios = <&gpio3 RK_PB0 GPIO_ACTIVE_LOW>;
+ pinctrl-0 = <&usb20_host_drv>;
+ regulator-name = "vcc_host1_5v";
+ regulator-always-on;
+ regulator-boot-on;
+ vin-supply = <&vcc_sys>;
};
- sdio_pwrseq: sdio-pwrseq {
- compatible = "mmc-pwrseq-simple";
+ };
+
+ vcc_sd: sdmmc-regulator {
+ compatible = "regulator-fixed";
+ gpio = <&gpio0 30 GPIO_ACTIVE_LOW>;
pinctrl-names = "default";
- pinctrl-0 = <&wifi_en>, <&wifi_host_wake>;
- reset-gpios = <&gpio3 RK_PB0 GPIO_ACTIVE_LOW>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&sdmmc0m1_pin>;
+ regulator-name = "vcc_sd";
+ regulator-min-microvolt = <3300000>;
@@ -478,17 +478,17 @@ index 111111111111..222222222222 100644
+&pinctrl {
+ pinctrl-names = "default";
+ pinctrl-0 = <&clk_32k_out>;
- wifi {
- wifi_en: wifi-en {
- rockchip,pins = <3 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
+
+ clk_32k {
+ clk_32k_out: clk-32k-out {
+ rockchip,pins =
+ <1 RK_PD4 1 &pcfg_pull_none>;
+ };
+ };
+
- wifi {
- wifi_en: wifi-en {
- rockchip,pins = <3 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
+ pmic {
+ pmic_int_l: pmic-int-l {
+ rockchip,pins =
@@ -540,23 +540,19 @@ index 111111111111..222222222222 100644
-&saradc {
- vref-supply = <&vcc_18>;
+&u2phy_otg {
+ status = "okay";
+};
+
+&uart2 {
status = "okay";
};
-&usb20_host_drv {
- rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up>;
+&usb20_otg {
+ dr_mode = "host";
+&uart2 {
+ status = "okay";
};
-&vcc_host1_5v {
- gpio = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>;
+&usb_host0_ehci {
+&usb20_otg {
+ dr_mode = "host";
+ status = "okay";
};
@@ -564,6 +560,10 @@ index 111111111111..222222222222 100644
- gpios = <&gpio0 RK_PD3 GPIO_ACTIVE_HIGH>;
- pinctrl-names = "default";
- pinctrl-0 = <&sdio_per_pin>;
+&usb_host0_ehci {
+ status = "okay";
+};
+
+&usb_host0_ohci {
+ status = "okay";
+};

2
patch/kernel/archive/rockchip64-6.13/board-rockpi4-0003-arm64-dts-pcie.patch
View File

@@ -104,7 +104,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi b/arch/arm64/boo
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
@@ -111,6 +111,8 @@ vcc3v3_pcie: vcc3v3-pcie-regulator {
@@ -111,6 +111,8 @@ vcc3v3_pcie: regulator-vcc3v3-pcie {
regulator-name = "vcc3v3_pcie";
regulator-always-on;
regulator-boot-on;

12
patch/kernel/archive/rockchip64-6.13/board-rockpis-dts-fixes.patch
View File

@@ -1,14 +1,14 @@
From 65e256b55e9f9d503647f53d0ffc68b283d70a88 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Paolo Sabatino <paolo.sabatino@gmail.com>
Date: Wed, 27 Nov 2024 19:06:49 +0100
Subject: [PATCH] rk3308: fixes for rock pi s dts
Subject: rk3308: fixes for rock pi s dts
---
.../boot/dts/rockchip/rk3308-rock-pi-s.dts | 73 +++++++++++++++++++
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts | 73 ++++++++++
1 file changed, 73 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
index 62d18ca769a1..b1a77910fffb 100644
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
@@ -48,6 +48,54 @@ blue-led {
@@ -66,7 +66,7 @@ index 62d18ca769a1..b1a77910fffb 100644
sdio_pwrseq: sdio-pwrseq {
compatible = "mmc-pwrseq-simple";
pinctrl-0 = <&wifi_enable_h>;
@@ -128,6 +176,11 @@ vdd_log: vdd-log {
@@ -128,6 +176,11 @@ vdd_log: regulator-vdd-log {
};
};
@@ -117,5 +117,5 @@ index 62d18ca769a1..b1a77910fffb 100644
status = "okay";
--
2.43.0
Armbian

2
patch/kernel/archive/rockchip64-6.13/board-station-p2.patch
View File

@@ -39,7 +39,7 @@ index 111111111111..222222222222 100644
};
};
@@ -126,41 +124,134 @@ vcc5v0_sys: vcc5v0-sys-regulator {
@@ -126,41 +124,134 @@ vcc5v0_sys: regulator-vcc5v0-sys {
vin-supply = <&dc_12v>;
};

43
patch/kernel/archive/rockchip64-6.13/general-add-hdmi-mks-ips50-resolutions.patch
View File

@@ -1,7 +1,8 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Maxim Medvedev <redrathnure@gmail.com>
Date: Mon, 1 Jan 2024 21:50:10 +0000
Subject: HDMI EDID records for 800x480 resolution (a MKS IPS50 screen and similar)
Subject: HDMI EDID records for 800x480 resolution (a MKS IPS50 screen and
similar)
---
drivers/gpu/drm/drm_edid.c | 12 +++++++++-
@@ -11,12 +12,10 @@ Subject: HDMI EDID records for 800x480 resolution (a MKS IPS50 screen and simila
4 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index a491280ca48c..6d74e4b62dcf 100644
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -1536,10 +1536,20 @@ static const struct drm_display_mode edid_cea_modes_193[] = {
/* 219 - 4096x2160@120Hz 256:135 */
{ DRM_MODE("4096x2160", DRM_MODE_TYPE_DRIVER, 1188000, 4096, 4184,
@@ -1550,6 +1550,16 @@ static const struct drm_display_mode edid_cea_modes_193[] = {
4272, 4400, 0, 2160, 2168, 2178, 2250, 0,
DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
.picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135, },
@@ -33,11 +32,7 @@ index a491280ca48c..6d74e4b62dcf 100644
};
/*
* HDMI 1.4 4k modes. Index using the VIC.
*/
@@ -4167,11 +4177,11 @@ static bool drm_edid_has_cta_extension(const struct drm_edid *drm_edid)
}
@@ -4215,7 +4225,7 @@ static bool drm_edid_has_cta_extension(const struct drm_edid *drm_edid)
static __always_inline const struct drm_display_mode *cea_mode_for_vic(u8 vic)
{
BUILD_BUG_ON(1 + ARRAY_SIZE(edid_cea_modes_1) - 1 != 127);
@@ -46,15 +41,11 @@ index a491280ca48c..6d74e4b62dcf 100644
if (vic >= 1 && vic < 1 + ARRAY_SIZE(edid_cea_modes_1))
return &edid_cea_modes_1[vic - 1];
if (vic >= 193 && vic < 193 + ARRAY_SIZE(edid_cea_modes_193))
return &edid_cea_modes_193[vic - 193];
diff --git a/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c b/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c
index db774d97918f..375fbc8a8747 100644
index 111111111111..222222222222 100644
--- a/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c
+++ b/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c
@@ -293,10 +293,11 @@ struct inno_hdmi_phy_drv_data {
static const struct pre_pll_config pre_pll_cfg_table[] = {
{ 25175000, 25175000, 3, 125, 3, 1, 1, 1, 3, 3, 4, 0, 0xe00000},
@@ -295,6 +295,7 @@ static const struct pre_pll_config pre_pll_cfg_table[] = {
{ 25175000, 31468750, 1, 41, 0, 3, 3, 1, 3, 3, 4, 0, 0xf5554f},
{ 27000000, 27000000, 1, 36, 0, 3, 3, 1, 2, 3, 4, 0, 0x0},
{ 27000000, 33750000, 1, 45, 0, 3, 3, 1, 3, 3, 4, 0, 0x0},
@@ -62,15 +53,11 @@ index db774d97918f..375fbc8a8747 100644
{ 31500000, 31500000, 1, 42, 0, 3, 3, 1, 2, 3, 4, 0, 0x0},
{ 31500000, 39375000, 1, 105, 1, 3, 3, 10, 0, 3, 4, 0, 0x0},
{ 33750000, 33750000, 1, 45, 0, 3, 3, 1, 2, 3, 4, 0, 0x0},
{ 33750000, 42187500, 1, 169, 2, 3, 3, 15, 0, 3, 4, 0, 0x0},
{ 35500000, 35500000, 1, 71, 2, 2, 2, 6, 0, 3, 4, 0, 0x0},
diff --git a/drivers/video/hdmi.c b/drivers/video/hdmi.c
index 03c7f27dde49..8d68d34ce023 100644
index 111111111111..222222222222 100644
--- a/drivers/video/hdmi.c
+++ b/drivers/video/hdmi.c
@@ -1113,10 +1113,12 @@ hdmi_picture_aspect_get_name(enum hdmi_picture_aspect picture_aspect)
return "16:9";
case HDMI_PICTURE_ASPECT_64_27:
@@ -1115,6 +1115,8 @@ hdmi_picture_aspect_get_name(enum hdmi_picture_aspect picture_aspect)
return "64:27";
case HDMI_PICTURE_ASPECT_256_135:
return "256:135";
@@ -79,15 +66,11 @@ index 03c7f27dde49..8d68d34ce023 100644
case HDMI_PICTURE_ASPECT_RESERVED:
return "Reserved";
}
return "Invalid";
}
diff --git a/include/linux/hdmi.h b/include/linux/hdmi.h
index 3bb87bf6bc65..be61a7954847 100644
index 111111111111..222222222222 100644
--- a/include/linux/hdmi.h
+++ b/include/linux/hdmi.h
@@ -97,10 +97,11 @@ enum hdmi_picture_aspect {
HDMI_PICTURE_ASPECT_NONE,
HDMI_PICTURE_ASPECT_4_3,
@@ -108,6 +108,7 @@ enum hdmi_picture_aspect {
HDMI_PICTURE_ASPECT_16_9,
HDMI_PICTURE_ASPECT_64_27,
HDMI_PICTURE_ASPECT_256_135,
@@ -95,8 +78,6 @@ index 3bb87bf6bc65..be61a7954847 100644
HDMI_PICTURE_ASPECT_RESERVED,
};
enum hdmi_active_aspect {
HDMI_ACTIVE_ASPECT_16_9_TOP = 2,
--
Created with Armbian build tools https://github.com/armbian/build
Armbian

2
patch/kernel/archive/rockchip64-6.13/general-add-overlay-configfs.patch
View File

@@ -103,7 +103,7 @@ diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
index 111111111111..222222222222 100644
--- a/drivers/of/Kconfig
+++ b/drivers/of/Kconfig
@@ -120,4 +120,15 @@ config OF_OVERLAY_KUNIT_TEST
@@ -126,4 +126,15 @@ config OF_OVERLAY_KUNIT_TEST
config OF_NUMA
bool

2
patch/kernel/archive/rockchip64-6.13/general-add-pll-hdmi-timings.patch
View File

@@ -72,7 +72,7 @@ diff --git a/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c b/drivers/phy/rockchi
index 111111111111..222222222222 100644
--- a/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c
+++ b/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c
@@ -464,6 +464,77 @@ static const struct pre_pll_config pre_pll_cfg_table[] = {
@@ -465,6 +465,77 @@ static const struct pre_pll_config pre_pll_cfg_table[] = {
{594000000, 297000000, 1, 99, 0, 1, 1, 1, 0, 1, 1, 0, 0x0},
{594000000, 371250000, 4, 495, 0, 3, 1, 1, 3, 0, 0, 1, 0x0},
{594000000, 594000000, 1, 99, 0, 2, 0, 1, 0, 1, 1, 0, 0x0},

4
patch/kernel/archive/rockchip64-6.13/general-add-xtx-spi-nor-chips.patch
View File

@@ -30,7 +30,7 @@ diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c
index 111111111111..222222222222 100644
--- a/drivers/mtd/spi-nor/core.c
+++ b/drivers/mtd/spi-nor/core.c
@@ -1977,6 +1977,7 @@ static const struct spi_nor_manufacturer *manufacturers[] = {
@@ -1980,6 +1980,7 @@ static const struct spi_nor_manufacturer *manufacturers[] = {
&spi_nor_sst,
&spi_nor_winbond,
&spi_nor_xmc,
@@ -42,7 +42,7 @@ diff --git a/drivers/mtd/spi-nor/core.h b/drivers/mtd/spi-nor/core.h
index 111111111111..222222222222 100644
--- a/drivers/mtd/spi-nor/core.h
+++ b/drivers/mtd/spi-nor/core.h
@@ -593,6 +593,7 @@ extern const struct spi_nor_manufacturer spi_nor_spansion;
@@ -594,6 +594,7 @@ extern const struct spi_nor_manufacturer spi_nor_spansion;
extern const struct spi_nor_manufacturer spi_nor_sst;
extern const struct spi_nor_manufacturer spi_nor_winbond;
extern const struct spi_nor_manufacturer spi_nor_xmc;

2
patch/kernel/archive/rockchip64-6.13/general-cryptov1-trng.patch
View File

@@ -18,7 +18,7 @@ diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 111111111111..222222222222 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -696,6 +696,14 @@ config CRYPTO_DEV_ROCKCHIP
@@ -717,6 +717,14 @@ config CRYPTO_DEV_ROCKCHIP
This driver interfaces with the hardware crypto accelerator.
Supporting cbc/ecb chainmode, and aes/des/des3_ede cipher mode.

2
patch/kernel/archive/rockchip64-6.13/general-disable-mtu-validation.patch
View File

@@ -18,7 +18,7 @@ diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/eth
index 111111111111..222222222222 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -5851,27 +5851,15 @@ static void stmmac_set_rx_mode(struct net_device *dev)
@@ -5827,27 +5827,15 @@ static void stmmac_set_rx_mode(struct net_device *dev)
static int stmmac_change_mtu(struct net_device *dev, int new_mtu)
{
struct stmmac_priv *priv = netdev_priv(dev);

2
patch/kernel/archive/rockchip64-6.13/general-fix-inno-usb2-phy-init.patch
View File

@@ -11,7 +11,7 @@ diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchi
index 111111111111..222222222222 100644
--- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
+++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
@@ -1307,11 +1307,6 @@ static int rockchip_usb2phy_otg_port_init(struct rockchip_usb2phy *rphy,
@@ -1323,11 +1323,6 @@ static int rockchip_usb2phy_otg_port_init(struct rockchip_usb2phy *rphy,
goto out;
}

2
patch/kernel/archive/rockchip64-6.13/general-fix-mmc-signal-voltage-before-reboot.patch
View File

@@ -26,7 +26,7 @@ diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 111111111111..222222222222 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1368,6 +1368,14 @@ void mmc_power_off(struct mmc_host *host)
@@ -1377,6 +1377,14 @@ void mmc_power_off(struct mmc_host *host)
if (host->ios.power_mode == MMC_POWER_OFF)
return;

9
patch/kernel/archive/rockchip64-6.13/general-hdmi-clock-fixes.patch
View File

@@ -6,9 +6,9 @@ Subject: hdmi timing core changes and fixes
---
drivers/clk/rockchip/clk-rk3399.c | 49 ++++++++--
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 12 +--
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 44 ++++++++-
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 42 ++++++++
drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 7 ++
4 files changed, 98 insertions(+), 14 deletions(-)
4 files changed, 97 insertions(+), 13 deletions(-)
diff --git a/drivers/clk/rockchip/clk-rk3399.c b/drivers/clk/rockchip/clk-rk3399.c
index 111111111111..222222222222 100644
@@ -136,7 +136,7 @@ diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockc
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
+++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
@@ -175,6 +175,46 @@ static const struct dw_hdmi_mpll_config rockchip_mpll_cfg[] = {
@@ -178,6 +178,46 @@ static const struct dw_hdmi_mpll_config rockchip_mpll_cfg[] = {
}
};
@@ -183,7 +183,7 @@ index 111111111111..222222222222 100644
static const struct dw_hdmi_curr_ctrl rockchip_cur_ctr[] = {
/* pixelclk bpp8 bpp10 bpp12 */
{
@@ -364,6 +404,8 @@ static int dw_hdmi_rockchip_genphy_init(struct dw_hdmi *dw_hdmi, void *data,
@@ -343,6 +383,8 @@ static int dw_hdmi_rockchip_genphy_init(struct dw_hdmi *dw_hdmi, void *data,
dw_hdmi_set_high_tmds_clock_ratio(dw_hdmi, display);
@@ -254,3 +254,4 @@ index 111111111111..222222222222 100644
.modeset = &rk3328_modeset,
--
Armbian

2
patch/kernel/archive/rockchip64-6.13/general-rk3328-dtsi-trb-ent-quirk.patch
View File

@@ -48,7 +48,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rock
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -1068,6 +1068,7 @@ usbdrd3: usb@ff600000 {
@@ -1070,6 +1070,7 @@ usbdrd3: usb@ff600000 {
snps,dis-del-phy-power-chg-quirk;
snps,dis_enblslpm_quirk;
snps,dis-tx-ipgap-linecheck-quirk;

4
patch/kernel/archive/rockchip64-6.13/general-rk808-configurable-switch-voltage-steps.patch
View File

@@ -86,8 +86,8 @@ index 111111111111..222222222222 100644
gpio_level = gpiod_get_value(gpio);
if (gpio_level == 0) {
@@ -1863,6 +1866,12 @@ static int rk808_regulator_dt_parse_pdata(struct device *dev,
0 : tmp);
@@ -1860,6 +1863,12 @@ static int rk808_regulator_dt_parse_pdata(struct device *dev, struct regmap *map
gpiod_is_active_low(pdata->dvs_gpio[i]) ? 0 : tmp);
}
+ tmp = of_property_read_u32(dev->of_node, "max-buck-steps-per-change", &pdata->max_buck_steps_per_change);

15
patch/kernel/archive/rockchip64-6.13/general-st7796-driver.patch
View File

@@ -4,12 +4,16 @@ Date: Fri, 12 May 2023 22:30:14 +0000
Subject: Custom st7796 display module
---
drivers/staging/fbtft/Kconfig | 6 +
drivers/staging/fbtft/Makefile | 1 +
drivers/staging/fbtft/fb_st7796.c | 154 ++++++++++
3 files changed, 161 insertions(+)
diff --git a/drivers/staging/fbtft/Kconfig b/drivers/staging/fbtft/Kconfig
index 4d29e8c1014..265c7e3fe76 100644
index 111111111111..222222222222 100644
--- a/drivers/staging/fbtft/Kconfig
+++ b/drivers/staging/fbtft/Kconfig
@@ -82,6 +82,12 @@ config FB_TFT_ILI9481
@@ -80,6 +80,12 @@ config FB_TFT_ILI9481
help
Generic Framebuffer support for ILI9481
@@ -23,7 +27,7 @@ index 4d29e8c1014..265c7e3fe76 100644
tristate "FB driver for the ILI9486 LCD Controller"
depends on FB_TFT
diff --git a/drivers/staging/fbtft/Makefile b/drivers/staging/fbtft/Makefile
index e9cdf0f0a7d..3c62b33e596 100644
index 111111111111..222222222222 100644
--- a/drivers/staging/fbtft/Makefile
+++ b/drivers/staging/fbtft/Makefile
@@ -16,6 +16,7 @@ obj-$(CONFIG_FB_TFT_ILI9325) += fb_ili9325.o
@@ -36,7 +40,7 @@ index e9cdf0f0a7d..3c62b33e596 100644
obj-$(CONFIG_FB_TFT_RA8875) += fb_ra8875.o
diff --git a/drivers/staging/fbtft/fb_st7796.c b/drivers/staging/fbtft/fb_st7796.c
new file mode 100755
index 00000000000..c7deedbea69
index 000000000000..111111111111
--- /dev/null
+++ b/drivers/staging/fbtft/fb_st7796.c
@@ -0,0 +1,154 @@
@@ -194,3 +198,6 @@ index 00000000000..c7deedbea69
+MODULE_DESCRIPTION("FB driver for the ST7796 LCD display controller");
+MODULE_AUTHOR("Christian Vogelgsang + somebody from makerbase");
+MODULE_LICENSE("GPL");
--
Armbian

2
patch/kernel/archive/rockchip64-6.13/general-v4l2-rkvdec-00-fixes.patch
View File

@@ -173,7 +173,7 @@ diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2
index 111111111111..222222222222 100644
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -1366,6 +1366,8 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
@@ -1367,6 +1367,8 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
case V4L2_PIX_FMT_NV42: descr = "Y/VU 4:4:4"; break;
case V4L2_PIX_FMT_P010: descr = "10-bit Y/UV 4:2:0"; break;
case V4L2_PIX_FMT_P012: descr = "12-bit Y/UV 4:2:0"; break;

12
patch/kernel/archive/rockchip64-6.13/general-v4l2-rkvdec-01-vp9.patch
View File

@@ -13,7 +13,7 @@ diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvde
index 111111111111..222222222222 100644
--- a/drivers/staging/media/rkvdec/rkvdec.c
+++ b/drivers/staging/media/rkvdec/rkvdec.c
@@ -1130,9 +1130,9 @@ static void rkvdec_remove(struct platform_device *pdev)
@@ -1128,9 +1128,9 @@ static void rkvdec_remove(struct platform_device *pdev)
cancel_delayed_work_sync(&rkvdec->watchdog_work);
@@ -221,7 +221,7 @@ index 111111111111..222222222222 100644
#include <linux/slab.h>
#include <linux/videodev2.h>
#include <linux/workqueue.h>
@@ -720,6 +723,11 @@ static void rkvdec_job_finish(struct rkvdec_ctx *ctx,
@@ -718,6 +721,11 @@ static void rkvdec_job_finish(struct rkvdec_ctx *ctx,
pm_runtime_mark_last_busy(rkvdec->dev);
pm_runtime_put_autosuspend(rkvdec->dev);
@@ -233,7 +233,7 @@ index 111111111111..222222222222 100644
rkvdec_job_finish_no_pm(ctx, result);
}
@@ -757,6 +765,33 @@ static void rkvdec_device_run(void *priv)
@@ -755,6 +763,33 @@ static void rkvdec_device_run(void *priv)
if (WARN_ON(!desc))
return;
@@ -267,7 +267,7 @@ index 111111111111..222222222222 100644
ret = pm_runtime_resume_and_get(rkvdec->dev);
if (ret < 0) {
@@ -1023,6 +1058,11 @@ static irqreturn_t rkvdec_irq_handler(int irq, void *priv)
@@ -1021,6 +1056,11 @@ static irqreturn_t rkvdec_irq_handler(int irq, void *priv)
if (cancel_delayed_work(&rkvdec->watchdog_work)) {
struct rkvdec_ctx *ctx;
@@ -279,7 +279,7 @@ index 111111111111..222222222222 100644
ctx = v4l2_m2m_get_curr_priv(rkvdec->m2m_dev);
rkvdec_job_finish(ctx, state);
}
@@ -1040,6 +1080,7 @@ static void rkvdec_watchdog_func(struct work_struct *work)
@@ -1038,6 +1078,7 @@ static void rkvdec_watchdog_func(struct work_struct *work)
ctx = v4l2_m2m_get_curr_priv(rkvdec->m2m_dev);
if (ctx) {
dev_err(rkvdec->dev, "Frame processing timed out!\n");
@@ -287,7 +287,7 @@ index 111111111111..222222222222 100644
writel(RKVDEC_IRQ_DIS, rkvdec->regs + RKVDEC_REG_INTERRUPT);
writel(0, rkvdec->regs + RKVDEC_REG_SYSCTRL);
rkvdec_job_finish(ctx, VB2_BUF_STATE_ERROR);
@@ -1108,6 +1149,18 @@ static int rkvdec_probe(struct platform_device *pdev)
@@ -1106,6 +1147,18 @@ static int rkvdec_probe(struct platform_device *pdev)
return ret;
}

10
patch/kernel/archive/rockchip64-6.13/general-v4l2-rkvdec-02-hevc.patch
View File

@@ -2903,7 +2903,7 @@ index 111111111111..222222222222 100644
return -EINVAL;
f->pixelformat = rkvdec_coded_fmts[f->index].fourcc;
@@ -949,14 +974,17 @@ static int rkvdec_init_ctrls(struct rkvdec_ctx *ctx)
@@ -947,14 +972,17 @@ static int rkvdec_init_ctrls(struct rkvdec_ctx *ctx)
int ret;
for (i = 0; i < ARRAY_SIZE(rkvdec_coded_fmts); i++)
@@ -2925,7 +2925,7 @@ index 111111111111..222222222222 100644
}
ret = v4l2_ctrl_handler_setup(&ctx->ctrl_hdl);
@@ -1158,8 +1186,17 @@ static void rkvdec_watchdog_func(struct work_struct *work)
@@ -1156,8 +1184,17 @@ static void rkvdec_watchdog_func(struct work_struct *work)
}
}
@@ -2944,7 +2944,7 @@ index 111111111111..222222222222 100644
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, of_rkvdec_match);
@@ -1171,6 +1208,7 @@ static const char * const rkvdec_clk_names[] = {
@@ -1169,6 +1206,7 @@ static const char * const rkvdec_clk_names[] = {
static int rkvdec_probe(struct platform_device *pdev)
{
struct rkvdec_dev *rkvdec;
@@ -2952,7 +2952,7 @@ index 111111111111..222222222222 100644
unsigned int i;
int ret, irq;
@@ -1196,6 +1234,13 @@ static int rkvdec_probe(struct platform_device *pdev)
@@ -1194,6 +1232,13 @@ static int rkvdec_probe(struct platform_device *pdev)
if (ret)
return ret;
@@ -3028,7 +3028,7 @@ diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvde
index 111111111111..222222222222 100644
--- a/drivers/staging/media/rkvdec/rkvdec.c
+++ b/drivers/staging/media/rkvdec/rkvdec.c
@@ -1192,11 +1192,19 @@ static const struct rkvdec_variant rk3399_rkvdec_variant = {
@@ -1190,11 +1190,19 @@ static const struct rkvdec_variant rk3399_rkvdec_variant = {
RKVDEC_CAPABILITY_VP9
};

8
patch/kernel/archive/rockchip64-6.13/media-0001-Add-rkvdec2-Support-v3.patch
View File

@@ -1104,7 +1104,7 @@ diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
index 111111111111..222222222222 100644
--- a/drivers/staging/media/Kconfig
+++ b/drivers/staging/media/Kconfig
@@ -35,6 +35,7 @@ source "drivers/staging/media/meson/vdec/Kconfig"
@@ -33,6 +33,7 @@ source "drivers/staging/media/max96712/Kconfig"
source "drivers/staging/media/meson/vdec/Kconfig"
source "drivers/staging/media/rkvdec/Kconfig"
@@ -1116,7 +1116,7 @@ diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
index 111111111111..222222222222 100644
--- a/drivers/staging/media/Makefile
+++ b/drivers/staging/media/Makefile
@@ -6,6 +6,7 @@ obj-$(CONFIG_VIDEO_MAX96712) += max96712/
@@ -5,6 +5,7 @@ obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx/
obj-$(CONFIG_VIDEO_MAX96712) += max96712/
obj-$(CONFIG_VIDEO_MESON_VDEC) += meson/vdec/
obj-$(CONFIG_VIDEO_ROCKCHIP_VDEC) += rkvdec/
@@ -3679,7 +3679,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
@@ -2841,6 +2841,16 @@ system_sram2: sram@ff001000 {
@@ -2882,6 +2882,16 @@ system_sram2: sram@ff001000 {
ranges = <0x0 0x0 0xff001000 0xef000>;
#address-cells = <1>;
#size-cells = <1>;
@@ -3696,7 +3696,7 @@ index 111111111111..222222222222 100644
};
pinctrl: pinctrl {
@@ -2910,6 +2920,46 @@ gpio4: gpio@fec50000 {
@@ -2951,6 +2961,46 @@ gpio4: gpio@fec50000 {
#interrupt-cells = <2>;
};
};

29
patch/kernel/archive/rockchip64-6.13/media-0003-rk3568-disable-hantro-h264.patch
View File

@@ -10,11 +10,25 @@ Subject: [ARCHEOLOGY] rockchip64-edge: disable hantro g1 h264 decoder on
> X-Git-Archeology: Subject: rockchip64-edge: disable hantro g1 h264 decoder on rk356x
> X-Git-Archeology:
---
arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 2 +-
drivers/media/platform/verisilicon/hantro_drv.c | 1 -
drivers/media/platform/verisilicon/hantro_hw.h | 1 -
drivers/media/platform/verisilicon/rockchip_vpu_hw.c | 21 ++--------
3 files changed, 3 insertions(+), 20 deletions(-)
4 files changed, 4 insertions(+), 21 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
@@ -1127,7 +1127,7 @@ power-domain@RK3588_PD_SDMMC {
};
vpu121: video-codec@fdb50000 {
- compatible = "rockchip,rk3588-vpu121", "rockchip,rk3568-vpu";
+ compatible = "rockchip,rk3588-vpu121", "rockchip,rk3328-vpu";
reg = <0x0 0xfdb50000 0x0 0x800>;
interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH 0>;
interrupt-names = "vdpu";
diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/media/platform/verisilicon/hantro_drv.c
index 111111111111..222222222222 100644
--- a/drivers/media/platform/verisilicon/hantro_drv.c
@@ -78,19 +92,6 @@ index 111111111111..222222222222 100644
const struct hantro_variant px30_vpu_variant = {
.enc_offset = 0x0,
.enc_fmts = rockchip_vpu_enc_fmts,
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
index fc67585b6..d27d60580 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
@@ -1127,7 +1127,7 @@ power-domain@RK3588_PD_SDMMC {
};
vpu121: video-codec@fdb50000 {
- compatible = "rockchip,rk3588-vpu121", "rockchip,rk3568-vpu";
+ compatible = "rockchip,rk3588-vpu121", "rockchip,rk3328-vpu";
reg = <0x0 0xfdb50000 0x0 0x800>;
interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH 0>;
interrupt-names = "vdpu";
--
Armbian

2
patch/kernel/archive/rockchip64-6.13/regulator-add-fan53200-driver.patch
View File

@@ -24,7 +24,7 @@ diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 111111111111..222222222222 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -772,6 +772,7 @@ CONFIG_REGULATOR_BD9571MWV=y
@@ -773,6 +773,7 @@ CONFIG_REGULATOR_BD9571MWV=y
CONFIG_REGULATOR_CROS_EC=y
CONFIG_REGULATOR_DA9211=m
CONFIG_REGULATOR_FAN53555=y

2
patch/kernel/archive/rockchip64-6.13/rk3308-0001-pinctrl-slew-mux.patch
View File

@@ -218,7 +218,7 @@ index 111111111111..222222222222 100644
arg = rc;
break;
default:
@@ -3963,6 +4057,7 @@ static struct rockchip_pin_ctrl rk3308_pin_ctrl = {
@@ -3965,6 +4059,7 @@ static struct rockchip_pin_ctrl rk3308_pin_ctrl = {
.pull_calc_reg = rk3308_calc_pull_reg_and_bit,
.drv_calc_reg = rk3308_calc_drv_reg_and_bit,
.schmitt_calc_reg = rk3308_calc_schmitt_reg_and_bit,

2
patch/kernel/archive/rockchip64-6.13/rk3308-0003-pinctrl-io-voltage-domains.patch
View File

@@ -95,7 +95,7 @@ index 111111111111..222222222222 100644
/*
* Generate a bitmask for setting a value (v) with a write mask bit in hiword
* register 31:16 area.
@@ -3720,6 +3726,24 @@ static int rockchip_pinctrl_probe(struct platform_device *pdev)
@@ -3722,6 +3728,24 @@ static int rockchip_pinctrl_probe(struct platform_device *pdev)
if (ret)
return ret;

25
patch/kernel/archive/rockchip64-6.13/rk3308-acodec-vendor-driver.patch
View File

@@ -1,21 +1,20 @@
From 919c736d71b5c7d311b41e96e67985d34f1937f7 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Paolo Sabatino <paolo.sabatino@gmail.com>
Date: Fri, 20 Dec 2024 11:48:31 +0100
Subject: [PATCH] revert rk3308 analog codec to vendor code
Subject: revert rk3308 analog codec to vendor code
---
arch/arm64/boot/dts/rockchip/rk3308.dtsi | 146 +-
sound/soc/codecs/rk3308_codec.c | 5681 +++++++++++++++++++---
sound/soc/codecs/rk3308_codec.h | 892 +++-
arch/arm64/boot/dts/rockchip/rk3308.dtsi | 7 +-
sound/soc/codecs/rk3308_codec.c | 5681 ++++++++--
sound/soc/codecs/rk3308_codec.h | 892 +-
sound/soc/codecs/rk3308_codec_provider.h | 28 +
4 files changed, 5804 insertions(+), 943 deletions(-)
create mode 100644 sound/soc/codecs/rk3308_codec_provider.h
4 files changed, 5665 insertions(+), 943 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
index 31c25de2d689..1e9a82423d28 100644
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
@@ -836,11 +975,14 @@ codec: codec@ff560000 {
@@ -836,11 +836,14 @@ codec: codec@ff560000 {
compatible = "rockchip,rk3308-codec";
reg = <0x0 0xff560000 0x0 0x10000>;
rockchip,grf = <&grf>;
@@ -33,7 +32,7 @@ index 31c25de2d689..1e9a82423d28 100644
#sound-dai-cells = <0>;
status = "disabled";
diff --git a/sound/soc/codecs/rk3308_codec.c b/sound/soc/codecs/rk3308_codec.c
index 8b51e87a1711..e918b4e3cb48 100644
index 111111111111..222222222222 100644
--- a/sound/soc/codecs/rk3308_codec.c
+++ b/sound/soc/codecs/rk3308_codec.c
@@ -1,9 +1,20 @@
@@ -5950,7 +5949,7 @@ index 8b51e87a1711..e918b4e3cb48 100644
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
diff --git a/sound/soc/codecs/rk3308_codec.h b/sound/soc/codecs/rk3308_codec.h
index a4226b235ab7..93e089dae081 100644
index 111111111111..222222222222 100644
--- a/sound/soc/codecs/rk3308_codec.h
+++ b/sound/soc/codecs/rk3308_codec.h
@@ -1,15 +1,114 @@
@@ -7122,7 +7121,7 @@ index a4226b235ab7..93e089dae081 100644
#endif /* __RK3308_CODEC_H__ */
diff --git a/sound/soc/codecs/rk3308_codec_provider.h b/sound/soc/codecs/rk3308_codec_provider.h
new file mode 100644
index 000000000000..34c1ef86a507
index 000000000000..111111111111
--- /dev/null
+++ b/sound/soc/codecs/rk3308_codec_provider.h
@@ -0,0 +1,28 @@
@@ -7155,5 +7154,5 @@ index 000000000000..34c1ef86a507
+
+#endif /* __RK3308_CODEC_PROVIDER_H__ */
--
2.43.0
Armbian

4
patch/kernel/archive/rockchip64-6.13/rk3308-add-gmac-alias.patch
View File

@@ -8,10 +8,10 @@ Subject: arm64: dts: rk3308: Add mac node at dtsi level
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
index 2ae4bb7d5e62..2a6f41e2281f 100644
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
@@ -24,6 +24,7 @@ aliases {
@@ -29,6 +29,7 @@ aliases {
i2c1 = &i2c1;
i2c2 = &i2c2;
i2c3 = &i2c3;

2
patch/kernel/archive/rockchip64-6.13/rk3308-add-missing-i2s-controllers.patch
View File

@@ -11,7 +11,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rock
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
@@ -701,6 +701,65 @@ dmac1: dma-controller@ff2d0000 {
@@ -608,6 +608,65 @@ dmac1: dma-controller@ff2d0000 {
#dma-cells = <1>;
};

6
patch/kernel/archive/rockchip64-6.13/rk3308-add-tsadc-driver.patch
View File

@@ -11,10 +11,10 @@ Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
2 files changed, 27 insertions(+)
diff --git a/Documentation/devicetree/bindings/thermal/rockchip-thermal.yaml b/Documentation/devicetree/bindings/thermal/rockchip-thermal.yaml
index 55f8ec0bec01..c822baf04aed 100644
index 111111111111..222222222222 100644
--- a/Documentation/devicetree/bindings/thermal/rockchip-thermal.yaml
+++ b/Documentation/devicetree/bindings/thermal/rockchip-thermal.yaml
@@ -15,6 +15,7 @@ properties:
@@ -17,6 +17,7 @@ properties:
- rockchip,px30-tsadc
- rockchip,rk3228-tsadc
- rockchip,rk3288-tsadc
@@ -23,7 +23,7 @@ index 55f8ec0bec01..c822baf04aed 100644
- rockchip,rk3368-tsadc
- rockchip,rk3399-tsadc
diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_thermal.c
index 77231a9d28ff..13182e2a3142 100644
index 111111111111..222222222222 100644
--- a/drivers/thermal/rockchip_thermal.c
+++ b/drivers/thermal/rockchip_thermal.c
@@ -1060,6 +1060,28 @@ static void rk_tsadcv3_tshut_mode(int chn, void __iomem *regs,

12
patch/kernel/archive/rockchip64-6.13/rk3308-dts-legacy-cryptov2.patch
View File

@@ -1,17 +1,17 @@
From aae322ad410b6ad891c1b6605811756124c3b1f9 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Paolo Sabatino <paolo.sabatino@gmail.com>
Date: Mon, 25 Nov 2024 17:23:22 +0100
Subject: [PATCH] rk3308: add cryptov2 dts node
Subject: rk3308: add cryptov2 dts node
---
arch/arm64/boot/dts/rockchip/rk3308.dtsi | 15 +++++++++++++++
arch/arm64/boot/dts/rockchip/rk3308.dtsi | 15 ++++++++++
1 file changed, 15 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
index 2ae4bb7d5e62..7c13709c522c 100644
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
@@ -164,6 +164,21 @@ xin24m: xin24m {
@@ -170,6 +170,21 @@ xin24m: xin24m {
clock-output-names = "xin24m";
};
@@ -34,5 +34,5 @@ index 2ae4bb7d5e62..7c13709c522c 100644
compatible = "rockchip,rk3308-grf", "syscon", "simple-mfd";
reg = <0x0 0xff000000 0x0 0x08000>;
--
2.43.0
Armbian

6
patch/kernel/archive/rockchip64-6.13/rk3308-dts-thermal-zones.patch
View File

@@ -8,11 +8,11 @@ Subject: arm64: dts: rockchip: add cpu's thermal config for rk3308
1 file changed, 64 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
index 2a6f41e2281f..fde32008902a 100644
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
@@ -552,6 +552,70 @@ saradc: saradc@ff1e0000 {
status = "disabled";
@@ -601,6 +601,70 @@ logic_leakage: logic-leakage@18 {
};
};
+ thermal_zones: thermal-zones {

4
patch/kernel/archive/rockchip64-6.13/rk3328-dtsi-spdif.patch
View File

@@ -107,7 +107,7 @@ index 111111111111..222222222222 100644
resets = <&cru SRST_GPU_A>;
operating-points-v2 = <&gpu_opp_table>;
};
@@ -966,6 +991,7 @@ cru: clock-controller@ff440000 {
@@ -968,6 +993,7 @@ cru: clock-controller@ff440000 {
<&cru ACLK_BUS_PRE>, <&cru HCLK_BUS_PRE>,
<&cru PCLK_BUS_PRE>, <&cru ACLK_PERI_PRE>,
<&cru HCLK_PERI>, <&cru PCLK_PERI>,
@@ -115,7 +115,7 @@ index 111111111111..222222222222 100644
<&cru SCLK_RTC32K>;
assigned-clock-parents =
<&cru HDMIPHY>, <&cru PLL_APLL>,
@@ -987,6 +1013,7 @@ cru: clock-controller@ff440000 {
@@ -989,6 +1015,7 @@ cru: clock-controller@ff440000 {
<150000000>, <75000000>,
<75000000>, <150000000>,
<75000000>, <75000000>,

2
patch/kernel/archive/rockchip64-6.13/rk3328-dtsi-usb3-reset-properties.patch
View File

@@ -11,7 +11,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rock
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -1217,6 +1217,8 @@ usbdrd3: usb@ff600000 {
@@ -1219,6 +1219,8 @@ usbdrd3: usb@ff600000 {
<&cru ACLK_USB3OTG>;
clock-names = "ref_clk", "suspend_clk",
"bus_clk";

8
patch/kernel/archive/rockchip64-6.13/rk3328-roc-cc-add-missing-nodes.patch
View File

@@ -14,7 +14,7 @@ new mode 100755
index 111111111111..222222222222
--- a/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi
@@ -133,6 +133,14 @@ user_led: led-1 {
@@ -128,6 +128,14 @@ user_led: led-1 {
default-state = "off";
};
};
@@ -29,7 +29,7 @@ index 111111111111..222222222222
};
&analog_sound {
@@ -203,6 +211,10 @@ &gmac2io {
@@ -198,6 +206,10 @@ &gmac2io {
status = "okay";
};
@@ -40,7 +40,7 @@ index 111111111111..222222222222
&hdmi {
status = "okay";
};
@@ -345,6 +357,13 @@ &io_domains {
@@ -338,6 +350,13 @@ &io_domains {
};
&pinctrl {
@@ -54,7 +54,7 @@ index 111111111111..222222222222
pmic {
pmic_int_l: pmic-int-l {
rockchip,pins = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_up>;
@@ -375,6 +394,19 @@ &sdmmc {
@@ -368,6 +387,19 @@ &sdmmc {
status = "okay";
};

14
patch/kernel/archive/rockchip64-6.13/rk3399-fix-pci-lanes.patch
View File

@@ -1,19 +1,19 @@
From 77f6dfcb20c2dc6a4a2f5303709c6fa0c7b65f30 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Valmantas Paliksa <walmis@gmail.com>
Date: Thu, 12 Dec 2024 12:24:33 +0200
Subject: [PATCH] Disable PHY_LANE_IDLE_OFF for each instance of
Subject: Disable PHY_LANE_IDLE_OFF for each instance of
rockchip_pcie_phy_power_one
Previously PHY_LANE_IDLE_OFF was only disabled for the first lane
---
drivers/phy/rockchip/phy-rockchip-pcie.c | 12 ++++++------
drivers/phy/rockchip/phy-rockchip-pcie.c | 12 +++++-----
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/phy/rockchip/phy-rockchip-pcie.c b/drivers/phy/rockchip/phy-rockchip-pcie.c
index 8234b83fdd88..240cb27a0e9e 100644
index 111111111111..222222222222 100644
--- a/drivers/phy/rockchip/phy-rockchip-pcie.c
+++ b/drivers/phy/rockchip/phy-rockchip-pcie.c
@@ -167,6 +167,12 @@ static int rockchip_pcie_phy_power_on(struct phy *phy)
@@ -166,6 +166,12 @@ static int rockchip_pcie_phy_power_on(struct phy *phy)
mutex_lock(&rk_phy->pcie_mutex);
@@ -26,7 +26,7 @@ index 8234b83fdd88..240cb27a0e9e 100644
if (rk_phy->pwr_cnt++)
goto err_out;
@@ -181,12 +187,6 @@ static int rockchip_pcie_phy_power_on(struct phy *phy)
@@ -180,12 +186,6 @@ static int rockchip_pcie_phy_power_on(struct phy *phy)
PHY_CFG_ADDR_MASK,
PHY_CFG_ADDR_SHIFT));
@@ -40,5 +40,5 @@ index 8234b83fdd88..240cb27a0e9e 100644
* No documented timeout value for phy operation below,
* so we make it large enough here. And we use loop-break
--
2.34.1
Armbian

6
patch/kernel/archive/rockchip64-6.13/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch
View File

@@ -77,7 +77,7 @@ diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/adm
index 111111111111..222222222222 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -4704,6 +4704,14 @@
@@ -4716,6 +4716,14 @@
nomsi Do not use MSI for native PCIe PME signaling (this makes
all PCIe root ports use INTx for all services).
@@ -150,7 +150,7 @@ diff --git a/drivers/pci/controller/pcie-rockchip.c b/drivers/pci/controller/pci
index 111111111111..222222222222 100644
--- a/drivers/pci/controller/pcie-rockchip.c
+++ b/drivers/pci/controller/pcie-rockchip.c
@@ -151,6 +151,12 @@ int rockchip_pcie_parse_dt(struct rockchip_pcie *rockchip)
@@ -153,6 +153,12 @@ int rockchip_pcie_parse_dt(struct rockchip_pcie *rockchip)
return PTR_ERR(rockchip->clk_pcie_pm);
}
@@ -167,7 +167,7 @@ diff --git a/drivers/pci/controller/pcie-rockchip.h b/drivers/pci/controller/pci
index 111111111111..222222222222 100644
--- a/drivers/pci/controller/pcie-rockchip.h
+++ b/drivers/pci/controller/pcie-rockchip.h
@@ -318,6 +318,8 @@ struct rockchip_pcie {
@@ -340,6 +340,8 @@ struct rockchip_pcie {
phys_addr_t msg_bus_addr;
bool is_rc;
struct resource *mem_res;

6
patch/kernel/archive/rockchip64-6.13/rk356x-add-rkvdec2-support.patch
View File

@@ -16,7 +16,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk356x-base.dtsi b/arch/arm64/boot/dts
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk356x-base.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk356x-base.dtsi
@@ -449,6 +449,19 @@ usb2phy1_grf: syscon@fdca8000 {
@@ -369,6 +369,19 @@ usb2phy1_grf: syscon@fdca8000 {
reg = <0x0 0xfdca8000 0x0 0x8000>;
};
@@ -36,7 +36,7 @@ index 111111111111..222222222222 100644
pmucru: clock-controller@fdd00000 {
compatible = "rockchip,rk3568-pmucru";
reg = <0x0 0xfdd00000 0x0 0x1000>;
@@ -635,7 +648,7 @@ gpu: gpu@fde60000 {
@@ -554,7 +567,7 @@ gpu: gpu@fde60000 {
};
vpu: video-codec@fdea0400 {
@@ -45,7 +45,7 @@ index 111111111111..222222222222 100644
reg = <0x0 0xfdea0000 0x0 0x800>;
interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "vdpu";
@@ -686,6 +699,26 @@ vepu_mmu: iommu@fdee0800 {
@@ -605,6 +618,26 @@ vepu_mmu: iommu@fdee0800 {
#iommu-cells = <0>;
};

6
patch/kernel/archive/rockchip64-6.13/rk3588-0010-fix-clk-divisions.patch
View File

@@ -70,7 +70,7 @@ diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c
index 111111111111..222222222222 100644
--- a/drivers/clk/clk-divider.c
+++ b/drivers/clk/clk-divider.c
@@ -220,7 +220,7 @@ static int _div_round_up(const struct clk_div_table *table,
@@ -226,7 +226,7 @@ static int _div_round_up(const struct clk_div_table *table,
unsigned long parent_rate, unsigned long rate,
unsigned long flags)
{
@@ -79,7 +79,7 @@ index 111111111111..222222222222 100644
if (flags & CLK_DIVIDER_POWER_OF_TWO)
div = __roundup_pow_of_two(div);
@@ -237,7 +237,7 @@ static int _div_round_closest(const struct clk_div_table *table,
@@ -243,7 +243,7 @@ static int _div_round_closest(const struct clk_div_table *table,
int up, down;
unsigned long up_rate, down_rate;
@@ -88,7 +88,7 @@ index 111111111111..222222222222 100644
down = parent_rate / rate;
if (flags & CLK_DIVIDER_POWER_OF_TWO) {
@@ -473,7 +473,7 @@ int divider_get_val(unsigned long rate, unsigned long parent_rate,
@@ -479,7 +479,7 @@ int divider_get_val(unsigned long rate, unsigned long parent_rate,
{
unsigned int div, value;

2
patch/kernel/archive/rockchip64-6.13/rk3588-0113-add-synopsys-designware-hdmi-rx-controller.patch
View File

@@ -3929,7 +3929,7 @@ diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 111111111111..222222222222 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -847,6 +847,7 @@ CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
@@ -849,6 +849,7 @@ CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
CONFIG_VIDEO_SUN6I_CSI=m

2
patch/kernel/archive/rockchip64-6.13/rk3588-0131-vop2-hdmi0-disp-modes-support.patch
View File

@@ -196,7 +196,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
@@ -2822,6 +2822,7 @@ hdptxphy_hdmi0: phy@fed60000 {
@@ -2811,6 +2811,7 @@ hdptxphy_hdmi0: phy@fed60000 {
reg = <0x0 0xfed60000 0x0 0x2000>;
clocks = <&cru CLK_USB2PHY_HDPTXRXPHY_REF>, <&cru PCLK_HDPTX0>;
clock-names = "ref", "apb";

4
patch/kernel/archive/rockchip64-6.13/rk3588-1010-arm64-dts-rock-5b-Slow-down-emmc-to-hs200-and-add-ts.patch
View File

@@ -11,7 +11,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/d
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
@@ -408,8 +408,7 @@ &sdhci {
@@ -440,8 +440,7 @@ &sdhci {
no-sdio;
no-sd;
non-removable;
@@ -21,7 +21,7 @@ index 111111111111..222222222222 100644
status = "okay";
};
@@ -463,6 +462,10 @@ flash@0 {
@@ -495,6 +494,10 @@ flash@0 {
};
};

31
patch/kernel/archive/rockchip64-6.13/rk3588-1011-rock5b-hdmi1.patch
View File

@@ -1,20 +1,19 @@
From: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Date: Wed, 11 Dec 2024 01:06:17 +0200
Subject: [PATCH v2 4/4] arm64: dts: rockchip: Enable HDMI1 on rock-5b
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: amazingfate <liujianfeng1994@gmail.com>
Date: Thu, 26 Dec 2024 21:47:15 +0100
Subject: [ARCHEOLOGY] rockchip64-6.13: add hdmi1 support to rock5b
Add the necessary DT changes to enable the second HDMI output port on
Radxa ROCK 5B.
While at it, switch the position of &vop_mmu and @vop to maintain the
alphabetical order.
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
> X-Git-Archeology: - Revision 12bb4ea7dfd695901aba31ae4b5260398c932a17: https://github.com/armbian/build/commit/12bb4ea7dfd695901aba31ae4b5260398c932a17
> X-Git-Archeology: Date: Thu, 26 Dec 2024 21:47:15 +0100
> X-Git-Archeology: From: amazingfate <liujianfeng1994@gmail.com>
> X-Git-Archeology: Subject: rockchip64-6.13: add hdmi1 support to rock5b
> X-Git-Archeology:
---
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 44 +++++++++++++++++++++++--
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 44 +++++++++-
1 file changed, 42 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
index c44d001da16978bbbb8a93d652893a786e9ea79b..9c3793d394a6f226bbbd3a88381974ea01ca7069 100644
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
@@ -49,6 +49,17 @@ hdmi0_con_in: endpoint {
@@ -68,7 +67,7 @@ index c44d001da16978bbbb8a93d652893a786e9ea79b..9c3793d394a6f226bbbd3a88381974ea
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0m2_xfer>;
@@ -891,11 +924,11 @@ &usb_host2_xhci {
@@ -894,11 +927,11 @@ &usb_host2_xhci {
status = "okay";
};
@@ -82,7 +81,7 @@ index c44d001da16978bbbb8a93d652893a786e9ea79b..9c3793d394a6f226bbbd3a88381974ea
status = "okay";
};
@@ -905,3 +938,10 @@ vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 {
@@ -908,3 +941,10 @@ vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 {
remote-endpoint = <&hdmi0_in_vp0>;
};
};
@@ -93,6 +92,6 @@ index c44d001da16978bbbb8a93d652893a786e9ea79b..9c3793d394a6f226bbbd3a88381974ea
+ remote-endpoint = <&hdmi1_in_vp1>;
+ };
+};
--
2.47.0
Armbian

8
patch/kernel/archive/rockchip64-6.13/rk3588-1031-arm64-dts-rockchip-Add-HDMI-support-to-ArmSoM-Sige7.patch
View File

@@ -4,8 +4,8 @@ Date: Thu, 6 Jun 2024 23:28:01 +0800
Subject: arm64: dts: rockchip: Add HDMI support to ArmSoM Sige7
---
arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts | 35 ++++++++++
1 file changed, 35 insertions(+)
arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts | 30 ++++++++++
1 file changed, 30 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts b/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts
index 111111111111..222222222222 100644
@@ -19,7 +19,7 @@ index 111111111111..222222222222 100644
#include "rk3588.dtsi"
/ {
@@ -159,6 +160,20 @@ &cpu_l3 {
@@ -164,6 +165,20 @@ &gpu {
status = "okay";
};
@@ -40,7 +40,7 @@ index 111111111111..222222222222 100644
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0m2_xfer>;
@@ -723,3 +743,18 @@ &usb_host1_xhci {
@@ -723,3 +738,18 @@ &usb_host1_xhci {
dr_mode = "host";
status = "okay";
};

2
patch/kernel/archive/rockchip64-6.13/rk3588-1032-arm64-dts-rockchip-Add-ap6275p-wireless-support-to-A.patch
View File

@@ -11,7 +11,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts b/arch/arm64/b
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts
@@ -288,6 +288,22 @@ &pcie2x1l0 {
@@ -283,6 +283,22 @@ &pcie2x1l0 {
&pcie2x1l1 {
reset-gpios = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>;
status = "okay";

33
patch/kernel/archive/rockchip64-6.13/rk3588-1040-board-khadas-edge2-add-nodes.patch
View File

@@ -1,17 +1,17 @@
From 509f1c7905fdf603e596681f2e933c9c2bab1ee3 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Muhammed Efe Cetin <efectn@protonmail.com>
Date: Tue, 10 Dec 2024 20:54:33 +0300
Subject: [PATCH 1/3] arm64: dts: rockchip: Add USB-C to Khadas Edge 2
Subject: arm64: dts: rockchip: Add USB-C to Khadas Edge 2
Khadas Edge 2 has 2x Type-C port. One just supports PD and
controlled by MCU. The other one supports PD, DP Alt mode and DRD. This
commit adds support for DRD.
---
.../dts/rockchip/rk3588s-khadas-edge2.dts | 119 ++++++++++++++++++
arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts | 119 ++++++++++
1 file changed, 119 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts b/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts
index ac48e7fd3923..d55a91302f68 100644
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts
@@ -6,6 +6,7 @@
@@ -176,21 +176,19 @@ index ac48e7fd3923..d55a91302f68 100644
status = "okay";
};
--
2.47.1
Armbian
From 1c658581d83dfdad45ae3181d2d239c617f7b45c Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Muhammed Efe Cetin <efectn@protonmail.com>
Date: Tue, 10 Dec 2024 20:57:42 +0300
Subject: [PATCH 2/3] arm64: dts: rockchip: Add bluetooth support to Khadas
Edge 2
Subject: arm64: dts: rockchip: Add bluetooth support to Khadas Edge 2
---
.../boot/dts/rockchip/rk3588s-khadas-edge2.dts | 18 +++++++++++++++++-
arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts | 18 +++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts b/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts
index d55a91302f68..f5971e27526d 100644
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts
@@ -766,8 +766,24 @@ &uart2 {
@@ -220,20 +218,19 @@ index d55a91302f68..f5971e27526d 100644
&u2phy0 {
--
2.47.1
Armbian
From f734fc304914f25a763f2c7a77df8ba0228b76fd Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Muhammed Efe Cetin <efectn@protonmail.com>
Date: Tue, 10 Dec 2024 21:00:25 +0300
Subject: [PATCH 3/3] arm64: dts: rockchip: Add HDMI & VOP2 to Khadas Edge 2
Subject: arm64: dts: rockchip: Add HDMI & VOP2 to Khadas Edge 2
---
.../dts/rockchip/rk3588s-khadas-edge2.dts | 47 +++++++++++++++++++
arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts | 47 ++++++++++
1 file changed, 47 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts b/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts
index f5971e27526d..fb61955979ee 100644
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts
@@ -6,6 +6,7 @@
@@ -309,5 +306,5 @@ index f5971e27526d..fb61955979ee 100644
+ };
+};
--
2.47.1
Armbian

4
patch/kernel/archive/rockchip64-6.13/rk3588-1041-board-khadas-edge2-mcu.patch
View File

@@ -343,7 +343,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts b/arch/arm64/
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts
@@ -306,6 +306,13 @@ hym8563: rtc@51 {
@@ -326,6 +326,13 @@ hym8563: rtc@51 {
clock-output-names = "hym8563";
wakeup-source;
};
@@ -373,7 +373,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts b/arch/arm64/
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts
@@ -315,6 +315,62 @@ khadas_mcu: system-controller@18 {
@@ -335,6 +335,62 @@ khadas_mcu: system-controller@18 {
};
};

10
patch/kernel/archive/rockchip64-6.13/rk3588-1051-board-nanopc-t6-Add-USB3-psu-and-fan-support.patch
View File

@@ -1,14 +1,14 @@
From bb7749d28f22659f3e23c0dc073a7f47647b6a51 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Muhammed Efe Cetin <efectn@protonmail.com>
Date: Tue, 10 Dec 2024 21:27:49 +0300
Subject: [PATCH] Add Missing parameters for USB3.0 and FAN
Subject: Add Missing parameters for USB3.0 and FAN
---
.../boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 54 +++++++++++++++++++
arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 54 ++++++++++
1 file changed, 54 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
index cb350727d116..f866f5d2bccd 100644
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
@@ -78,6 +78,15 @@ usr_led: led-1 {
@@ -101,5 +101,5 @@ index cb350727d116..f866f5d2bccd 100644
};
--
2.47.1
Armbian

2
patch/kernel/archive/rockchip64-6.13/rk3588-1063-arm64-dts-rockchip-Enable-automatic-fan-control-on-t.patch
View File

@@ -20,7 +20,7 @@ index 111111111111..222222222222 100644
fan-supply = <&vcc5v0_sys>;
pinctrl-names = "default";
pinctrl-0 = <&pwm0m2_pins &fan_int>;
@@ -213,6 +213,36 @@ rgmii_phy: ethernet-phy@1 {
@@ -266,6 +266,36 @@ map5 {
};
};

10
patch/kernel/archive/rockchip64-6.13/rk3588-1072-arm64-dts-rockchip-add-AP6275P-wifi-to-Orange-Pi-5B.patch
View File

@@ -1,14 +1,14 @@
From f895a8708e44fee9cc3486116fcbc4ae48942faa Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Muhammed Efe Cetin <efectn@protonmail.com>
Date: Tue, 10 Dec 2024 21:56:10 +0300
Subject: [PATCH] arm64: dts: rockchip: add AP6275P wifi to Orange Pi 5B
Subject: arm64: dts: rockchip: add AP6275P wifi to Orange Pi 5B
---
.../boot/dts/rockchip/rk3588s-orangepi-5b.dts | 33 +++++++++++++++++++
arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5b.dts | 33 ++++++++++
1 file changed, 33 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5b.dts
index d21ec320d295..56e191ea8457 100644
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5b.dts
@@ -12,6 +12,39 @@ aliases {
@@ -52,5 +52,5 @@ index d21ec320d295..56e191ea8457 100644
&sdhci {
--
2.47.1
Armbian

11
patch/kernel/archive/rockchip64-6.13/rk3588-1080-arm64-dts-rockchip-add-USB3-support-to-NanoPi-R6-ser.patch
View File

@@ -1,15 +1,14 @@
From de21a620de53d9ee5c05ffa1877c3e0da5796848 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Muhammed Efe Cetin <efectn@protonmail.com>
Date: Tue, 10 Dec 2024 22:03:19 +0300
Subject: [PATCH] arm64: dts: rockchip: add USB3 support to NanoPi R6 series
boards
Subject: arm64: dts: rockchip: add USB3 support to NanoPi R6 series boards
---
.../boot/dts/rockchip/rk3588s-nanopi-r6.dtsi | 19 +++++++++++++++++++
arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi | 19 ++++++++++
1 file changed, 19 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi
index 76a6e8e517e9..79375dd1cea4 100644
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi
@@ -774,6 +774,15 @@ &tsadc {
@@ -46,5 +45,5 @@ index 76a6e8e517e9..79375dd1cea4 100644
status = "okay";
};
--
2.47.1
Armbian

6
patch/kernel/archive/rockchip64-6.13/rk35xx-montjoie-crypto-v2-rk35xx.patch
View File

@@ -102,7 +102,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
@@ -1879,6 +1879,18 @@ sdhci: mmc@fe2e0000 {
@@ -1930,6 +1930,18 @@ sdhci: mmc@fe2e0000 {
status = "disabled";
};
@@ -142,7 +142,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk356x-base.dtsi b/arch/arm64/boot/dts
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk356x-base.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk356x-base.dtsi
@@ -1155,6 +1155,18 @@ rng: rng@fe388000 {
@@ -1074,6 +1074,18 @@ rng: rng@fe388000 {
status = "disabled";
};
@@ -345,7 +345,7 @@ diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 111111111111..222222222222 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -722,6 +722,35 @@ config CRYPTO_DEV_TEGRA
@@ -743,6 +743,35 @@ config CRYPTO_DEV_TEGRA
Select this to enable Tegra Security Engine which accelerates various
AES encryption/decryption and HASH algorithms.