diff --git a/patch/kernel/archive/rockchip64-6.10/add-board-helios64.patch b/patch/kernel/archive/rockchip64-6.10/add-board-helios64.patch index be107a49e16a..57306f4777f5 100644 --- a/patch/kernel/archive/rockchip64-6.10/add-board-helios64.patch +++ b/patch/kernel/archive/rockchip64-6.10/add-board-helios64.patch @@ -1,7 +1,7 @@ -From 98834ee2745daea7ee9c2f620acc1d09a4da2cdc Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aditya Prayoga Date: Tue, 15 Sep 2020 20:04:22 +0700 -Subject: [PATCH] Add board Helios64 +Subject: Add board Helios64 note: rpardini: this patch was rebased on top of 6.3.1, finally admitting that it used to blindly overwrite the mainline dts (it was added when helios64 @@ -10,11 +10,11 @@ is the complete set of changes actually done. Signed-off-by: Aditya Prayoga --- - .../dts/rockchip/rk3399-kobol-helios64.dts | 735 ++++++++++++++++-- - 1 file changed, 654 insertions(+), 81 deletions(-) + arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts | 734 +++++++++- + 1 file changed, 654 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 9586bb12a5d8..09e2cfe40696 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts @@ -11,6 +11,10 @@ @@ -234,7 +234,7 @@ index 9586bb12a5d8..09e2cfe40696 100644 vcc3v0_sd: vcc3v0-sd { compatible = "regulator-fixed"; enable-active-high; -@@ -210,6 +346,36 @@ vcc5v0_usb: vcc5v0-usb { +@@ -210,6 +348,36 @@ vcc5v0_usb: vcc5v0-usb { vin-supply = <&vcc5v0_perdev>; }; @@ -271,7 +271,7 @@ index 9586bb12a5d8..09e2cfe40696 100644 vcc12v_dcin: vcc12v-dcin { compatible = "regulator-fixed"; regulator-name = "vcc12v_dcin"; -@@ -228,36 +394,60 @@ vcc12v_dcin_bkup: vcc12v-dcin-bkup { +@@ -228,36 +396,60 @@ vcc12v_dcin_bkup: vcc12v-dcin-bkup { regulator-max-microvolt = <12000000>; vin-supply = <&vcc12v_dcin>; }; @@ -358,7 +358,7 @@ index 9586bb12a5d8..09e2cfe40696 100644 }; &cpu_l0 { -@@ -276,6 +467,20 @@ &cpu_l3 { +@@ -276,6 +468,20 @@ &cpu_l3 { cpu-supply = <&vdd_cpu_l>; }; @@ -379,7 +379,7 @@ index 9586bb12a5d8..09e2cfe40696 100644 &emmc_phy { status = "okay"; }; -@@ -296,6 +500,11 @@ &gmac { +@@ -296,6 +502,11 @@ &gmac { status = "okay"; }; @@ -391,7 +391,7 @@ index 9586bb12a5d8..09e2cfe40696 100644 &i2c0 { clock-frequency = <400000>; i2c-scl-rising-time-ns = <168>; -@@ -311,6 +520,7 @@ rk808: pmic@1b { +@@ -311,6 +522,7 @@ rk808: pmic@1b { pinctrl-names = "default"; pinctrl-0 = <&pmic_int_l>; rockchip,system-power-controller; @@ -399,7 +399,7 @@ index 9586bb12a5d8..09e2cfe40696 100644 vcc1-supply = <&vcc5v0_sys>; vcc2-supply = <&vcc5v0_sys>; vcc3-supply = <&vcc5v0_sys>; -@@ -327,6 +537,19 @@ rk808: pmic@1b { +@@ -327,6 +539,19 @@ rk808: pmic@1b { #clock-cells = <1>; regulators { @@ -419,7 +419,7 @@ index 9586bb12a5d8..09e2cfe40696 100644 vdd_cpu_l: DCDC_REG2 { regulator-name = "vdd_cpu_l"; regulator-always-on; -@@ -334,19 +557,48 @@ vdd_cpu_l: DCDC_REG2 { +@@ -334,19 +559,48 @@ vdd_cpu_l: DCDC_REG2 { regulator-min-microvolt = <750000>; regulator-max-microvolt = <1350000>; regulator-ramp-delay = <6001>; @@ -469,7 +469,7 @@ index 9586bb12a5d8..09e2cfe40696 100644 regulator-state-mem { regulator-on-in-suspend; regulator-suspend-microvolt = <1800000>; -@@ -359,25 +611,61 @@ vcc_sdio_s0: LDO_REG4 { +@@ -359,25 +613,61 @@ vcc_sdio_s0: LDO_REG4 { regulator-boot-on; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3000000>; @@ -533,7 +533,7 @@ index 9586bb12a5d8..09e2cfe40696 100644 }; }; -@@ -385,12 +673,33 @@ vdd_cpu_b: regulator@40 { +@@ -385,12 +675,33 @@ vdd_cpu_b: regulator@40 { compatible = "silergy,syr827"; reg = <0x40>; fcs,suspend-voltage-selector = <1>; @@ -567,7 +567,7 @@ index 9586bb12a5d8..09e2cfe40696 100644 vin-supply = <&vcc5v0_sys>; regulator-state-mem { -@@ -405,17 +714,101 @@ &i2c2 { +@@ -405,17 +716,101 @@ &i2c2 { i2c-scl-falling-time-ns = <30>; status = "okay"; @@ -671,7 +671,7 @@ index 9586bb12a5d8..09e2cfe40696 100644 status = "okay"; }; -@@ -428,6 +821,7 @@ &pcie0 { +@@ -428,6 +823,7 @@ &pcie0 { max-link-speed = <2>; num-lanes = <2>; pinctrl-names = "default"; @@ -679,7 +679,7 @@ index 9586bb12a5d8..09e2cfe40696 100644 status = "okay"; vpcie12v-supply = <&vcc12v_dcin>; -@@ -437,36 +831,116 @@ &pcie0 { +@@ -437,36 +833,116 @@ &pcie0 { }; &pinctrl { @@ -804,7 +804,7 @@ index 9586bb12a5d8..09e2cfe40696 100644 hdd_a_power_en: hdd-a-power-en { rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>; }; -@@ -486,7 +960,7 @@ usb_lan_en: usb-lan-en { +@@ -486,7 +962,7 @@ usb_lan_en: usb-lan-en { vcc3v0-sd { sdmmc0_pwr_h: sdmmc0-pwr-h { @@ -813,7 +813,7 @@ index 9586bb12a5d8..09e2cfe40696 100644 }; }; }; -@@ -506,10 +980,29 @@ &pwm1 { +@@ -506,10 +982,29 @@ &pwm1 { status = "okay"; }; @@ -843,7 +843,7 @@ index 9586bb12a5d8..09e2cfe40696 100644 vqmmc-supply = <&vcc1v8_sys_s0>; status = "okay"; }; -@@ -517,8 +1010,9 @@ &sdhci { +@@ -517,8 +1012,9 @@ &sdhci { &sdmmc { bus-width = <4>; cap-sd-highspeed; @@ -854,7 +854,7 @@ index 9586bb12a5d8..09e2cfe40696 100644 pinctrl-names = "default"; pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>; vmmc-supply = <&vcc3v0_sd>; -@@ -547,6 +1041,27 @@ &spi5 { +@@ -547,6 +1043,27 @@ &spi5 { status = "okay"; }; @@ -882,7 +882,7 @@ index 9586bb12a5d8..09e2cfe40696 100644 &tcphy1 { /* phy for &usbdrd_dwc3_1 */ status = "okay"; -@@ -560,61 +1075,118 @@ &tsadc { +@@ -560,61 +1077,118 @@ &tsadc { status = "okay"; }; @@ -1034,5 +1034,5 @@ index 9586bb12a5d8..09e2cfe40696 100644 + status = "okay"; +}; -- -2.43.0 +Armbian diff --git a/patch/kernel/archive/rockchip64-6.10/board-firefly-rk3399-dts.patch b/patch/kernel/archive/rockchip64-6.10/board-firefly-rk3399-dts.patch index f212d69355a7..31b6c44dae63 100644 --- a/patch/kernel/archive/rockchip64-6.10/board-firefly-rk3399-dts.patch +++ b/patch/kernel/archive/rockchip64-6.10/board-firefly-rk3399-dts.patch @@ -1,7 +1,42 @@ -index c654b6b02f3..f73f792eb44 100644 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: chainsx +Date: Fri, 17 May 2024 14:33:21 +0100 +Subject: [ARCHEOLOGY] firefly-rk3399: move to rockchip64 family + +> X-Git-Archeology: - Revision aa6ed7ce328617cf7eefa21d7e5f0a750d3a3477: https://github.com/armbian/build/commit/aa6ed7ce328617cf7eefa21d7e5f0a750d3a3477 +> X-Git-Archeology: Date: Fri, 17 May 2024 14:33:21 +0100 +> X-Git-Archeology: From: chainsx +> X-Git-Archeology: Subject: firefly-rk3399: move to rockchip64 family +> X-Git-Archeology: +> X-Git-Archeology: - Revision 7e574bd484de7238f0aba41dea5f3b5fb4e4fe8f: https://github.com/armbian/build/commit/7e574bd484de7238f0aba41dea5f3b5fb4e4fe8f +> X-Git-Archeology: Date: Sat, 18 May 2024 09:47:04 +0100 +> X-Git-Archeology: From: chainsx +> X-Git-Archeology: Subject: firefly-rk3399: fix patch +> X-Git-Archeology: +> X-Git-Archeology: - Revision 5fe762e0a344f3487d8ff007f571b2407c817a25: https://github.com/armbian/build/commit/5fe762e0a344f3487d8ff007f571b2407c817a25 +> X-Git-Archeology: Date: Sun, 19 May 2024 19:41:24 +0200 +> X-Git-Archeology: From: chainsx +> X-Git-Archeology: Subject: Optimize the kernel device tree patch for rk3399-firefly. +> X-Git-Archeology: +> X-Git-Archeology: - Revision 69ca2492628b2aae217c33fde921b3840851eb14: https://github.com/armbian/build/commit/69ca2492628b2aae217c33fde921b3840851eb14 +> X-Git-Archeology: Date: Wed, 05 Jun 2024 22:18:24 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip64: bump edge kernel to 6.9 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 4ae0a958146810117050d0dbd359b99691a0fa0c: https://github.com/armbian/build/commit/4ae0a958146810117050d0dbd359b99691a0fa0c +> X-Git-Archeology: Date: Mon, 22 Jul 2024 19:17:52 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip64: bump edge kernel to 6.10 +> X-Git-Archeology: +--- + arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 133 +++++++--- + 1 file changed, 103 insertions(+), 30 deletions(-) + +diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts -@@ -217,7 +216,7 @@ +@@ -217,7 +217,7 @@ vcc5v0_host: vcc5v0-host-regulator { enable-active-high; gpio = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; @@ -10,7 +45,7 @@ index c654b6b02f3..f73f792eb44 100644 regulator-name = "vcc5v0_host"; regulator-always-on; vin-supply = <&vcc_sys>; -@@ -236,8 +235,11 @@ +@@ -236,8 +236,11 @@ vcc5v0_typec: vcc5v0-typec-regulator { vcc_sys: vcc-sys { compatible = "regulator-fixed"; @@ -23,7 +58,7 @@ index c654b6b02f3..f73f792eb44 100644 regulator-boot-on; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; -@@ -254,6 +256,27 @@ +@@ -254,6 +257,27 @@ vdd_log: vdd-log { regulator-min-microvolt = <430000>; regulator-max-microvolt = <1400000>; }; @@ -51,7 +86,7 @@ index c654b6b02f3..f73f792eb44 100644 }; &cpu_l0 { -@@ -306,6 +329,8 @@ +@@ -306,6 +330,8 @@ &gpu { }; &hdmi { @@ -60,7 +95,7 @@ index c654b6b02f3..f73f792eb44 100644 ddc-i2c-bus = <&i2c3>; pinctrl-names = "default"; pinctrl-0 = <&hdmi_cec>; -@@ -330,18 +355,18 @@ +@@ -330,18 +356,18 @@ rk808: pmic@1b { rockchip,system-power-controller; wakeup-source; @@ -89,7 +124,7 @@ index c654b6b02f3..f73f792eb44 100644 regulators { vdd_center: DCDC_REG1 { -@@ -389,8 +414,8 @@ +@@ -389,8 +415,8 @@ regulator-state-mem { }; }; @@ -100,7 +135,7 @@ index c654b6b02f3..f73f792eb44 100644 regulator-always-on; regulator-boot-on; regulator-min-microvolt = <1800000>; -@@ -400,12 +425,12 @@ +@@ -400,12 +426,12 @@ regulator-state-mem { }; }; @@ -117,7 +152,7 @@ index c654b6b02f3..f73f792eb44 100644 regulator-state-mem { regulator-off-in-suspend; }; -@@ -458,12 +483,12 @@ +@@ -458,12 +484,12 @@ regulator-state-mem { }; }; @@ -134,7 +169,7 @@ index c654b6b02f3..f73f792eb44 100644 regulator-state-mem { regulator-off-in-suspend; }; -@@ -504,14 +529,16 @@ +@@ -504,14 +530,16 @@ regulator-state-mem { vdd_cpu_b: regulator@40 { compatible = "silergy,syr827"; reg = <0x40>; @@ -153,7 +188,7 @@ index c654b6b02f3..f73f792eb44 100644 regulator-state-mem { regulator-off-in-suspend; -@@ -522,13 +549,15 @@ +@@ -522,13 +550,15 @@ vdd_gpu: regulator@41 { compatible = "silergy,syr828"; reg = <0x41>; fcs,suspend-voltage-selector = <1>; @@ -170,7 +205,7 @@ index c654b6b02f3..f73f792eb44 100644 regulator-state-mem { regulator-off-in-suspend; -@@ -565,7 +594,7 @@ +@@ -565,7 +595,7 @@ &i2c4 { status = "okay"; fusb0: typec-portc@22 { @@ -179,7 +214,7 @@ index c654b6b02f3..f73f792eb44 100644 reg = <0x22>; interrupt-parent = <&gpio1>; interrupts = ; -@@ -638,7 +667,7 @@ +@@ -638,7 +668,7 @@ &i2s2 { &io_domains { status = "okay"; @@ -188,7 +223,7 @@ index c654b6b02f3..f73f792eb44 100644 audio-supply = <&vcca1v8_codec>; sdmmc-supply = <&vcc_sdio>; gpio1830-supply = <&vcc_3v0>; -@@ -652,7 +681,10 @@ +@@ -652,7 +682,10 @@ &pcie0 { ep-gpios = <&gpio4 RK_PD1 GPIO_ACTIVE_HIGH>; num-lanes = <4>; pinctrl-names = "default"; @@ -200,7 +235,7 @@ index c654b6b02f3..f73f792eb44 100644 status = "okay"; }; -@@ -704,6 +736,10 @@ +@@ -704,6 +737,10 @@ pcie_pwr_en: pcie-pwr-en { pcie_3g_drv: pcie-3g-drv { rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>; }; @@ -211,7 +246,7 @@ index c654b6b02f3..f73f792eb44 100644 }; pmic { -@@ -742,6 +778,14 @@ +@@ -742,6 +779,14 @@ usb2 { vcc5v0_host_en: vcc5v0-host-en { rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>; }; @@ -226,7 +261,7 @@ index c654b6b02f3..f73f792eb44 100644 }; wifi { -@@ -749,6 +793,20 @@ +@@ -749,6 +794,20 @@ wifi_host_wake_l: wifi-host-wake-l { rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>; }; }; @@ -247,7 +282,7 @@ index c654b6b02f3..f73f792eb44 100644 }; &pwm0 { -@@ -788,7 +846,7 @@ +@@ -788,7 +847,7 @@ brcmf: wifi@1 { reg = <1>; compatible = "brcm,bcm4329-fmac"; interrupt-parent = <&gpio0>; @@ -256,7 +291,7 @@ index c654b6b02f3..f73f792eb44 100644 interrupt-names = "host-wake"; brcm,drive-strength = <5>; pinctrl-names = "default"; -@@ -885,8 +943,22 @@ +@@ -885,8 +944,22 @@ u2phy1_host: host-port { &uart0 { pinctrl-names = "default"; @@ -280,3 +315,6 @@ index c654b6b02f3..f73f792eb44 100644 }; &uart2 { +-- +Armbian + diff --git a/patch/kernel/archive/rockchip64-6.10/board-helios64-dts-fix-stability-issues.patch b/patch/kernel/archive/rockchip64-6.10/board-helios64-dts-fix-stability-issues.patch index 1b427c141177..b2a57f43c62e 100644 --- a/patch/kernel/archive/rockchip64-6.10/board-helios64-dts-fix-stability-issues.patch +++ b/patch/kernel/archive/rockchip64-6.10/board-helios64-dts-fix-stability-issues.patch @@ -1,7 +1,7 @@ -From 4244bd791ab2fe68abebc1b6bf71ffbc02535828 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aditya Prayoga Date: Thu, 4 Mar 2021 10:39:40 +0700 -Subject: [PATCH] Attempt to improve stability on Helios64 (#2680) +Subject: Attempt to improve stability on Helios64 (#2680) > X-Git-Archeology: > recovered message: > * Adjust the RK808 buck step to improve stability > X-Git-Archeology: > recovered message: > * Adjust vdd_log and enable vdd_center init voltage @@ -56,7 +56,7 @@ Subject: [PATCH] Attempt to improve stability on Helios64 (#2680) 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts -index 09e2cfe40696..4cb72981809a 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts @@ -522,6 +522,7 @@ rk808: pmic@1b { @@ -68,5 +68,5 @@ index 09e2cfe40696..4cb72981809a 100644 vcc1-supply = <&vcc5v0_sys>; vcc2-supply = <&vcc5v0_sys>; -- -2.43.0 +Armbian diff --git a/patch/kernel/archive/rockchip64-6.10/board-helios64-remove-pcie-ep-gpios.patch b/patch/kernel/archive/rockchip64-6.10/board-helios64-remove-pcie-ep-gpios.patch index ff7ca38b5346..a9c9820977ff 100644 --- a/patch/kernel/archive/rockchip64-6.10/board-helios64-remove-pcie-ep-gpios.patch +++ b/patch/kernel/archive/rockchip64-6.10/board-helios64-remove-pcie-ep-gpios.patch @@ -1,7 +1,7 @@ -From 9fd42a26755ee7303a033c9c1fba3a492e0044f5 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aditya Prayoga Date: Tue, 15 Sep 2020 13:42:02 +0700 -Subject: [PATCH] Remove PCIE ep-gpios from Helios64 +Subject: Remove PCIE ep-gpios from Helios64 Signed-off-by: Aditya Prayoga --- @@ -9,7 +9,7 @@ Signed-off-by: Aditya Prayoga 1 file changed, 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts -index 4cb72981809a..824e7a4d8e40 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts @@ -820,7 +820,6 @@ &pcie_phy { @@ -21,5 +21,5 @@ index 4cb72981809a..824e7a4d8e40 100644 num-lanes = <2>; pinctrl-names = "default"; -- -2.43.0 +Armbian diff --git a/patch/kernel/archive/rockchip64-6.10/board-nanopc-t4-add-typec-dp.patch b/patch/kernel/archive/rockchip64-6.10/board-nanopc-t4-add-typec-dp.patch index b6a2dc3d616b..7a8a5204bc33 100644 --- a/patch/kernel/archive/rockchip64-6.10/board-nanopc-t4-add-typec-dp.patch +++ b/patch/kernel/archive/rockchip64-6.10/board-nanopc-t4-add-typec-dp.patch @@ -9,7 +9,7 @@ Signed-off-by: tonymac32 1 file changed, 96 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts b/arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts -index 3bf8f959e42c..2b1220beabd5 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts @@ -9,6 +9,7 @@ diff --git a/patch/kernel/archive/rockchip64-6.10/board-nanopi-m4v2-dts-add-sound-card.patch b/patch/kernel/archive/rockchip64-6.10/board-nanopi-m4v2-dts-add-sound-card.patch index 8c03adf2bfa8..835f4fcd4d6e 100644 --- a/patch/kernel/archive/rockchip64-6.10/board-nanopi-m4v2-dts-add-sound-card.patch +++ b/patch/kernel/archive/rockchip64-6.10/board-nanopi-m4v2-dts-add-sound-card.patch @@ -79,10 +79,10 @@ Subject: [ARCHEOLOGY] Initial addition of NanoPi M4V2 2 files changed, 60 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi -index 7c5f441a2219..3e899f584871 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi -@@ -132,6 +132,27 @@ status_led: led-0 { +@@ -133,6 +133,27 @@ status_led: led-0 { }; }; @@ -110,7 +110,7 @@ index 7c5f441a2219..3e899f584871 100644 sdio_pwrseq: sdio-pwrseq { compatible = "mmc-pwrseq-simple"; clocks = <&rk808 1>; -@@ -216,6 +237,10 @@ &hdmi_sound { +@@ -217,6 +238,10 @@ &hdmi_sound { status = "okay"; }; @@ -121,7 +121,7 @@ index 7c5f441a2219..3e899f584871 100644 &i2c0 { clock-frequency = <400000>; i2c-scl-rising-time-ns = <160>; -@@ -463,6 +488,16 @@ &i2c1 { +@@ -464,6 +489,16 @@ &i2c1 { i2c-scl-rising-time-ns = <150>; i2c-scl-falling-time-ns = <30>; status = "okay"; @@ -138,7 +138,7 @@ index 7c5f441a2219..3e899f584871 100644 }; &i2c2 { -@@ -494,6 +529,16 @@ &i2s2 { +@@ -495,6 +530,16 @@ &i2s2 { status = "okay"; }; @@ -155,7 +155,7 @@ index 7c5f441a2219..3e899f584871 100644 &io_domains { bt656-supply = <&vcc_1v8>; audio-supply = <&vcca1v8_codec>; -@@ -759,3 +804,9 @@ &vopl { +@@ -760,3 +805,9 @@ &vopl { &vopl_mmu { status = "okay"; }; @@ -166,7 +166,7 @@ index 7c5f441a2219..3e899f584871 100644 + status = "okay"; +}; diff --git a/sound/soc/rockchip/Kconfig b/sound/soc/rockchip/Kconfig -index f98a2fa85edd..be36e36c8783 100644 +index 111111111111..222222222222 100644 --- a/sound/soc/rockchip/Kconfig +++ b/sound/soc/rockchip/Kconfig @@ -65,6 +65,15 @@ config SND_SOC_ROCKCHIP_RT5645 diff --git a/patch/kernel/archive/rockchip64-6.10/board-nanopi-r2c-plus.patch b/patch/kernel/archive/rockchip64-6.10/board-nanopi-r2c-plus.patch index 72fe01212211..d95e671c487f 100644 --- a/patch/kernel/archive/rockchip64-6.10/board-nanopi-r2c-plus.patch +++ b/patch/kernel/archive/rockchip64-6.10/board-nanopi-r2c-plus.patch @@ -13,7 +13,7 @@ Subject: [ARCHEOLOGY] rockchip64: bump rockchip64-edge kernel to 6.5 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2c-plus.dts b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2c-plus.dts -index 16a1958e4572..45954295d51d 100644 +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 { diff --git a/patch/kernel/archive/rockchip64-6.10/board-nanopi-r2s.patch b/patch/kernel/archive/rockchip64-6.10/board-nanopi-r2s.patch index c707061370f8..be57a4e711c9 100644 --- a/patch/kernel/archive/rockchip64-6.10/board-nanopi-r2s.patch +++ b/patch/kernel/archive/rockchip64-6.10/board-nanopi-r2s.patch @@ -8,7 +8,7 @@ Subject: rockchip64: consolidate nanopi r2s device trees 1 file changed, 328 insertions(+), 165 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts -index 1445b879ac7a..7ebf21d7faac 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts @@ -1,119 +1,167 @@ @@ -36,10 +36,9 @@ index 1445b879ac7a..7ebf21d7faac 100644 + "rockchip,rk3328"; aliases { -- ethernet0 = &gmac2io; + ethernet0 = &gmac2io; - ethernet1 = &rtl8153; - mmc0 = &sdmmc; -+ ethernet0 = &gmac2io; + ethernet1 = &r8153; }; @@ -243,7 +242,7 @@ index 1445b879ac7a..7ebf21d7faac 100644 }; }; -@@ -120,34 +168,57 @@ &cpu0 { +@@ -121,34 +169,57 @@ &cpu0 { cpu-supply = <&vdd_arm>; }; @@ -313,7 +312,7 @@ index 1445b879ac7a..7ebf21d7faac 100644 status = "okay"; mdio { -@@ -155,13 +226,11 @@ mdio { +@@ -156,13 +227,11 @@ mdio { #address-cells = <1>; #size-cells = <0>; @@ -331,7 +330,7 @@ index 1445b879ac7a..7ebf21d7faac 100644 }; }; }; -@@ -169,36 +238,35 @@ rtl8211e: ethernet-phy@1 { +@@ -170,36 +239,35 @@ rtl8211e: ethernet-phy@1 { &i2c1 { status = "okay"; @@ -383,7 +382,7 @@ index 1445b879ac7a..7ebf21d7faac 100644 regulator-state-mem { regulator-on-in-suspend; regulator-suspend-microvolt = <1000000>; -@@ -207,12 +275,11 @@ regulator-state-mem { +@@ -208,12 +276,11 @@ regulator-state-mem { vdd_arm: DCDC_REG2 { regulator-name = "vdd_arm"; @@ -399,7 +398,7 @@ index 1445b879ac7a..7ebf21d7faac 100644 regulator-state-mem { regulator-on-in-suspend; regulator-suspend-microvolt = <950000>; -@@ -223,19 +290,17 @@ vcc_ddr: DCDC_REG3 { +@@ -224,19 +291,17 @@ vcc_ddr: DCDC_REG3 { regulator-name = "vcc_ddr"; regulator-always-on; regulator-boot-on; @@ -423,7 +422,7 @@ index 1445b879ac7a..7ebf21d7faac 100644 regulator-state-mem { regulator-on-in-suspend; regulator-suspend-microvolt = <3300000>; -@@ -244,11 +309,10 @@ regulator-state-mem { +@@ -245,11 +310,10 @@ regulator-state-mem { vcc_18: LDO_REG1 { regulator-name = "vcc_18"; @@ -437,7 +436,7 @@ index 1445b879ac7a..7ebf21d7faac 100644 regulator-state-mem { regulator-on-in-suspend; regulator-suspend-microvolt = <1800000>; -@@ -257,11 +321,10 @@ regulator-state-mem { +@@ -258,11 +322,10 @@ regulator-state-mem { vcc18_emmc: LDO_REG2 { regulator-name = "vcc18_emmc"; @@ -451,7 +450,7 @@ index 1445b879ac7a..7ebf21d7faac 100644 regulator-state-mem { regulator-on-in-suspend; regulator-suspend-microvolt = <1800000>; -@@ -270,11 +333,10 @@ regulator-state-mem { +@@ -271,11 +334,10 @@ regulator-state-mem { vdd_10: LDO_REG3 { regulator-name = "vdd_10"; @@ -465,7 +464,7 @@ index 1445b879ac7a..7ebf21d7faac 100644 regulator-state-mem { regulator-on-in-suspend; regulator-suspend-microvolt = <1000000>; -@@ -285,20 +347,21 @@ regulator-state-mem { +@@ -286,20 +348,21 @@ regulator-state-mem { }; &io_domains { @@ -497,7 +496,7 @@ index 1445b879ac7a..7ebf21d7faac 100644 }; }; -@@ -308,61 +371,165 @@ eth_phy_reset_pin: eth-phy-reset-pin { +@@ -309,61 +372,165 @@ eth_phy_reset_pin: eth-phy-reset-pin { }; }; @@ -689,7 +688,7 @@ index 1445b879ac7a..7ebf21d7faac 100644 status = "okay"; }; -@@ -378,13 +545,16 @@ &u2phy_otg { +@@ -379,13 +546,16 @@ &u2phy_otg { status = "okay"; }; @@ -709,7 +708,7 @@ index 1445b879ac7a..7ebf21d7faac 100644 }; &usbdrd3 { -@@ -393,17 +563,10 @@ &usbdrd3 { +@@ -394,17 +564,10 @@ &usbdrd3 { #address-cells = <1>; #size-cells = <0>; diff --git a/patch/kernel/archive/rockchip64-6.10/board-nanopi-r4s-pwmfan.patch b/patch/kernel/archive/rockchip64-6.10/board-nanopi-r4s-pwmfan.patch index 2fb280e546cd..5122a5fad191 100644 --- a/patch/kernel/archive/rockchip64-6.10/board-nanopi-r4s-pwmfan.patch +++ b/patch/kernel/archive/rockchip64-6.10/board-nanopi-r4s-pwmfan.patch @@ -8,7 +8,7 @@ Subject: Add pwm-fan support to nanopi r4s 1 file changed, 35 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts -index fe5b52610010..10cc254fd1dc 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts @@ -62,6 +62,41 @@ vdd_5v: vdd-5v { diff --git a/patch/kernel/archive/rockchip64-6.10/board-orangepi-r1-plus.patch b/patch/kernel/archive/rockchip64-6.10/board-orangepi-r1-plus.patch index 7cb0c747bf7b..2e272f10092f 100644 --- a/patch/kernel/archive/rockchip64-6.10/board-orangepi-r1-plus.patch +++ b/patch/kernel/archive/rockchip64-6.10/board-orangepi-r1-plus.patch @@ -114,7 +114,7 @@ Subject: [ARCHEOLOGY] Initial ROCK Pi E support (as WIP) (#2042) 1 file changed, 45 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts -index f20662929c77..c55d79e12f16 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts @@ -8,6 +8,7 @@ diff --git a/patch/kernel/archive/rockchip64-6.10/board-orangepi-rk3399-pcie.patch b/patch/kernel/archive/rockchip64-6.10/board-orangepi-rk3399-pcie.patch index dfbf219abd24..27d19163d45d 100644 --- a/patch/kernel/archive/rockchip64-6.10/board-orangepi-rk3399-pcie.patch +++ b/patch/kernel/archive/rockchip64-6.10/board-orangepi-rk3399-pcie.patch @@ -8,7 +8,7 @@ Subject: arm64: dts: rockchip: add pcie support to orangepi rk3399 board 1 file changed, 31 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts b/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts -index e7551449e718..fc23d4733509 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts @@ -124,6 +124,17 @@ vcc3v0_sd: vcc3v0-sd { diff --git a/patch/kernel/archive/rockchip64-6.10/board-pbp-add-dp-alt-mode.patch b/patch/kernel/archive/rockchip64-6.10/board-pbp-add-dp-alt-mode.patch index 6e29666c547e..f85593bd206f 100644 --- a/patch/kernel/archive/rockchip64-6.10/board-pbp-add-dp-alt-mode.patch +++ b/patch/kernel/archive/rockchip64-6.10/board-pbp-add-dp-alt-mode.patch @@ -11,7 +11,7 @@ Subject: add-dp-alt-mode-to-PBP 4 files changed, 210 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 054c6a4d1a45..48b865d30b14 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts @@ -422,6 +422,7 @@ edp_out_panel: endpoint@0 { @@ -32,7 +32,7 @@ index 054c6a4d1a45..48b865d30b14 100644 ports { #address-cells = <1>; #size-cells = <0>; -@@ -972,6 +976,7 @@ spiflash: flash@0 { +@@ -971,6 +975,7 @@ spiflash: flash@0 { }; &tcphy0 { @@ -41,7 +41,7 @@ index 054c6a4d1a45..48b865d30b14 100644 }; diff --git a/drivers/phy/rockchip/phy-rockchip-typec.c b/drivers/phy/rockchip/phy-rockchip-typec.c -index 4efcb78b0ab1..6a641d9f752c 100644 +index 111111111111..222222222222 100644 --- a/drivers/phy/rockchip/phy-rockchip-typec.c +++ b/drivers/phy/rockchip/phy-rockchip-typec.c @@ -40,6 +40,7 @@ @@ -76,7 +76,7 @@ index 4efcb78b0ab1..6a641d9f752c 100644 pm_runtime_enable(dev); diff --git a/drivers/usb/typec/altmodes/displayport.c b/drivers/usb/typec/altmodes/displayport.c -index 59e0218a8bc5..5b046eb1fad7 100644 +index 111111111111..222222222222 100644 --- a/drivers/usb/typec/altmodes/displayport.c +++ b/drivers/usb/typec/altmodes/displayport.c @@ -9,6 +9,8 @@ @@ -88,8 +88,8 @@ index 59e0218a8bc5..5b046eb1fad7 100644 #include #include #include -@@ -69,6 +71,8 @@ struct dp_altmode { - struct fwnode_handle *connector_fwnode; +@@ -74,6 +76,8 @@ struct dp_altmode { + struct typec_altmode *plug_prime; }; +void dp_altmode_update_extcon(struct dp_altmode *dp, bool disconnect); @@ -97,7 +97,7 @@ index 59e0218a8bc5..5b046eb1fad7 100644 static int dp_altmode_notify(struct dp_altmode *dp) { unsigned long conf; -@@ -77,7 +81,9 @@ static int dp_altmode_notify(struct dp_altmode *dp) +@@ -82,7 +86,9 @@ static int dp_altmode_notify(struct dp_altmode *dp) if (dp->data.conf) { state = get_count_order(DP_CONF_GET_PIN_ASSIGN(dp->data.conf)); conf = TYPEC_MODAL_STATE(state); @@ -107,7 +107,7 @@ index 59e0218a8bc5..5b046eb1fad7 100644 conf = TYPEC_STATE_USB; } -@@ -163,6 +169,40 @@ static int dp_altmode_status_update(struct dp_altmode *dp) +@@ -182,6 +188,40 @@ static int dp_altmode_status_update(struct dp_altmode *dp) return ret; } @@ -148,16 +148,16 @@ index 59e0218a8bc5..5b046eb1fad7 100644 static int dp_altmode_configured(struct dp_altmode *dp) { sysfs_notify(&dp->alt->dev.kobj, "displayport", "configuration"); -@@ -242,6 +282,8 @@ static void dp_altmode_work(struct work_struct *work) +@@ -298,6 +338,8 @@ static void dp_altmode_work(struct work_struct *work) case DP_STATE_EXIT: if (typec_altmode_exit(dp->alt)) dev_err(&dp->alt->dev, "Exit Mode Failed!\n"); + else + dp_altmode_update_extcon(dp, true); break; - default: - break; -@@ -579,8 +621,14 @@ int dp_altmode_probe(struct typec_altmode *alt) + case DP_STATE_EXIT_PRIME: + if (typec_cable_altmode_exit(dp->plug_prime, TYPEC_PLUG_SOP_P)) +@@ -733,8 +775,14 @@ int dp_altmode_probe(struct typec_altmode *alt) if (!(DP_CAP_PIN_ASSIGN_DFP_D(port->vdo) & DP_CAP_PIN_ASSIGN_UFP_D(alt->vdo)) && !(DP_CAP_PIN_ASSIGN_UFP_D(port->vdo) & @@ -172,10 +172,10 @@ index 59e0218a8bc5..5b046eb1fad7 100644 + } + - ret = sysfs_create_group(&alt->dev.kobj, &dp_altmode_group); - if (ret) + dp = devm_kzalloc(&alt->dev, sizeof(*dp), GFP_KERNEL); + if (!dp) diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c -index d962f67c95ae..5ac809870867 100644 +index 111111111111..222222222222 100644 --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c @@ -8,6 +8,7 @@ @@ -186,7 +186,7 @@ index d962f67c95ae..5ac809870867 100644 #include #include #include -@@ -552,6 +552,12 @@ struct tcpm_port { +@@ -551,6 +552,12 @@ struct tcpm_port { */ unsigned int message_id_prime; unsigned int rx_msgid_prime; @@ -199,7 +199,7 @@ index d962f67c95ae..5ac809870867 100644 #ifdef CONFIG_DEBUG_FS struct dentry *dentry; struct mutex logbuffer_lock; /* log buffer access lock */ -@@ -879,6 +886,35 @@ static void tcpm_ams_finish(struct tcpm_port *port) +@@ -939,6 +946,35 @@ static void tcpm_ams_finish(struct tcpm_port *port) port->ams = NONE_AMS; } @@ -233,9 +233,9 @@ index d962f67c95ae..5ac809870867 100644 +} + static int tcpm_pd_transmit(struct tcpm_port *port, - enum tcpm_transmit_type type, + enum tcpm_transmit_type tx_sop_type, const struct pd_message *msg) -@@ -1091,6 +1127,8 @@ static int tcpm_set_roles(struct tcpm_port *port, bool attached, +@@ -1178,6 +1214,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); @@ -244,7 +244,7 @@ index d962f67c95ae..5ac809870867 100644 return 0; } -@@ -1562,7 +1600,7 @@ static void svdm_consume_modes(struct tcpm_port *port, const u32 *p, int cnt) +@@ -1733,7 +1771,7 @@ static void svdm_consume_modes(struct tcpm_port *port, const u32 *p, int cnt, paltmode->mode = i; paltmode->vdo = p[i]; @@ -253,7 +253,7 @@ index d962f67c95ae..5ac809870867 100644 pmdata->altmodes, paltmode->svid, paltmode->mode, paltmode->vdo); -@@ -1583,6 +1621,8 @@ static void tcpm_register_partner_altmodes(struct tcpm_port *port) +@@ -1757,6 +1795,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; @@ -262,7 +262,7 @@ index d962f67c95ae..5ac809870867 100644 } port->partner_altmode[i] = altmode; } -@@ -2167,11 +2173,13 @@ static int tcpm_pd_svdm(struct tcpm_port *port, struct typec_altmode *adev, +@@ -2133,11 +2173,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]; @@ -276,17 +276,15 @@ index d962f67c95ae..5ac809870867 100644 *response_tx_sop_type = TCPC_TX_SOP_PRIME; response[0] = VDO(USB_SID_PD, 1, typec_get_cable_svdm_version(typec), -@@ -3650,8 +3692,9 @@ static int tcpm_src_attach(struct tcpm_port *port) - static void tcpm_typec_disconnect(struct tcpm_port *port) - { +@@ -4344,6 +4386,7 @@ static void tcpm_typec_disconnect(struct tcpm_port *port) + port->cable = NULL; if (port->connected) { if (port->partner) { + tcpm_update_extcon_data(port, false); typec_partner_set_usb_power_delivery(port->partner, NULL); typec_unregister_partner(port->partner); port->partner = NULL; - } -@@ -3739,6 +3782,8 @@ static void tcpm_detach(struct tcpm_port *port) +@@ -4438,6 +4481,8 @@ static void tcpm_detach(struct tcpm_port *port) } tcpm_reset_port(port); @@ -295,7 +293,7 @@ index d962f67c95ae..5ac809870867 100644 } static void tcpm_src_detach(struct tcpm_port *port) -@@ -6258,6 +6303,64 @@ static int tcpm_port_register_pd(struct tcpm_port *port) +@@ -7028,6 +7073,64 @@ static int tcpm_port_register_pd(struct tcpm_port *port) return ret; } @@ -360,7 +358,7 @@ index d962f67c95ae..5ac809870867 100644 static int tcpm_fw_get_caps(struct tcpm_port *port, struct fwnode_handle *fwnode) { struct fwnode_handle *capabilities, *child, *caps = NULL; -@@ -6119,6 +6222,23 @@ static int tcpm_fw_get_caps(struct tcpm_port *port, +@@ -7041,6 +7144,23 @@ static int tcpm_fw_get_caps(struct tcpm_port *port, struct fwnode_handle *fwnode if (!fwnode) return -EINVAL; @@ -384,7 +382,7 @@ index d962f67c95ae..5ac809870867 100644 /* * This fwnode has a "compatible" property, but is never populated as a * struct device. Instead we simply parse it to read the properties. -@@ -6571,6 +6691,17 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc) +@@ -7591,6 +7711,17 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc) goto out_destroy_wq; port->try_role = port->typec_caps.prefer_role; @@ -400,10 +398,10 @@ index d962f67c95ae..5ac809870867 100644 + } +#endif - port->typec_caps.fwnode = tcpc->fwnode; port->typec_caps.revision = 0x0120; /* Type-C spec release 1.2 */ -@@ -6613,6 +6744,12 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc) - port->port_altmode, ALTMODE_DISCOVERY_MAX); + port->typec_caps.pd_revision = 0x0300; /* USB-PD spec release 3.0 */ +@@ -7634,6 +7765,12 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc) + &tcpm_cable_ops); port->registered = true; + err = tcpm_fw_get_caps_late(port, tcpc->fwnode); @@ -418,4 +416,3 @@ index d962f67c95ae..5ac809870867 100644 -- Armbian - diff --git a/patch/kernel/archive/rockchip64-6.10/board-radxa-e25-sdmmc0-fix.patch b/patch/kernel/archive/rockchip64-6.10/board-radxa-e25-sdmmc0-fix.patch index 41758a620fbd..b46e5b4ac972 100644 --- a/patch/kernel/archive/rockchip64-6.10/board-radxa-e25-sdmmc0-fix.patch +++ b/patch/kernel/archive/rockchip64-6.10/board-radxa-e25-sdmmc0-fix.patch @@ -18,7 +18,7 @@ Subject: [ARCHEOLOGY] Improve SD card compatibility on Radxa E25 (#5165) 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts -index 72ad74c38a2b..5751dc7e2ebc 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts @@ -194,7 +194,7 @@ &sdmmc0 { diff --git a/patch/kernel/archive/rockchip64-6.10/board-radxa-e25-usb3-and-emmc-fix.patch b/patch/kernel/archive/rockchip64-6.10/board-radxa-e25-usb3-and-emmc-fix.patch index afd5918a0b7e..ab550e8406ea 100644 --- a/patch/kernel/archive/rockchip64-6.10/board-radxa-e25-usb3-and-emmc-fix.patch +++ b/patch/kernel/archive/rockchip64-6.10/board-radxa-e25-usb3-and-emmc-fix.patch @@ -19,7 +19,7 @@ Subject: [ARCHEOLOGY] Improve SD card compatibility on Radxa E25 (#5165) 2 files changed, 14 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi -index 45b03dcbbad4..ffae714d56dc 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi @@ -389,6 +389,17 @@ &sdhci { @@ -47,7 +47,7 @@ index 45b03dcbbad4..ffae714d56dc 100644 + dr_mode = "host"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts -index 5751dc7e2ebc..7d7d00adf10a 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts @@ -209,6 +209,8 @@ &usb_host0_ohci { diff --git a/patch/kernel/archive/rockchip64-6.10/board-rk3328-roc-cc-dts-enable-dmc.patch b/patch/kernel/archive/rockchip64-6.10/board-rk3328-roc-cc-dts-enable-dmc.patch index 658c3e15ce3e..270dbb82b34c 100644 --- a/patch/kernel/archive/rockchip64-6.10/board-rk3328-roc-cc-dts-enable-dmc.patch +++ b/patch/kernel/archive/rockchip64-6.10/board-rk3328-roc-cc-dts-enable-dmc.patch @@ -8,7 +8,7 @@ Subject: enable roc-cc dmc 1 file changed, 38 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts -index 5d5d9574088c..be5d064d6a93 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts @@ -4,6 +4,7 @@ @@ -19,7 +19,7 @@ index 5d5d9574088c..be5d064d6a93 100644 #include "rk3328.dtsi" / { -@@ -19,6 +20,32 @@ chosen { +@@ -20,6 +21,32 @@ chosen { stdout-path = "serial2:1500000n8"; }; @@ -52,7 +52,7 @@ index 5d5d9574088c..be5d064d6a93 100644 gmac_clkin: external-gmac-clock { compatible = "fixed-clock"; clock-frequency = <125000000>; -@@ -115,6 +142,17 @@ &codec { +@@ -116,6 +143,17 @@ &codec { status = "okay"; }; diff --git a/patch/kernel/archive/rockchip64-6.10/board-rk3328-roc-cc-dts-ram-profile.patch b/patch/kernel/archive/rockchip64-6.10/board-rk3328-roc-cc-dts-ram-profile.patch index 71b23c423c80..dc5e81132123 100644 --- a/patch/kernel/archive/rockchip64-6.10/board-rk3328-roc-cc-dts-ram-profile.patch +++ b/patch/kernel/archive/rockchip64-6.10/board-rk3328-roc-cc-dts-ram-profile.patch @@ -10,7 +10,7 @@ Signed-off-by: tonymac32 diff --git a/arch/arm64/boot/dts/rockchip/rk3328-dram-renegade-timing.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-dram-renegade-timing.dtsi new file mode 100644 -index 000000000000..303428153094 +index 000000000000..111111111111 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-dram-renegade-timing.dtsi @@ -0,0 +1,311 @@ diff --git a/patch/kernel/archive/rockchip64-6.10/board-rk3328-roc-pc-dts-ram-profile.patch b/patch/kernel/archive/rockchip64-6.10/board-rk3328-roc-pc-dts-ram-profile.patch index 872a1574beec..226ffb31ba9b 100644 --- a/patch/kernel/archive/rockchip64-6.10/board-rk3328-roc-pc-dts-ram-profile.patch +++ b/patch/kernel/archive/rockchip64-6.10/board-rk3328-roc-pc-dts-ram-profile.patch @@ -69,7 +69,7 @@ Subject: [ARCHEOLOGY] Add files via upload diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc-pc-dram-timing.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-roc-pc-dram-timing.dtsi new file mode 100644 -index 000000000000..8b2077d086f5 +index 000000000000..111111111111 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-roc-pc-dram-timing.dtsi @@ -0,0 +1,223 @@ diff --git a/patch/kernel/archive/rockchip64-6.10/board-rk3328-roc-pc.patch b/patch/kernel/archive/rockchip64-6.10/board-rk3328-roc-pc.patch index 43892ae48fb7..64179e552360 100644 --- a/patch/kernel/archive/rockchip64-6.10/board-rk3328-roc-pc.patch +++ b/patch/kernel/archive/rockchip64-6.10/board-rk3328-roc-pc.patch @@ -8,7 +8,7 @@ Subject: enable dmc for rk3328-roc-pc 1 file changed, 466 insertions(+), 59 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3328-roc-pc.dts -index e3e3984d01d4..02047f049822 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-roc-pc.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-roc-pc.dts @@ -1,110 +1,517 @@ diff --git a/patch/kernel/archive/rockchip64-6.10/board-rock3a-emmc-sfc.patch b/patch/kernel/archive/rockchip64-6.10/board-rock3a-emmc-sfc.patch index 84e0169a4d63..8ce6fd52b9a4 100644 --- a/patch/kernel/archive/rockchip64-6.10/board-rock3a-emmc-sfc.patch +++ b/patch/kernel/archive/rockchip64-6.10/board-rock3a-emmc-sfc.patch @@ -28,11 +28,11 @@ Subject: [ARCHEOLOGY] update rockchip64 edge to 5.19 (#4039) 1 file changed, 11 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts -index e05ab11981f5..37de541cd4a1 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts -@@ -753,6 +753,17 @@ &sdmmc2 { - status = "okay"; +@@ -767,6 +767,17 @@ flash@0 { + }; }; +&sfc { diff --git a/patch/kernel/archive/rockchip64-6.10/board-rock3a-usb3.patch b/patch/kernel/archive/rockchip64-6.10/board-rock3a-usb3.patch index b5dfe00f774a..a49f809ba96e 100644 --- a/patch/kernel/archive/rockchip64-6.10/board-rock3a-usb3.patch +++ b/patch/kernel/archive/rockchip64-6.10/board-rock3a-usb3.patch @@ -28,10 +28,10 @@ Subject: [ARCHEOLOGY] update rockchip64 edge to 5.19 (#4039) 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts -index 37de541cd4a1..effcb2ee471f 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts -@@ -805,6 +805,7 @@ &usb_host0_ohci { +@@ -819,6 +819,7 @@ &usb_host0_ohci { &usb_host0_xhci { extcon = <&usb2phy0>; diff --git a/patch/kernel/archive/rockchip64-6.10/board-rock64-mail-supply.patch b/patch/kernel/archive/rockchip64-6.10/board-rock64-mail-supply.patch index a108ddef5e55..d285e9908658 100644 --- a/patch/kernel/archive/rockchip64-6.10/board-rock64-mail-supply.patch +++ b/patch/kernel/archive/rockchip64-6.10/board-rock64-mail-supply.patch @@ -9,10 +9,10 @@ Signed-off-by: tonymac32 1 file changed, 5 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts -index 0a27fa5271f5..1596ce3368f7 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts -@@ -135,6 +135,11 @@ &emmc { +@@ -136,6 +136,11 @@ &emmc { status = "okay"; }; diff --git a/patch/kernel/archive/rockchip64-6.10/board-rockpi3-enable-dmc.patch b/patch/kernel/archive/rockchip64-6.10/board-rockpi3-enable-dmc.patch index 6164405eedc8..29500dfd3838 100644 --- a/patch/kernel/archive/rockchip64-6.10/board-rockpi3-enable-dmc.patch +++ b/patch/kernel/archive/rockchip64-6.10/board-rockpi3-enable-dmc.patch @@ -18,7 +18,7 @@ Subject: [ARCHEOLOGY] rockchip64: enable dmc on Rock PI E board 1 file changed, 7 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts -index 018a3a5075c7..9b3453cece85 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts @@ -15,6 +15,7 @@ @@ -29,7 +29,7 @@ index 018a3a5075c7..9b3453cece85 100644 / { model = "Radxa ROCK Pi E"; -@@ -388,3 +389,9 @@ &usbdrd3 { +@@ -443,3 +444,9 @@ &usbdrd3 { &usb_host0_ehci { status = "okay"; }; diff --git a/patch/kernel/archive/rockchip64-6.10/board-rockpi4-0003-arm64-dts-pcie.patch b/patch/kernel/archive/rockchip64-6.10/board-rockpi4-0003-arm64-dts-pcie.patch index 3552a282ba37..ff2cb3e3e448 100644 --- a/patch/kernel/archive/rockchip64-6.10/board-rockpi4-0003-arm64-dts-pcie.patch +++ b/patch/kernel/archive/rockchip64-6.10/board-rockpi4-0003-arm64-dts-pcie.patch @@ -101,10 +101,10 @@ Subject: [ARCHEOLOGY] Rock Pi 4 enable PCIe in device tree for "dev" target 1 file changed, 4 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi -index f2279aa6ca9e..9d1b2129431c 100644 +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 -@@ -112,6 +112,8 @@ vcc3v3_pcie: vcc3v3-pcie-regulator { +@@ -113,6 +113,8 @@ vcc3v3_pcie: vcc3v3-pcie-regulator { regulator-name = "vcc3v3_pcie"; regulator-always-on; regulator-boot-on; @@ -113,7 +113,7 @@ index f2279aa6ca9e..9d1b2129431c 100644 vin-supply = <&vcc5v0_sys>; }; -@@ -528,9 +530,11 @@ &pcie0 { +@@ -530,9 +532,11 @@ &pcie0 { num-lanes = <4>; pinctrl-0 = <&pcie_clkreqnb_cpm>; pinctrl-names = "default"; diff --git a/patch/kernel/archive/rockchip64-6.10/board-rockpie-0001-arm64-dts-rockchip-fix-gmac-PHY-attach-error.patch b/patch/kernel/archive/rockchip64-6.10/board-rockpie-0001-arm64-dts-rockchip-fix-gmac-PHY-attach-error.patch index e9025725c641..86d5829845d5 100644 --- a/patch/kernel/archive/rockchip64-6.10/board-rockpie-0001-arm64-dts-rockchip-fix-gmac-PHY-attach-error.patch +++ b/patch/kernel/archive/rockchip64-6.10/board-rockpie-0001-arm64-dts-rockchip-fix-gmac-PHY-attach-error.patch @@ -9,12 +9,10 @@ Signed-off-by: FUKAUMI Naoki 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts -index f2616bfe3843..4fa44218447e 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts -@@ -165,10 +165,11 @@ mdio { - compatible = "snps,dwmac-mdio"; - #address-cells = <1>; +@@ -167,6 +167,7 @@ mdio { #size-cells = <0>; rtl8211: ethernet-phy@1 { @@ -22,8 +20,6 @@ index f2616bfe3843..4fa44218447e 100644 reg = <1>; pinctrl-0 = <ð_phy_int_pin>, <ð_phy_reset_pin>; pinctrl-names = "default"; - interrupt-parent = <&gpio1>; - interrupts = <24 IRQ_TYPE_LEVEL_LOW>; -- -Created with Armbian build tools https://github.com/armbian/build +Armbian diff --git a/patch/kernel/archive/rockchip64-6.10/board-rockpis-0005-arm64-dts-rk3308-Add-gmac-node-at-dtsi-level.patch b/patch/kernel/archive/rockchip64-6.10/board-rockpis-0005-arm64-dts-rk3308-Add-gmac-node-at-dtsi-level.patch index 3db2657a852c..0933f42f66dc 100644 --- a/patch/kernel/archive/rockchip64-6.10/board-rockpis-0005-arm64-dts-rk3308-Add-gmac-node-at-dtsi-level.patch +++ b/patch/kernel/archive/rockchip64-6.10/board-rockpis-0005-arm64-dts-rk3308-Add-gmac-node-at-dtsi-level.patch @@ -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; diff --git a/patch/kernel/archive/rockchip64-6.10/board-rockpis-0007-arm64-dts-rockchip-add-cpu-s-thermal-config-for-rk33.patch b/patch/kernel/archive/rockchip64-6.10/board-rockpis-0007-arm64-dts-rockchip-add-cpu-s-thermal-config-for-rk33.patch index 2d86ad6c3580..9dbb4d8a63d2 100644 --- a/patch/kernel/archive/rockchip64-6.10/board-rockpis-0007-arm64-dts-rockchip-add-cpu-s-thermal-config-for-rk33.patch +++ b/patch/kernel/archive/rockchip64-6.10/board-rockpis-0007-arm64-dts-rockchip-add-cpu-s-thermal-config-for-rk33.patch @@ -8,10 +8,10 @@ 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 { +@@ -557,6 +557,70 @@ saradc: saradc@ff1e0000 { status = "disabled"; }; diff --git a/patch/kernel/archive/rockchip64-6.10/board-rockpis-0008-thermal-rockchip-add-tsadc-support-for-rk3308.patch b/patch/kernel/archive/rockchip64-6.10/board-rockpis-0008-thermal-rockchip-add-tsadc-support-for-rk3308.patch index 3902d61c8fba..1f985ec022e5 100644 --- a/patch/kernel/archive/rockchip64-6.10/board-rockpis-0008-thermal-rockchip-add-tsadc-support-for-rk3308.patch +++ b/patch/kernel/archive/rockchip64-6.10/board-rockpis-0008-thermal-rockchip-add-tsadc-support-for-rk3308.patch @@ -11,7 +11,7 @@ Signed-off-by: Rocky Hao 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: @@ -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, diff --git a/patch/kernel/archive/rockchip64-6.10/board-rockpis-0012-arm64-dts-rk3308-Add-rk-timer-rtc.patch b/patch/kernel/archive/rockchip64-6.10/board-rockpis-0012-arm64-dts-rk3308-Add-rk-timer-rtc.patch index e8ecc0a02a2f..4162522f6258 100644 --- a/patch/kernel/archive/rockchip64-6.10/board-rockpis-0012-arm64-dts-rk3308-Add-rk-timer-rtc.patch +++ b/patch/kernel/archive/rockchip64-6.10/board-rockpis-0012-arm64-dts-rk3308-Add-rk-timer-rtc.patch @@ -4,14 +4,14 @@ Date: Fri, 17 Jan 2020 17:12:51 +0100 Subject: arm64: dts: rk3308: Add rk-timer-rtc --- - arch/arm64/boot/dts/rockchip/rk3308.dtsi | 11 +++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) + arch/arm64/boot/dts/rockchip/rk3308.dtsi | 9 +++++++++ + 1 file changed, 9 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rockchip/rk3308.dtsi -index 1567758ca90e..291f011800b2 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi -@@ -540,6 +540,15 @@ rktimer: rktimer@ff1a0000 { +@@ -545,6 +545,15 @@ rktimer: rktimer@ff1a0000 { clock-names = "pclk", "timer"; }; diff --git a/patch/kernel/archive/rockchip64-6.10/board-rockpis-0027-arm64-dts-rk3308-add-otp-cpuinfo.patch b/patch/kernel/archive/rockchip64-6.10/board-rockpis-0027-arm64-dts-rk3308-add-otp-cpuinfo.patch index f11c766eb4e2..a8983cc44795 100644 --- a/patch/kernel/archive/rockchip64-6.10/board-rockpis-0027-arm64-dts-rk3308-add-otp-cpuinfo.patch +++ b/patch/kernel/archive/rockchip64-6.10/board-rockpis-0027-arm64-dts-rk3308-add-otp-cpuinfo.patch @@ -64,10 +64,10 @@ Subject: [ARCHEOLOGY] Bumping EDGE kernel to 5.14.y (#3125) 1 file changed, 29 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rockchip/rk3308.dtsi -index dd221ee88722..5f48dcee7548 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi -@@ -138,6 +138,12 @@ arm-pmu { +@@ -143,6 +143,12 @@ arm-pmu { interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>; }; @@ -80,7 +80,7 @@ index dd221ee88722..5f48dcee7548 100644 mac_clkin: external-mac-clock { compatible = "fixed-clock"; clock-frequency = <50000000>; -@@ -145,6 +151,29 @@ mac_clkin: external-mac-clock { +@@ -150,6 +156,29 @@ mac_clkin: external-mac-clock { #clock-cells = <0>; }; diff --git a/patch/kernel/archive/rockchip64-6.10/board-rockpis-0029-arm64-dts-rk3308-add-reserved-memory-ramoops.patch b/patch/kernel/archive/rockchip64-6.10/board-rockpis-0029-arm64-dts-rk3308-add-reserved-memory-ramoops.patch index e64c536bc09a..259ef9ed8f5a 100644 --- a/patch/kernel/archive/rockchip64-6.10/board-rockpis-0029-arm64-dts-rk3308-add-reserved-memory-ramoops.patch +++ b/patch/kernel/archive/rockchip64-6.10/board-rockpis-0029-arm64-dts-rk3308-add-reserved-memory-ramoops.patch @@ -64,10 +64,10 @@ Subject: [ARCHEOLOGY] Bumping EDGE kernel to 5.14.y (#3125) 1 file changed, 20 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rockchip/rk3308.dtsi -index 5f48dcee7548..c5fe355c6deb 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi -@@ -179,6 +179,26 @@ psci { +@@ -184,6 +184,26 @@ psci { method = "smc"; }; diff --git a/patch/kernel/archive/rockchip64-6.10/board-rockpro64-0001-Add-pcie-bus-scan-delay.patch b/patch/kernel/archive/rockchip64-6.10/board-rockpro64-0001-Add-pcie-bus-scan-delay.patch index 42c9ba693774..9a94752966f7 100644 --- a/patch/kernel/archive/rockchip64-6.10/board-rockpro64-0001-Add-pcie-bus-scan-delay.patch +++ b/patch/kernel/archive/rockchip64-6.10/board-rockpro64-0001-Add-pcie-bus-scan-delay.patch @@ -48,10 +48,10 @@ Subject: Rockpro64 add pcie bus scan delay 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi -index bca2b50e0a93..1e7295215b58 100644 +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 { +@@ -664,6 +664,7 @@ &pcie0 { pinctrl-0 = <&pcie_perst>; vpcie12v-supply = <&vcc12v_dcin>; vpcie3v3-supply = <&vcc3v3_pcie>; diff --git a/patch/kernel/archive/rockchip64-6.10/board-rockpro64-change-rx_delay-for-gmac.patch b/patch/kernel/archive/rockchip64-6.10/board-rockpro64-change-rx_delay-for-gmac.patch index 4e7ed60cfbef..674fe5ab58ac 100644 --- a/patch/kernel/archive/rockchip64-6.10/board-rockpro64-change-rx_delay-for-gmac.patch +++ b/patch/kernel/archive/rockchip64-6.10/board-rockpro64-change-rx_delay-for-gmac.patch @@ -9,10 +9,10 @@ Change-Id: Ib3899f684188aa1ed1545717af004bba53fe0e07 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi -index 1e7295215b58..25ee84e06874 100644 +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 { +@@ -308,7 +308,7 @@ &gmac { snps,reset-active-low; snps,reset-delays-us = <0 10000 50000>; tx_delay = <0x28>; diff --git a/patch/kernel/archive/rockchip64-6.10/board-rockpro64-fix-emmc.patch b/patch/kernel/archive/rockchip64-6.10/board-rockpro64-fix-emmc.patch index 7aeb8dc4fac6..fbc045a52a15 100644 --- a/patch/kernel/archive/rockchip64-6.10/board-rockpro64-fix-emmc.patch +++ b/patch/kernel/archive/rockchip64-6.10/board-rockpro64-fix-emmc.patch @@ -99,10 +99,10 @@ Subject: [ARCHEOLOGY] fix PMIC_INT_L gpio conflicting with I2C8_SCL in 1 file changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi -index 25ee84e06874..f5f521986d43 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi -@@ -17,6 +17,7 @@ aliases { +@@ -18,6 +18,7 @@ aliases { }; chosen { @@ -110,7 +110,7 @@ index 25ee84e06874..f5f521986d43 100644 stdout-path = "serial2:1500000n8"; }; -@@ -815,6 +816,7 @@ &sdmmc { +@@ -816,6 +817,7 @@ &sdmmc { &sdhci { bus-width = <8>; diff --git a/patch/kernel/archive/rockchip64-6.10/board-rockpro64-fix-spi1-flash-speed.patch b/patch/kernel/archive/rockchip64-6.10/board-rockpro64-fix-spi1-flash-speed.patch index 3fb67e1c646b..6e70b364bc91 100644 --- a/patch/kernel/archive/rockchip64-6.10/board-rockpro64-fix-spi1-flash-speed.patch +++ b/patch/kernel/archive/rockchip64-6.10/board-rockpro64-fix-spi1-flash-speed.patch @@ -88,10 +88,10 @@ Subject: [ARCHEOLOGY] slow SPIFlash to avoid errors 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi -index f5f521986d43..6eddc07a958f 100644 +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 { +@@ -839,7 +839,7 @@ &spi1 { flash@0 { compatible = "jedec,spi-nor"; reg = <0>; diff --git a/patch/kernel/archive/rockchip64-6.10/board-rockpro64-work-led-heartbeat.patch b/patch/kernel/archive/rockchip64-6.10/board-rockpro64-work-led-heartbeat.patch index 9e17aa826118..5ded653b7f32 100644 --- a/patch/kernel/archive/rockchip64-6.10/board-rockpro64-work-led-heartbeat.patch +++ b/patch/kernel/archive/rockchip64-6.10/board-rockpro64-work-led-heartbeat.patch @@ -78,10 +78,10 @@ Subject: [ARCHEOLOGY] Switch RockPro64 work led to heartbeat trigger 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi -index 6eddc07a958f..eb1eebadb637 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi -@@ -66,7 +66,7 @@ leds { +@@ -67,7 +67,7 @@ leds { work_led: led-0 { label = "work"; diff --git a/patch/kernel/archive/rockchip64-6.10/board-rocks0-0001-deviceTree.patch b/patch/kernel/archive/rockchip64-6.10/board-rocks0-0001-deviceTree.patch index fa0f46a0c85a..3de87010905b 100644 --- a/patch/kernel/archive/rockchip64-6.10/board-rocks0-0001-deviceTree.patch +++ b/patch/kernel/archive/rockchip64-6.10/board-rocks0-0001-deviceTree.patch @@ -6,11 +6,11 @@ Subject: Added Linux device tree for Rock S0 Signed-off-by: Brent Roman --- arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts | 347 ++++++++++ - 1 files changed, 347 insertions(+) + 1 file changed, 347 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts b/arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts new file mode 100644 -index 000000000..aded16959 +index 000000000000..111111111111 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts @@ -0,0 +1,347 @@ @@ -362,5 +362,5 @@ index 000000000..aded16959 +}; + -- -Created with Armbian build tools https://github.com/armbian/build +Armbian diff --git a/patch/kernel/archive/rockchip64-6.10/board-station-p2.patch b/patch/kernel/archive/rockchip64-6.10/board-station-p2.patch index 670c56d8fea3..f2539135cd8d 100644 --- a/patch/kernel/archive/rockchip64-6.10/board-station-p2.patch +++ b/patch/kernel/archive/rockchip64-6.10/board-station-p2.patch @@ -1,6 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: chainsx +Date: Thu, 25 Jul 2024 16:40:28 +0200 +Subject: [ARCHEOLOGY] fix rk3568-roc-pc + +> X-Git-Archeology: - Revision 1c7c5d302dbc52a5c9a16a4e9f12786277e56fac: https://github.com/armbian/build/commit/1c7c5d302dbc52a5c9a16a4e9f12786277e56fac +> X-Git-Archeology: Date: Thu, 25 Jul 2024 16:40:28 +0200 +> X-Git-Archeology: From: chainsx +> X-Git-Archeology: Subject: fix rk3568-roc-pc +> X-Git-Archeology: +--- + arch/arm64/boot/dts/rockchip/rk3568-roc-pc.dts | 380 ++++++++-- + 1 file changed, 325 insertions(+), 55 deletions(-) + +diff --git a/arch/arm64/boot/dts/rockchip/rk3568-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3568-roc-pc.dts +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-roc-pc.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-roc-pc.dts -@@ -48,17 +48,15 @@ +@@ -48,17 +48,15 @@ gmac1_clkin: external-gmac1-clock { #clock-cells = <0>; }; @@ -23,7 +39,7 @@ }; }; -@@ -126,41 +124,134 @@ +@@ -126,41 +124,134 @@ vcc5v0_sys: vcc5v0-sys-regulator { vin-supply = <&dc_12v>; }; @@ -176,7 +192,7 @@ }; &combphy1 { -@@ -247,15 +338,59 @@ +@@ -247,15 +338,59 @@ &hdmi_sound { &i2c0 { status = "okay"; @@ -238,7 +254,7 @@ vcc1-supply = <&vcc3v3_sys>; vcc2-supply = <&vcc3v3_sys>; vcc3-supply = <&vcc3v3_sys>; -@@ -284,6 +419,8 @@ +@@ -284,6 +419,8 @@ regulator-state-mem { }; vdd_gpu: DCDC_REG2 { @@ -247,7 +263,7 @@ regulator-name = "vdd_gpu"; regulator-init-microvolt = <900000>; regulator-initial-mode = <0x2>; -@@ -320,19 +457,9 @@ +@@ -320,19 +457,9 @@ regulator-state-mem { }; }; @@ -269,7 +285,7 @@ regulator-name = "vdda0v9_image"; regulator-min-microvolt = <900000>; regulator-max-microvolt = <900000>; -@@ -368,6 +495,8 @@ +@@ -368,6 +495,8 @@ regulator-state-mem { }; vccio_acodec: LDO_REG4 { @@ -278,7 +294,7 @@ regulator-name = "vccio_acodec"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; -@@ -379,6 +508,8 @@ +@@ -379,6 +508,8 @@ regulator-state-mem { vccio_sd: LDO_REG5 { regulator-name = "vccio_sd"; @@ -287,7 +303,7 @@ regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3300000>; -@@ -426,6 +557,8 @@ +@@ -426,6 +557,8 @@ regulator-state-mem { }; vcca1v8_image: LDO_REG9 { @@ -296,7 +312,7 @@ regulator-name = "vcca1v8_image"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; -@@ -435,6 +568,17 @@ +@@ -435,6 +568,17 @@ regulator-state-mem { }; }; @@ -314,7 +330,7 @@ vcc_3v3: SWITCH_REG1 { regulator-name = "vcc_3v3"; regulator-always-on; -@@ -455,6 +599,10 @@ +@@ -455,6 +599,10 @@ regulator-state-mem { }; }; }; @@ -325,7 +341,7 @@ }; }; -@@ -477,7 +625,7 @@ +@@ -477,7 +625,7 @@ rgmii_phy1: phy@0 { }; &pcie30phy { @@ -334,7 +350,7 @@ }; &pcie3x2 { -@@ -490,19 +638,27 @@ +@@ -490,19 +638,27 @@ &pcie3x2 { &pinctrl { leds { @@ -365,7 +381,7 @@ }; pcie { -@@ -512,21 +668,53 @@ +@@ -512,21 +668,53 @@ pcie_reset_pin: pcie-reset-pin { vcc3v3_pcie_en_pin: vcc3v3-pcie-en-pin { rockchip,pins = <0 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>; }; @@ -421,7 +437,7 @@ vccio3-supply = <&vccio_sd>; vccio4-supply = <&vcc_1v8>; vccio5-supply = <&vcc_3v3>; -@@ -548,25 +736,44 @@ +@@ -548,25 +736,44 @@ &sdhci { bus-width = <8>; max-frequency = <200000000>; non-removable; @@ -470,7 +486,7 @@ status = "okay"; }; -@@ -588,6 +795,7 @@ +@@ -588,6 +795,7 @@ &usb2phy1 { }; &usb2phy0_otg { @@ -478,7 +494,7 @@ status = "okay"; }; -@@ -609,6 +817,10 @@ +@@ -609,6 +817,10 @@ &usb_host0_ohci { status = "okay"; }; @@ -489,7 +505,7 @@ &usb_host1_ehci { status = "okay"; }; -@@ -617,11 +829,13 @@ +@@ -617,11 +829,13 @@ &usb_host1_ohci { status = "okay"; }; @@ -505,7 +521,7 @@ status = "okay"; }; -@@ -632,12 +846,68 @@ +@@ -632,12 +846,68 @@ vp0_out_hdmi: endpoint@ROCKCHIP_VOP2_EP_HDMI0 { }; }; @@ -578,3 +594,6 @@ +&pwm7 { status = "okay"; }; +-- +Armbian + diff --git a/patch/kernel/archive/rockchip64-6.10/drv-spi-spidev-remove-warnings.patch b/patch/kernel/archive/rockchip64-6.10/drv-spi-spidev-remove-warnings.patch index 80987aa16384..304b2402e330 100644 --- a/patch/kernel/archive/rockchip64-6.10/drv-spi-spidev-remove-warnings.patch +++ b/patch/kernel/archive/rockchip64-6.10/drv-spi-spidev-remove-warnings.patch @@ -9,12 +9,10 @@ Signed-off-by: John Doe 1 file changed, 2 insertions(+) diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c -index 5304728c6..64c4280de 100644 +index 111111111111..222222222222 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c -@@ -698,10 +698,11 @@ static const struct file_operations spidev_fops = { - static const struct class spidev_class = { - .name = "spidev", +@@ -700,6 +700,7 @@ static const struct class spidev_class = { }; static const struct spi_device_id spidev_spi_ids[] = { @@ -22,11 +20,7 @@ index 5304728c6..64c4280de 100644 { .name = "bh2228fv" }, { .name = "dh2228fv" }, { .name = "ltc2488" }, - { .name = "sx1301" }, - { .name = "bk4" }, -@@ -727,10 +728,11 @@ static int spidev_of_check(struct device *dev) - dev_err(dev, "spidev listed directly in DT is not supported\n"); - return -EINVAL; +@@ -729,6 +730,7 @@ static int spidev_of_check(struct device *dev) } static const struct of_device_id spidev_dt_ids[] = { @@ -34,8 +28,6 @@ index 5304728c6..64c4280de 100644 { .compatible = "cisco,spi-petra", .data = &spidev_of_check }, { .compatible = "dh,dhcom-board", .data = &spidev_of_check }, { .compatible = "lineartechnology,ltc2488", .data = &spidev_of_check }, - { .compatible = "lwn,bk4", .data = &spidev_of_check }, - { .compatible = "menlo,m53cpld", .data = &spidev_of_check }, -- -Created with Armbian build tools https://github.com/armbian/build +Armbian diff --git a/patch/kernel/archive/rockchip64-6.10/general-add-miniDP-dt-doc.patch b/patch/kernel/archive/rockchip64-6.10/general-add-miniDP-dt-doc.patch index c74bfad3e38f..4729ab07e470 100644 --- a/patch/kernel/archive/rockchip64-6.10/general-add-miniDP-dt-doc.patch +++ b/patch/kernel/archive/rockchip64-6.10/general-add-miniDP-dt-doc.patch @@ -58,7 +58,7 @@ Subject: [ARCHEOLOGY] RK3399 Typec DP (#2676) diff --git a/Documentation/devicetree/bindings/extcon/extcon-usbc-virtual-pd.yaml b/Documentation/devicetree/bindings/extcon/extcon-usbc-virtual-pd.yaml new file mode 100644 -index 000000000000..8110fbe2ddc2 +index 000000000000..111111111111 --- /dev/null +++ b/Documentation/devicetree/bindings/extcon/extcon-usbc-virtual-pd.yaml @@ -0,0 +1,66 @@ diff --git a/patch/kernel/archive/rockchip64-6.10/general-add-miniDP-virtual-extcon.patch b/patch/kernel/archive/rockchip64-6.10/general-add-miniDP-virtual-extcon.patch index 00551e8b3159..187e66fa1de7 100644 --- a/patch/kernel/archive/rockchip64-6.10/general-add-miniDP-virtual-extcon.patch +++ b/patch/kernel/archive/rockchip64-6.10/general-add-miniDP-virtual-extcon.patch @@ -59,12 +59,12 @@ Subject: [ARCHEOLOGY] RK3399 Typec DP (#2676) 3 files changed, 296 insertions(+) diff --git a/drivers/extcon/Kconfig b/drivers/extcon/Kconfig -index 8de9023c2a38..21f0f856cacb 100644 +index 111111111111..222222222222 100644 --- a/drivers/extcon/Kconfig +++ b/drivers/extcon/Kconfig -@@ -191,4 +191,14 @@ config EXTCON_USBC_TUSB320 - Say Y here to enable support for USB Type C cable detection extcon - support using a TUSB320. +@@ -203,4 +203,14 @@ config EXTCON_RTK_TYPE_C + The DHC (Digital Home Hub) RTD series SoC contains a type c module. + This driver will detect the status of the type-c port. +config EXTCON_USBC_VIRTUAL_PD + tristate "Virtual Type-C PD EXTCON support" @@ -78,17 +78,17 @@ index 8de9023c2a38..21f0f856cacb 100644 + endif diff --git a/drivers/extcon/Makefile b/drivers/extcon/Makefile -index 1b390d934ca9..57c1e65bfcfd 100644 +index 111111111111..222222222222 100644 --- a/drivers/extcon/Makefile +++ b/drivers/extcon/Makefile -@@ -25,3 +25,4 @@ obj-$(CONFIG_EXTCON_RTK_TYPE_C) += extcon-rtk-type-c.o +@@ -26,3 +26,4 @@ obj-$(CONFIG_EXTCON_USB_GPIO) += extcon-usb-gpio.o obj-$(CONFIG_EXTCON_USBC_CROS_EC) += extcon-usbc-cros-ec.o obj-$(CONFIG_EXTCON_USBC_TUSB320) += extcon-usbc-tusb320.o obj-$(CONFIG_EXTCON_RTK_TYPE_C) += extcon-rtk-type-c.o +obj-$(CONFIG_EXTCON_USBC_VIRTUAL_PD) += extcon-usbc-virtual-pd.o diff --git a/drivers/extcon/extcon-usbc-virtual-pd.c b/drivers/extcon/extcon-usbc-virtual-pd.c new file mode 100644 -index 000000000000..e0713670e33d +index 000000000000..111111111111 --- /dev/null +++ b/drivers/extcon/extcon-usbc-virtual-pd.c @@ -0,0 +1,285 @@ diff --git a/patch/kernel/archive/rockchip64-6.10/general-add-overlay-compilation-support.patch b/patch/kernel/archive/rockchip64-6.10/general-add-overlay-compilation-support.patch index 3a0c05e60cab..6cad873b4e4d 100644 --- a/patch/kernel/archive/rockchip64-6.10/general-add-overlay-compilation-support.patch +++ b/patch/kernel/archive/rockchip64-6.10/general-add-overlay-compilation-support.patch @@ -1,15 +1,15 @@ -From a8f9689004d59f0a454ce8cb06bf1556971c1bad Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Sat, 20 Jul 2024 13:58:49 +0200 -Subject: [PATCH] compile .scr and install overlays in right path +Subject: compile .scr and install overlays in right path --- - scripts/Makefile.dtbinst | 13 ++++++++++++- - scripts/Makefile.lib | 8 +++++++- + scripts/Makefile.dtbinst | 13 +++++++++- + scripts/Makefile.lib | 8 +++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst -index 9d920419a62c..9144a1b7c909 100644 +index 111111111111..222222222222 100644 --- a/scripts/Makefile.dtbinst +++ b/scripts/Makefile.dtbinst @@ -33,7 +33,18 @@ endef @@ -33,7 +33,7 @@ index 9d920419a62c..9144a1b7c909 100644 endif # CONFIG_ARCH_WANT_FLAT_DTB_INSTALL diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib -index 9f06f6aaf7fc..67a7b73b6688 100644 +index 111111111111..222222222222 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -394,15 +394,21 @@ quiet_cmd_wrap_S_dtb = WRAP $@ @@ -60,5 +60,5 @@ index 9f06f6aaf7fc..67a7b73b6688 100644 -d $(depfile).dtc.tmp $(dtc-tmp) ; \ cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile) -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip64-6.10/general-add-overlay-configfs.patch b/patch/kernel/archive/rockchip64-6.10/general-add-overlay-configfs.patch index 895edaddbfbf..3f5ce0ed279a 100644 --- a/patch/kernel/archive/rockchip64-6.10/general-add-overlay-configfs.patch +++ b/patch/kernel/archive/rockchip64-6.10/general-add-overlay-configfs.patch @@ -64,7 +64,7 @@ Signed-off-by: Phil Elwell diff --git a/Documentation/devicetree/configfs-overlays.txt b/Documentation/devicetree/configfs-overlays.txt new file mode 100644 -index 000000000000..5fa43e064307 +index 000000000000..111111111111 --- /dev/null +++ b/Documentation/devicetree/configfs-overlays.txt @@ -0,0 +1,31 @@ @@ -100,10 +100,10 @@ index 000000000000..5fa43e064307 +intended to be used by hardware managers in the kernel, while the copy interface +make sense for developers (since it avoids problems with namespaces). diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig -index da9826accb1b..69e7c420b8f4 100644 +index 111111111111..222222222222 100644 --- a/drivers/of/Kconfig +++ b/drivers/of/Kconfig -@@ -102,4 +102,15 @@ config OF_OVERLAY +@@ -110,4 +110,15 @@ config OF_OVERLAY config OF_NUMA bool @@ -120,7 +120,7 @@ index da9826accb1b..69e7c420b8f4 100644 + endif # OF diff --git a/drivers/of/Makefile b/drivers/of/Makefile -index eff624854575..61bd05f08ca1 100644 +index 111111111111..222222222222 100644 --- a/drivers/of/Makefile +++ b/drivers/of/Makefile @@ -1,6 +1,7 @@ @@ -129,11 +129,11 @@ index eff624854575..61bd05f08ca1 100644 obj-$(CONFIG_OF_KOBJ) += kobj.o +obj-$(CONFIG_OF_CONFIGFS) += configfs.o obj-$(CONFIG_OF_DYNAMIC) += dynamic.o - obj-$(CONFIG_OF_FLATTREE) += fdt.o + obj-$(CONFIG_OF_FLATTREE) += fdt.o empty_root.dtb.o obj-$(CONFIG_OF_EARLY_FLATTREE) += fdt_address.o diff --git a/drivers/of/configfs.c b/drivers/of/configfs.c new file mode 100644 -index 000000000000..1c30f35c3ca1 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/of/configfs.c @@ -0,0 +1,277 @@ diff --git a/patch/kernel/archive/rockchip64-6.10/general-add-panel-simple-dsi.patch b/patch/kernel/archive/rockchip64-6.10/general-add-panel-simple-dsi.patch index 536acee59be8..ba8279b90fad 100644 --- a/patch/kernel/archive/rockchip64-6.10/general-add-panel-simple-dsi.patch +++ b/patch/kernel/archive/rockchip64-6.10/general-add-panel-simple-dsi.patch @@ -62,10 +62,10 @@ Subject: [ARCHEOLOGY] general add panel simple dsi (#3140) 2 files changed, 773 insertions(+) diff --git a/drivers/gpu/drm/panel/Makefile b/drivers/gpu/drm/panel/Makefile -index 433e93d57949..02076386ed5f 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/panel/Makefile +++ b/drivers/gpu/drm/panel/Makefile -@@ -9,6 +9,7 @@ obj-$(CONFIG_DRM_PANEL_BOE_TV101WUM_NL6) += panel-boe-tv101wum-nl6.o +@@ -10,6 +10,7 @@ obj-$(CONFIG_DRM_PANEL_BOE_TV101WUM_NL6) += panel-boe-tv101wum-nl6.o obj-$(CONFIG_DRM_PANEL_DSI_CM) += panel-dsi-cm.o obj-$(CONFIG_DRM_PANEL_LVDS) += panel-lvds.o obj-$(CONFIG_DRM_PANEL_SIMPLE) += panel-simple.o @@ -75,7 +75,7 @@ index 433e93d57949..02076386ed5f 100644 obj-$(CONFIG_DRM_PANEL_ELIDA_KD35T133) += panel-elida-kd35t133.o diff --git a/drivers/gpu/drm/panel/panel-simple-dsi.c b/drivers/gpu/drm/panel/panel-simple-dsi.c new file mode 100644 -index 000000000000..e3c8dcf8cb5e +index 000000000000..111111111111 --- /dev/null +++ b/drivers/gpu/drm/panel/panel-simple-dsi.c @@ -0,0 +1,772 @@ diff --git a/patch/kernel/archive/rockchip64-6.10/general-add-pll-hdmi-timings.patch b/patch/kernel/archive/rockchip64-6.10/general-add-pll-hdmi-timings.patch index 1e8adef25fef..a930ebd16e58 100644 --- a/patch/kernel/archive/rockchip64-6.10/general-add-pll-hdmi-timings.patch +++ b/patch/kernel/archive/rockchip64-6.10/general-add-pll-hdmi-timings.patch @@ -69,7 +69,7 @@ Subject: [ARCHEOLOGY] Adding pll hdmi timing to rockchip64-dev too 1 file changed, 71 insertions(+) diff --git a/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c b/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c -index 053bd62e31ba..db774d97918f 100644 +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[] = { diff --git a/patch/kernel/archive/rockchip64-6.10/general-add-xtx-spi-nor-chips.patch b/patch/kernel/archive/rockchip64-6.10/general-add-xtx-spi-nor-chips.patch index c634008efd61..2468ecb9183a 100644 --- a/patch/kernel/archive/rockchip64-6.10/general-add-xtx-spi-nor-chips.patch +++ b/patch/kernel/archive/rockchip64-6.10/general-add-xtx-spi-nor-chips.patch @@ -15,10 +15,10 @@ Signed-off-by: microcai 4 files changed, 24 insertions(+) diff --git a/drivers/mtd/spi-nor/Makefile b/drivers/mtd/spi-nor/Makefile -index e347b435a038..364413da729b 100644 +index 111111111111..222222222222 100644 --- a/drivers/mtd/spi-nor/Makefile +++ b/drivers/mtd/spi-nor/Makefile -@@ -18,6 +18,7 @@ spi-nor-objs += winbond.o +@@ -16,6 +16,7 @@ spi-nor-objs += winbond.o spi-nor-objs += xilinx.o spi-nor-objs += xmc.o spi-nor-$(CONFIG_DEBUG_FS) += debugfs.o @@ -27,10 +27,10 @@ index e347b435a038..364413da729b 100644 obj-$(CONFIG_MTD_SPI_NOR) += controllers/ diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c -index 1b0c6770c14e..0cd1b57ecfcd 100644 +index 111111111111..222222222222 100644 --- a/drivers/mtd/spi-nor/core.c +++ b/drivers/mtd/spi-nor/core.c -@@ -2015,6 +2015,7 @@ static const struct spi_nor_manufacturer *manufacturers[] = { +@@ -1988,6 +1988,7 @@ static const struct spi_nor_manufacturer *manufacturers[] = { &spi_nor_winbond, &spi_nor_xilinx, &spi_nor_xmc, @@ -39,10 +39,10 @@ index 1b0c6770c14e..0cd1b57ecfcd 100644 static const struct flash_info spi_nor_generic_flash = { diff --git a/drivers/mtd/spi-nor/core.h b/drivers/mtd/spi-nor/core.h -index 9217379b9cfe..28b90256425a 100644 +index 111111111111..222222222222 100644 --- a/drivers/mtd/spi-nor/core.h +++ b/drivers/mtd/spi-nor/core.h -@@ -647,6 +647,7 @@ extern const struct spi_nor_manufacturer spi_nor_sst; +@@ -605,6 +605,7 @@ 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_xilinx; extern const struct spi_nor_manufacturer spi_nor_xmc; @@ -52,7 +52,7 @@ index 9217379b9cfe..28b90256425a 100644 diff --git a/drivers/mtd/spi-nor/xtx.c b/drivers/mtd/spi-nor/xtx.c new file mode 100644 -index 000000000000..5a7ec40c9701 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/mtd/spi-nor/xtx.c @@ -0,0 +1,21 @@ diff --git a/patch/kernel/archive/rockchip64-6.10/general-cryptov1-trng.patch b/patch/kernel/archive/rockchip64-6.10/general-cryptov1-trng.patch index 3e89f9960d68..4af381925f55 100644 --- a/patch/kernel/archive/rockchip64-6.10/general-cryptov1-trng.patch +++ b/patch/kernel/archive/rockchip64-6.10/general-cryptov1-trng.patch @@ -1,25 +1,24 @@ -From a5046250a7e335dcb8541b8851754e43a362a6a7 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Sun, 14 Jan 2024 11:53:20 +0100 -Subject: [PATCH] rockchip64: add TRNG to existing crypto v1 driver +Subject: rockchip64: add TRNG to existing crypto v1 driver original patch source: https://patchwork.kernel.org/project/linux-rockchip/patch/20230707115242.3411259-1-clabbe@baylibre.com/ --- - drivers/crypto/Kconfig | 8 ++ - drivers/crypto/rockchip/Makefile | 1 + - drivers/crypto/rockchip/rk3288_crypto.c | 18 +++- - drivers/crypto/rockchip/rk3288_crypto.h | 18 ++++ - drivers/crypto/rockchip/rk3288_crypto_ahash.c | 2 + - .../crypto/rockchip/rk3288_crypto_skcipher.c | 2 + - drivers/crypto/rockchip/rk3288_crypto_trng.c | 92 +++++++++++++++++++ + drivers/crypto/Kconfig | 8 + + drivers/crypto/rockchip/Makefile | 1 + + drivers/crypto/rockchip/rk3288_crypto.c | 18 +- + drivers/crypto/rockchip/rk3288_crypto.h | 18 ++ + drivers/crypto/rockchip/rk3288_crypto_ahash.c | 2 + + drivers/crypto/rockchip/rk3288_crypto_skcipher.c | 2 + + drivers/crypto/rockchip/rk3288_crypto_trng.c | 92 ++++++++++ 7 files changed, 140 insertions(+), 1 deletion(-) - create mode 100644 drivers/crypto/rockchip/rk3288_crypto_trng.c diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig -index c761952f0dc6..3c5bffccad5b 100644 +index 111111111111..222222222222 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig -@@ -649,6 +649,14 @@ config CRYPTO_DEV_ROCKCHIP +@@ -635,6 +635,14 @@ config CRYPTO_DEV_ROCKCHIP This driver interfaces with the hardware crypto accelerator. Supporting cbc/ecb chainmode, and aes/des/des3_ede cipher mode. @@ -35,7 +34,7 @@ index c761952f0dc6..3c5bffccad5b 100644 bool "Enable Rockchip crypto stats" depends on CRYPTO_DEV_ROCKCHIP diff --git a/drivers/crypto/rockchip/Makefile b/drivers/crypto/rockchip/Makefile -index 2132d8326223..955e95504b3c 100644 +index 111111111111..222222222222 100644 --- a/drivers/crypto/rockchip/Makefile +++ b/drivers/crypto/rockchip/Makefile @@ -3,3 +3,4 @@ obj-$(CONFIG_CRYPTO_DEV_ROCKCHIP) += rk_crypto.o @@ -44,7 +43,7 @@ index 2132d8326223..955e95504b3c 100644 rk3288_crypto_ahash.o +rk_crypto-$(CONFIG_CRYPTO_DEV_ROCKCHIP_TRNG) += rk3288_crypto_trng.o diff --git a/drivers/crypto/rockchip/rk3288_crypto.c b/drivers/crypto/rockchip/rk3288_crypto.c -index 77d5705a5d96..d17c7069306e 100644 +index 111111111111..222222222222 100644 --- a/drivers/crypto/rockchip/rk3288_crypto.c +++ b/drivers/crypto/rockchip/rk3288_crypto.c @@ -47,15 +47,18 @@ static const struct rk_variant rk3288_variant = { @@ -78,7 +77,7 @@ index 77d5705a5d96..d17c7069306e 100644 } spin_unlock(&rocklist.lock); -@@ -390,6 +397,10 @@ static int rk_crypto_probe(struct platform_device *pdev) +@@ -395,6 +402,10 @@ static int rk_crypto_probe(struct platform_device *pdev) dev_err(dev, "Fail to register crypto algorithms"); goto err_register_alg; } @@ -89,7 +88,7 @@ index 77d5705a5d96..d17c7069306e 100644 register_debugfs(crypto_info); } -@@ -420,6 +431,11 @@ static int rk_crypto_remove(struct platform_device *pdev) +@@ -425,6 +436,11 @@ static void rk_crypto_remove(struct platform_device *pdev) #ifdef CONFIG_CRYPTO_DEV_ROCKCHIP_DEBUG debugfs_remove_recursive(rocklist.dbgfs_dir); #endif @@ -102,7 +101,7 @@ index 77d5705a5d96..d17c7069306e 100644 } rk_crypto_pm_exit(crypto_tmp); diff --git a/drivers/crypto/rockchip/rk3288_crypto.h b/drivers/crypto/rockchip/rk3288_crypto.h -index 3aa03cbfb6be..c90bbb1d9069 100644 +index 111111111111..222222222222 100644 --- a/drivers/crypto/rockchip/rk3288_crypto.h +++ b/drivers/crypto/rockchip/rk3288_crypto.h @@ -11,6 +11,7 @@ @@ -161,7 +160,7 @@ index 3aa03cbfb6be..c90bbb1d9069 100644 +int rk3288_hwrng_register(struct rk_crypto_info *rk); +void rk3288_hwrng_unregister(struct rk_crypto_info *rk); diff --git a/drivers/crypto/rockchip/rk3288_crypto_ahash.c b/drivers/crypto/rockchip/rk3288_crypto_ahash.c -index 8c143180645e..cefd68b8af5c 100644 +index 111111111111..222222222222 100644 --- a/drivers/crypto/rockchip/rk3288_crypto_ahash.c +++ b/drivers/crypto/rockchip/rk3288_crypto_ahash.c @@ -296,6 +296,7 @@ static int rk_hash_run(struct crypto_engine *engine, void *breq) @@ -179,9 +178,9 @@ index 8c143180645e..cefd68b8af5c 100644 + mutex_unlock(&rkc->lock); pm_runtime_put_autosuspend(rkc->dev); - local_bh_disable(); + rk_hash_unprepare(engine, breq); diff --git a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c b/drivers/crypto/rockchip/rk3288_crypto_skcipher.c -index da95747d973f..4c124d8f9294 100644 +index 111111111111..222222222222 100644 --- a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c +++ b/drivers/crypto/rockchip/rk3288_crypto_skcipher.c @@ -363,6 +363,7 @@ static int rk_cipher_run(struct crypto_engine *engine, void *async_req) @@ -202,7 +201,7 @@ index da95747d973f..4c124d8f9294 100644 err = -EFAULT; diff --git a/drivers/crypto/rockchip/rk3288_crypto_trng.c b/drivers/crypto/rockchip/rk3288_crypto_trng.c new file mode 100644 -index 000000000000..7a0e1300d0e8 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/crypto/rockchip/rk3288_crypto_trng.c @@ -0,0 +1,92 @@ @@ -299,6 +298,5 @@ index 000000000000..7a0e1300d0e8 + hwrng_unregister(&rk->hwrng); +} -- -2.34.1 - +Armbian diff --git a/patch/kernel/archive/rockchip64-6.10/general-disable-mtu-validation.patch b/patch/kernel/archive/rockchip64-6.10/general-disable-mtu-validation.patch index 951aef6b4881..9e8046caef0a 100644 --- a/patch/kernel/archive/rockchip64-6.10/general-disable-mtu-validation.patch +++ b/patch/kernel/archive/rockchip64-6.10/general-disable-mtu-validation.patch @@ -15,10 +15,10 @@ Signed-off-by: Igor Pecovnik 1 file changed, 12 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c -index 5801f4d50f95..6f9b14164fc8 100644 +index 111111111111..222222222222 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c -@@ -5676,27 +5676,15 @@ static void stmmac_set_rx_mode(struct net_device *dev) +@@ -5863,27 +5863,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); diff --git a/patch/kernel/archive/rockchip64-6.10/general-fix-es8316-kernel-panic.patch b/patch/kernel/archive/rockchip64-6.10/general-fix-es8316-kernel-panic.patch index 7978106e95fd..f1c48e920d97 100644 --- a/patch/kernel/archive/rockchip64-6.10/general-fix-es8316-kernel-panic.patch +++ b/patch/kernel/archive/rockchip64-6.10/general-fix-es8316-kernel-panic.patch @@ -88,10 +88,10 @@ Subject: [ARCHEOLOGY] Enable es8316 on RockPi4 (#1885) 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/es8316.c b/sound/soc/codecs/es8316.c -index a8f347f1affb..a9a7746f1adb 100644 +index 111111111111..222222222222 100644 --- a/sound/soc/codecs/es8316.c +++ b/sound/soc/codecs/es8316.c -@@ -702,7 +702,7 @@ static void es8316_disable_jack_detect(struct snd_soc_component *component) +@@ -724,7 +724,7 @@ static void es8316_disable_jack_detect(struct snd_soc_component *component) snd_soc_component_update_bits(component, ES8316_GPIO_DEBOUNCE, ES8316_GPIO_ENABLE_INTERRUPT, 0); diff --git a/patch/kernel/archive/rockchip64-6.10/general-fix-inno-usb2-phy-init.patch b/patch/kernel/archive/rockchip64-6.10/general-fix-inno-usb2-phy-init.patch index 550e5183b197..ff0080f0c79c 100644 --- a/patch/kernel/archive/rockchip64-6.10/general-fix-inno-usb2-phy-init.patch +++ b/patch/kernel/archive/rockchip64-6.10/general-fix-inno-usb2-phy-init.patch @@ -8,10 +8,10 @@ Subject: remove usb2phy extcon initialization causing kernel oops 1 file changed, 5 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c -index b982c3f0d4b5..25514646ad8e 100644 +index 111111111111..222222222222 100644 --- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c +++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c -@@ -1286,11 +1286,6 @@ static int rockchip_usb2phy_otg_port_init(struct rockchip_usb2phy *rphy, +@@ -1307,11 +1307,6 @@ static int rockchip_usb2phy_otg_port_init(struct rockchip_usb2phy *rphy, goto out; } diff --git a/patch/kernel/archive/rockchip64-6.10/general-fix-mmc-signal-voltage-before-reboot.patch b/patch/kernel/archive/rockchip64-6.10/general-fix-mmc-signal-voltage-before-reboot.patch index 9850e7f0a59a..c62edf8392e8 100644 --- a/patch/kernel/archive/rockchip64-6.10/general-fix-mmc-signal-voltage-before-reboot.patch +++ b/patch/kernel/archive/rockchip64-6.10/general-fix-mmc-signal-voltage-before-reboot.patch @@ -23,10 +23,10 @@ Signed-off-by: Jonas Karlman 1 file changed, 8 insertions(+) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c -index 3d3e0ca52614..33cb13b7bf88 100644 +index 111111111111..222222222222 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c -@@ -1363,6 +1363,14 @@ void mmc_power_off(struct mmc_host *host) +@@ -1368,6 +1368,14 @@ void mmc_power_off(struct mmc_host *host) if (host->ios.power_mode == MMC_POWER_OFF) return; diff --git a/patch/kernel/archive/rockchip64-6.10/general-hdmi-clock-fixes.patch b/patch/kernel/archive/rockchip64-6.10/general-hdmi-clock-fixes.patch index 1058b35e10af..d5f2d5196789 100644 --- a/patch/kernel/archive/rockchip64-6.10/general-hdmi-clock-fixes.patch +++ b/patch/kernel/archive/rockchip64-6.10/general-hdmi-clock-fixes.patch @@ -1,18 +1,18 @@ -From 5113ec8e82ea78884308aac6b0b8172c417d570b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Sat, 6 Apr 2024 15:40:30 +0200 -Subject: [PATCH 1/2] hdmi timing core changes and fixes +Subject: hdmi timing core changes and fixes --- - drivers/clk/rockchip/clk-rk3399.c | 49 ++++++++++++++++++--- - drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 29 ++++++++---- - drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 44 +++++++++++++++++- - drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 31 ++++++++++--- - drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 7 +++ - 6 files changed, 140 insertions(+), 24 deletions(-) + 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/rockchip_drm_vop.c | 15 ++- + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 7 ++ + 5 files changed, 109 insertions(+), 18 deletions(-) diff --git a/drivers/clk/rockchip/clk-rk3399.c b/drivers/clk/rockchip/clk-rk3399.c -index 9ebd6c451b3d..d2391fdd6cb5 100644 +index 111111111111..222222222222 100644 --- a/drivers/clk/rockchip/clk-rk3399.c +++ b/drivers/clk/rockchip/clk-rk3399.c @@ -105,6 +105,39 @@ static struct rockchip_pll_rate_table rk3399_pll_rates[] = { @@ -108,10 +108,10 @@ index 9ebd6c451b3d..d2391fdd6cb5 100644 RK3399_CLKGATE_CON(10), 12, GFLAGS), diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c -index 6c1d79474505..e3de91dc100b 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c -@@ -68,15 +68,15 @@ static const u16 csc_coeff_rgb_out_eitu709[3][4] = { +@@ -69,15 +69,15 @@ static const u16 csc_coeff_rgb_out_eitu709[3][4] = { }; static const u16 csc_coeff_rgb_in_eitu601[3][4] = { @@ -134,10 +134,10 @@ index 6c1d79474505..e3de91dc100b 100644 static const u16 csc_coeff_rgb_full_to_rgb_limited[3][4] = { diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c -index 341550199111..1159fc713a2a 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c -@@ -176,6 +176,46 @@ static const struct dw_hdmi_mpll_config rockchip_mpll_cfg[] = { +@@ -175,6 +175,46 @@ static const struct dw_hdmi_mpll_config rockchip_mpll_cfg[] = { } }; @@ -184,7 +184,7 @@ index 341550199111..1159fc713a2a 100644 static const struct dw_hdmi_curr_ctrl rockchip_cur_ctr[] = { /* pixelclk bpp8 bpp10 bpp12 */ { -@@ -202,7 +242,7 @@ static const struct dw_hdmi_curr_ctrl rockchip_cur_ctr[] = { +@@ -201,7 +241,7 @@ static const struct dw_hdmi_curr_ctrl rockchip_cur_ctr[] = { static const struct dw_hdmi_phy_config rockchip_phy_config[] = { /*pixelclk symbol term vlev*/ { 74250000, 0x8009, 0x0004, 0x0272}, @@ -193,7 +193,7 @@ index 341550199111..1159fc713a2a 100644 { 297000000, 0x8039, 0x0005, 0x028d}, { ~0UL, 0x0000, 0x0000, 0x0000} }; -@@ -363,6 +403,8 @@ static int dw_hdmi_rockchip_genphy_init(struct dw_hdmi *dw_hdmi, void *data, +@@ -362,6 +402,8 @@ static int dw_hdmi_rockchip_genphy_init(struct dw_hdmi *dw_hdmi, void *data, { struct rockchip_hdmi *hdmi = (struct rockchip_hdmi *)data; @@ -203,10 +203,10 @@ index 341550199111..1159fc713a2a 100644 } diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c -index 4b338cb89d32..468347e16f92 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c -@@ -381,8 +381,8 @@ static void scl_vop_cal_scl_fac(struct vop *vop, const struct vop_win_data *win, +@@ -396,8 +396,8 @@ static void scl_vop_cal_scl_fac(struct vop *vop, const struct vop_win_data *win, if (info->is_yuv) is_yuv = true; @@ -217,7 +217,7 @@ index 4b338cb89d32..468347e16f92 100644 return; } -@@ -923,6 +923,7 @@ static void vop_plane_atomic_update(struct drm_plane *plane, +@@ -933,6 +933,7 @@ static void vop_plane_atomic_update(struct drm_plane *plane, int format; int is_yuv = fb->format->is_yuv; int i; @@ -225,7 +225,7 @@ index 4b338cb89d32..468347e16f92 100644 /* * can't update plane when vop is disabled. -@@ -941,8 +942,14 @@ static void vop_plane_atomic_update(struct drm_plane *plane, +@@ -951,8 +952,14 @@ static void vop_plane_atomic_update(struct drm_plane *plane, obj = fb->obj[0]; rk_obj = to_rockchip_obj(obj); @@ -241,7 +241,7 @@ index 4b338cb89d32..468347e16f92 100644 act_info = (actual_h - 1) << 16 | ((actual_w - 1) & 0xffff); dsp_info = (drm_rect_height(dest) - 1) << 16; -@@ -1022,7 +1022,7 @@ static void vop_plane_atomic_update(struct drm_plane *plane, +@@ -1015,7 +1022,7 @@ static void vop_plane_atomic_update(struct drm_plane *plane, offset += (src->y1 >> 16) * fb->pitches[1] / fb->format->vsub; dma_addr = rk_uv_obj->dma_addr + offset + fb->offsets[1]; @@ -250,12 +250,11 @@ index 4b338cb89d32..468347e16f92 100644 VOP_WIN_SET(vop, win, uv_mst, dma_addr); for (i = 0; i < NUM_YUV2YUV_COEFFICIENTS; i++) { - diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c -index 7b2805006776..ffa0c717290e 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c -@@ -731,6 +731,7 @@ static const struct vop_intr rk3288_vop_intr = { +@@ -763,6 +763,7 @@ static const struct vop_intr rk3288_vop_intr = { static const struct vop_data rk3288_vop = { .version = VOP_VERSION(3, 1), .feature = VOP_FEATURE_OUTPUT_RGB10, @@ -263,7 +262,7 @@ index 7b2805006776..ffa0c717290e 100644 .intr = &rk3288_vop_intr, .common = &rk3288_common, .modeset = &rk3288_modeset, -@@ -838,6 +839,7 @@ static const struct vop_misc rk3368_misc = { +@@ -870,6 +871,7 @@ static const struct vop_misc rk3368_misc = { static const struct vop_data rk3368_vop = { .version = VOP_VERSION(3, 2), @@ -271,7 +270,7 @@ index 7b2805006776..ffa0c717290e 100644 .intr = &rk3368_vop_intr, .common = &rk3288_common, .modeset = &rk3288_modeset, -@@ -860,6 +862,7 @@ static const struct vop_intr rk3366_vop_intr = { +@@ -892,6 +894,7 @@ static const struct vop_intr rk3366_vop_intr = { static const struct vop_data rk3366_vop = { .version = VOP_VERSION(3, 4), @@ -279,7 +278,7 @@ index 7b2805006776..ffa0c717290e 100644 .intr = &rk3366_vop_intr, .common = &rk3288_common, .modeset = &rk3288_modeset, -@@ -988,6 +991,7 @@ static const struct vop_afbc rk3399_vop_afbc = { +@@ -1045,6 +1048,7 @@ static const struct vop_afbc rk3399_vop_afbc = { static const struct vop_data rk3399_vop_big = { .version = VOP_VERSION(3, 5), .feature = VOP_FEATURE_OUTPUT_RGB10, @@ -287,7 +286,7 @@ index 7b2805006776..ffa0c717290e 100644 .intr = &rk3366_vop_intr, .common = &rk3399_common, .modeset = &rk3288_modeset, -@@ -1016,6 +1020,7 @@ static const struct vop_win_yuv2yuv_data rk3399_vop_lit_win_yuv2yuv_data[] = { +@@ -1073,6 +1077,7 @@ static const struct vop_win_yuv2yuv_data rk3399_vop_lit_win_yuv2yuv_data[] = { static const struct vop_data rk3399_vop_lit = { .version = VOP_VERSION(3, 6), @@ -295,7 +294,7 @@ index 7b2805006776..ffa0c717290e 100644 .intr = &rk3366_vop_intr, .common = &rk3399_common, .modeset = &rk3288_modeset, -@@ -1038,6 +1043,7 @@ static const struct vop_win_data rk3228_vop_win_data[] = { +@@ -1095,6 +1100,7 @@ static const struct vop_win_data rk3228_vop_win_data[] = { static const struct vop_data rk3228_vop = { .version = VOP_VERSION(3, 7), .feature = VOP_FEATURE_OUTPUT_RGB10, @@ -303,7 +302,7 @@ index 7b2805006776..ffa0c717290e 100644 .intr = &rk3366_vop_intr, .common = &rk3288_common, .modeset = &rk3288_modeset, -@@ -1110,6 +1116,7 @@ static const struct vop_win_data rk3328_vop_win_data[] = { +@@ -1167,6 +1173,7 @@ static const struct vop_win_data rk3328_vop_win_data[] = { static const struct vop_data rk3328_vop = { .version = VOP_VERSION(3, 8), .feature = VOP_FEATURE_OUTPUT_RGB10, @@ -311,6 +310,8 @@ index 7b2805006776..ffa0c717290e 100644 .intr = &rk3328_vop_intr, .common = &rk3328_common, .modeset = &rk3328_modeset, +-- +Armbian From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Miouyouyou @@ -318,14 +319,14 @@ Date: Sun, 24 May 2020 23:08:01 +0200 Subject: [ARCHEOLOGY] [RFC] RK3288 : Add HDMI resolutions (#1887) --- - drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 147 +++++----- - 1 file changed, 68 insertions(+), 79 deletions(-) + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 145 +++++----- + 1 file changed, 67 insertions(+), 78 deletions(-) diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c -index 341550199111..05c5a4fb16b2 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c -@@ -92,86 +92,88 @@ static struct rockchip_hdmi *to_rockchip_hdmi(struct drm_encoder *encoder) +@@ -91,86 +91,88 @@ static struct rockchip_hdmi *to_rockchip_hdmi(struct drm_encoder *encoder) static const struct dw_hdmi_mpll_config rockchip_mpll_cfg[] = { { @@ -333,21 +334,16 @@ index 341550199111..05c5a4fb16b2 100644 - { 0x00b3, 0x0000}, - { 0x2153, 0x0000}, - { 0x40f3, 0x0000} -+ 30666000, { -+ { 0x00b3, 0x0000 }, -+ { 0x2153, 0x0000 }, -+ { 0x40f3, 0x0000 }, - }, +- }, - }, { - 36000000, { - { 0x00b3, 0x0000}, - { 0x2153, 0x0000}, - { 0x40f3, 0x0000} -+ }, { -+ 36800000, { ++ 30666000, { + { 0x00b3, 0x0000 }, + { 0x2153, 0x0000 }, -+ { 0x40a2, 0x0001 }, ++ { 0x40f3, 0x0000 }, }, - }, { - 40000000, { @@ -355,9 +351,9 @@ index 341550199111..05c5a4fb16b2 100644 - { 0x2153, 0x0000}, - { 0x40f3, 0x0000} + }, { -+ 46000000, { ++ 36800000, { + { 0x00b3, 0x0000 }, -+ { 0x2142, 0x0001 }, ++ { 0x2153, 0x0000 }, + { 0x40a2, 0x0001 }, }, - }, { @@ -366,8 +362,8 @@ index 341550199111..05c5a4fb16b2 100644 - { 0x2142, 0x0001}, - { 0x40a2, 0x0001}, + }, { -+ 61333000, { -+ { 0x0072, 0x0001 }, ++ 46000000, { ++ { 0x00b3, 0x0000 }, + { 0x2142, 0x0001 }, + { 0x40a2, 0x0001 }, }, @@ -377,10 +373,10 @@ index 341550199111..05c5a4fb16b2 100644 - { 0x2142, 0x0001}, - { 0x40a2, 0x0001}, + }, { -+ 73600000, { ++ 61333000, { + { 0x0072, 0x0001 }, + { 0x2142, 0x0001 }, -+ { 0x4061, 0x0002 }, ++ { 0x40a2, 0x0001 }, }, - }, { - 66000000, { @@ -388,9 +384,9 @@ index 341550199111..05c5a4fb16b2 100644 - { 0x217e, 0x0002}, - { 0x4061, 0x0002} + }, { -+ 92000000, { ++ 73600000, { + { 0x0072, 0x0001 }, -+ { 0x2145, 0x0002 }, ++ { 0x2142, 0x0001 }, + { 0x4061, 0x0002 }, }, - }, { @@ -399,8 +395,8 @@ index 341550199111..05c5a4fb16b2 100644 - { 0x2145, 0x0002}, - { 0x4061, 0x0002} + }, { -+ 122666000, { -+ { 0x0051, 0x0002 }, ++ 92000000, { ++ { 0x0072, 0x0001 }, + { 0x2145, 0x0002 }, + { 0x4061, 0x0002 }, }, @@ -408,10 +404,10 @@ index 341550199111..05c5a4fb16b2 100644 - 83500000, { - { 0x0072, 0x0001}, + }, { -+ 147200000, { ++ 122666000, { + { 0x0051, 0x0002 }, + { 0x2145, 0x0002 }, -+ { 0x4064, 0x0003 }, ++ { 0x4061, 0x0002 }, }, - }, { - 108000000, { @@ -419,9 +415,9 @@ index 341550199111..05c5a4fb16b2 100644 - { 0x2145, 0x0002}, - { 0x4061, 0x0002} + }, { -+ 184000000, { ++ 147200000, { + { 0x0051, 0x0002 }, -+ { 0x214c, 0x0003 }, ++ { 0x2145, 0x0002 }, + { 0x4064, 0x0003 }, }, - }, { @@ -429,7 +425,12 @@ index 341550199111..05c5a4fb16b2 100644 - { 0x0051, 0x0002}, - { 0x2145, 0x0002}, - { 0x4061, 0x0002} -- }, ++ }, { ++ 184000000, { ++ { 0x0051, 0x0002 }, ++ { 0x214c, 0x0003 }, ++ { 0x4064, 0x0003 }, + }, - }, { - 146250000, { - { 0x0051, 0x0002}, @@ -477,7 +478,7 @@ index 341550199111..05c5a4fb16b2 100644 }, } }; -@@ -179,22 +181,8 @@ static const struct dw_hdmi_mpll_config rockchip_mpll_cfg[] = { +@@ -218,20 +220,6 @@ static const struct dw_hdmi_mpll_config rockchip_mpll_cfg_420[] = { static const struct dw_hdmi_curr_ctrl rockchip_cur_ctr[] = { /* pixelclk bpp8 bpp10 bpp12 */ { @@ -496,20 +497,17 @@ index 341550199111..05c5a4fb16b2 100644 - 148500000, { 0x0000, 0x0038, 0x0038 }, - }, { 600000000, { 0x0000, 0x0000, 0x0000 }, -- }, { -+ }, { + }, { ~0UL, { 0x0000, 0x0000, 0x0000}, - } - }; -@@ -204,6 +192,7 @@ static const struct dw_hdmi_phy_config rockchip_phy_config[] = { +@@ -243,6 +231,7 @@ static const struct dw_hdmi_phy_config rockchip_phy_config[] = { { 74250000, 0x8009, 0x0004, 0x0272}, - { 148500000, 0x802b, 0x0004, 0x028d}, + { 165000000, 0x802b, 0x0004, 0x0209}, { 297000000, 0x8039, 0x0005, 0x028d}, + { 594000000, 0x8039, 0x0000, 0x019d}, { ~0UL, 0x0000, 0x0000, 0x0000} }; -@@ -257,7 +246,7 @@ dw_hdmi_rockchip_mode_valid(struct dw_hdmi *dw_hdmi, void *data, +@@ -296,7 +285,7 @@ dw_hdmi_rockchip_mode_valid(struct dw_hdmi *dw_hdmi, void *data, struct rockchip_hdmi *hdmi = data; const struct dw_hdmi_mpll_config *mpll_cfg = rockchip_mpll_cfg; int pclk = mode->clock * 1000; @@ -518,6 +516,6 @@ index 341550199111..05c5a4fb16b2 100644 int i; if (hdmi->ref_clk) { - -- -2.34.1 +Armbian + diff --git a/patch/kernel/archive/rockchip64-6.10/general-increasing_DMA_block_memory_allocation_to_2048.patch b/patch/kernel/archive/rockchip64-6.10/general-increasing_DMA_block_memory_allocation_to_2048.patch index e6f706a0ac16..529e60d9879b 100644 --- a/patch/kernel/archive/rockchip64-6.10/general-increasing_DMA_block_memory_allocation_to_2048.patch +++ b/patch/kernel/archive/rockchip64-6.10/general-increasing_DMA_block_memory_allocation_to_2048.patch @@ -1,5 +1,121 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Igor Pecovnik +Date: Mon, 21 Aug 2017 08:54:53 +0200 +Subject: [ARCHEOLOGY] Increasing DMA block memory allocation to 2048k on all + relevant kernels. + +> X-Git-Archeology: > recovered message: > https://forum.armbian.com/index.php?/topic/4811-uas-mainline-kernel-coherent-pool-memory-size +> X-Git-Archeology: - Revision 908bb199ec2defd77f7f05d2016980abf100d627: https://github.com/armbian/build/commit/908bb199ec2defd77f7f05d2016980abf100d627 +> X-Git-Archeology: Date: Mon, 21 Aug 2017 08:54:53 +0200 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Increasing DMA block memory allocation to 2048k on all relevant kernels. +> X-Git-Archeology: +> X-Git-Archeology: - Revision a3cf7b74858e1f862db8ca238bd44f6406be6662: https://github.com/armbian/build/commit/a3cf7b74858e1f862db8ca238bd44f6406be6662 +> X-Git-Archeology: Date: Mon, 21 Aug 2017 17:52:29 +0200 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Revert "Increasing DMA block memory allocation to 2048k on all relevant kernels." +> X-Git-Archeology: +> X-Git-Archeology: - Revision 2be21aad5dc965b3bc67e136a1e1170119d60f74: https://github.com/armbian/build/commit/2be21aad5dc965b3bc67e136a1e1170119d60f74 +> X-Git-Archeology: Date: Mon, 21 Aug 2017 17:52:48 +0200 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Increasing DMA block memory allocation to 2048k on all relevant kernels. https://forum.armbian.com/index.php?/topic/4811-uas-mainline-kernel-coherent-pool-memory-size +> X-Git-Archeology: +> X-Git-Archeology: - Revision b3d2bd4864d89ce032344051e6ced2ba9371084b: https://github.com/armbian/build/commit/b3d2bd4864d89ce032344051e6ced2ba9371084b +> X-Git-Archeology: Date: Wed, 30 Aug 2017 05:42:08 +0000 +> X-Git-Archeology: From: Tonymac32 +> X-Git-Archeology: Subject: Meson64 Dev increase DMA block memory allocation +> X-Git-Archeology: +> X-Git-Archeology: - Revision 2c59bb9934b749b5df74d4134cd393dc24fd5160: https://github.com/armbian/build/commit/2c59bb9934b749b5df74d4134cd393dc24fd5160 +> X-Git-Archeology: Date: Mon, 18 Sep 2017 12:06:30 +0200 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Lepotato. Added NEXT, added patches from C2 NEXT, au, config update, removed deprecated patches, ... +> X-Git-Archeology: +> X-Git-Archeology: - Revision 13e94e58f04be27db51d18b7dac1d15a1864b79e: https://github.com/armbian/build/commit/13e94e58f04be27db51d18b7dac1d15a1864b79e +> X-Git-Archeology: Date: Fri, 27 Oct 2017 16:14:21 +0300 +> X-Git-Archeology: From: zador-blood-stained +> X-Git-Archeology: Subject: Remove random executable bits from patch files +> X-Git-Archeology: +> X-Git-Archeology: - Revision 2c08ec8f5a210de35f9482f482ac01ea15381792: https://github.com/armbian/build/commit/2c08ec8f5a210de35f9482f482ac01ea15381792 +> X-Git-Archeology: Date: Thu, 24 May 2018 13:32:29 +0200 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Merge sunxi family into stable +> X-Git-Archeology: +> X-Git-Archeology: - Revision 7d2f3af08f23049c91c88eec5062613bbfbc85d4: https://github.com/armbian/build/commit/7d2f3af08f23049c91c88eec5062613bbfbc85d4 +> X-Git-Archeology: Date: Thu, 24 May 2018 15:44:15 +0200 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Merging Rockchip family +> X-Git-Archeology: +> X-Git-Archeology: - Revision 99a34c7be1e342247a981f99c7930ee73c144f3e: https://github.com/armbian/build/commit/99a34c7be1e342247a981f99c7930ee73c144f3e +> X-Git-Archeology: Date: Tue, 26 Jun 2018 12:47:49 +0000 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Move Odroid C2 from 4.14.y to 4.16.y, added patch for ethernet, DEV to master, both tested ... not perfect but in a better condition. +> X-Git-Archeology: +> X-Git-Archeology: - Revision fcb85f17675990514d8fadc905e6ccc3bded7138: https://github.com/armbian/build/commit/fcb85f17675990514d8fadc905e6ccc3bded7138 +> X-Git-Archeology: Date: Thu, 28 Jun 2018 08:27:08 +0000 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Major Amlogic RFC and cleanup +> X-Git-Archeology: +> X-Git-Archeology: - Revision c57ebd663cf1b15ad193d4a761f9c044ba3b2acf: https://github.com/armbian/build/commit/c57ebd663cf1b15ad193d4a761f9c044ba3b2acf +> X-Git-Archeology: Date: Tue, 17 Jul 2018 16:11:07 +0200 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: - attach Odroid XU4 4.14.y back to Hardkernel kernel branch +> X-Git-Archeology: +> X-Git-Archeology: - Revision a26ccdee627f1fa27b3285e3840434cddb5aae62: https://github.com/armbian/build/commit/a26ccdee627f1fa27b3285e3840434cddb5aae62 +> X-Git-Archeology: Date: Wed, 07 Nov 2018 11:11:51 +0100 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: [odroid xu4] Drop kernel 3.10.y, default -> offical 4.14.y, next = vanilla 4.19.y http://ix.io/1rcZ & dev = n/a +> X-Git-Archeology: +> X-Git-Archeology: - Revision a156fddf8f5bb5a6ac28ffc528ba0ec28ff9df81: https://github.com/armbian/build/commit/a156fddf8f5bb5a6ac28ffc528ba0ec28ff9df81 +> X-Git-Archeology: Date: Fri, 18 Jan 2019 20:10:35 +0100 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: [ odroidxu4 ] Reverting NEXT back to stock 4.14.y due to many troubles, DEV = 4.19.y +> X-Git-Archeology: +> X-Git-Archeology: - Revision 79c1c2781915c59bd24576af92b9dbe57da24fac: https://github.com/armbian/build/commit/79c1c2781915c59bd24576af92b9dbe57da24fac +> X-Git-Archeology: Date: Fri, 17 May 2019 10:46:57 +0200 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: [ odroidxu4 dev ] Move to 5.1.y +> X-Git-Archeology: +> X-Git-Archeology: - Revision 150ac0c2afa147d9e3b036c8ecd8238fe5648cf3: https://github.com/armbian/build/commit/150ac0c2afa147d9e3b036c8ecd8238fe5648cf3 +> X-Git-Archeology: Date: Tue, 19 Nov 2019 23:25:39 +0100 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Remove K<4, change branches, new features (#1586) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 4d4c3f58ffc1cbfbb060cbabc9eb414036a2fda5: https://github.com/armbian/build/commit/4d4c3f58ffc1cbfbb060cbabc9eb414036a2fda5 +> X-Git-Archeology: Date: Wed, 02 Sep 2020 23:22:09 +0200 +> X-Git-Archeology: From: Piotr Szczepanik +> X-Git-Archeology: Subject: Switched rockchip64 curent to kernel 5.8.y (#2175) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153 +> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704) +> X-Git-Archeology: +> X-Git-Archeology: - Revision 92f1a22d76b987afa7ba555d5b509adc51d689e7: https://github.com/armbian/build/commit/92f1a22d76b987afa7ba555d5b509adc51d689e7 +> X-Git-Archeology: Date: Fri, 16 Dec 2022 13:38:13 +0100 +> X-Git-Archeology: From: Igor Pecovnik +> X-Git-Archeology: Subject: Re-add rockchip64 6.0 patches (#4575) +> X-Git-Archeology: +> X-Git-Archeology: - Revision e4d413b9166e3633b40fb23382fb1045b9d0e315: https://github.com/armbian/build/commit/e4d413b9166e3633b40fb23382fb1045b9d0e315 +> X-Git-Archeology: Date: Tue, 26 Mar 2024 13:46:35 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip64: bump edge kernel to 6.8 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 69ca2492628b2aae217c33fde921b3840851eb14: https://github.com/armbian/build/commit/69ca2492628b2aae217c33fde921b3840851eb14 +> X-Git-Archeology: Date: Wed, 05 Jun 2024 22:18:24 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip64: bump edge kernel to 6.9 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 4ae0a958146810117050d0dbd359b99691a0fa0c: https://github.com/armbian/build/commit/4ae0a958146810117050d0dbd359b99691a0fa0c +> X-Git-Archeology: Date: Mon, 22 Jul 2024 19:17:52 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip64: bump edge kernel to 6.10 +> X-Git-Archeology: +--- + kernel/dma/pool.c | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + diff --git a/kernel/dma/pool.c b/kernel/dma/pool.c -index d10613eb0f63..d2223bc39f79 100644 +index 111111111111..222222222222 100644 --- a/kernel/dma/pool.c +++ b/kernel/dma/pool.c @@ -189,13 +189,11 @@ static int __init dma_atomic_pool_init(void) @@ -19,3 +135,6 @@ index d10613eb0f63..d2223bc39f79 100644 } INIT_WORK(&atomic_pool_work, atomic_pool_work_fn); +-- +Armbian + diff --git a/patch/kernel/archive/rockchip64-6.10/general-legacy-rockchip-hwrng.patch b/patch/kernel/archive/rockchip64-6.10/general-legacy-rockchip-hwrng.patch index 4dad1529a165..fb8ead66001b 100644 --- a/patch/kernel/archive/rockchip64-6.10/general-legacy-rockchip-hwrng.patch +++ b/patch/kernel/archive/rockchip64-6.10/general-legacy-rockchip-hwrng.patch @@ -34,10 +34,10 @@ Subject: [ARCHEOLOGY] Restored Hardware Random Number Generator from legacy 4 files changed, 359 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rockchip/rk3308.dtsi -index c5fe355c6deb..3eaef6941a8f 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi -@@ -655,6 +655,21 @@ logic_thermal: logic-thermal { +@@ -660,6 +660,21 @@ logic_thermal: logic-thermal { }; }; @@ -60,7 +60,7 @@ index c5fe355c6deb..3eaef6941a8f 100644 compatible = "rockchip,rk3308-tsadc"; reg = <0x0 0xff1f0000 0x0 0x100>; diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig -index 8de74dcfa18c..89000c996d77 100644 +index 111111111111..222222222222 100644 --- a/drivers/char/hw_random/Kconfig +++ b/drivers/char/hw_random/Kconfig @@ -383,6 +383,19 @@ config HW_RANDOM_STM32 @@ -84,7 +84,7 @@ index 8de74dcfa18c..89000c996d77 100644 tristate "Microchip PIC32 Random Number Generator support" depends on MACH_PIC32 || COMPILE_TEST diff --git a/drivers/char/hw_random/Makefile b/drivers/char/hw_random/Makefile -index 32549a1186dc..fd3bbf6e08e1 100644 +index 111111111111..222222222222 100644 --- a/drivers/char/hw_random/Makefile +++ b/drivers/char/hw_random/Makefile @@ -35,6 +35,7 @@ obj-$(CONFIG_HW_RANDOM_IPROC_RNG200) += iproc-rng200.o @@ -97,7 +97,7 @@ index 32549a1186dc..fd3bbf6e08e1 100644 obj-$(CONFIG_HW_RANDOM_CAVIUM) += cavium-rng.o cavium-rng-vf.o diff --git a/drivers/char/hw_random/rockchip-rng.c b/drivers/char/hw_random/rockchip-rng.c new file mode 100644 -index 000000000000..c0121f1f542e +index 000000000000..111111111111 --- /dev/null +++ b/drivers/char/hw_random/rockchip-rng.c @@ -0,0 +1,330 @@ diff --git a/patch/kernel/archive/rockchip64-6.10/general-legacy-rockchip-hwrng_5.10.patch b/patch/kernel/archive/rockchip64-6.10/general-legacy-rockchip-hwrng_5.10.patch index 5fa902ca1ce6..ebd23d5fddaf 100644 --- a/patch/kernel/archive/rockchip64-6.10/general-legacy-rockchip-hwrng_5.10.patch +++ b/patch/kernel/archive/rockchip64-6.10/general-legacy-rockchip-hwrng_5.10.patch @@ -24,7 +24,7 @@ Subject: [ARCHEOLOGY] Updated v4.4 HW RND driver with that from v5.10 kernel 1 file changed, 249 insertions(+), 79 deletions(-) diff --git a/drivers/char/hw_random/rockchip-rng.c b/drivers/char/hw_random/rockchip-rng.c -index c0121f1f542e..13503c54fe62 100644 +index 111111111111..222222222222 100644 --- a/drivers/char/hw_random/rockchip-rng.c +++ b/drivers/char/hw_random/rockchip-rng.c @@ -21,18 +21,24 @@ diff --git a/patch/kernel/archive/rockchip64-6.10/general-possibility-of-disabling-rk808-rtc.patch b/patch/kernel/archive/rockchip64-6.10/general-possibility-of-disabling-rk808-rtc.patch index 86229a2e7ac2..028c0eccf44b 100644 --- a/patch/kernel/archive/rockchip64-6.10/general-possibility-of-disabling-rk808-rtc.patch +++ b/patch/kernel/archive/rockchip64-6.10/general-possibility-of-disabling-rk808-rtc.patch @@ -22,12 +22,12 @@ Signed-off-by: Piotr Szczepanik 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c -index 0ed7c0d7784e..528917b236f9 100644 +index 111111111111..222222222222 100644 --- a/drivers/mfd/mfd-core.c +++ b/drivers/mfd/mfd-core.c -@@ -202,7 +202,7 @@ static int mfd_add_device(struct device *parent, int id, - } +@@ -209,7 +209,7 @@ static int mfd_add_device(struct device *parent, int id, + match: if (!pdev->dev.of_node) - pr_warn("%s: Failed to locate of_node [id: %d]\n", + pr_debug("%s: Failed to locate of_node [id: %d]\n", @@ -35,17 +35,17 @@ index 0ed7c0d7784e..528917b236f9 100644 } diff --git a/drivers/mfd/rk8xx-core.c b/drivers/mfd/rk8xx-core.c -index 11a831e92da8..9ec56d4abcfa 100644 +index 111111111111..222222222222 100644 --- a/drivers/mfd/rk8xx-core.c +++ b/drivers/mfd/rk8xx-core.c -@@ -120,6 +120,7 @@ static const struct mfd_cell rk818s[] = { - { .name = "rk808-regulator", .id = PLATFORM_DEVID_NONE, }, +@@ -133,6 +133,7 @@ static const struct mfd_cell rk818s[] = { + { .name = "rk808-regulator", }, { .name = "rk808-rtc", + .of_compatible = "rk808-rtc", .num_resources = ARRAY_SIZE(rtc_resources), .resources = rtc_resources, - .id = PLATFORM_DEVID_NONE, + }, -- Armbian diff --git a/patch/kernel/archive/rockchip64-6.10/general-rk3328-dtsi-trb-ent-quirk.patch b/patch/kernel/archive/rockchip64-6.10/general-rk3328-dtsi-trb-ent-quirk.patch index 7a103ed1a3f2..cd93b6f784e7 100644 --- a/patch/kernel/archive/rockchip64-6.10/general-rk3328-dtsi-trb-ent-quirk.patch +++ b/patch/kernel/archive/rockchip64-6.10/general-rk3328-dtsi-trb-ent-quirk.patch @@ -45,10 +45,10 @@ Subject: [ARCHEOLOGY] Enable rockchip64: XHCI HCD USB TRB ENT quirk for RK3328 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -index 4e30c5279ac6..303680413ed9 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -@@ -1030,6 +1030,7 @@ usbdrd3: usb@ff600000 { +@@ -1049,6 +1049,7 @@ usbdrd3: usb@ff600000 { snps,dis-del-phy-power-chg-quirk; snps,dis_enblslpm_quirk; snps,dis-tx-ipgap-linecheck-quirk; diff --git a/patch/kernel/archive/rockchip64-6.10/general-rk808-configurable-switch-voltage-steps.patch b/patch/kernel/archive/rockchip64-6.10/general-rk808-configurable-switch-voltage-steps.patch index 40dc792d063d..5166d4d83b81 100644 --- a/patch/kernel/archive/rockchip64-6.10/general-rk808-configurable-switch-voltage-steps.patch +++ b/patch/kernel/archive/rockchip64-6.10/general-rk808-configurable-switch-voltage-steps.patch @@ -39,10 +39,10 @@ Signed-off-by: Ricardo Pardini 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/regulator/rk808-regulator.c b/drivers/regulator/rk808-regulator.c -index 867a2cf243f6..52575e71ce33 100644 +index 111111111111..222222222222 100644 --- a/drivers/regulator/rk808-regulator.c +++ b/drivers/regulator/rk808-regulator.c -@@ -204,6 +204,7 @@ struct rk8xx_register_bit { +@@ -207,6 +207,7 @@ struct rk8xx_register_bit { struct rk808_regulator_data { struct gpio_desc *dvs_gpio[2]; @@ -50,7 +50,7 @@ index 867a2cf243f6..52575e71ce33 100644 }; static const struct linear_range rk808_ldo3_voltage_ranges[] = { -@@ -416,7 +417,8 @@ static int rk808_buck1_2_get_voltage_sel_regmap(struct regulator_dev *rdev) +@@ -419,7 +420,8 @@ static int rk808_buck1_2_get_voltage_sel_regmap(struct regulator_dev *rdev) } static int rk808_buck1_2_i2c_set_voltage_sel(struct regulator_dev *rdev, @@ -60,7 +60,7 @@ index 867a2cf243f6..52575e71ce33 100644 { int ret, delta_sel; unsigned int old_sel, tmp, val, mask = rdev->desc->vsel_mask; -@@ -435,8 +437,8 @@ static int rk808_buck1_2_i2c_set_voltage_sel(struct regulator_dev *rdev, +@@ -438,8 +440,8 @@ static int rk808_buck1_2_i2c_set_voltage_sel(struct regulator_dev *rdev, * the risk of overshoot. Put it into a multi-step, can effectively * avoid this problem, a step is 100mv here. */ @@ -71,7 +71,7 @@ index 867a2cf243f6..52575e71ce33 100644 val = old_sel << (ffs(mask) - 1); val |= tmp; -@@ -470,12 +472,13 @@ static int rk808_buck1_2_set_voltage_sel(struct regulator_dev *rdev, +@@ -473,12 +475,13 @@ static int rk808_buck1_2_set_voltage_sel(struct regulator_dev *rdev, struct rk808_regulator_data *pdata = rdev_get_drvdata(rdev); int id = rdev_get_id(rdev); struct gpio_desc *gpio = pdata->dvs_gpio[id]; @@ -86,7 +86,7 @@ index 867a2cf243f6..52575e71ce33 100644 gpio_level = gpiod_get_value(gpio); if (gpio_level == 0) { -@@ -1657,6 +1660,12 @@ static int rk808_regulator_dt_parse_pdata(struct device *dev, +@@ -1861,6 +1864,12 @@ static int rk808_regulator_dt_parse_pdata(struct device *dev, 0 : tmp); } diff --git a/patch/kernel/archive/rockchip64-6.10/general-rockchip-overlays.patch b/patch/kernel/archive/rockchip64-6.10/general-rockchip-overlays.patch index 7c39c266c95c..fc036cb149f0 100644 --- a/patch/kernel/archive/rockchip64-6.10/general-rockchip-overlays.patch +++ b/patch/kernel/archive/rockchip64-6.10/general-rockchip-overlays.patch @@ -10,10 +10,10 @@ Subject: add overlays framework for rockchip (scripts/Makefile.lib only) 1 file changed, 3 insertions(+) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib -index 9ea801a22569..3cde7d57e261 100644 +index 111111111111..222222222222 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib -@@ -88,6 +88,9 @@ base-dtb-y := $(foreach m, $(multi-dtb-y), $(firstword $(call suffix-search, $m, +@@ -93,6 +93,9 @@ base-dtb-y := $(filter %.dtb, $(call real-search, $(multi-dtb-y), .dtb, -dtbs)) always-y += $(dtb-y) diff --git a/patch/kernel/archive/rockchip64-6.10/general-rt5651-add-mclk.patch b/patch/kernel/archive/rockchip64-6.10/general-rt5651-add-mclk.patch index 87e230ed24bb..785cb5c703b9 100644 --- a/patch/kernel/archive/rockchip64-6.10/general-rt5651-add-mclk.patch +++ b/patch/kernel/archive/rockchip64-6.10/general-rt5651-add-mclk.patch @@ -69,7 +69,7 @@ Subject: [ARCHEOLOGY] Fixed sound from rt5651 on OrangePi 4 (#1870) 2 files changed, 17 insertions(+) diff --git a/sound/soc/codecs/rt5651.c b/sound/soc/codecs/rt5651.c -index 0cee4fd1c84b..90b08604e615 100644 +index 111111111111..222222222222 100644 --- a/sound/soc/codecs/rt5651.c +++ b/sound/soc/codecs/rt5651.c @@ -24,6 +24,7 @@ @@ -117,7 +117,7 @@ index 0cee4fd1c84b..90b08604e615 100644 snd_soc_component_update_bits(component, RT5651_PWR_ANLG1, diff --git a/sound/soc/codecs/rt5651.h b/sound/soc/codecs/rt5651.h -index 20c33a3ece37..17524fa9fdfc 100644 +index 111111111111..222222222222 100644 --- a/sound/soc/codecs/rt5651.h +++ b/sound/soc/codecs/rt5651.h @@ -2097,6 +2097,7 @@ struct rt5651_priv { diff --git a/patch/kernel/archive/rockchip64-6.10/general-v4l2-iep-driver.patch b/patch/kernel/archive/rockchip64-6.10/general-v4l2-iep-driver.patch index 370691b33a0c..3b405824ddd6 100644 --- a/patch/kernel/archive/rockchip64-6.10/general-v4l2-iep-driver.patch +++ b/patch/kernel/archive/rockchip64-6.10/general-v4l2-iep-driver.patch @@ -74,7 +74,7 @@ Subject: Rockchip IEP driver diff --git a/Documentation/devicetree/bindings/media/rockchip-iep.yaml b/Documentation/devicetree/bindings/media/rockchip-iep.yaml new file mode 100644 -index 000000000000..a9efcda13fc1 +index 000000000000..111111111111 --- /dev/null +++ b/Documentation/devicetree/bindings/media/rockchip-iep.yaml @@ -0,0 +1,73 @@ @@ -152,10 +152,10 @@ index 000000000000..a9efcda13fc1 + power-domains = <&power RK3228_PD_VIO>; + }; diff --git a/arch/arm/boot/dts/rockchip/rk3288.dtsi b/arch/arm/boot/dts/rockchip/rk3288.dtsi -index cb9cdaddffd4..54bf9ae3ab4b 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/rockchip/rk3288.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi -@@ -984,14 +984,25 @@ crypto: crypto@ff8a0000 { +@@ -993,14 +993,25 @@ crypto: crypto@ff8a0000 { reset-names = "crypto-rst"; }; @@ -183,10 +183,10 @@ index cb9cdaddffd4..54bf9ae3ab4b 100644 isp_mmu: iommu@ff914000 { diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -index e729e7a22b23..4e30c5279ac6 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -@@ -722,6 +722,28 @@ vop_mmu: iommu@ff373f00 { +@@ -750,6 +750,28 @@ vop_mmu: iommu@ff373f00 { status = "disabled"; }; @@ -216,10 +216,10 @@ index e729e7a22b23..4e30c5279ac6 100644 compatible = "rockchip,rk3328-dw-hdmi"; reg = <0x0 0xff3c0000 0x0 0x20000>; diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi -index 5bc2d4faeea6..8aa038f5657a 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi -@@ -1404,12 +1404,25 @@ vdec_mmu: iommu@ff660480 { +@@ -1475,12 +1475,25 @@ vdec_mmu: iommu@ff660480 { #iommu-cells = <0>; }; @@ -246,7 +246,7 @@ index 5bc2d4faeea6..8aa038f5657a 100644 status = "disabled"; }; diff --git a/drivers/media/platform/rockchip/Kconfig b/drivers/media/platform/rockchip/Kconfig -index b41d3960c1b4..862590be7916 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/Kconfig +++ b/drivers/media/platform/rockchip/Kconfig @@ -4,3 +4,4 @@ comment "Rockchip media platform drivers" @@ -255,7 +255,7 @@ index b41d3960c1b4..862590be7916 100644 source "drivers/media/platform/rockchip/rkisp1/Kconfig" +source "drivers/media/platform/rockchip/iep/Kconfig" diff --git a/drivers/media/platform/rockchip/Makefile b/drivers/media/platform/rockchip/Makefile -index 4f782b876ac9..be8015c6d9e4 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/rockchip/Makefile +++ b/drivers/media/platform/rockchip/Makefile @@ -1,3 +1,4 @@ @@ -265,7 +265,7 @@ index 4f782b876ac9..be8015c6d9e4 100644 +obj-y += iep/ diff --git a/drivers/media/platform/rockchip/iep/Kconfig b/drivers/media/platform/rockchip/iep/Kconfig new file mode 100644 -index 000000000000..e513fa7f45f2 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/media/platform/rockchip/iep/Kconfig @@ -0,0 +1,13 @@ @@ -284,7 +284,7 @@ index 000000000000..e513fa7f45f2 + will be called rockchip-iep diff --git a/drivers/media/platform/rockchip/iep/Makefile b/drivers/media/platform/rockchip/iep/Makefile new file mode 100644 -index 000000000000..5c89b3277469 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/media/platform/rockchip/iep/Makefile @@ -0,0 +1,5 @@ @@ -295,7 +295,7 @@ index 000000000000..5c89b3277469 +obj-$(CONFIG_VIDEO_ROCKCHIP_IEP) += rockchip-iep.o diff --git a/drivers/media/platform/rockchip/iep/iep-regs.h b/drivers/media/platform/rockchip/iep/iep-regs.h new file mode 100644 -index 000000000000..a68685ef3604 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/media/platform/rockchip/iep/iep-regs.h @@ -0,0 +1,291 @@ @@ -592,7 +592,7 @@ index 000000000000..a68685ef3604 +#endif diff --git a/drivers/media/platform/rockchip/iep/iep.c b/drivers/media/platform/rockchip/iep/iep.c new file mode 100644 -index 000000000000..f4b9320733be +index 000000000000..111111111111 --- /dev/null +++ b/drivers/media/platform/rockchip/iep/iep.c @@ -0,0 +1,1089 @@ @@ -1687,7 +1687,7 @@ index 000000000000..f4b9320733be +MODULE_LICENSE("GPL v2"); diff --git a/drivers/media/platform/rockchip/iep/iep.h b/drivers/media/platform/rockchip/iep/iep.h new file mode 100644 -index 000000000000..7d9fc61624b6 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/media/platform/rockchip/iep/iep.h @@ -0,0 +1,112 @@ diff --git a/patch/kernel/archive/rockchip64-6.10/general-v4l2-rkvdec-00-fixes.patch b/patch/kernel/archive/rockchip64-6.10/general-v4l2-rkvdec-00-fixes.patch index ed0c61c2cb9c..c710a918e8b2 100644 --- a/patch/kernel/archive/rockchip64-6.10/general-v4l2-rkvdec-00-fixes.patch +++ b/patch/kernel/archive/rockchip64-6.10/general-v4l2-rkvdec-00-fixes.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Mon, 6 Jul 2020 21:54:35 +0000 -Subject: [PATCH] media: v4l2-common: Add helpers to calculate bytesperline and +Subject: media: v4l2-common: Add helpers to calculate bytesperline and sizeimage Add helper functions to calculate plane bytesperline and sizeimage, these @@ -13,14 +13,14 @@ use of block width and height. Signed-off-by: Jonas Karlman --- - drivers/media/v4l2-core/v4l2-common.c | 77 +++++++++++++-------------- + drivers/media/v4l2-core/v4l2-common.c | 77 +++++----- 1 file changed, 38 insertions(+), 39 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-common.c b/drivers/media/v4l2-core/v4l2-common.c -index e0fbe6ba4b6c..cb2f1acab7cf 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/v4l2-core/v4l2-common.c +++ b/drivers/media/v4l2-core/v4l2-common.c -@@ -338,6 +338,33 @@ static inline unsigned int v4l2_format_block_height(const struct v4l2_format_inf +@@ -355,6 +355,33 @@ static inline unsigned int v4l2_format_block_height(const struct v4l2_format_inf return info->block_h[plane]; } @@ -54,7 +54,7 @@ index e0fbe6ba4b6c..cb2f1acab7cf 100644 void v4l2_apply_frmsize_constraints(u32 *width, u32 *height, const struct v4l2_frmsize_stepwise *frmsize) { -@@ -373,37 +400,19 @@ int v4l2_fill_pixfmt_mp(struct v4l2_pix_format_mplane *pixfmt, +@@ -390,37 +417,19 @@ int v4l2_fill_pixfmt_mp(struct v4l2_pix_format_mplane *pixfmt, if (info->mem_planes == 1) { plane = &pixfmt->plane_fmt[0]; @@ -99,7 +99,7 @@ index e0fbe6ba4b6c..cb2f1acab7cf 100644 } } return 0; -@@ -427,22 +436,12 @@ int v4l2_fill_pixfmt(struct v4l2_pix_format *pixfmt, u32 pixelformat, +@@ -444,22 +453,12 @@ int v4l2_fill_pixfmt(struct v4l2_pix_format *pixfmt, u32 pixelformat, pixfmt->width = width; pixfmt->height = height; pixfmt->pixelformat = pixelformat; @@ -126,11 +126,13 @@ index e0fbe6ba4b6c..cb2f1acab7cf 100644 return 0; } EXPORT_SYMBOL_GPL(v4l2_fill_pixfmt); +-- +Armbian From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Mon, 6 Jul 2020 21:54:36 +0000 -Subject: [PATCH] media: v4l2: Add NV15 and NV20 pixel formats +Subject: media: v4l2: Add NV15 and NV20 pixel formats Add NV15 and NV20 pixel formats used by the Rockchip Video Decoder for 10-bit buffers. @@ -154,12 +156,12 @@ Signed-off-by: Jonas Karlman 3 files changed, 8 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-common.c b/drivers/media/v4l2-core/v4l2-common.c -index cb2f1acab7cf..8446a1deffd8 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/v4l2-core/v4l2-common.c +++ b/drivers/media/v4l2-core/v4l2-common.c -@@ -268,6 +268,9 @@ const struct v4l2_format_info *v4l2_format_info(u32 format) - { .format = V4L2_PIX_FMT_NV42, .pixel_enc = V4L2_PIXEL_ENC_YUV, .mem_planes = 1, .comp_planes = 2, .bpp = { 1, 2, 0, 0 }, .bpp_div = { 1, 1, 1, 1 }, .hdiv = 1, .vdiv = 1 }, +@@ -282,6 +282,9 @@ const struct v4l2_format_info *v4l2_format_info(u32 format) { .format = V4L2_PIX_FMT_P010, .pixel_enc = V4L2_PIXEL_ENC_YUV, .mem_planes = 1, .comp_planes = 2, .bpp = { 2, 2, 0, 0 }, .bpp_div = { 1, 1, 1, 1 }, .hdiv = 2, .vdiv = 1 }, + { .format = V4L2_PIX_FMT_P012, .pixel_enc = V4L2_PIXEL_ENC_YUV, .mem_planes = 1, .comp_planes = 2, .bpp = { 2, 4, 0, 0 }, .bpp_div = { 1, 1, 1, 1 }, .hdiv = 2, .vdiv = 2 }, + { .format = V4L2_PIX_FMT_NV15, .pixel_enc = V4L2_PIXEL_ENC_YUV, .mem_planes = 1, .comp_planes = 2, .bpp = { 5, 5, 0, 0 }, .bpp_div = { 1, 1, 1, 1 }, .hdiv = 2, .vdiv = 2, .block_w = { 4, 2, 0, 0 }, .block_h = { 1, 1, 0, 0 } }, + { .format = V4L2_PIX_FMT_NV20, .pixel_enc = V4L2_PIXEL_ENC_YUV, .mem_planes = 1, .comp_planes = 2, .bpp = { 5, 5, 0, 0 }, .bpp_div = { 1, 1, 1, 1 }, .hdiv = 2, .vdiv = 1, .block_w = { 4, 2, 0, 0 }, .block_h = { 1, 1, 0, 0 } }, @@ -168,10 +170,10 @@ index cb2f1acab7cf..8446a1deffd8 100644 { .format = V4L2_PIX_FMT_YVU410, .pixel_enc = V4L2_PIXEL_ENC_YUV, .mem_planes = 1, .comp_planes = 3, .bpp = { 1, 1, 1, 0 }, .bpp_div = { 1, 1, 1, 1 }, .hdiv = 4, .vdiv = 4 }, { .format = V4L2_PIX_FMT_YUV411P, .pixel_enc = V4L2_PIXEL_ENC_YUV, .mem_planes = 1, .comp_planes = 3, .bpp = { 1, 1, 1, 0 }, .bpp_div = { 1, 1, 1, 1 }, .hdiv = 4, .vdiv = 1 }, diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c -index e6fd355a2e92..24771edaa4f2 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c -@@ -1354,6 +1354,8 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) +@@ -1364,6 +1364,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; @@ -181,25 +183,27 @@ index e6fd355a2e92..24771edaa4f2 100644 case V4L2_PIX_FMT_NV12_16L16: descr = "Y/UV 4:2:0 (16x16 Linear)"; break; case V4L2_PIX_FMT_NV12_32L32: descr = "Y/UV 4:2:0 (32x32 Linear)"; break; diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h -index 01e630f2ec78..cea44992aea3 100644 +index 111111111111..222222222222 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h -@@ -628,6 +628,9 @@ struct v4l2_pix_format { - #define V4L2_PIX_FMT_NV42 v4l2_fourcc('N', 'V', '4', '2') /* 24 Y/VU 4:4:4 */ - #define V4L2_PIX_FMT_P010 v4l2_fourcc('P', '0', '1', '0') /* 24 Y/UV 4:2:0 10-bit per component */ +@@ -647,6 +647,9 @@ struct v4l2_pix_format { + #define V4L2_PIX_FMT_P010 v4l2_fourcc('P', '0', '1', '0') /* 24 Y/CbCr 4:2:0 10-bit per component */ + #define V4L2_PIX_FMT_P012 v4l2_fourcc('P', '0', '1', '2') /* 24 Y/CbCr 4:2:0 12-bit per component */ +#define V4L2_PIX_FMT_NV15 v4l2_fourcc('N', 'V', '1', '5') /* 15 Y/UV 4:2:0 10-bit packed */ +#define V4L2_PIX_FMT_NV20 v4l2_fourcc('N', 'V', '2', '0') /* 20 Y/UV 4:2:2 10-bit packed */ + /* two non contiguous planes - one Y, one Cr + Cb interleaved */ - #define V4L2_PIX_FMT_NV12M v4l2_fourcc('N', 'M', '1', '2') /* 12 Y/UV 4:2:0 */ - #define V4L2_PIX_FMT_NV21M v4l2_fourcc('N', 'M', '2', '1') /* 21 Y/VU 4:2:0 */ + #define V4L2_PIX_FMT_NV12M v4l2_fourcc('N', 'M', '1', '2') /* 12 Y/CbCr 4:2:0 */ + #define V4L2_PIX_FMT_NV21M v4l2_fourcc('N', 'M', '2', '1') /* 21 Y/CrCb 4:2:0 */ +-- +Armbian From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Mon, 6 Jul 2020 21:54:36 +0000 -Subject: [PATCH] media: rkvdec: h264: Use bytesperline and buffer height to - calculate stride +Subject: media: rkvdec: h264: Use bytesperline and buffer height to calculate + stride Use bytesperline and buffer height to calculate the strides configured. @@ -212,7 +216,7 @@ Signed-off-by: Jonas Karlman 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/media/rkvdec/rkvdec-h264.c b/drivers/staging/media/rkvdec/rkvdec-h264.c -index 4fc167b42cf0..a8635105e387 100644 +index 111111111111..222222222222 100644 --- a/drivers/staging/media/rkvdec/rkvdec-h264.c +++ b/drivers/staging/media/rkvdec/rkvdec-h264.c @@ -896,9 +896,9 @@ static void config_registers(struct rkvdec_ctx *ctx, @@ -239,12 +243,13 @@ index 4fc167b42cf0..a8635105e387 100644 y_virstride = hor_virstride * ver_virstride; if (sps->chroma_format_idc == 0) +-- +Armbian From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Mon, 6 Jul 2020 21:54:37 +0000 -Subject: [PATCH] media: rkvdec: Extract rkvdec_fill_decoded_pixfmt helper - method +Subject: media: rkvdec: Extract rkvdec_fill_decoded_pixfmt helper method This extract setting decoded pixfmt into a helper method, current code is replaced with a call to the new helper method. @@ -253,11 +258,11 @@ The helper method is also called from a new function in next patch. Signed-off-by: Jonas Karlman --- - drivers/staging/media/rkvdec/rkvdec.c | 29 ++++++++++++++------------- + drivers/staging/media/rkvdec/rkvdec.c | 29 +++++----- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c -index 7bab7586918c..40cc791aef26 100644 +index 111111111111..222222222222 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -27,6 +27,17 @@ @@ -310,11 +315,13 @@ index 7bab7586918c..40cc791aef26 100644 return 0; } +-- +Armbian From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Mon, 6 Jul 2020 21:54:37 +0000 -Subject: [PATCH] media: rkvdec: Lock capture pixel format in s_ctrl and s_fmt +Subject: media: rkvdec: Lock capture pixel format in s_ctrl and s_fmt Add an optional valid_fmt operation that should return the valid pixelformat of CAPTURE buffers. @@ -324,12 +331,12 @@ and 4:2:2 content. Signed-off-by: Jonas Karlman --- - drivers/staging/media/rkvdec/rkvdec.c | 67 +++++++++++++++++++++++---- + drivers/staging/media/rkvdec/rkvdec.c | 67 ++++++++-- drivers/staging/media/rkvdec/rkvdec.h | 2 + 2 files changed, 61 insertions(+), 8 deletions(-) diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c -index 40cc791aef26..e93e1cb0f829 100644 +index 111111111111..222222222222 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -38,19 +38,56 @@ static void rkvdec_fill_decoded_pixfmt(struct rkvdec_ctx *ctx, @@ -447,7 +454,7 @@ index 40cc791aef26..e93e1cb0f829 100644 return -EINVAL; diff --git a/drivers/staging/media/rkvdec/rkvdec.h b/drivers/staging/media/rkvdec/rkvdec.h -index 633335ebb9c4..b9e219438bc9 100644 +index 111111111111..222222222222 100644 --- a/drivers/staging/media/rkvdec/rkvdec.h +++ b/drivers/staging/media/rkvdec/rkvdec.h @@ -66,6 +66,7 @@ vb2_to_rkvdec_decoded_buf(struct vb2_buffer *buf) @@ -466,11 +473,13 @@ index 633335ebb9c4..b9e219438bc9 100644 const struct rkvdec_coded_fmt_desc *coded_fmt_desc; struct v4l2_ctrl_handler ctrl_hdl; struct rkvdec_dev *dev; +-- +Armbian From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Mon, 6 Jul 2020 21:54:37 +0000 -Subject: [PATCH] media: rkvdec: h264: Support High 10 and 4:2:2 profiles +Subject: media: rkvdec: h264: Support High 10 and 4:2:2 profiles Add support and enable decoding of H264 High 10 and 4:2:2 profiles. @@ -482,12 +491,12 @@ for the provided SPS control. Signed-off-by: Jonas Karlman --- - drivers/staging/media/rkvdec/rkvdec-h264.c | 33 ++++++++++++++++------ - drivers/staging/media/rkvdec/rkvdec.c | 19 +++++++++---- + drivers/staging/media/rkvdec/rkvdec-h264.c | 33 +++++++--- + drivers/staging/media/rkvdec/rkvdec.c | 19 ++++-- 2 files changed, 37 insertions(+), 15 deletions(-) diff --git a/drivers/staging/media/rkvdec/rkvdec-h264.c b/drivers/staging/media/rkvdec/rkvdec-h264.c -index a8635105e387..0069d3d198db 100644 +index 111111111111..222222222222 100644 --- a/drivers/staging/media/rkvdec/rkvdec-h264.c +++ b/drivers/staging/media/rkvdec/rkvdec-h264.c @@ -1031,19 +1031,14 @@ static int rkvdec_h264_validate_sps(struct rkvdec_ctx *ctx, @@ -549,7 +558,7 @@ index a8635105e387..0069d3d198db 100644 .stop = rkvdec_h264_stop, .run = rkvdec_h264_run, diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c -index e93e1cb0f829..4f5436c89e08 100644 +index 111111111111..222222222222 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -31,7 +31,7 @@ static void rkvdec_fill_decoded_pixfmt(struct rkvdec_ctx *ctx, @@ -607,11 +616,13 @@ index e93e1cb0f829..4f5436c89e08 100644 } }; +-- +Armbian From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alex Bee Date: Sun, 27 Mar 2022 14:18:07 +0200 -Subject: [PATCH] media: rkvdec-h264: Don't hardcode SPS/PPS parameters +Subject: media: rkvdec-h264: Don't hardcode SPS/PPS parameters Some SPS/PPS parameters are currently hardcoded in the driver even though so do exist in the uapi which is stable by now. @@ -620,11 +631,11 @@ Use them instead of hardcoding them. Signed-off-by: Alex Bee --- - drivers/staging/media/rkvdec/rkvdec-h264.c | 13 +++++++------ + drivers/staging/media/rkvdec/rkvdec-h264.c | 13 +++++----- 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/staging/media/rkvdec/rkvdec-h264.c b/drivers/staging/media/rkvdec/rkvdec-h264.c -index 0069d3d198db..2c27acaba85e 100644 +index 111111111111..222222222222 100644 --- a/drivers/staging/media/rkvdec/rkvdec-h264.c +++ b/drivers/staging/media/rkvdec/rkvdec-h264.c @@ -655,13 +655,14 @@ static void assemble_hw_pps(struct rkvdec_ctx *ctx, @@ -657,3 +668,6 @@ index 0069d3d198db..2c27acaba85e 100644 WRITE_PPS(!!(pps->flags & V4L2_H264_PPS_FLAG_ENTROPY_CODING_MODE), ENTROPY_CODING_MODE_FLAG); WRITE_PPS(!!(pps->flags & V4L2_H264_PPS_FLAG_BOTTOM_FIELD_PIC_ORDER_IN_FRAME_PRESENT), +-- +Armbian + diff --git a/patch/kernel/archive/rockchip64-6.10/general-v4l2-rkvdec-01-vp9.patch b/patch/kernel/archive/rockchip64-6.10/general-v4l2-rkvdec-01-vp9.patch index 69d274d591e7..cff40f692938 100644 --- a/patch/kernel/archive/rockchip64-6.10/general-v4l2-rkvdec-01-vp9.patch +++ b/patch/kernel/archive/rockchip64-6.10/general-v4l2-rkvdec-01-vp9.patch @@ -1,8 +1,8 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Sat, 23 May 2020 10:16:01 +0000 -Subject: [PATCH] WIP: media: rkvdec: pm runtime dont use autosuspend before - disable and cleanup +Subject: WIP: media: rkvdec: pm runtime dont use autosuspend before disable + and cleanup Signed-off-by: Jonas Karlman --- @@ -10,10 +10,10 @@ Signed-off-by: Jonas Karlman 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c -index 4f5436c89e08..eaf2f133a264 100644 +index 111111111111..222222222222 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c -@@ -1125,9 +1125,9 @@ static int rkvdec_remove(struct platform_device *pdev) +@@ -1130,9 +1130,9 @@ static void rkvdec_remove(struct platform_device *pdev) cancel_delayed_work_sync(&rkvdec->watchdog_work); @@ -25,11 +25,13 @@ index 4f5436c89e08..eaf2f133a264 100644 } #ifdef CONFIG_PM +-- +Armbian From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Randy Li Date: Sun, 6 Jan 2019 01:48:37 +0800 -Subject: [PATCH] soc: rockchip: power-domain: export idle request +Subject: soc: rockchip: power-domain: export idle request We need to put the power status of HEVC IP into IDLE unless we can't reset that IP or the SoC would crash down. @@ -40,17 +42,16 @@ Signed-off-by: Caesar Wang Signed-off-by: Jeffy Chen Signed-off-by: Randy Li --- - drivers/pmdomain/rockchip/pm-domains.c | 23 +++++++++++++++++++++++ - include/linux/rockchip_pmu.h | 15 +++++++++++++++ - include/soc/rockchip/pm_domains.h | 6 ++++++ + drivers/pmdomain/rockchip/pm-domains.c | 23 ++++++++++ + include/linux/rockchip_pmu.h | 15 ++++++ + include/soc/rockchip/pm_domains.h | 6 +++ 3 files changed, 44 insertions(+) - create mode 100644 include/linux/rockchip_pmu.h diff --git a/drivers/pmdomain/rockchip/pm-domains.c b/drivers/pmdomain/rockchip/pm-domains.c -index 89795abac951..ffb5d62c9d52 100644 +index 111111111111..222222222222 100644 --- a/drivers/pmdomain/rockchip/pm-domains.c +++ b/drivers/pmdomain/rockchip/pm-domains.c -@@ -309,6 +309,29 @@ static int rockchip_pmu_set_idle_request(struct rockchip_pm_domain *pd, +@@ -347,6 +347,29 @@ static int rockchip_pmu_set_idle_request(struct rockchip_pm_domain *pd, return 0; } @@ -82,7 +83,7 @@ index 89795abac951..ffb5d62c9d52 100644 int i; diff --git a/include/linux/rockchip_pmu.h b/include/linux/rockchip_pmu.h new file mode 100644 -index 000000000000..720b3314e71a +index 000000000000..111111111111 --- /dev/null +++ b/include/linux/rockchip_pmu.h @@ -0,0 +1,15 @@ @@ -102,7 +103,7 @@ index 000000000000..720b3314e71a + +#endif /* _LINUX_ROCKCHIP_PM_H */ diff --git a/include/soc/rockchip/pm_domains.h b/include/soc/rockchip/pm_domains.h -index 7dbd941fc937..c5a59dd71754 100644 +index 111111111111..222222222222 100644 --- a/include/soc/rockchip/pm_domains.h +++ b/include/soc/rockchip/pm_domains.h @@ -10,6 +10,7 @@ @@ -125,21 +126,23 @@ index 7dbd941fc937..c5a59dd71754 100644 #endif /* CONFIG_ROCKCHIP_PM_DOMAINS */ #endif /* __SOC_ROCKCHIP_PM_DOMAINS_H__ */ +-- +Armbian From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alex Bee Date: Wed, 20 May 2020 17:04:47 +0200 -Subject: [PATCH] WIP: media: rkvdec: implement reset controls +Subject: WIP: media: rkvdec: implement reset controls --- - .../bindings/media/rockchip,vdec.yaml | 19 +++++++ - drivers/staging/media/rkvdec/rkvdec-regs.h | 5 ++ - drivers/staging/media/rkvdec/rkvdec.c | 53 +++++++++++++++++++ - drivers/staging/media/rkvdec/rkvdec.h | 11 +++- + Documentation/devicetree/bindings/media/rockchip,vdec.yaml | 19 ++++ + drivers/staging/media/rkvdec/rkvdec-regs.h | 5 + + drivers/staging/media/rkvdec/rkvdec.c | 53 ++++++++++ + drivers/staging/media/rkvdec/rkvdec.h | 11 +- 4 files changed, 87 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/media/rockchip,vdec.yaml b/Documentation/devicetree/bindings/media/rockchip,vdec.yaml -index 3bcfb8e12333..dd6958df1de8 100644 +index 111111111111..222222222222 100644 --- a/Documentation/devicetree/bindings/media/rockchip,vdec.yaml +++ b/Documentation/devicetree/bindings/media/rockchip,vdec.yaml @@ -53,6 +53,18 @@ properties: @@ -183,7 +186,7 @@ index 3bcfb8e12333..dd6958df1de8 100644 ... diff --git a/drivers/staging/media/rkvdec/rkvdec-regs.h b/drivers/staging/media/rkvdec/rkvdec-regs.h -index 15b9bee92016..3acc914888f6 100644 +index 111111111111..222222222222 100644 --- a/drivers/staging/media/rkvdec/rkvdec-regs.h +++ b/drivers/staging/media/rkvdec/rkvdec-regs.h @@ -28,6 +28,11 @@ @@ -199,7 +202,7 @@ index 15b9bee92016..3acc914888f6 100644 #define RKVDEC_REG_SYSCTRL 0x008 #define RKVDEC_IN_ENDIAN BIT(0) diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c -index eaf2f133a264..f55abb7c377f 100644 +index 111111111111..222222222222 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -10,12 +10,15 @@ @@ -218,7 +221,7 @@ index eaf2f133a264..f55abb7c377f 100644 #include #include #include -@@ -717,6 +720,11 @@ static void rkvdec_job_finish(struct rkvdec_ctx *ctx, +@@ -720,6 +723,11 @@ static void rkvdec_job_finish(struct rkvdec_ctx *ctx, pm_runtime_mark_last_busy(rkvdec->dev); pm_runtime_put_autosuspend(rkvdec->dev); @@ -230,7 +233,7 @@ index eaf2f133a264..f55abb7c377f 100644 rkvdec_job_finish_no_pm(ctx, result); } -@@ -754,6 +762,33 @@ static void rkvdec_device_run(void *priv) +@@ -757,6 +765,33 @@ static void rkvdec_device_run(void *priv) if (WARN_ON(!desc)) return; @@ -264,7 +267,7 @@ index eaf2f133a264..f55abb7c377f 100644 ret = pm_runtime_resume_and_get(rkvdec->dev); if (ret < 0) { -@@ -1020,6 +1055,11 @@ static irqreturn_t rkvdec_irq_handler(int irq, void *priv) +@@ -1023,6 +1058,11 @@ static irqreturn_t rkvdec_irq_handler(int irq, void *priv) if (cancel_delayed_work(&rkvdec->watchdog_work)) { struct rkvdec_ctx *ctx; @@ -276,7 +279,7 @@ index eaf2f133a264..f55abb7c377f 100644 ctx = v4l2_m2m_get_curr_priv(rkvdec->m2m_dev); rkvdec_job_finish(ctx, state); } -@@ -1037,6 +1077,7 @@ static void rkvdec_watchdog_func(struct work_struct *work) +@@ -1040,6 +1080,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"); @@ -284,7 +287,7 @@ index eaf2f133a264..f55abb7c377f 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); -@@ -1105,6 +1146,18 @@ static int rkvdec_probe(struct platform_device *pdev) +@@ -1108,6 +1149,18 @@ static int rkvdec_probe(struct platform_device *pdev) return ret; } @@ -304,7 +307,7 @@ index eaf2f133a264..f55abb7c377f 100644 pm_runtime_use_autosuspend(&pdev->dev); pm_runtime_enable(&pdev->dev); diff --git a/drivers/staging/media/rkvdec/rkvdec.h b/drivers/staging/media/rkvdec/rkvdec.h -index b9e219438bc9..f02f79c405f0 100644 +index 111111111111..222222222222 100644 --- a/drivers/staging/media/rkvdec/rkvdec.h +++ b/drivers/staging/media/rkvdec/rkvdec.h @@ -11,10 +11,11 @@ @@ -342,38 +345,27 @@ index b9e219438bc9..f02f79c405f0 100644 }; struct rkvdec_ctx { - -@@ -1345,6 +1348,11 @@ vdec: video-codec@ff660000 { - clock-names = "axi", "ahb", "cabac", "core"; - iommus = <&vdec_mmu>; - power-domains = <&power RK3399_PD_VDU>; -+ resets = <&cru SRST_H_VDU>, <&cru SRST_A_VDU>, -+ <&cru SRST_VDU_CORE>, <&cru SRST_VDU_CA>, -+ <&cru SRST_A_VDU_NOC>, <&cru SRST_H_VDU_NOC>; -+ reset-names = "video_h", "video_a", "video_core", "video_cabac", -+ "niu_a", "niu_h"; - }; - - vdec_mmu: iommu@ff660480 { +-- +Armbian From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alex Bee Date: Sat, 21 Aug 2021 16:12:36 +0200 -Subject: [PATCH] media: hantro: rockchip: Increase RK3288's max ACLK +Subject: media: hantro: rockchip: Increase RK3288's max ACLK Required to proper decode H.264@4K Signed-off-by: Alex Bee --- - drivers/media/platform/verisilicon/rockchip_vpu_hw.c | 14 +++++++++++--- + drivers/media/platform/verisilicon/rockchip_vpu_hw.c | 14 ++++++++-- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/verisilicon/rockchip_vpu_hw.c b/drivers/media/platform/verisilicon/rockchip_vpu_hw.c -index 8de6fd2e8eef..002b1a600f93 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/verisilicon/rockchip_vpu_hw.c +++ b/drivers/media/platform/verisilicon/rockchip_vpu_hw.c -@@ -15,7 +15,8 @@ - #include "rockchip_vpu2_regs.h" +@@ -16,7 +16,8 @@ + #include "rockchip_vpu981_regs.h" #define RK3066_ACLK_MAX_FREQ (300 * 1000 * 1000) -#define RK3288_ACLK_MAX_FREQ (400 * 1000 * 1000) @@ -382,7 +374,7 @@ index 8de6fd2e8eef..002b1a600f93 100644 #define RK3588_ACLK_MAX_FREQ (300 * 1000 * 1000) #define ROCKCHIP_VPU981_MIN_SIZE 64 -@@ -346,13 +347,20 @@ static int rk3066_vpu_hw_init(struct hantro_dev *vpu) +@@ -448,13 +449,20 @@ static int rk3588_vpu981_hw_init(struct hantro_dev *vpu) return 0; } @@ -404,7 +396,7 @@ index 8de6fd2e8eef..002b1a600f93 100644 static void rk3066_vpu_dec_reset(struct hantro_ctx *ctx) { struct hantro_dev *vpu = ctx->dev; -@@ -592,7 +600,7 @@ const struct hantro_variant rk3288_vpu_variant = { +@@ -710,7 +718,7 @@ const struct hantro_variant rk3288_vpu_variant = { .codec_ops = rk3288_vpu_codec_ops, .irqs = rockchip_vpu1_irqs, .num_irqs = ARRAY_SIZE(rockchip_vpu1_irqs), @@ -413,12 +405,13 @@ index 8de6fd2e8eef..002b1a600f93 100644 .clk_names = rockchip_vpu_clk_names, .num_clocks = ARRAY_SIZE(rockchip_vpu_clk_names) }; +-- +Armbian From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alex Bee Date: Sun, 4 Jul 2021 15:19:44 +0200 -Subject: [PATCH] media: rkvdec: disable QoS for VP9 (corruptions on RK3328 - otherwise) +Subject: media: rkvdec: disable QoS for VP9 (corruptions on RK3328 otherwise) Signed-off-by: Alex Bee --- @@ -427,7 +420,7 @@ Signed-off-by: Alex Bee 2 files changed, 10 insertions(+) diff --git a/drivers/staging/media/rkvdec/rkvdec-regs.h b/drivers/staging/media/rkvdec/rkvdec-regs.h -index 3acc914888f6..265f5234f4eb 100644 +index 111111111111..222222222222 100644 --- a/drivers/staging/media/rkvdec/rkvdec-regs.h +++ b/drivers/staging/media/rkvdec/rkvdec-regs.h @@ -222,6 +222,8 @@ @@ -440,10 +433,10 @@ index 3acc914888f6..265f5234f4eb 100644 #define RKVDEC_REG_PREF_CHR_CACHE_COMMAND 0x450 diff --git a/drivers/staging/media/rkvdec/rkvdec-vp9.c b/drivers/staging/media/rkvdec/rkvdec-vp9.c -index d8c1c0db15c7..a289bc968e91 100644 +index 111111111111..222222222222 100644 --- a/drivers/staging/media/rkvdec/rkvdec-vp9.c +++ b/drivers/staging/media/rkvdec/rkvdec-vp9.c -@@ -802,6 +802,7 @@ static int rkvdec_vp9_run(struct rkvdec_ctx *ctx) +@@ -803,6 +803,7 @@ static int rkvdec_vp9_run(struct rkvdec_ctx *ctx) struct rkvdec_dev *rkvdec = ctx->dev; struct rkvdec_vp9_run run = { }; int ret; @@ -451,7 +444,7 @@ index d8c1c0db15c7..a289bc968e91 100644 ret = rkvdec_vp9_run_preamble(ctx, &run); if (ret) { -@@ -823,6 +824,13 @@ static int rkvdec_vp9_run(struct rkvdec_ctx *ctx) +@@ -824,6 +825,13 @@ static int rkvdec_vp9_run(struct rkvdec_ctx *ctx) writel(1, rkvdec->regs + RKVDEC_REG_PREF_CHR_CACHE_COMMAND); writel(0xe, rkvdec->regs + RKVDEC_REG_STRMD_ERR_EN); @@ -465,21 +458,23 @@ index d8c1c0db15c7..a289bc968e91 100644 /* Start decoding! */ writel(RKVDEC_INTERRUPT_DEC_E | RKVDEC_CONFIG_DEC_CLK_GATE_E | RKVDEC_TIMEOUT_E | RKVDEC_BUF_EMPTY_E, +-- +Armbian From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alex Bee Date: Thu, 16 Jun 2022 13:18:22 +0200 -Subject: [PATCH] WIP: arm64: dts: add resets to vdec for RK3328 +Subject: WIP: arm64: dts: add resets to vdec for RK3328 --- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -index 5519347232f6..431c4ec198be 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -@@ -674,6 +674,11 @@ vdec: video-codec@ff360000 { +@@ -704,6 +704,11 @@ vdec: video-codec@ff360000 { assigned-clocks = <&cru ACLK_RKVDEC>, <&cru SCLK_VDEC_CABAC>, <&cru SCLK_VDEC_CORE>; assigned-clock-rates = <400000000>, <400000000>, <300000000>; @@ -491,3 +486,6 @@ index 5519347232f6..431c4ec198be 100644 iommus = <&vdec_mmu>; power-domains = <&power RK3328_PD_VIDEO>; }; +-- +Armbian + diff --git a/patch/kernel/archive/rockchip64-6.10/general-v4l2-rkvdec-02-hevc.patch b/patch/kernel/archive/rockchip64-6.10/general-v4l2-rkvdec-02-hevc.patch index 58b3e72e5a27..07e5e15df303 100644 --- a/patch/kernel/archive/rockchip64-6.10/general-v4l2-rkvdec-02-hevc.patch +++ b/patch/kernel/archive/rockchip64-6.10/general-v4l2-rkvdec-02-hevc.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Sat, 23 May 2020 15:17:45 +0000 -Subject: [PATCH] WIP: media: rkvdec: add HEVC backend +Subject: WIP: media: rkvdec: add HEVC backend NOTE: cabac table and scailing list code is copied 1:1 from mpp TODO: fix lowdelay flag and rework the scaling list part @@ -10,15 +10,14 @@ Signed-off-by: Jonas Karlman Signed-off-by: Alex Bee --- drivers/staging/media/rkvdec/Makefile | 2 +- - drivers/staging/media/rkvdec/rkvdec-hevc.c | 2572 ++++++++++++++++++++ + drivers/staging/media/rkvdec/rkvdec-hevc.c | 2572 ++++++++++ drivers/staging/media/rkvdec/rkvdec-regs.h | 1 + drivers/staging/media/rkvdec/rkvdec.c | 73 +- drivers/staging/media/rkvdec/rkvdec.h | 1 + 5 files changed, 2647 insertions(+), 2 deletions(-) - create mode 100644 drivers/staging/media/rkvdec/rkvdec-hevc.c diff --git a/drivers/staging/media/rkvdec/Makefile b/drivers/staging/media/rkvdec/Makefile -index cb86b429cfaa..a77122641d14 100644 +index 111111111111..222222222222 100644 --- a/drivers/staging/media/rkvdec/Makefile +++ b/drivers/staging/media/rkvdec/Makefile @@ -1,3 +1,3 @@ @@ -28,7 +27,7 @@ index cb86b429cfaa..a77122641d14 100644 +rockchip-vdec-y += rkvdec.o rkvdec-h264.o rkvdec-hevc.o rkvdec-vp9.o diff --git a/drivers/staging/media/rkvdec/rkvdec-hevc.c b/drivers/staging/media/rkvdec/rkvdec-hevc.c new file mode 100644 -index 000000000000..7a375a23eaf1 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/staging/media/rkvdec/rkvdec-hevc.c @@ -0,0 +1,2572 @@ @@ -2605,7 +2604,7 @@ index 000000000000..7a375a23eaf1 + .valid_fmt = rkvdec_hevc_valid_fmt, +}; diff --git a/drivers/staging/media/rkvdec/rkvdec-regs.h b/drivers/staging/media/rkvdec/rkvdec-regs.h -index 265f5234f4eb..4319ee3ccbbc 100644 +index 111111111111..222222222222 100644 --- a/drivers/staging/media/rkvdec/rkvdec-regs.h +++ b/drivers/staging/media/rkvdec/rkvdec-regs.h @@ -48,6 +48,7 @@ @@ -2617,7 +2616,7 @@ index 265f5234f4eb..4319ee3ccbbc 100644 #define RKVDEC_MODE_VP9 2 #define RKVDEC_RPS_MODE BIT(24) diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c -index f55abb7c377f..00a9bf583596 100644 +index 111111111111..222222222222 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -74,7 +74,7 @@ static int rkvdec_s_ctrl(struct v4l2_ctrl *ctrl) @@ -2715,7 +2714,7 @@ index f55abb7c377f..00a9bf583596 100644 .fourcc = V4L2_PIX_FMT_VP9_FRAME, .frmsize = { diff --git a/drivers/staging/media/rkvdec/rkvdec.h b/drivers/staging/media/rkvdec/rkvdec.h -index f02f79c405f0..d6222a2588be 100644 +index 111111111111..222222222222 100644 --- a/drivers/staging/media/rkvdec/rkvdec.h +++ b/drivers/staging/media/rkvdec/rkvdec.h @@ -133,6 +133,7 @@ void rkvdec_run_preamble(struct rkvdec_ctx *ctx, struct rkvdec_run *run); @@ -2726,11 +2725,13 @@ index f02f79c405f0..d6222a2588be 100644 extern const struct rkvdec_coded_fmt_ops rkvdec_vp9_fmt_ops; #endif /* RKVDEC_H_ */ +-- +Armbian From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alex Bee Date: Sat, 30 Jan 2021 18:16:39 +0100 -Subject: [PATCH] media: rkvdec: add variants support +Subject: media: rkvdec: add variants support rkvdec IP has different versions which among others differ in the supported decoding formats. @@ -2744,12 +2745,12 @@ the better soultion than duplicatiing code for every newly added IP. Signed-off-by: Alex Bee --- - drivers/staging/media/rkvdec/rkvdec.c | 105 ++++++++++++++++++-------- - drivers/staging/media/rkvdec/rkvdec.h | 10 +++ + drivers/staging/media/rkvdec/rkvdec.c | 105 +++++++--- + drivers/staging/media/rkvdec/rkvdec.h | 10 + 2 files changed, 85 insertions(+), 30 deletions(-) diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c -index 00a9bf583596..955c53afe20f 100644 +index 111111111111..222222222222 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -14,6 +14,7 @@ @@ -2902,7 +2903,7 @@ index 00a9bf583596..955c53afe20f 100644 return -EINVAL; f->pixelformat = rkvdec_coded_fmts[f->index].fourcc; -@@ -946,14 +971,17 @@ static int rkvdec_init_ctrls(struct rkvdec_ctx *ctx) +@@ -949,14 +974,17 @@ static int rkvdec_init_ctrls(struct rkvdec_ctx *ctx) int ret; for (i = 0; i < ARRAY_SIZE(rkvdec_coded_fmts); i++) @@ -2924,7 +2925,7 @@ index 00a9bf583596..955c53afe20f 100644 } ret = v4l2_ctrl_handler_setup(&ctx->ctrl_hdl); -@@ -1155,8 +1183,17 @@ static void rkvdec_watchdog_func(struct work_struct *work) +@@ -1158,8 +1186,17 @@ static void rkvdec_watchdog_func(struct work_struct *work) } } @@ -2943,7 +2944,7 @@ index 00a9bf583596..955c53afe20f 100644 { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, of_rkvdec_match); -@@ -1168,6 +1205,7 @@ static const char * const rkvdec_clk_names[] = { +@@ -1171,6 +1208,7 @@ static const char * const rkvdec_clk_names[] = { static int rkvdec_probe(struct platform_device *pdev) { struct rkvdec_dev *rkvdec; @@ -2951,7 +2952,7 @@ index 00a9bf583596..955c53afe20f 100644 unsigned int i; int ret, irq; -@@ -1193,6 +1231,13 @@ static int rkvdec_probe(struct platform_device *pdev) +@@ -1196,6 +1234,13 @@ static int rkvdec_probe(struct platform_device *pdev) if (ret) return ret; @@ -2966,7 +2967,7 @@ index 00a9bf583596..955c53afe20f 100644 if (IS_ERR(rkvdec->regs)) return PTR_ERR(rkvdec->regs); diff --git a/drivers/staging/media/rkvdec/rkvdec.h b/drivers/staging/media/rkvdec/rkvdec.h -index d6222a2588be..ad8e83884121 100644 +index 111111111111..222222222222 100644 --- a/drivers/staging/media/rkvdec/rkvdec.h +++ b/drivers/staging/media/rkvdec/rkvdec.h @@ -29,6 +29,10 @@ @@ -3007,11 +3008,13 @@ index d6222a2588be..ad8e83884121 100644 }; struct rkvdec_ctx { +-- +Armbian From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alex Bee Date: Sat, 30 Jan 2021 18:21:59 +0100 -Subject: [PATCH] media: rkvdec: add RK3288 variant +Subject: media: rkvdec: add RK3288 variant This adds RK3288 variant to rkvdec driver. In this earlier version of the IP only HEVC decoding is supported. @@ -3022,10 +3025,10 @@ Signed-off-by: Alex Bee 1 file changed, 8 insertions(+) diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c -index 955c53afe20f..4e228cd82f21 100644 +index 111111111111..222222222222 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c -@@ -1189,11 +1189,19 @@ static const struct rkvdec_variant rk3399_rkvdec_variant = { +@@ -1192,11 +1192,19 @@ static const struct rkvdec_variant rk3399_rkvdec_variant = { RKVDEC_CAPABILITY_VP9 }; @@ -3045,22 +3048,24 @@ index 955c53afe20f..4e228cd82f21 100644 { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, of_rkvdec_match); +-- +Armbian From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alex Bee Date: Sat, 30 Jan 2021 18:27:30 +0100 -Subject: [PATCH] ARM: dts: RK3288: add hevc node +Subject: ARM: dts: RK3288: add hevc node Signed-off-by: Alex Bee --- - arch/arm/boot/dts/rockchip/rk3288.dtsi | 21 ++++++++++++++++++++- + arch/arm/boot/dts/rockchip/rk3288.dtsi | 21 +++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/rockchip/rk3288.dtsi b/arch/arm/boot/dts/rockchip/rk3288.dtsi -index 7b2cde230b87..59fba3ac6aae 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/rockchip/rk3288.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi -@@ -1248,6 +1248,25 @@ vpu_mmu: iommu@ff9a0800 { +@@ -1307,6 +1307,25 @@ vpu_mmu: iommu@ff9a0800 { power-domains = <&power RK3288_PD_VIDEO>; }; @@ -3086,7 +3091,7 @@ index 7b2cde230b87..59fba3ac6aae 100644 hevc_mmu: iommu@ff9c0440 { compatible = "rockchip,iommu"; reg = <0x0 0xff9c0440 0x0 0x40>, <0x0 0xff9c0480 0x0 0x40>; -@@ -1255,7 +1274,7 @@ hevc_mmu: iommu@ff9c0440 { +@@ -1314,7 +1333,7 @@ hevc_mmu: iommu@ff9c0440 { clocks = <&cru ACLK_HEVC>, <&cru HCLK_HEVC>; clock-names = "aclk", "iface"; #iommu-cells = <0>; @@ -3095,11 +3100,13 @@ index 7b2cde230b87..59fba3ac6aae 100644 }; gpu: gpu@ffa30000 { +-- +Armbian From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Nicolas Dufresne Date: Tue, 10 May 2022 14:37:29 -0400 -Subject: [PATCH] media: rkvdec: Fix HEVC RPS bit offsets +Subject: media: rkvdec: Fix HEVC RPS bit offsets The offsets from the uAPI need to be extended to include some bits that can be calculated from the parameters. This has been compared @@ -3114,11 +3121,11 @@ Fixed by this change: Signed-off-by: Nicolas Dufresne --- - drivers/staging/media/rkvdec/rkvdec-hevc.c | 26 +++++++++++++++++++--- + drivers/staging/media/rkvdec/rkvdec-hevc.c | 26 ++++++++-- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/drivers/staging/media/rkvdec/rkvdec-hevc.c b/drivers/staging/media/rkvdec/rkvdec-hevc.c -index 7a375a23eaf1..580073d49b6a 100644 +index 111111111111..222222222222 100644 --- a/drivers/staging/media/rkvdec/rkvdec-hevc.c +++ b/drivers/staging/media/rkvdec/rkvdec-hevc.c @@ -10,6 +10,7 @@ @@ -3177,11 +3184,13 @@ index 7a375a23eaf1..580073d49b6a 100644 LONG_TERM_RPS_BIT_OFFSET); WRITE_RPS(sl_params->short_term_ref_pic_set_size, SHORT_TERM_RPS_BIT_OFFSET); +-- +Armbian From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Nicolas Dufresne Date: Tue, 10 May 2022 15:12:03 -0400 -Subject: [PATCH] media: rkvdec: Fix number of HEVC references being set in RPS +Subject: media: rkvdec: Fix number of HEVC references being set in RPS The numbers from the bitstream are values between 1 - 16 (as they are the number - 1). The difference between 0 and 1 needs to be determined @@ -3194,7 +3203,7 @@ Signed-off-by: Nicolas Dufresne 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/staging/media/rkvdec/rkvdec-hevc.c b/drivers/staging/media/rkvdec/rkvdec-hevc.c -index 580073d49b6a..ce15028918b2 100644 +index 111111111111..222222222222 100644 --- a/drivers/staging/media/rkvdec/rkvdec-hevc.c +++ b/drivers/staging/media/rkvdec/rkvdec-hevc.c @@ -2199,6 +2199,8 @@ static void assemble_hw_rps(struct rkvdec_ctx *ctx, @@ -3224,3 +3233,6 @@ index 580073d49b6a..ce15028918b2 100644 WRITE_RPS(!!(dpb[sl_params->ref_idx_l1[i]].flags & V4L2_HEVC_DPB_ENTRY_LONG_TERM_REFERENCE), REF_PIC_LONG_TERM_L1(i)); WRITE_RPS(sl_params->ref_idx_l1[i], REF_PIC_IDX_L1(i)); +-- +Armbian + diff --git a/patch/kernel/archive/rockchip64-6.10/general-workaround-broadcom-bt-serdev.patch b/patch/kernel/archive/rockchip64-6.10/general-workaround-broadcom-bt-serdev.patch index 7404b49d2f63..882460fa6b3f 100644 --- a/patch/kernel/archive/rockchip64-6.10/general-workaround-broadcom-bt-serdev.patch +++ b/patch/kernel/archive/rockchip64-6.10/general-workaround-broadcom-bt-serdev.patch @@ -9,10 +9,10 @@ Subject: Workaround to make several broadcom bluetooth serdev devices work 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c -index 0a5445ac5e1b..06b442260c94 100644 +index 111111111111..222222222222 100644 --- a/drivers/bluetooth/btbcm.c +++ b/drivers/bluetooth/btbcm.c -@@ -134,7 +134,7 @@ int btbcm_check_bdaddr(struct hci_dev *hdev) +@@ -135,7 +135,7 @@ int btbcm_check_bdaddr(struct hci_dev *hdev) if (btbcm_set_bdaddr_from_efi(hdev) != 0) { bt_dev_info(hdev, "BCM: Using default device address (%pMR)", &bda->bdaddr); diff --git a/patch/kernel/archive/rockchip64-6.10/kernel-6.8-tools-cgroup-makefile.patch b/patch/kernel/archive/rockchip64-6.10/kernel-6.8-tools-cgroup-makefile.patch index 068fe83689d6..7bf4a2576aa9 100644 --- a/patch/kernel/archive/rockchip64-6.10/kernel-6.8-tools-cgroup-makefile.patch +++ b/patch/kernel/archive/rockchip64-6.10/kernel-6.8-tools-cgroup-makefile.patch @@ -1,6 +1,30 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Paolo Sabatino +Date: Mon, 25 Mar 2024 19:38:38 +0100 +Subject: [ARCHEOLOGY] rockchip: bump edge kernel to 6.8 + +> X-Git-Archeology: - Revision 47d2e8287e34fed3e47f37ab076d0f34ed0ac399: https://github.com/armbian/build/commit/47d2e8287e34fed3e47f37ab076d0f34ed0ac399 +> X-Git-Archeology: Date: Mon, 25 Mar 2024 19:38:38 +0100 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip: bump edge kernel to 6.8 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 724573bf7a21e61b0b626f835031a4c3206bb8ba: https://github.com/armbian/build/commit/724573bf7a21e61b0b626f835031a4c3206bb8ba +> X-Git-Archeology: Date: Wed, 05 Jun 2024 22:18:51 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: bump rockchip family edge kernel to 6.9 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 4ae0a958146810117050d0dbd359b99691a0fa0c: https://github.com/armbian/build/commit/4ae0a958146810117050d0dbd359b99691a0fa0c +> X-Git-Archeology: Date: Mon, 22 Jul 2024 19:17:52 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip64: bump edge kernel to 6.10 +> X-Git-Archeology: +--- + tools/cgroup/Makefile | 11 ++++++++++ + 1 file changed, 11 insertions(+) + diff --git a/tools/cgroup/Makefile b/tools/cgroup/Makefile new file mode 100644 -index 000000000000..ffca068e4a76 +index 000000000000..111111111111 --- /dev/null +++ b/tools/cgroup/Makefile @@ -0,0 +1,11 @@ @@ -15,3 +39,6 @@ index 000000000000..ffca068e4a76 + +clean: + $(RM) cgroup_event_listener +-- +Armbian + diff --git a/patch/kernel/archive/rockchip64-6.10/media-0003-rk3568-disable-hantro-h264.patch b/patch/kernel/archive/rockchip64-6.10/media-0003-rk3568-disable-hantro-h264.patch index b5bd91af5ad5..0cf26595564b 100644 --- a/patch/kernel/archive/rockchip64-6.10/media-0003-rk3568-disable-hantro-h264.patch +++ b/patch/kernel/archive/rockchip64-6.10/media-0003-rk3568-disable-hantro-h264.patch @@ -1,5 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: amazingfate +Date: Sun, 28 Jul 2024 14:35:34 +0800 +Subject: [ARCHEOLOGY] rockchip64-edge: disable hantro g1 h264 decoder on + rk356x + +> X-Git-Archeology: - Revision d5cb0d6732f7ab06f34ee6ce18ed6bef266c3c4a: https://github.com/armbian/build/commit/d5cb0d6732f7ab06f34ee6ce18ed6bef266c3c4a +> X-Git-Archeology: Date: Sun, 28 Jul 2024 14:35:34 +0800 +> X-Git-Archeology: From: amazingfate +> X-Git-Archeology: Subject: rockchip64-edge: disable hantro g1 h264 decoder on rk356x +> X-Git-Archeology: +--- + 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(-) + diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/media/platform/verisilicon/hantro_drv.c -index 34b123daf..802a5dca1 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/verisilicon/hantro_drv.c +++ b/drivers/media/platform/verisilicon/hantro_drv.c @@ -721,7 +721,6 @@ static const struct of_device_id of_hantro_match[] = { @@ -11,7 +28,7 @@ index 34b123daf..802a5dca1 100644 #endif #ifdef CONFIG_VIDEO_HANTRO_IMX8M diff --git a/drivers/media/platform/verisilicon/hantro_hw.h b/drivers/media/platform/verisilicon/hantro_hw.h -index 7737320cc..5aa048ef3 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/verisilicon/hantro_hw.h +++ b/drivers/media/platform/verisilicon/hantro_hw.h @@ -404,7 +404,6 @@ extern const struct hantro_variant rk3288_vpu_variant; @@ -23,10 +40,10 @@ index 7737320cc..5aa048ef3 100644 extern const struct hantro_variant sama5d4_vdec_variant; extern const struct hantro_variant sunxi_vpu_variant; diff --git a/drivers/media/platform/verisilicon/rockchip_vpu_hw.c b/drivers/media/platform/verisilicon/rockchip_vpu_hw.c -index f97527670..5707dce4b 100644 +index 111111111111..222222222222 100644 --- a/drivers/media/platform/verisilicon/rockchip_vpu_hw.c +++ b/drivers/media/platform/verisilicon/rockchip_vpu_hw.c -@@ -719,10 +719,9 @@ const struct hantro_variant rk3288_vpu_variant = { +@@ -727,10 +727,9 @@ const struct hantro_variant rk3288_vpu_variant = { const struct hantro_variant rk3328_vpu_variant = { .dec_offset = 0x400, @@ -40,7 +57,7 @@ index f97527670..5707dce4b 100644 .codec_ops = rk3399_vpu_codec_ops, .irqs = rockchip_vdpu2_irqs, .num_irqs = ARRAY_SIZE(rockchip_vdpu2_irqs), -@@ -766,20 +765,6 @@ const struct hantro_variant rk3568_vepu_variant = { +@@ -774,20 +773,6 @@ const struct hantro_variant rk3568_vepu_variant = { .num_clocks = ARRAY_SIZE(rockchip_vpu_clk_names) }; @@ -61,3 +78,6 @@ index f97527670..5707dce4b 100644 const struct hantro_variant px30_vpu_variant = { .enc_offset = 0x0, .enc_fmts = rockchip_vpu_enc_fmts, +-- +Armbian + diff --git a/patch/kernel/archive/rockchip64-6.10/net-usb-r8152-add-LED-configuration-from-OF.patch b/patch/kernel/archive/rockchip64-6.10/net-usb-r8152-add-LED-configuration-from-OF.patch index 5e331b1e7477..3d2910b78e05 100644 --- a/patch/kernel/archive/rockchip64-6.10/net-usb-r8152-add-LED-configuration-from-OF.patch +++ b/patch/kernel/archive/rockchip64-6.10/net-usb-r8152-add-LED-configuration-from-OF.patch @@ -13,18 +13,18 @@ Signed-off-by: David Bauer 1 file changed, 23 insertions(+) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c -index afb20c0ed688..f2fa63b5ad05 100644 +index 111111111111..222222222222 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c -@@ -11,6 +11,7 @@ - #include +@@ -12,6 +12,7 @@ #include + #include #include +#include #include #include #include -@@ -6980,6 +6981,22 @@ static void rtl_tally_reset(struct r8152 *tp) +@@ -7045,6 +7046,22 @@ static void rtl_tally_reset(struct r8152 *tp) ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data); } @@ -47,7 +47,7 @@ index afb20c0ed688..f2fa63b5ad05 100644 static void r8152b_init(struct r8152 *tp) { u32 ocp_data; -@@ -7021,6 +7038,8 @@ static void r8152b_init(struct r8152 *tp) +@@ -7086,6 +7103,8 @@ static void r8152b_init(struct r8152 *tp) ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL); ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN); ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data); @@ -56,7 +56,7 @@ index afb20c0ed688..f2fa63b5ad05 100644 } static void r8153_init(struct r8152 *tp) -@@ -7161,6 +7180,8 @@ static void r8153_init(struct r8152 *tp) +@@ -7226,6 +7245,8 @@ static void r8153_init(struct r8152 *tp) tp->coalesce = COALESCE_SLOW; break; } @@ -65,7 +65,7 @@ index afb20c0ed688..f2fa63b5ad05 100644 } static void r8153b_init(struct r8152 *tp) -@@ -7243,6 +7264,8 @@ static void r8153b_init(struct r8152 *tp) +@@ -7308,6 +7329,8 @@ static void r8153b_init(struct r8152 *tp) rtl_tally_reset(tp); tp->coalesce = 15000; /* 15 us */ diff --git a/patch/kernel/archive/rockchip64-6.10/regulator-add-fan53200-driver.patch b/patch/kernel/archive/rockchip64-6.10/regulator-add-fan53200-driver.patch index 73d860e5c31c..bee95c015532 100644 --- a/patch/kernel/archive/rockchip64-6.10/regulator-add-fan53200-driver.patch +++ b/patch/kernel/archive/rockchip64-6.10/regulator-add-fan53200-driver.patch @@ -21,22 +21,22 @@ Signed-off-by: Ricardo Pardini 4 files changed, 533 insertions(+) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig -index a789119e6483..3337a1e1eb66 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig -@@ -731,6 +731,7 @@ CONFIG_REGULATOR_BD718XX=y - CONFIG_REGULATOR_BD9571MWV=y +@@ -757,6 +757,7 @@ CONFIG_REGULATOR_BD9571MWV=y CONFIG_REGULATOR_CROS_EC=y + CONFIG_REGULATOR_DA9211=m CONFIG_REGULATOR_FAN53555=y +CONFIG_REGULATOR_FAN53200=y CONFIG_REGULATOR_GPIO=y CONFIG_REGULATOR_HI6421V530=y CONFIG_REGULATOR_HI655X=y diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig -index 965d4f0c18a6..62c8aad24b38 100644 +index 111111111111..222222222222 100644 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig -@@ -393,6 +393,17 @@ config REGULATOR_FAN53880 +@@ -403,6 +403,17 @@ config REGULATOR_FAN53880 (PMIC), it is controlled by I2C and provides one BUCK, one BOOST and four LDO outputs. @@ -55,10 +55,10 @@ index 965d4f0c18a6..62c8aad24b38 100644 tristate "GPIO regulator support" depends on GPIOLIB || COMPILE_TEST diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile -index 23074714a81a..484fcc264cc7 100644 +index 111111111111..222222222222 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile -@@ -47,6 +47,7 @@ obj-$(CONFIG_REGULATOR_DBX500_PRCMU) += dbx500-prcmu.o +@@ -48,6 +48,7 @@ obj-$(CONFIG_REGULATOR_DBX500_PRCMU) += dbx500-prcmu.o obj-$(CONFIG_REGULATOR_DB8500_PRCMU) += db8500-prcmu.o obj-$(CONFIG_REGULATOR_FAN53555) += fan53555.o obj-$(CONFIG_REGULATOR_FAN53880) += fan53880.o @@ -68,7 +68,7 @@ index 23074714a81a..484fcc264cc7 100644 obj-$(CONFIG_REGULATOR_HI6421V530) += hi6421v530-regulator.o diff --git a/drivers/regulator/fan53200.c b/drivers/regulator/fan53200.c new file mode 100644 -index 000000000000..f7e33e67f073 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/regulator/fan53200.c @@ -0,0 +1,520 @@ diff --git a/patch/kernel/archive/rockchip64-6.10/rk3308-0001-pinctrl-slew-mux.patch b/patch/kernel/archive/rockchip64-6.10/rk3308-0001-pinctrl-slew-mux.patch index d7fda15627a6..dfc4fbe51153 100644 --- a/patch/kernel/archive/rockchip64-6.10/rk3308-0001-pinctrl-slew-mux.patch +++ b/patch/kernel/archive/rockchip64-6.10/rk3308-0001-pinctrl-slew-mux.patch @@ -81,10 +81,10 @@ Subject: [ARCHEOLOGY] Rockpis wifi fixes (#4008) 4 files changed, 100 insertions(+) diff --git a/drivers/pinctrl/pinconf-generic.c b/drivers/pinctrl/pinconf-generic.c -index 365c4b0ca465..bacc2987c55b 100644 +index 111111111111..222222222222 100644 --- a/drivers/pinctrl/pinconf-generic.c +++ b/drivers/pinctrl/pinconf-generic.c -@@ -51,6 +51,7 @@ static const struct pin_config_item conf_items[] = { +@@ -53,6 +53,7 @@ static const struct pin_config_item conf_items[] = { PCONFDUMP(PIN_CONFIG_SLEEP_HARDWARE_STATE, "sleep hardware state", NULL, false), PCONFDUMP(PIN_CONFIG_SLEW_RATE, "slew rate", NULL, true), PCONFDUMP(PIN_CONFIG_SKEW_DELAY, "skew delay", NULL, true), @@ -93,10 +93,10 @@ index 365c4b0ca465..bacc2987c55b 100644 static void pinconf_generic_dump_one(struct pinctrl_dev *pctldev, diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c -index 45e416f68e74..94af47ad9667 100644 +index 111111111111..222222222222 100644 --- a/drivers/pinctrl/pinctrl-rockchip.c +++ b/drivers/pinctrl/pinctrl-rockchip.c -@@ -2533,6 +2533,26 @@ static int rockchip_set_pull(struct rockchip_pin_bank *bank, +@@ -2567,6 +2567,26 @@ static int rockchip_set_pull(struct rockchip_pin_bank *bank, return ret; } @@ -123,7 +123,7 @@ index 45e416f68e74..94af47ad9667 100644 #define RK3328_SCHMITT_BITS_PER_PIN 1 #define RK3328_SCHMITT_PINS_PER_REG 16 #define RK3328_SCHMITT_BANK_STRIDE 8 -@@ -2646,6 +2666,51 @@ static int rockchip_set_schmitt(struct rockchip_pin_bank *bank, +@@ -2680,6 +2700,51 @@ static int rockchip_set_schmitt(struct rockchip_pin_bank *bank, return regmap_update_bits(regmap, reg, rmask, data); } @@ -175,7 +175,7 @@ index 45e416f68e74..94af47ad9667 100644 /* * Pinmux_ops handling */ -@@ -2878,6 +2943,15 @@ static int rockchip_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin, +@@ -2915,6 +2980,15 @@ static int rockchip_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin, if (rc < 0) return rc; break; @@ -191,7 +191,7 @@ index 45e416f68e74..94af47ad9667 100644 default: return -ENOTSUPP; break; -@@ -2952,6 +3026,26 @@ static int rockchip_pinconf_get(struct pinctrl_dev *pctldev, unsigned int pin, +@@ -2989,6 +3063,26 @@ static int rockchip_pinconf_get(struct pinctrl_dev *pctldev, unsigned int pin, if (rc < 0) return rc; @@ -218,7 +218,7 @@ index 45e416f68e74..94af47ad9667 100644 arg = rc; break; default: -@@ -3759,6 +3853,7 @@ static struct rockchip_pin_ctrl rk3308_pin_ctrl = { +@@ -3794,6 +3888,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, @@ -227,10 +227,10 @@ index 45e416f68e74..94af47ad9667 100644 static struct rockchip_pin_bank rk3328_pin_banks[] = { diff --git a/drivers/pinctrl/pinctrl-rockchip.h b/drivers/pinctrl/pinctrl-rockchip.h -index 4759f336941e..785f48791631 100644 +index 111111111111..222222222222 100644 --- a/drivers/pinctrl/pinctrl-rockchip.h +++ b/drivers/pinctrl/pinctrl-rockchip.h -@@ -406,6 +406,9 @@ struct rockchip_pin_ctrl { +@@ -407,6 +407,9 @@ struct rockchip_pin_ctrl { int (*schmitt_calc_reg)(struct rockchip_pin_bank *bank, int pin_num, struct regmap **regmap, int *reg, u8 *bit); @@ -241,7 +241,7 @@ index 4759f336941e..785f48791631 100644 struct rockchip_pin_config { diff --git a/include/linux/pinctrl/pinconf-generic.h b/include/linux/pinctrl/pinconf-generic.h -index d74b7a4ea154..87bd22137988 100644 +index 111111111111..222222222222 100644 --- a/include/linux/pinctrl/pinconf-generic.h +++ b/include/linux/pinctrl/pinconf-generic.h @@ -142,6 +142,7 @@ enum pin_config_param { diff --git a/patch/kernel/archive/rockchip64-6.10/rk3308-0002-iodomains.patch b/patch/kernel/archive/rockchip64-6.10/rk3308-0002-iodomains.patch index b78de78c4f8c..4700fbd988b3 100644 --- a/patch/kernel/archive/rockchip64-6.10/rk3308-0002-iodomains.patch +++ b/patch/kernel/archive/rockchip64-6.10/rk3308-0002-iodomains.patch @@ -78,7 +78,7 @@ Subject: [ARCHEOLOGY] Rockpis wifi fixes (#4008) 1 file changed, 45 insertions(+) diff --git a/drivers/soc/rockchip/io-domain.c b/drivers/soc/rockchip/io-domain.c -index 6619256c2d11..6ffaccd3ed80 100644 +index 111111111111..222222222222 100644 --- a/drivers/soc/rockchip/io-domain.c +++ b/drivers/soc/rockchip/io-domain.c @@ -39,6 +39,10 @@ diff --git a/patch/kernel/archive/rockchip64-6.10/rk3308-0003-pinctrl-io-voltage-domains.patch b/patch/kernel/archive/rockchip64-6.10/rk3308-0003-pinctrl-io-voltage-domains.patch index d0cafa90ce57..314e3f76f14c 100644 --- a/patch/kernel/archive/rockchip64-6.10/rk3308-0003-pinctrl-io-voltage-domains.patch +++ b/patch/kernel/archive/rockchip64-6.10/rk3308-0003-pinctrl-io-voltage-domains.patch @@ -79,7 +79,7 @@ Subject: [ARCHEOLOGY] Rockpis wifi fixes (#4008) 2 files changed, 24 insertions(+), 45 deletions(-) diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c -index 94af47ad9667..9b9200634bb6 100644 +index 111111111111..222222222222 100644 --- a/drivers/pinctrl/pinctrl-rockchip.c +++ b/drivers/pinctrl/pinctrl-rockchip.c @@ -40,6 +40,12 @@ @@ -95,7 +95,7 @@ index 94af47ad9667..9b9200634bb6 100644 /* * Generate a bitmask for setting a value (v) with a write mask bit in hiword * register 31:16 area. -@@ -3514,6 +3520,24 @@ static int rockchip_pinctrl_probe(struct platform_device *pdev) +@@ -3551,6 +3557,24 @@ static int rockchip_pinctrl_probe(struct platform_device *pdev) if (ret) return ret; @@ -121,7 +121,7 @@ index 94af47ad9667..9b9200634bb6 100644 ret = of_platform_populate(np, NULL, NULL, &pdev->dev); diff --git a/drivers/soc/rockchip/io-domain.c b/drivers/soc/rockchip/io-domain.c -index 6ffaccd3ed80..6619256c2d11 100644 +index 111111111111..222222222222 100644 --- a/drivers/soc/rockchip/io-domain.c +++ b/drivers/soc/rockchip/io-domain.c @@ -39,10 +39,6 @@ diff --git a/patch/kernel/archive/rockchip64-6.10/rk3308-add-missing-i2s-controllers.patch b/patch/kernel/archive/rockchip64-6.10/rk3308-add-missing-i2s-controllers.patch index 33577be68b2c..bdd4c758275e 100644 --- a/patch/kernel/archive/rockchip64-6.10/rk3308-add-missing-i2s-controllers.patch +++ b/patch/kernel/archive/rockchip64-6.10/rk3308-add-missing-i2s-controllers.patch @@ -1,17 +1,17 @@ -From 8c92404a280aa7f35a311fb0939b8276371fcba3 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Sun, 21 Jul 2024 14:18:30 +0200 -Subject: [PATCH] add missing i2s controllers +Subject: add missing i2s controllers --- - arch/arm64/boot/dts/rockchip/rk3308.dtsi | 59 ++++++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3308.dtsi | 59 ++++++++++ 1 file changed, 59 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rockchip/rk3308.dtsi -index c00da150a22f..a9d1cb1debe9 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi -@@ -578,6 +578,65 @@ dmac1: dma-controller@ff2d0000 { +@@ -716,6 +716,65 @@ dmac1: dma-controller@ff2d0000 { #dma-cells = <1>; }; @@ -78,5 +78,5 @@ index c00da150a22f..a9d1cb1debe9 100644 * - can be clock producer or consumer * - up to 8 capture channels and 2 playback channels -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/rockchip64-6.10/rk3328-add-dmc-driver.patch b/patch/kernel/archive/rockchip64-6.10/rk3328-add-dmc-driver.patch index 96c0cbecdc95..88bf52d02658 100644 --- a/patch/kernel/archive/rockchip64-6.10/rk3328-add-dmc-driver.patch +++ b/patch/kernel/archive/rockchip64-6.10/rk3328-add-dmc-driver.patch @@ -11,16 +11,18 @@ Subject: rk3328 dmc driver drivers/clk/rockchip/clk.h | 3 +- drivers/devfreq/Kconfig | 12 + drivers/devfreq/Makefile | 1 + - drivers/devfreq/event/rockchip-dfi.c | 554 +++++- + drivers/devfreq/event/rockchip-dfi.c | 77 +- drivers/devfreq/rk3328_dmc.c | 836 ++++++++++ include/dt-bindings/clock/rockchip-ddr.h | 63 + include/dt-bindings/memory/rk3328-dram.h | 159 ++ + include/soc/rockchip/rk3228_grf.h | 14 + + include/soc/rockchip/rk3328_grf.h | 14 + include/soc/rockchip/rockchip_sip.h | 11 + - 12 files changed, 2099 insertions(+), 56 deletions(-) + 14 files changed, 1692 insertions(+), 14 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3328-dram-default-timing.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-dram-default-timing.dtsi new file mode 100644 -index 000000000000..a3f5ff4bdc47 +index 000000000000..111111111111 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-dram-default-timing.dtsi @@ -0,0 +1,311 @@ @@ -336,10 +338,10 @@ index 000000000000..a3f5ff4bdc47 + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -index 303680413ed9..e3c8409c225f 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -@@ -566,6 +566,67 @@ tsadc: tsadc@ff250000 { +@@ -594,6 +594,67 @@ tsadc: tsadc@ff250000 { status = "disabled"; }; @@ -408,7 +410,7 @@ index 303680413ed9..e3c8409c225f 100644 compatible = "rockchip,rk3328-efuse"; reg = <0x0 0xff260000 0x0 0x50>; diff --git a/drivers/clk/rockchip/clk-ddr.c b/drivers/clk/rockchip/clk-ddr.c -index 86718c54e56b..08b313495e8c 100644 +index 111111111111..222222222222 100644 --- a/drivers/clk/rockchip/clk-ddr.c +++ b/drivers/clk/rockchip/clk-ddr.c @@ -87,6 +87,134 @@ static const struct clk_ops rockchip_ddrclk_sip_ops = { @@ -557,7 +559,7 @@ index 86718c54e56b..08b313495e8c 100644 pr_err("%s: unsupported ddrclk type %d\n", __func__, ddr_flag); kfree(ddrclk); diff --git a/drivers/clk/rockchip/clk-rk3328.c b/drivers/clk/rockchip/clk-rk3328.c -index 267ab54937d3..aa4afc8a17aa 100644 +index 111111111111..222222222222 100644 --- a/drivers/clk/rockchip/clk-rk3328.c +++ b/drivers/clk/rockchip/clk-rk3328.c @@ -315,14 +315,15 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { @@ -583,7 +585,7 @@ index 267ab54937d3..aa4afc8a17aa 100644 GATE(0, "clk_ddrmon", "xin24m", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(0), 6, GFLAGS), diff --git a/drivers/clk/rockchip/clk.h b/drivers/clk/rockchip/clk.h -index 758ebaf2236b..fe033ebcb62d 100644 +index 111111111111..222222222222 100644 --- a/drivers/clk/rockchip/clk.h +++ b/drivers/clk/rockchip/clk.h @@ -486,7 +486,8 @@ struct clk *rockchip_clk_register_mmc(const char *name, @@ -597,7 +599,7 @@ index 758ebaf2236b..fe033ebcb62d 100644 struct clk *rockchip_clk_register_ddrclk(const char *name, int flags, const char *const *parent_names, diff --git a/drivers/devfreq/Kconfig b/drivers/devfreq/Kconfig -index 3c4862a752b5..ab0e2bd1c8de 100644 +index 111111111111..222222222222 100644 --- a/drivers/devfreq/Kconfig +++ b/drivers/devfreq/Kconfig @@ -129,6 +129,18 @@ config ARM_MEDIATEK_CCI_DEVFREQ @@ -620,7 +622,7 @@ index 3c4862a752b5..ab0e2bd1c8de 100644 tristate "ARM RK3399 DMC DEVFREQ Driver" depends on (ARCH_ROCKCHIP && HAVE_ARM_SMCCC) || \ diff --git a/drivers/devfreq/Makefile b/drivers/devfreq/Makefile -index bf40d04928d0..08c0738ae439 100644 +index 111111111111..222222222222 100644 --- a/drivers/devfreq/Makefile +++ b/drivers/devfreq/Makefile @@ -13,6 +13,7 @@ obj-$(CONFIG_ARM_IMX_BUS_DEVFREQ) += imx-bus.o @@ -632,7 +634,7 @@ index bf40d04928d0..08c0738ae439 100644 obj-$(CONFIG_ARM_TEGRA_DEVFREQ) += tegra30-devfreq.o diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/rockchip-dfi.c -index e2a1e4463b6f..fba3a958b352 100644 +index 111111111111..222222222222 100644 --- a/drivers/devfreq/event/rockchip-dfi.c +++ b/drivers/devfreq/event/rockchip-dfi.c @@ -24,6 +24,8 @@ @@ -755,52 +757,9 @@ index e2a1e4463b6f..fba3a958b352 100644 platform_set_drvdata(pdev, dfi); return 0; - -diff --git a/include/soc/rockchip/rk3228_grf.h b/include/soc/rockchip/rk3228_grf.h -new file mode 100644 -index 000000000000..e37406814fad ---- /dev/null -+++ b/include/soc/rockchip/rk3228_grf.h -@@ -0,0 +1,14 @@ -+/* SPDX-License-Identifier: GPL-2.0+ */ -+/* -+ * Rockchip General Register Files definitions for RK3228 -+ * -+ * Author: Paolo Sabatino -+ */ -+ -+#ifndef __SOC_RK3228_GRF_H -+#define __SOC_RK3228_GRF_H -+ -+#define RK3228_GRF_OS_REG2 0x5d0 -+#define RK3228_GRF_OS_REG2_DDRTYPE GENMASK(15, 13) -+ -+#endif - -diff --git a/include/soc/rockchip/rk3328_grf.h b/include/soc/rockchip/rk3328_grf.h -new file mode 100644 -index 000000000000..bf6d209be7e6 ---- /dev/null -+++ b/include/soc/rockchip/rk3328_grf.h -@@ -0,0 +1,14 @@ -+/* SPDX-License-Identifier: GPL-2.0+ */ -+/* -+ * Rockchip General Register Files definitions for RK3328 -+ * -+ * Author: Paolo Sabatino -+ */ -+ -+#ifndef __SOC_RK3328_GRF_H -+#define __SOC_RK3328_GRF_H -+ -+#define RK3328_GRF_OS_REG2 0x5d0 -+#define RK3328_GRF_OS_REG2_DDRTYPE GENMASK(15, 13) -+ -+#endif - diff --git a/drivers/devfreq/rk3328_dmc.c b/drivers/devfreq/rk3328_dmc.c new file mode 100644 -index 000000000000..7665526f0863 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/devfreq/rk3328_dmc.c @@ -0,0 +1,836 @@ @@ -1642,7 +1601,7 @@ index 000000000000..7665526f0863 +MODULE_DESCRIPTION("RK3328 dmcfreq driver with devfreq framework"); diff --git a/include/dt-bindings/clock/rockchip-ddr.h b/include/dt-bindings/clock/rockchip-ddr.h new file mode 100644 -index 000000000000..b065432e7793 +index 000000000000..111111111111 --- /dev/null +++ b/include/dt-bindings/clock/rockchip-ddr.h @@ -0,0 +1,63 @@ @@ -1711,7 +1670,7 @@ index 000000000000..b065432e7793 +#endif diff --git a/include/dt-bindings/memory/rk3328-dram.h b/include/dt-bindings/memory/rk3328-dram.h new file mode 100644 -index 000000000000..171f41c256d3 +index 000000000000..111111111111 --- /dev/null +++ b/include/dt-bindings/memory/rk3328-dram.h @@ -0,0 +1,159 @@ @@ -1874,8 +1833,48 @@ index 000000000000..171f41c256d3 +#define PHY_DDR4_LPDDR3_RON_RTT_20ohm (31) + +#endif /*_DT_BINDINGS_DRAM_ROCKCHIP_RK3328_H*/ +diff --git a/include/soc/rockchip/rk3228_grf.h b/include/soc/rockchip/rk3228_grf.h +new file mode 100644 +index 000000000000..111111111111 +--- /dev/null ++++ b/include/soc/rockchip/rk3228_grf.h +@@ -0,0 +1,14 @@ ++/* SPDX-License-Identifier: GPL-2.0+ */ ++/* ++ * Rockchip General Register Files definitions for RK3228 ++ * ++ * Author: Paolo Sabatino ++ */ ++ ++#ifndef __SOC_RK3228_GRF_H ++#define __SOC_RK3228_GRF_H ++ ++#define RK3228_GRF_OS_REG2 0x5d0 ++#define RK3228_GRF_OS_REG2_DDRTYPE GENMASK(15, 13) ++ ++#endif +diff --git a/include/soc/rockchip/rk3328_grf.h b/include/soc/rockchip/rk3328_grf.h +new file mode 100644 +index 000000000000..111111111111 +--- /dev/null ++++ b/include/soc/rockchip/rk3328_grf.h +@@ -0,0 +1,14 @@ ++/* SPDX-License-Identifier: GPL-2.0+ */ ++/* ++ * Rockchip General Register Files definitions for RK3328 ++ * ++ * Author: Paolo Sabatino ++ */ ++ ++#ifndef __SOC_RK3328_GRF_H ++#define __SOC_RK3328_GRF_H ++ ++#define RK3328_GRF_OS_REG2 0x5d0 ++#define RK3328_GRF_OS_REG2_DDRTYPE GENMASK(15, 13) ++ ++#endif diff --git a/include/soc/rockchip/rockchip_sip.h b/include/soc/rockchip/rockchip_sip.h -index c46a9ae2a2ab..fa7e0a2d72cc 100644 +index 111111111111..222222222222 100644 --- a/include/soc/rockchip/rockchip_sip.h +++ b/include/soc/rockchip/rockchip_sip.h @@ -16,5 +16,16 @@ @@ -1898,4 +1897,3 @@ index c46a9ae2a2ab..fa7e0a2d72cc 100644 -- Armbian - diff --git a/patch/kernel/archive/rockchip64-6.10/rk3328-add-rga-node.patch b/patch/kernel/archive/rockchip64-6.10/rk3328-add-rga-node.patch index 076dc91a88f5..a926043c5ec6 100644 --- a/patch/kernel/archive/rockchip64-6.10/rk3328-add-rga-node.patch +++ b/patch/kernel/archive/rockchip64-6.10/rk3328-add-rga-node.patch @@ -8,10 +8,10 @@ Subject: rk3328: add RGA node 1 file changed, 14 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -index e3c8409c225f..3f7770d83748 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -@@ -783,6 +783,20 @@ vop_mmu: iommu@ff373f00 { +@@ -816,6 +816,20 @@ vop_mmu: iommu@ff373f00 { status = "disabled"; }; diff --git a/patch/kernel/archive/rockchip64-6.10/rk3328-dtsi-mali-opp-table.patch b/patch/kernel/archive/rockchip64-6.10/rk3328-dtsi-mali-opp-table.patch index 9785fdc721ed..6ca8beb153e8 100644 --- a/patch/kernel/archive/rockchip64-6.10/rk3328-dtsi-mali-opp-table.patch +++ b/patch/kernel/archive/rockchip64-6.10/rk3328-dtsi-mali-opp-table.patch @@ -8,10 +8,10 @@ Subject: gpu operating points 1 file changed, 25 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -index 3f7770d83748..48c59e5ee235 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -@@ -684,6 +684,31 @@ gpu: gpu@ff300000 { +@@ -712,6 +712,31 @@ gpu: gpu@ff300000 { clocks = <&cru ACLK_GPU>, <&cru ACLK_GPU>; clock-names = "bus", "core"; resets = <&cru SRST_GPU_A>; diff --git a/patch/kernel/archive/rockchip64-6.10/rk3328-dtsi-mmc-reset-properties.patch b/patch/kernel/archive/rockchip64-6.10/rk3328-dtsi-mmc-reset-properties.patch index ff10e8be6ae8..f05361c2966c 100644 --- a/patch/kernel/archive/rockchip64-6.10/rk3328-dtsi-mmc-reset-properties.patch +++ b/patch/kernel/archive/rockchip64-6.10/rk3328-dtsi-mmc-reset-properties.patch @@ -8,10 +8,10 @@ Subject: mmc reset properties 1 file changed, 6 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -index 48c59e5ee235..b2d517bf0082 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -@@ -993,6 +993,8 @@ sdmmc: mmc@ff500000 { +@@ -1035,6 +1035,8 @@ sdmmc: mmc@ff500000 { clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>, <&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>; clock-names = "biu", "ciu", "ciu-drive", "ciu-sample"; @@ -20,7 +20,7 @@ index 48c59e5ee235..b2d517bf0082 100644 fifo-depth = <0x100>; max-frequency = <150000000>; status = "disabled"; -@@ -1005,6 +1007,8 @@ sdio: mmc@ff510000 { +@@ -1047,6 +1049,8 @@ sdio: mmc@ff510000 { clocks = <&cru HCLK_SDIO>, <&cru SCLK_SDIO>, <&cru SCLK_SDIO_DRV>, <&cru SCLK_SDIO_SAMPLE>; clock-names = "biu", "ciu", "ciu-drive", "ciu-sample"; @@ -29,7 +29,7 @@ index 48c59e5ee235..b2d517bf0082 100644 fifo-depth = <0x100>; max-frequency = <150000000>; status = "disabled"; -@@ -1017,6 +1021,8 @@ emmc: mmc@ff520000 { +@@ -1059,6 +1063,8 @@ emmc: mmc@ff520000 { clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>, <&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>; clock-names = "biu", "ciu", "ciu-drive", "ciu-sample"; diff --git a/patch/kernel/archive/rockchip64-6.10/rk3328-dtsi-sdmmc-ext-node.patch b/patch/kernel/archive/rockchip64-6.10/rk3328-dtsi-sdmmc-ext-node.patch index e92c97144bf8..549c9e590a96 100644 --- a/patch/kernel/archive/rockchip64-6.10/rk3328-dtsi-sdmmc-ext-node.patch +++ b/patch/kernel/archive/rockchip64-6.10/rk3328-dtsi-sdmmc-ext-node.patch @@ -8,10 +8,10 @@ Subject: sdmmc-ext node 1 file changed, 14 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -index b2d517bf0082..eb467c8586ab 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -@@ -1028,6 +1028,20 @@ emmc: mmc@ff520000 { +@@ -1070,6 +1070,20 @@ emmc: mmc@ff520000 { status = "disabled"; }; diff --git a/patch/kernel/archive/rockchip64-6.10/rk3328-dtsi-spdif.patch b/patch/kernel/archive/rockchip64-6.10/rk3328-dtsi-spdif.patch index fc4c48a3a910..61a25167837c 100644 --- a/patch/kernel/archive/rockchip64-6.10/rk3328-dtsi-spdif.patch +++ b/patch/kernel/archive/rockchip64-6.10/rk3328-dtsi-spdif.patch @@ -58,10 +58,10 @@ Subject: [ARCHEOLOGY] rockchip64: tidy up rk3328 patches 1 file changed, 27 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -index eb467c8586ab..cb0c3fd179b4 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -@@ -195,6 +195,26 @@ psci { +@@ -224,6 +224,26 @@ psci { method = "smc"; }; @@ -88,7 +88,7 @@ index eb467c8586ab..cb0c3fd179b4 100644 timer { compatible = "arm,armv8-timer"; interrupts = , -@@ -302,6 +322,10 @@ power: power-controller { +@@ -331,6 +351,10 @@ power: power-controller { #address-cells = <1>; #size-cells = <0>; @@ -99,7 +99,7 @@ index eb467c8586ab..cb0c3fd179b4 100644 power-domain@RK3328_PD_HEVC { reg = ; #power-domain-cells = <0>; -@@ -683,6 +707,7 @@ gpu: gpu@ff300000 { +@@ -711,6 +735,7 @@ gpu: gpu@ff300000 { "ppmmu1"; clocks = <&cru ACLK_GPU>, <&cru ACLK_GPU>; clock-names = "bus", "core"; @@ -107,7 +107,7 @@ index eb467c8586ab..cb0c3fd179b4 100644 resets = <&cru SRST_GPU_A>; operating-points-v2 = <&gpu_opp_table>; }; -@@ -925,6 +950,7 @@ cru: clock-controller@ff440000 { +@@ -967,6 +992,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 eb467c8586ab..cb0c3fd179b4 100644 <&cru SCLK_RTC32K>; assigned-clock-parents = <&cru HDMIPHY>, <&cru PLL_APLL>, -@@ -946,6 +972,7 @@ cru: clock-controller@ff440000 { +@@ -988,6 +1014,7 @@ cru: clock-controller@ff440000 { <150000000>, <75000000>, <75000000>, <150000000>, <75000000>, <75000000>, diff --git a/patch/kernel/archive/rockchip64-6.10/rk3328-dtsi-usb3-reset-properties.patch b/patch/kernel/archive/rockchip64-6.10/rk3328-dtsi-usb3-reset-properties.patch index fedb87415337..d4f1bc9abc7c 100644 --- a/patch/kernel/archive/rockchip64-6.10/rk3328-dtsi-usb3-reset-properties.patch +++ b/patch/kernel/archive/rockchip64-6.10/rk3328-dtsi-usb3-reset-properties.patch @@ -8,10 +8,10 @@ Subject: usb3 reset properties 1 file changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -index cb0c3fd179b4..3ff7408bf31b 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -@@ -1172,6 +1172,8 @@ usbdrd3: usb@ff600000 { +@@ -1218,6 +1218,8 @@ usbdrd3: usb@ff600000 { <&cru ACLK_USB3OTG>; clock-names = "ref_clk", "suspend_clk", "bus_clk"; diff --git a/patch/kernel/archive/rockchip64-6.10/rk3328-gpu-cooling-target.patch b/patch/kernel/archive/rockchip64-6.10/rk3328-gpu-cooling-target.patch index 902eb9ac94e3..21cf3525ecd0 100644 --- a/patch/kernel/archive/rockchip64-6.10/rk3328-gpu-cooling-target.patch +++ b/patch/kernel/archive/rockchip64-6.10/rk3328-gpu-cooling-target.patch @@ -9,10 +9,10 @@ Signed-off-by: tonymac32 1 file changed, 6 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -index 3ff7408bf31b..94eae571006f 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -@@ -565,6 +565,11 @@ map0 { +@@ -593,6 +593,11 @@ map0 { <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; contribution = <4096>; }; @@ -24,7 +24,7 @@ index 3ff7408bf31b..94eae571006f 100644 }; }; -@@ -710,6 +715,7 @@ gpu: gpu@ff300000 { +@@ -738,6 +743,7 @@ gpu: gpu@ff300000 { power-domains = <&power RK3328_PD_GPU>; resets = <&cru SRST_GPU_A>; operating-points-v2 = <&gpu_opp_table>; diff --git a/patch/kernel/archive/rockchip64-6.10/rk3328-roc-cc-add-missing-nodes.patch b/patch/kernel/archive/rockchip64-6.10/rk3328-roc-cc-add-missing-nodes.patch index 14ab270892cb..edd2f9388118 100644 --- a/patch/kernel/archive/rockchip64-6.10/rk3328-roc-cc-add-missing-nodes.patch +++ b/patch/kernel/archive/rockchip64-6.10/rk3328-roc-cc-add-missing-nodes.patch @@ -11,10 +11,10 @@ Signed-off-by: tonymac32 diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts old mode 100644 new mode 100755 -index be5d064d6a93..c5ecfc3e581a +index 111111111111..222222222222 --- a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts -@@ -132,6 +132,14 @@ user_led: led-1 { +@@ -133,6 +133,14 @@ user_led: led-1 { default-state = "off"; }; }; @@ -29,7 +29,7 @@ index be5d064d6a93..c5ecfc3e581a }; &analog_sound { -@@ -202,6 +210,10 @@ &gmac2io { +@@ -203,6 +211,10 @@ &gmac2io { status = "okay"; }; @@ -40,7 +40,7 @@ index be5d064d6a93..c5ecfc3e581a &hdmi { status = "okay"; }; -@@ -344,6 +356,13 @@ &io_domains { +@@ -345,6 +357,13 @@ &io_domains { }; &pinctrl { @@ -54,7 +54,7 @@ index be5d064d6a93..c5ecfc3e581a pmic { pmic_int_l: pmic-int-l { rockchip,pins = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_up>; -@@ -374,6 +393,19 @@ &sdmmc { +@@ -375,6 +394,19 @@ &sdmmc { status = "okay"; }; diff --git a/patch/kernel/archive/rockchip64-6.10/rk3399-add-sclk-i2sout-src-clock.patch b/patch/kernel/archive/rockchip64-6.10/rk3399-add-sclk-i2sout-src-clock.patch index ca601a8c2305..6d31e5720901 100644 --- a/patch/kernel/archive/rockchip64-6.10/rk3399-add-sclk-i2sout-src-clock.patch +++ b/patch/kernel/archive/rockchip64-6.10/rk3399-add-sclk-i2sout-src-clock.patch @@ -69,10 +69,10 @@ Subject: [ARCHEOLOGY] Fixed sound from rt5651 on OrangePi 4 (#1870) 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/clk/rockchip/clk-rk3399.c b/drivers/clk/rockchip/clk-rk3399.c -index 9ebd6c451b3d..4b9a3e1217aa 100644 +index 111111111111..222222222222 100644 --- a/drivers/clk/rockchip/clk-rk3399.c +++ b/drivers/clk/rockchip/clk-rk3399.c -@@ -624,7 +624,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { +@@ -659,7 +659,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { GATE(SCLK_I2S2_8CH, "clk_i2s2", "clk_i2s2_mux", CLK_SET_RATE_PARENT, RK3399_CLKGATE_CON(8), 11, GFLAGS), @@ -82,7 +82,7 @@ index 9ebd6c451b3d..4b9a3e1217aa 100644 COMPOSITE_NODIV(SCLK_I2S_8CH_OUT, "clk_i2sout", mux_i2sout_p, CLK_SET_RATE_PARENT, RK3399_CLKSEL_CON(31), 2, 1, MFLAGS, diff --git a/include/dt-bindings/clock/rk3399-cru.h b/include/dt-bindings/clock/rk3399-cru.h -index 39169d94a44e..8207557c1c5d 100644 +index 111111111111..222222222222 100644 --- a/include/dt-bindings/clock/rk3399-cru.h +++ b/include/dt-bindings/clock/rk3399-cru.h @@ -19,6 +19,7 @@ diff --git a/patch/kernel/archive/rockchip64-6.10/rk3399-dmc-polling-rate.patch b/patch/kernel/archive/rockchip64-6.10/rk3399-dmc-polling-rate.patch index 54768827ab93..71f5a8145073 100644 --- a/patch/kernel/archive/rockchip64-6.10/rk3399-dmc-polling-rate.patch +++ b/patch/kernel/archive/rockchip64-6.10/rk3399-dmc-polling-rate.patch @@ -18,7 +18,7 @@ Subject: [ARCHEOLOGY] rockchip64: set poll rate 50ms for rk3399 dmc driver 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/devfreq/rk3399_dmc.c b/drivers/devfreq/rk3399_dmc.c -index daff40702615..62f4804134c2 100644 +index 111111111111..222222222222 100644 --- a/drivers/devfreq/rk3399_dmc.c +++ b/drivers/devfreq/rk3399_dmc.c @@ -430,7 +430,7 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev) diff --git a/patch/kernel/archive/rockchip64-6.10/rk3399-enable-dwc3-xhci-usb-trb-quirk.patch b/patch/kernel/archive/rockchip64-6.10/rk3399-enable-dwc3-xhci-usb-trb-quirk.patch index 6304c4eff265..01cba086dd25 100644 --- a/patch/kernel/archive/rockchip64-6.10/rk3399-enable-dwc3-xhci-usb-trb-quirk.patch +++ b/patch/kernel/archive/rockchip64-6.10/rk3399-enable-dwc3-xhci-usb-trb-quirk.patch @@ -95,10 +95,10 @@ Subject: [ARCHEOLOGY] Fix 2.5G Ethernet on Helios64 Mainline kernel (#2567) 1 file changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi -index 8aa038f5657a..90905af1a702 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi -@@ -488,6 +488,7 @@ usbdrd_dwc3_0: usb@fe800000 { +@@ -558,6 +558,7 @@ usbdrd_dwc3_0: usb@fe800000 { snps,dis_u2_susphy_quirk; snps,dis-del-phy-power-chg-quirk; snps,dis-tx-ipgap-linecheck-quirk; @@ -106,7 +106,7 @@ index 8aa038f5657a..90905af1a702 100644 power-domains = <&power RK3399_PD_USB3>; status = "disabled"; }; -@@ -524,6 +525,7 @@ usbdrd_dwc3_1: usb@fe900000 { +@@ -594,6 +595,7 @@ usbdrd_dwc3_1: usb@fe900000 { snps,dis_u2_susphy_quirk; snps,dis-del-phy-power-chg-quirk; snps,dis-tx-ipgap-linecheck-quirk; diff --git a/patch/kernel/archive/rockchip64-6.10/rk3399-fix-pci-phy.patch b/patch/kernel/archive/rockchip64-6.10/rk3399-fix-pci-phy.patch index 21b02b310bdd..e3d75ec34cca 100644 --- a/patch/kernel/archive/rockchip64-6.10/rk3399-fix-pci-phy.patch +++ b/patch/kernel/archive/rockchip64-6.10/rk3399-fix-pci-phy.patch @@ -5,14 +5,14 @@ Subject: rk3399 PCIE PHY reset on probe Signed-off-by: Andrey Safonov --- - drivers/phy/rockchip/phy-rockchip-pcie.c | 16 ++++++++++++++++ + drivers/phy/rockchip/phy-rockchip-pcie.c | 16 ++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/phy/rockchip/phy-rockchip-pcie.c b/drivers/phy/rockchip/phy-rockchip-pcie.c -index 8234b83fdd88..aa5ca6db0563 100644 +index 111111111111..222222222222 100644 --- a/drivers/phy/rockchip/phy-rockchip-pcie.c +++ b/drivers/phy/rockchip/phy-rockchip-pcie.c -@@ -344,6 +344,20 @@ static const struct of_device_id rockchip_pcie_phy_dt_ids[] = { +@@ -343,6 +343,20 @@ static const struct of_device_id rockchip_pcie_phy_dt_ids[] = { MODULE_DEVICE_TABLE(of, rockchip_pcie_phy_dt_ids); @@ -33,7 +33,7 @@ index 8234b83fdd88..aa5ca6db0563 100644 static int rockchip_pcie_phy_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; -@@ -394,6 +408,8 @@ static int rockchip_pcie_phy_probe(struct platform_device *pdev) +@@ -391,6 +405,8 @@ static int rockchip_pcie_phy_probe(struct platform_device *pdev) phy_num = (phy_num == 0) ? 1 : PHY_MAX_LANE_NUM; dev_dbg(dev, "phy number is %d\n", phy_num); diff --git a/patch/kernel/archive/rockchip64-6.10/rk3399-fix-usb-phy.patch b/patch/kernel/archive/rockchip64-6.10/rk3399-fix-usb-phy.patch index 122034b1b0a4..1849e4f15b52 100644 --- a/patch/kernel/archive/rockchip64-6.10/rk3399-fix-usb-phy.patch +++ b/patch/kernel/archive/rockchip64-6.10/rk3399-fix-usb-phy.patch @@ -9,7 +9,7 @@ rockchip64: increase timeout for usb3 type C phy init 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/phy/rockchip/phy-rockchip-typec.c b/drivers/phy/rockchip/phy-rockchip-typec.c -index 6a641d9f752c..3862d7a4fcdb 100644 +index 111111111111..222222222222 100644 --- a/drivers/phy/rockchip/phy-rockchip-typec.c +++ b/drivers/phy/rockchip/phy-rockchip-typec.c @@ -904,7 +904,7 @@ static int rockchip_usb3_phy_power_on(struct phy *phy) diff --git a/patch/kernel/archive/rockchip64-6.10/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch b/patch/kernel/archive/rockchip64-6.10/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch index 9d5c97ce9c03..36b80de4953d 100644 --- a/patch/kernel/archive/rockchip64-6.10/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch +++ b/patch/kernel/archive/rockchip64-6.10/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch @@ -74,10 +74,10 @@ Subject: [ARCHEOLOGY] rockchip-[current,edge]: add pcie hack and lsi scsi/sas 4 files changed, 41 insertions(+) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index 0a1731a0f0ef..a47b48a8aaec 100644 +index 111111111111..222222222222 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -4485,6 +4485,14 @@ +@@ -4646,6 +4646,14 @@ nomsi Do not use MSI for native PCIe PME signaling (this makes all PCIe root ports use INTx for all services). @@ -93,7 +93,7 @@ index 0a1731a0f0ef..a47b48a8aaec 100644 pd_ignore_unused diff --git a/drivers/pci/controller/pcie-rockchip-host.c b/drivers/pci/controller/pcie-rockchip-host.c -index afbbdccd195d..f7fc4df0cee3 100644 +index 111111111111..222222222222 100644 --- a/drivers/pci/controller/pcie-rockchip-host.c +++ b/drivers/pci/controller/pcie-rockchip-host.c @@ -32,10 +32,14 @@ @@ -147,7 +147,7 @@ index afbbdccd195d..f7fc4df0cee3 100644 if (err) goto err_remove_irq_domain; diff --git a/drivers/pci/controller/pcie-rockchip.c b/drivers/pci/controller/pcie-rockchip.c -index 0ef2e622d36e..7255c1234fed 100644 +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) @@ -164,7 +164,7 @@ index 0ef2e622d36e..7255c1234fed 100644 } EXPORT_SYMBOL_GPL(rockchip_pcie_parse_dt); diff --git a/drivers/pci/controller/pcie-rockchip.h b/drivers/pci/controller/pcie-rockchip.h -index 6111de35f84c..591d2f122051 100644 +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 { diff --git a/patch/kernel/archive/rockchip64-6.10/rk3399-sd-drive-level-8ma.patch b/patch/kernel/archive/rockchip64-6.10/rk3399-sd-drive-level-8ma.patch index b36e193a465b..e6eef3ab91db 100644 --- a/patch/kernel/archive/rockchip64-6.10/rk3399-sd-drive-level-8ma.patch +++ b/patch/kernel/archive/rockchip64-6.10/rk3399-sd-drive-level-8ma.patch @@ -109,10 +109,10 @@ Subject: [ARCHEOLOGY] add better strength on SDCard and put back previous 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi -index 1eb5c63b468e..867a9f893b24 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi -@@ -2592,25 +2592,25 @@ sdio0_int: sdio0-int { +@@ -2662,25 +2662,25 @@ sdio0_int: sdio0-int { sdmmc { sdmmc_bus1: sdmmc-bus1 { rockchip,pins = @@ -145,7 +145,7 @@ index 1eb5c63b468e..867a9f893b24 100644 }; sdmmc_cd: sdmmc-cd { -@@ -2620,7 +2620,7 @@ sdmmc_cd: sdmmc-cd { +@@ -2690,7 +2690,7 @@ sdmmc_cd: sdmmc-cd { sdmmc_wp: sdmmc-wp { rockchip,pins = diff --git a/patch/kernel/archive/rockchip64-6.10/rk3399-sd-pwr-pinctrl.patch b/patch/kernel/archive/rockchip64-6.10/rk3399-sd-pwr-pinctrl.patch index c0be8a82a29b..107257953172 100644 --- a/patch/kernel/archive/rockchip64-6.10/rk3399-sd-pwr-pinctrl.patch +++ b/patch/kernel/archive/rockchip64-6.10/rk3399-sd-pwr-pinctrl.patch @@ -8,10 +8,10 @@ Subject: rk3399: add sd power pin to pinctrl node 1 file changed, 5 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi -index 867a9f893b24..76239a58ab0b 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi -@@ -2587,6 +2587,11 @@ sdio0_int: sdio0-int { +@@ -2657,6 +2657,11 @@ sdio0_int: sdio0-int { rockchip,pins = <0 RK_PA4 1 &pcfg_pull_up>; }; diff --git a/patch/kernel/archive/rockchip64-6.10/rk3399-unlock-temperature.patch b/patch/kernel/archive/rockchip64-6.10/rk3399-unlock-temperature.patch index dd305b6cf301..9e9a5e9d7104 100644 --- a/patch/kernel/archive/rockchip64-6.10/rk3399-unlock-temperature.patch +++ b/patch/kernel/archive/rockchip64-6.10/rk3399-unlock-temperature.patch @@ -98,10 +98,10 @@ Subject: [ARCHEOLOGY] Increase performance with rk3399-dev 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi -index 76239a58ab0b..a0441f640791 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi -@@ -858,17 +858,17 @@ cpu_thermal: cpu-thermal { +@@ -928,17 +928,17 @@ cpu_thermal: cpu-thermal { trips { cpu_alert0: cpu_alert0 { diff --git a/patch/kernel/archive/rockchip64-6.10/rk356x-add-rkvdec2-support.patch b/patch/kernel/archive/rockchip64-6.10/rk356x-add-rkvdec2-support.patch index eba682857401..a7708f16ec69 100644 --- a/patch/kernel/archive/rockchip64-6.10/rk356x-add-rkvdec2-support.patch +++ b/patch/kernel/archive/rockchip64-6.10/rk356x-add-rkvdec2-support.patch @@ -1,5 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: amazingfate +Date: Sun, 28 Jul 2024 14:35:34 +0800 +Subject: [ARCHEOLOGY] rockchip64-edge: add rkvdec2 for rk356x + +> X-Git-Archeology: - Revision e1a64270fa9aad808afd6dd5b4bb0b63e4295d20: https://github.com/armbian/build/commit/e1a64270fa9aad808afd6dd5b4bb0b63e4295d20 +> X-Git-Archeology: Date: Sun, 28 Jul 2024 14:35:34 +0800 +> X-Git-Archeology: From: amazingfate +> X-Git-Archeology: Subject: rockchip64-edge: add rkvdec2 for rk356x +> X-Git-Archeology: +--- + arch/arm64/boot/dts/rockchip/rk356x.dtsi | 34 +++++++++- + 1 file changed, 33 insertions(+), 1 deletion(-) + diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi -index d8543b555..37141f416 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi @@ -449,6 +449,19 @@ usb2phy1_grf: syscon@fdca8000 { @@ -57,3 +71,6 @@ index d8543b555..37141f416 100644 sdmmc2: mmc@fe000000 { compatible = "rockchip,rk3568-dw-mshc", "rockchip,rk3288-dw-mshc"; reg = <0x0 0xfe000000 0x0 0x4000>; +-- +Armbian + diff --git a/patch/kernel/archive/rockchip64-6.10/rk35xx-montjoie-crypto-v2-rk35xx.patch b/patch/kernel/archive/rockchip64-6.10/rk35xx-montjoie-crypto-v2-rk35xx.patch index 804c21f281b0..620fc6b1437b 100644 --- a/patch/kernel/archive/rockchip64-6.10/rk35xx-montjoie-crypto-v2-rk35xx.patch +++ b/patch/kernel/archive/rockchip64-6.10/rk35xx-montjoie-crypto-v2-rk35xx.patch @@ -13,7 +13,7 @@ Signed-off-by: Corentin Labbe diff --git a/Documentation/devicetree/bindings/crypto/rockchip,rk3588-crypto.yaml b/Documentation/devicetree/bindings/crypto/rockchip,rk3588-crypto.yaml new file mode 100644 -index 000000000000..c01963413260 +index 000000000000..111111111111 --- /dev/null +++ b/Documentation/devicetree/bindings/crypto/rockchip,rk3588-crypto.yaml @@ -0,0 +1,65 @@ @@ -99,10 +99,10 @@ Signed-off-by: Corentin Labbe 1 file changed, 12 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi -index 75e279781cf6..ca2078f72801 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi -@@ -2038,6 +2038,18 @@ sdhci: mmc@fe2e0000 { +@@ -1800,6 +1800,18 @@ sdhci: mmc@fe2e0000 { status = "disabled"; }; @@ -139,10 +139,10 @@ Signed-off-by: Corentin Labbe 1 file changed, 12 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi -index c19c0f1b3778..d2764659d21b 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi -@@ -1070,6 +1070,18 @@ sdhci: mmc@fe310000 { +@@ -1145,6 +1145,18 @@ sdhci: mmc@fe310000 { status = "disabled"; }; @@ -182,7 +182,7 @@ Signed-off-by: Corentin Labbe 2 files changed, 34 insertions(+), 76 deletions(-) diff --git a/drivers/clk/rockchip/rst-rk3588.c b/drivers/clk/rockchip/rst-rk3588.c -index e855bb8d5413..6556d9d3c7ab 100644 +index 111111111111..222222222222 100644 --- a/drivers/clk/rockchip/rst-rk3588.c +++ b/drivers/clk/rockchip/rst-rk3588.c @@ -16,9 +16,6 @@ @@ -195,7 +195,7 @@ index e855bb8d5413..6556d9d3c7ab 100644 /* 0xFD7F0000 + 0x0A00 */ #define RK3588_PMU1CRU_RESET_OFFSET(id, reg, bit) [id] = (0x30000*4 + reg * 16 + bit) -@@ -806,45 +803,6 @@ static const int rk3588_register_offset[] = { +@@ -807,45 +804,6 @@ static const int rk3588_register_offset[] = { RK3588_PMU1CRU_RESET_OFFSET(SRST_P_PMU0IOC, 5, 4), RK3588_PMU1CRU_RESET_OFFSET(SRST_P_GPIO0, 5, 5), RK3588_PMU1CRU_RESET_OFFSET(SRST_GPIO0, 5, 6), @@ -242,10 +242,10 @@ index e855bb8d5413..6556d9d3c7ab 100644 void rk3588_rst_init(struct device_node *np, void __iomem *reg_base) diff --git a/include/dt-bindings/reset/rockchip,rk3588-cru.h b/include/dt-bindings/reset/rockchip,rk3588-cru.h -index d4264db2a07f..c0d08ae78cd5 100644 +index 111111111111..222222222222 100644 --- a/include/dt-bindings/reset/rockchip,rk3588-cru.h +++ b/include/dt-bindings/reset/rockchip,rk3588-cru.h -@@ -716,39 +716,39 @@ +@@ -716,40 +716,40 @@ #define SRST_P_GPIO0 627 #define SRST_GPIO0 628 @@ -318,7 +318,8 @@ index d4264db2a07f..c0d08ae78cd5 100644 +#define SRST_P_TRNG_CHK 53 +#define SRST_TRNG_S 54 - #endif + #define SRST_A_HDMIRX_BIU 660 + -- Armbian @@ -341,12 +342,12 @@ Signed-off-by: Corentin Labbe 6 files changed, 1939 insertions(+) diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig -index 79c3bb9c99c3..b6a2027b1f9a 100644 +index 111111111111..222222222222 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig -@@ -660,6 +660,35 @@ config CRYPTO_DEV_ROCKCHIP_DEBUG - the number of requests per algorithm and other internal stats. - +@@ -661,6 +661,35 @@ config CRYPTO_DEV_TEGRA + Select this to enable Tegra Security Engine which accelerates various + AES encryption/decryption and HASH algorithms. +config CRYPTO_DEV_ROCKCHIP2 + tristate "Rockchip's cryptographic offloader V2" @@ -381,10 +382,10 @@ index 79c3bb9c99c3..b6a2027b1f9a 100644 tristate "Support for Xilinx ZynqMP AES hw accelerator" depends on ZYNQMP_FIRMWARE || COMPILE_TEST diff --git a/drivers/crypto/rockchip/Makefile b/drivers/crypto/rockchip/Makefile -index 785277aca71e..452a12ff6538 100644 +index 111111111111..222222222222 100644 --- a/drivers/crypto/rockchip/Makefile +++ b/drivers/crypto/rockchip/Makefile -@@ -3,3 +3,8 @@ obj-$(CONFIG_CRYPTO_DEV_ROCKCHIP) += rk_crypto.o +@@ -4,3 +4,8 @@ rk_crypto-objs := rk3288_crypto.o \ rk3288_crypto_skcipher.o \ rk3288_crypto_ahash.o rk_crypto-$(CONFIG_CRYPTO_DEV_ROCKCHIP_TRNG) += rk3288_crypto_trng.o @@ -395,7 +396,7 @@ index 785277aca71e..452a12ff6538 100644 + rk2_crypto_ahash.o diff --git a/drivers/crypto/rockchip/rk2_crypto.c b/drivers/crypto/rockchip/rk2_crypto.c new file mode 100644 -index 000000000000..79ed697d8ec5 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/crypto/rockchip/rk2_crypto.c @@ -0,0 +1,739 @@ @@ -1140,7 +1141,7 @@ index 000000000000..79ed697d8ec5 +MODULE_AUTHOR("Corentin Labbe "); diff --git a/drivers/crypto/rockchip/rk2_crypto.h b/drivers/crypto/rockchip/rk2_crypto.h new file mode 100644 -index 000000000000..59cd8be59f70 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/crypto/rockchip/rk2_crypto.h @@ -0,0 +1,246 @@ @@ -1392,7 +1393,7 @@ index 000000000000..59cd8be59f70 +void rk2_hash_exit_tfm(struct crypto_ahash *tfm); diff --git a/drivers/crypto/rockchip/rk2_crypto_ahash.c b/drivers/crypto/rockchip/rk2_crypto_ahash.c new file mode 100644 -index 000000000000..75b8d9893447 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/crypto/rockchip/rk2_crypto_ahash.c @@ -0,0 +1,344 @@ @@ -1742,7 +1743,7 @@ index 000000000000..75b8d9893447 +} diff --git a/drivers/crypto/rockchip/rk2_crypto_skcipher.c b/drivers/crypto/rockchip/rk2_crypto_skcipher.c new file mode 100644 -index 000000000000..3e8e44d84b47 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/crypto/rockchip/rk2_crypto_skcipher.c @@ -0,0 +1,576 @@ diff --git a/patch/kernel/archive/rockchip64-6.10/wifi-4003-add-bcm43342-chip.patch b/patch/kernel/archive/rockchip64-6.10/wifi-4003-add-bcm43342-chip.patch index e0307dc9c54b..9b91b3f144ac 100644 --- a/patch/kernel/archive/rockchip64-6.10/wifi-4003-add-bcm43342-chip.patch +++ b/patch/kernel/archive/rockchip64-6.10/wifi-4003-add-bcm43342-chip.patch @@ -9,7 +9,7 @@ Subject: add broadcom bcm43342 chip id 2 files changed, 3 insertions(+) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c -index 6b38d9de71af..6a603d045103 100644 +index 111111111111..222222222222 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c @@ -609,6 +609,7 @@ BRCMF_FW_DEF(4329, "brcmfmac4329-sdio"); @@ -29,7 +29,7 @@ index 6b38d9de71af..6a603d045103 100644 BRCMF_FW_ENTRY(BRCM_CC_43362_CHIP_ID, 0xFFFFFFFE, 43362), BRCMF_FW_ENTRY(BRCM_CC_4339_CHIP_ID, 0xFFFFFFFF, 4339), diff --git a/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h -index 44684bf1b9ac..bcf48de78d53 100644 +index 111111111111..222222222222 100644 --- a/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h +++ b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h @@ -27,6 +27,7 @@ diff --git a/patch/kernel/archive/rockchip64-6.10/wifi-4003-ssv-6051-driver.patch b/patch/kernel/archive/rockchip64-6.10/wifi-4003-ssv-6051-driver.patch index ed72e2aa1320..eb835621ed42 100644 --- a/patch/kernel/archive/rockchip64-6.10/wifi-4003-ssv-6051-driver.patch +++ b/patch/kernel/archive/rockchip64-6.10/wifi-4003-ssv-6051-driver.patch @@ -1,131 +1,73 @@ -From 3f30a652fb3e6ead83f65312d0240d5c9ea8c340 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Wed, 2 Nov 2022 15:40:06 +0000 -Subject: [PATCH] add ssv6xxx wifi driver +Subject: add ssv6xxx wifi driver --- - drivers/net/wireless/Kconfig | 1 + - drivers/net/wireless/Makefile | 1 + - drivers/net/wireless/ssv6051/Kconfig | 11 + - drivers/net/wireless/ssv6051/Makefile | 26 + - drivers/net/wireless/ssv6051/Makefile.bak | 107 + - .../ssv6051/firmware/ssv6051-wifi.cfg | 91 + - drivers/net/wireless/ssv6051/hci/hctrl.h | 178 + - drivers/net/wireless/ssv6051/hci/ssv_hci.c | 967 + - drivers/net/wireless/ssv6051/hci/ssv_hci.h | 77 + - drivers/net/wireless/ssv6051/hwif/hwif.h | 84 + - drivers/net/wireless/ssv6051/hwif/sdio/sdio.c | 1254 ++ - .../net/wireless/ssv6051/hwif/sdio/sdio_def.h | 80 + - drivers/net/wireless/ssv6051/include/cabrio.h | 28 + - .../net/wireless/ssv6051/include/ssv6200.h | 76 + - .../wireless/ssv6051/include/ssv6200_aux.h | 18221 ++++++++++++++++ - .../wireless/ssv6051/include/ssv6200_common.h | 452 + - .../ssv6051/include/ssv6200_configuration.h | 317 + - .../wireless/ssv6051/include/ssv6200_reg.h | 9694 ++++++++ - .../ssv6051/include/ssv6200_reg_sim.h | 176 + - .../net/wireless/ssv6051/include/ssv_cfg.h | 60 + - .../ssv6051/include/ssv_firmware_version.h | 25 + - .../wireless/ssv6051/include/ssv_version.h | 12 + - .../net/wireless/ssv6051/platform-config.mak | 97 + - drivers/net/wireless/ssv6051/rules.mak | 19 + - drivers/net/wireless/ssv6051/smac/ampdu.c | 2111 ++ - drivers/net/wireless/ssv6051/smac/ampdu.h | 215 + - drivers/net/wireless/ssv6051/smac/ap.c | 598 + - drivers/net/wireless/ssv6051/smac/ap.h | 41 + - drivers/net/wireless/ssv6051/smac/dev.c | 3880 ++++ - drivers/net/wireless/ssv6051/smac/dev.h | 445 + - drivers/net/wireless/ssv6051/smac/dev_tbl.h | 141 + - drivers/net/wireless/ssv6051/smac/drv_comm.h | 61 + - drivers/net/wireless/ssv6051/smac/efuse.c | 334 + - drivers/net/wireless/ssv6051/smac/efuse.h | 40 + - drivers/net/wireless/ssv6051/smac/init.c | 1347 ++ - drivers/net/wireless/ssv6051/smac/init.h | 23 + - drivers/net/wireless/ssv6051/smac/lib.c | 33 + - drivers/net/wireless/ssv6051/smac/lib.h | 23 + - .../net/wireless/ssv6051/smac/linux_80211.h | 24 + - drivers/net/wireless/ssv6051/smac/p2p.c | 305 + - drivers/net/wireless/ssv6051/smac/p2p.h | 58 + - drivers/net/wireless/ssv6051/smac/sar.c | 208 + - drivers/net/wireless/ssv6051/smac/sar.h | 63 + - drivers/net/wireless/ssv6051/smac/sec.h | 52 + - drivers/net/wireless/ssv6051/smac/smartlink.c | 340 + - .../wireless/ssv6051/smac/ssv6xxx_debugfs.c | 223 + - .../wireless/ssv6051/smac/ssv6xxx_debugfs.h | 27 + - .../net/wireless/ssv6051/smac/ssv_cfgvendor.c | 1384 ++ - .../net/wireless/ssv6051/smac/ssv_cfgvendor.h | 247 + - drivers/net/wireless/ssv6051/smac/ssv_ht_rc.c | 546 + - drivers/net/wireless/ssv6051/smac/ssv_ht_rc.h | 31 + - drivers/net/wireless/ssv6051/smac/ssv_pm.c | 19 + - drivers/net/wireless/ssv6051/smac/ssv_pm.h | 20 + - drivers/net/wireless/ssv6051/smac/ssv_rc.c | 1716 ++ - drivers/net/wireless/ssv6051/smac/ssv_rc.h | 50 + - .../net/wireless/ssv6051/smac/ssv_rc_common.h | 175 + - .../wireless/ssv6051/ssv6051-generic-wlan.c | 76 + - .../net/wireless/ssv6051/ssvdevice/ssv_cmd.c | 1765 ++ - .../net/wireless/ssv6051/ssvdevice/ssv_cmd.h | 50 + - .../wireless/ssv6051/ssvdevice/ssvdevice.c | 256 + - 60 files changed, 48983 insertions(+) - create mode 100644 drivers/net/wireless/ssv6051/Kconfig - create mode 100644 drivers/net/wireless/ssv6051/Makefile - create mode 100644 drivers/net/wireless/ssv6051/Makefile.bak - create mode 100644 drivers/net/wireless/ssv6051/firmware/ssv6051-wifi.cfg - create mode 100644 drivers/net/wireless/ssv6051/hci/hctrl.h - create mode 100644 drivers/net/wireless/ssv6051/hci/ssv_hci.c - create mode 100644 drivers/net/wireless/ssv6051/hci/ssv_hci.h - create mode 100644 drivers/net/wireless/ssv6051/hwif/hwif.h - create mode 100644 drivers/net/wireless/ssv6051/hwif/sdio/sdio.c - create mode 100644 drivers/net/wireless/ssv6051/hwif/sdio/sdio_def.h - create mode 100644 drivers/net/wireless/ssv6051/include/cabrio.h - create mode 100644 drivers/net/wireless/ssv6051/include/ssv6200.h - create mode 100644 drivers/net/wireless/ssv6051/include/ssv6200_aux.h - create mode 100644 drivers/net/wireless/ssv6051/include/ssv6200_common.h - create mode 100644 drivers/net/wireless/ssv6051/include/ssv6200_configuration.h - create mode 100644 drivers/net/wireless/ssv6051/include/ssv6200_reg.h - create mode 100644 drivers/net/wireless/ssv6051/include/ssv6200_reg_sim.h - create mode 100644 drivers/net/wireless/ssv6051/include/ssv_cfg.h - create mode 100644 drivers/net/wireless/ssv6051/include/ssv_firmware_version.h - create mode 100644 drivers/net/wireless/ssv6051/include/ssv_version.h - create mode 100644 drivers/net/wireless/ssv6051/platform-config.mak - create mode 100644 drivers/net/wireless/ssv6051/rules.mak - create mode 100644 drivers/net/wireless/ssv6051/smac/ampdu.c - create mode 100644 drivers/net/wireless/ssv6051/smac/ampdu.h - create mode 100644 drivers/net/wireless/ssv6051/smac/ap.c - create mode 100644 drivers/net/wireless/ssv6051/smac/ap.h - create mode 100644 drivers/net/wireless/ssv6051/smac/dev.c - create mode 100644 drivers/net/wireless/ssv6051/smac/dev.h - create mode 100644 drivers/net/wireless/ssv6051/smac/dev_tbl.h - create mode 100644 drivers/net/wireless/ssv6051/smac/drv_comm.h - create mode 100644 drivers/net/wireless/ssv6051/smac/efuse.c - create mode 100644 drivers/net/wireless/ssv6051/smac/efuse.h - create mode 100644 drivers/net/wireless/ssv6051/smac/init.c - create mode 100644 drivers/net/wireless/ssv6051/smac/init.h - create mode 100644 drivers/net/wireless/ssv6051/smac/lib.c - create mode 100644 drivers/net/wireless/ssv6051/smac/lib.h - create mode 100644 drivers/net/wireless/ssv6051/smac/linux_80211.h - create mode 100644 drivers/net/wireless/ssv6051/smac/p2p.c - create mode 100644 drivers/net/wireless/ssv6051/smac/p2p.h - create mode 100644 drivers/net/wireless/ssv6051/smac/sar.c - create mode 100644 drivers/net/wireless/ssv6051/smac/sar.h - create mode 100644 drivers/net/wireless/ssv6051/smac/sec.h - create mode 100644 drivers/net/wireless/ssv6051/smac/smartlink.c - create mode 100644 drivers/net/wireless/ssv6051/smac/ssv6xxx_debugfs.c - create mode 100644 drivers/net/wireless/ssv6051/smac/ssv6xxx_debugfs.h - create mode 100644 drivers/net/wireless/ssv6051/smac/ssv_cfgvendor.c - create mode 100644 drivers/net/wireless/ssv6051/smac/ssv_cfgvendor.h - create mode 100644 drivers/net/wireless/ssv6051/smac/ssv_ht_rc.c - create mode 100644 drivers/net/wireless/ssv6051/smac/ssv_ht_rc.h - create mode 100644 drivers/net/wireless/ssv6051/smac/ssv_pm.c - create mode 100644 drivers/net/wireless/ssv6051/smac/ssv_pm.h - create mode 100644 drivers/net/wireless/ssv6051/smac/ssv_rc.c - create mode 100644 drivers/net/wireless/ssv6051/smac/ssv_rc.h - create mode 100644 drivers/net/wireless/ssv6051/smac/ssv_rc_common.h - create mode 100644 drivers/net/wireless/ssv6051/ssv6051-generic-wlan.c - create mode 100644 drivers/net/wireless/ssv6051/ssvdevice/ssv_cmd.c - create mode 100644 drivers/net/wireless/ssv6051/ssvdevice/ssv_cmd.h - create mode 100644 drivers/net/wireless/ssv6051/ssvdevice/ssvdevice.c + drivers/net/wireless/Kconfig | 1 + + drivers/net/wireless/Makefile | 1 + + drivers/net/wireless/ssv6051/Kconfig | 11 + + drivers/net/wireless/ssv6051/Makefile | 26 + + drivers/net/wireless/ssv6051/Makefile.bak | 107 + + drivers/net/wireless/ssv6051/firmware/ssv6051-wifi.cfg | 91 + + drivers/net/wireless/ssv6051/hci/hctrl.h | 178 + + drivers/net/wireless/ssv6051/hci/ssv_hci.c | 967 + + drivers/net/wireless/ssv6051/hci/ssv_hci.h | 77 + + drivers/net/wireless/ssv6051/hwif/hwif.h | 84 + + drivers/net/wireless/ssv6051/hwif/sdio/sdio.c | 1254 + + drivers/net/wireless/ssv6051/hwif/sdio/sdio_def.h | 80 + + drivers/net/wireless/ssv6051/include/cabrio.h | 28 + + drivers/net/wireless/ssv6051/include/ssv6200.h | 76 + + drivers/net/wireless/ssv6051/include/ssv6200_aux.h | 18221 ++++++++++ + drivers/net/wireless/ssv6051/include/ssv6200_common.h | 452 + + drivers/net/wireless/ssv6051/include/ssv6200_configuration.h | 317 + + drivers/net/wireless/ssv6051/include/ssv6200_reg.h | 9694 +++++ + drivers/net/wireless/ssv6051/include/ssv6200_reg_sim.h | 176 + + drivers/net/wireless/ssv6051/include/ssv_cfg.h | 60 + + drivers/net/wireless/ssv6051/include/ssv_firmware_version.h | 25 + + drivers/net/wireless/ssv6051/include/ssv_version.h | 12 + + drivers/net/wireless/ssv6051/platform-config.mak | 97 + + drivers/net/wireless/ssv6051/rules.mak | 19 + + drivers/net/wireless/ssv6051/smac/ampdu.c | 2111 ++ + drivers/net/wireless/ssv6051/smac/ampdu.h | 215 + + drivers/net/wireless/ssv6051/smac/ap.c | 598 + + drivers/net/wireless/ssv6051/smac/ap.h | 41 + + drivers/net/wireless/ssv6051/smac/dev.c | 3881 ++ + drivers/net/wireless/ssv6051/smac/dev.h | 445 + + drivers/net/wireless/ssv6051/smac/dev_tbl.h | 141 + + drivers/net/wireless/ssv6051/smac/drv_comm.h | 61 + + drivers/net/wireless/ssv6051/smac/efuse.c | 334 + + drivers/net/wireless/ssv6051/smac/efuse.h | 40 + + drivers/net/wireless/ssv6051/smac/init.c | 1347 + + drivers/net/wireless/ssv6051/smac/init.h | 23 + + drivers/net/wireless/ssv6051/smac/lib.c | 33 + + drivers/net/wireless/ssv6051/smac/lib.h | 23 + + drivers/net/wireless/ssv6051/smac/linux_80211.h | 24 + + drivers/net/wireless/ssv6051/smac/p2p.c | 305 + + drivers/net/wireless/ssv6051/smac/p2p.h | 58 + + drivers/net/wireless/ssv6051/smac/sar.c | 208 + + drivers/net/wireless/ssv6051/smac/sar.h | 63 + + drivers/net/wireless/ssv6051/smac/sec.h | 52 + + drivers/net/wireless/ssv6051/smac/smartlink.c | 340 + + drivers/net/wireless/ssv6051/smac/ssv6xxx_debugfs.c | 223 + + drivers/net/wireless/ssv6051/smac/ssv6xxx_debugfs.h | 27 + + drivers/net/wireless/ssv6051/smac/ssv_cfgvendor.c | 1384 + + drivers/net/wireless/ssv6051/smac/ssv_cfgvendor.h | 247 + + drivers/net/wireless/ssv6051/smac/ssv_ht_rc.c | 546 + + drivers/net/wireless/ssv6051/smac/ssv_ht_rc.h | 31 + + drivers/net/wireless/ssv6051/smac/ssv_pm.c | 19 + + drivers/net/wireless/ssv6051/smac/ssv_pm.h | 20 + + drivers/net/wireless/ssv6051/smac/ssv_rc.c | 1716 + + drivers/net/wireless/ssv6051/smac/ssv_rc.h | 50 + + drivers/net/wireless/ssv6051/smac/ssv_rc_common.h | 175 + + drivers/net/wireless/ssv6051/ssv6051-generic-wlan.c | 76 + + drivers/net/wireless/ssv6051/ssvdevice/ssv_cmd.c | 1765 + + drivers/net/wireless/ssv6051/ssvdevice/ssv_cmd.h | 50 + + drivers/net/wireless/ssv6051/ssvdevice/ssvdevice.c | 256 + + 60 files changed, 48982 insertions(+) diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig -index de5e37846397..aa2cac9abdd3 100644 +index 111111111111..222222222222 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -18,6 +18,7 @@ menuconfig WLAN @@ -137,7 +79,7 @@ index de5e37846397..aa2cac9abdd3 100644 source "drivers/net/wireless/ath/Kconfig" source "drivers/net/wireless/atmel/Kconfig" diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile -index 92ffd2cef51c..8b56a42e97a6 100644 +index 111111111111..222222222222 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -3,6 +3,7 @@ @@ -150,7 +92,7 @@ index 92ffd2cef51c..8b56a42e97a6 100644 obj-$(CONFIG_WLAN_VENDOR_ATMEL) += atmel/ diff --git a/drivers/net/wireless/ssv6051/Kconfig b/drivers/net/wireless/ssv6051/Kconfig new file mode 100644 -index 000000000000..7706ad52ed7b +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/Kconfig @@ -0,0 +1,11 @@ @@ -167,7 +109,7 @@ index 000000000000..7706ad52ed7b + diff --git a/drivers/net/wireless/ssv6051/Makefile b/drivers/net/wireless/ssv6051/Makefile new file mode 100644 -index 000000000000..985d730f3d50 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/Makefile @@ -0,0 +1,26 @@ @@ -199,7 +141,7 @@ index 000000000000..985d730f3d50 + diff --git a/drivers/net/wireless/ssv6051/Makefile.bak b/drivers/net/wireless/ssv6051/Makefile.bak new file mode 100644 -index 000000000000..2733fa4dd3b7 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/Makefile.bak @@ -0,0 +1,107 @@ @@ -312,7 +254,7 @@ index 000000000000..2733fa4dd3b7 +.PHONY: all modules clean install diff --git a/drivers/net/wireless/ssv6051/firmware/ssv6051-wifi.cfg b/drivers/net/wireless/ssv6051/firmware/ssv6051-wifi.cfg new file mode 100644 -index 000000000000..c072960f6dea +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/firmware/ssv6051-wifi.cfg @@ -0,0 +1,91 @@ @@ -409,7 +351,7 @@ index 000000000000..c072960f6dea +################################################## diff --git a/drivers/net/wireless/ssv6051/hci/hctrl.h b/drivers/net/wireless/ssv6051/hci/hctrl.h new file mode 100644 -index 000000000000..95218c8040e7 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/hci/hctrl.h @@ -0,0 +1,178 @@ @@ -593,7 +535,7 @@ index 000000000000..95218c8040e7 +#endif diff --git a/drivers/net/wireless/ssv6051/hci/ssv_hci.c b/drivers/net/wireless/ssv6051/hci/ssv_hci.c new file mode 100644 -index 000000000000..9fedbeb55754 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/hci/ssv_hci.c @@ -0,0 +1,967 @@ @@ -1566,7 +1508,7 @@ index 000000000000..9fedbeb55754 +EXPORT_SYMBOL(ssv6xxx_hci_exit); diff --git a/drivers/net/wireless/ssv6051/hci/ssv_hci.h b/drivers/net/wireless/ssv6051/hci/ssv_hci.h new file mode 100644 -index 000000000000..dd166c607d5d +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/hci/ssv_hci.h @@ -0,0 +1,77 @@ @@ -1649,7 +1591,7 @@ index 000000000000..dd166c607d5d +#endif diff --git a/drivers/net/wireless/ssv6051/hwif/hwif.h b/drivers/net/wireless/ssv6051/hwif/hwif.h new file mode 100644 -index 000000000000..6b5263d157d8 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/hwif/hwif.h @@ -0,0 +1,84 @@ @@ -1739,7 +1681,7 @@ index 000000000000..6b5263d157d8 +#endif diff --git a/drivers/net/wireless/ssv6051/hwif/sdio/sdio.c b/drivers/net/wireless/ssv6051/hwif/sdio/sdio.c new file mode 100644 -index 000000000000..273777cd0485 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/hwif/sdio/sdio.c @@ -0,0 +1,1254 @@ @@ -2999,7 +2941,7 @@ index 000000000000..273777cd0485 +EXPORT_SYMBOL(ssv6xxx_sdio_exit); diff --git a/drivers/net/wireless/ssv6051/hwif/sdio/sdio_def.h b/drivers/net/wireless/ssv6051/hwif/sdio/sdio_def.h new file mode 100644 -index 000000000000..57aefd3bf9fa +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/hwif/sdio/sdio_def.h @@ -0,0 +1,80 @@ @@ -3085,7 +3027,7 @@ index 000000000000..57aefd3bf9fa +#endif diff --git a/drivers/net/wireless/ssv6051/include/cabrio.h b/drivers/net/wireless/ssv6051/include/cabrio.h new file mode 100644 -index 000000000000..0b1327865c6b +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/include/cabrio.h @@ -0,0 +1,28 @@ @@ -3119,7 +3061,7 @@ index 000000000000..0b1327865c6b +#endif diff --git a/drivers/net/wireless/ssv6051/include/ssv6200.h b/drivers/net/wireless/ssv6051/include/ssv6200.h new file mode 100644 -index 000000000000..22eaceaf285d +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/include/ssv6200.h @@ -0,0 +1,76 @@ @@ -3201,7 +3143,7 @@ index 000000000000..22eaceaf285d +#endif diff --git a/drivers/net/wireless/ssv6051/include/ssv6200_aux.h b/drivers/net/wireless/ssv6051/include/ssv6200_aux.h new file mode 100644 -index 000000000000..03ec3f07d330 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/include/ssv6200_aux.h @@ -0,0 +1,18221 @@ @@ -21428,7 +21370,7 @@ index 000000000000..03ec3f07d330 +#define SRAM_TAG_15_SZ 16 diff --git a/drivers/net/wireless/ssv6051/include/ssv6200_common.h b/drivers/net/wireless/ssv6051/include/ssv6200_common.h new file mode 100644 -index 000000000000..e6d30f3714f7 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/include/ssv6200_common.h @@ -0,0 +1,452 @@ @@ -21886,7 +21828,7 @@ index 000000000000..e6d30f3714f7 +#endif diff --git a/drivers/net/wireless/ssv6051/include/ssv6200_configuration.h b/drivers/net/wireless/ssv6051/include/ssv6200_configuration.h new file mode 100644 -index 000000000000..0327393de3f5 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/include/ssv6200_configuration.h @@ -0,0 +1,317 @@ @@ -22209,7 +22151,7 @@ index 000000000000..0327393de3f5 +}; diff --git a/drivers/net/wireless/ssv6051/include/ssv6200_reg.h b/drivers/net/wireless/ssv6051/include/ssv6200_reg.h new file mode 100644 -index 000000000000..d4a99b25d61f +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/include/ssv6200_reg.h @@ -0,0 +1,9694 @@ @@ -31909,7 +31851,7 @@ index 000000000000..d4a99b25d61f +#define DEF_TAG_SRAM0_F_STATUS_7() (REG32(ADR_TAG_SRAM0_F_STATUS_7)) = (0x00000000) diff --git a/drivers/net/wireless/ssv6051/include/ssv6200_reg_sim.h b/drivers/net/wireless/ssv6051/include/ssv6200_reg_sim.h new file mode 100644 -index 000000000000..e15a481ba300 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/include/ssv6200_reg_sim.h @@ -0,0 +1,176 @@ @@ -32091,7 +32033,7 @@ index 000000000000..e15a481ba300 +}; diff --git a/drivers/net/wireless/ssv6051/include/ssv_cfg.h b/drivers/net/wireless/ssv6051/include/ssv_cfg.h new file mode 100644 -index 000000000000..79b75619936e +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/include/ssv_cfg.h @@ -0,0 +1,60 @@ @@ -32157,7 +32099,7 @@ index 000000000000..79b75619936e +#endif diff --git a/drivers/net/wireless/ssv6051/include/ssv_firmware_version.h b/drivers/net/wireless/ssv6051/include/ssv_firmware_version.h new file mode 100644 -index 000000000000..7fabbe308f9d +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/include/ssv_firmware_version.h @@ -0,0 +1,25 @@ @@ -32188,7 +32130,7 @@ index 000000000000..7fabbe308f9d +#endif diff --git a/drivers/net/wireless/ssv6051/include/ssv_version.h b/drivers/net/wireless/ssv6051/include/ssv_version.h new file mode 100644 -index 000000000000..99be5354f783 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/include/ssv_version.h @@ -0,0 +1,12 @@ @@ -32206,7 +32148,7 @@ index 000000000000..99be5354f783 +#endif diff --git a/drivers/net/wireless/ssv6051/platform-config.mak b/drivers/net/wireless/ssv6051/platform-config.mak new file mode 100644 -index 000000000000..b1b6f0510d28 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/platform-config.mak @@ -0,0 +1,97 @@ @@ -32310,7 +32252,7 @@ index 000000000000..b1b6f0510d28 \ No newline at end of file diff --git a/drivers/net/wireless/ssv6051/rules.mak b/drivers/net/wireless/ssv6051/rules.mak new file mode 100644 -index 000000000000..b3262852249c +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/rules.mak @@ -0,0 +1,19 @@ @@ -32335,7 +32277,7 @@ index 000000000000..b3262852249c + M=$(KBUILD_DIR) modules_install diff --git a/drivers/net/wireless/ssv6051/smac/ampdu.c b/drivers/net/wireless/ssv6051/smac/ampdu.c new file mode 100644 -index 000000000000..846830f3d209 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/ampdu.c @@ -0,0 +1,2111 @@ @@ -34452,7 +34394,7 @@ index 000000000000..846830f3d209 +} diff --git a/drivers/net/wireless/ssv6051/smac/ampdu.h b/drivers/net/wireless/ssv6051/smac/ampdu.h new file mode 100644 -index 000000000000..faa61c4f9297 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/ampdu.h @@ -0,0 +1,215 @@ @@ -34673,7 +34615,7 @@ index 000000000000..faa61c4f9297 +#endif diff --git a/drivers/net/wireless/ssv6051/smac/ap.c b/drivers/net/wireless/ssv6051/smac/ap.c new file mode 100644 -index 000000000000..0f2ba6a31a05 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/ap.c @@ -0,0 +1,598 @@ @@ -35277,7 +35219,7 @@ index 000000000000..0f2ba6a31a05 +} diff --git a/drivers/net/wireless/ssv6051/smac/ap.h b/drivers/net/wireless/ssv6051/smac/ap.h new file mode 100644 -index 000000000000..93b5275715b5 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/ap.h @@ -0,0 +1,41 @@ @@ -35324,7 +35266,7 @@ index 000000000000..93b5275715b5 +#endif diff --git a/drivers/net/wireless/ssv6051/smac/dev.c b/drivers/net/wireless/ssv6051/smac/dev.c new file mode 100644 -index 000000000000..214e93fae460 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/dev.c @@ -0,0 +1,3881 @@ @@ -39211,7 +39153,7 @@ index 000000000000..214e93fae460 +#endif diff --git a/drivers/net/wireless/ssv6051/smac/dev.h b/drivers/net/wireless/ssv6051/smac/dev.h new file mode 100644 -index 000000000000..0a6357624b1c +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/dev.h @@ -0,0 +1,445 @@ @@ -39662,7 +39604,7 @@ index 000000000000..0a6357624b1c +#endif diff --git a/drivers/net/wireless/ssv6051/smac/dev_tbl.h b/drivers/net/wireless/ssv6051/smac/dev_tbl.h new file mode 100644 -index 000000000000..5c49d0bde6a6 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/dev_tbl.h @@ -0,0 +1,141 @@ @@ -39809,7 +39751,7 @@ index 000000000000..5c49d0bde6a6 +#endif diff --git a/drivers/net/wireless/ssv6051/smac/drv_comm.h b/drivers/net/wireless/ssv6051/smac/drv_comm.h new file mode 100644 -index 000000000000..f04fbae004c3 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/drv_comm.h @@ -0,0 +1,61 @@ @@ -39876,7 +39818,7 @@ index 000000000000..f04fbae004c3 +#endif diff --git a/drivers/net/wireless/ssv6051/smac/efuse.c b/drivers/net/wireless/ssv6051/smac/efuse.c new file mode 100644 -index 000000000000..9a1f3f5488f2 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/efuse.c @@ -0,0 +1,334 @@ @@ -40216,7 +40158,7 @@ index 000000000000..9a1f3f5488f2 +} diff --git a/drivers/net/wireless/ssv6051/smac/efuse.h b/drivers/net/wireless/ssv6051/smac/efuse.h new file mode 100644 -index 000000000000..c25280c5abad +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/efuse.h @@ -0,0 +1,40 @@ @@ -40262,7 +40204,7 @@ index 000000000000..c25280c5abad +#endif diff --git a/drivers/net/wireless/ssv6051/smac/init.c b/drivers/net/wireless/ssv6051/smac/init.c new file mode 100644 -index 000000000000..592c52a28381 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/init.c @@ -0,0 +1,1347 @@ @@ -41615,7 +41557,7 @@ index 000000000000..592c52a28381 +EXPORT_SYMBOL(ssv6xxx_exit); diff --git a/drivers/net/wireless/ssv6051/smac/init.h b/drivers/net/wireless/ssv6051/smac/init.h new file mode 100644 -index 000000000000..97994d00d4da +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/init.h @@ -0,0 +1,23 @@ @@ -41644,7 +41586,7 @@ index 000000000000..97994d00d4da +#endif diff --git a/drivers/net/wireless/ssv6051/smac/lib.c b/drivers/net/wireless/ssv6051/smac/lib.c new file mode 100644 -index 000000000000..ccf0974b0f20 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/lib.c @@ -0,0 +1,33 @@ @@ -41683,7 +41625,7 @@ index 000000000000..ccf0974b0f20 +} diff --git a/drivers/net/wireless/ssv6051/smac/lib.h b/drivers/net/wireless/ssv6051/smac/lib.h new file mode 100644 -index 000000000000..266cf7afac95 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/lib.h @@ -0,0 +1,23 @@ @@ -41712,7 +41654,7 @@ index 000000000000..266cf7afac95 +#endif diff --git a/drivers/net/wireless/ssv6051/smac/linux_80211.h b/drivers/net/wireless/ssv6051/smac/linux_80211.h new file mode 100644 -index 000000000000..e268808e3c93 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/linux_80211.h @@ -0,0 +1,24 @@ @@ -41742,7 +41684,7 @@ index 000000000000..e268808e3c93 +#endif diff --git a/drivers/net/wireless/ssv6051/smac/p2p.c b/drivers/net/wireless/ssv6051/smac/p2p.c new file mode 100644 -index 000000000000..60fd8effd6ec +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/p2p.c @@ -0,0 +1,305 @@ @@ -42053,7 +41995,7 @@ index 000000000000..60fd8effd6ec +#endif diff --git a/drivers/net/wireless/ssv6051/smac/p2p.h b/drivers/net/wireless/ssv6051/smac/p2p.h new file mode 100644 -index 000000000000..a5bb99c61bb0 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/p2p.h @@ -0,0 +1,58 @@ @@ -42117,7 +42059,7 @@ index 000000000000..a5bb99c61bb0 +#endif diff --git a/drivers/net/wireless/ssv6051/smac/sar.c b/drivers/net/wireless/ssv6051/smac/sar.c new file mode 100644 -index 000000000000..44a47a5c7a0f +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/sar.c @@ -0,0 +1,208 @@ @@ -42331,7 +42273,7 @@ index 000000000000..44a47a5c7a0f +} diff --git a/drivers/net/wireless/ssv6051/smac/sar.h b/drivers/net/wireless/ssv6051/smac/sar.h new file mode 100644 -index 000000000000..291d58f236eb +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/sar.h @@ -0,0 +1,63 @@ @@ -42400,7 +42342,7 @@ index 000000000000..291d58f236eb +#endif diff --git a/drivers/net/wireless/ssv6051/smac/sec.h b/drivers/net/wireless/ssv6051/smac/sec.h new file mode 100644 -index 000000000000..04a0f47c8ce2 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/sec.h @@ -0,0 +1,52 @@ @@ -42458,7 +42400,7 @@ index 000000000000..04a0f47c8ce2 +#endif diff --git a/drivers/net/wireless/ssv6051/smac/smartlink.c b/drivers/net/wireless/ssv6051/smac/smartlink.c new file mode 100644 -index 000000000000..69e8d5118e09 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/smartlink.c @@ -0,0 +1,340 @@ @@ -42804,7 +42746,7 @@ index 000000000000..69e8d5118e09 +EXPORT_SYMBOL(ksmartlink_exit); diff --git a/drivers/net/wireless/ssv6051/smac/ssv6xxx_debugfs.c b/drivers/net/wireless/ssv6051/smac/ssv6xxx_debugfs.c new file mode 100644 -index 000000000000..9be5ea96e7f9 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/ssv6xxx_debugfs.c @@ -0,0 +1,223 @@ @@ -43033,7 +42975,7 @@ index 000000000000..9be5ea96e7f9 +}; diff --git a/drivers/net/wireless/ssv6051/smac/ssv6xxx_debugfs.h b/drivers/net/wireless/ssv6051/smac/ssv6xxx_debugfs.h new file mode 100644 -index 000000000000..39caceadda4a +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/ssv6xxx_debugfs.h @@ -0,0 +1,27 @@ @@ -43066,7 +43008,7 @@ index 000000000000..39caceadda4a +#endif diff --git a/drivers/net/wireless/ssv6051/smac/ssv_cfgvendor.c b/drivers/net/wireless/ssv6051/smac/ssv_cfgvendor.c new file mode 100644 -index 000000000000..f0135447b1f3 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/ssv_cfgvendor.c @@ -0,0 +1,1384 @@ @@ -44456,7 +44398,7 @@ index 000000000000..f0135447b1f3 +#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)) || defined(SSV_VENDOR_EXT_SUPPORT) */ diff --git a/drivers/net/wireless/ssv6051/smac/ssv_cfgvendor.h b/drivers/net/wireless/ssv6051/smac/ssv_cfgvendor.h new file mode 100644 -index 000000000000..6d8696fcd220 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/ssv_cfgvendor.h @@ -0,0 +1,247 @@ @@ -44709,7 +44651,7 @@ index 000000000000..6d8696fcd220 +#endif /* _RTW_CFGVENDOR_H_ */ diff --git a/drivers/net/wireless/ssv6051/smac/ssv_ht_rc.c b/drivers/net/wireless/ssv6051/smac/ssv_ht_rc.c new file mode 100644 -index 000000000000..fae819c43400 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/ssv_ht_rc.c @@ -0,0 +1,546 @@ @@ -45261,7 +45203,7 @@ index 000000000000..fae819c43400 +} diff --git a/drivers/net/wireless/ssv6051/smac/ssv_ht_rc.h b/drivers/net/wireless/ssv6051/smac/ssv_ht_rc.h new file mode 100644 -index 000000000000..275c3356e036 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/ssv_ht_rc.h @@ -0,0 +1,31 @@ @@ -45298,7 +45240,7 @@ index 000000000000..275c3356e036 +#endif diff --git a/drivers/net/wireless/ssv6051/smac/ssv_pm.c b/drivers/net/wireless/ssv6051/smac/ssv_pm.c new file mode 100644 -index 000000000000..fc3be2013f61 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/ssv_pm.c @@ -0,0 +1,19 @@ @@ -45323,7 +45265,7 @@ index 000000000000..fc3be2013f61 +#include "sar.h" diff --git a/drivers/net/wireless/ssv6051/smac/ssv_pm.h b/drivers/net/wireless/ssv6051/smac/ssv_pm.h new file mode 100644 -index 000000000000..9be260dd904e +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/ssv_pm.h @@ -0,0 +1,20 @@ @@ -45349,7 +45291,7 @@ index 000000000000..9be260dd904e +#endif diff --git a/drivers/net/wireless/ssv6051/smac/ssv_rc.c b/drivers/net/wireless/ssv6051/smac/ssv_rc.c new file mode 100644 -index 000000000000..9c3574285364 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/ssv_rc.c @@ -0,0 +1,1716 @@ @@ -47071,7 +47013,7 @@ index 000000000000..9c3574285364 +} diff --git a/drivers/net/wireless/ssv6051/smac/ssv_rc.h b/drivers/net/wireless/ssv6051/smac/ssv_rc.h new file mode 100644 -index 000000000000..911c182897fa +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/ssv_rc.h @@ -0,0 +1,50 @@ @@ -47127,7 +47069,7 @@ index 000000000000..911c182897fa +#endif diff --git a/drivers/net/wireless/ssv6051/smac/ssv_rc_common.h b/drivers/net/wireless/ssv6051/smac/ssv_rc_common.h new file mode 100644 -index 000000000000..13f3fdd8072b +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/smac/ssv_rc_common.h @@ -0,0 +1,175 @@ @@ -47308,7 +47250,7 @@ index 000000000000..13f3fdd8072b +#endif diff --git a/drivers/net/wireless/ssv6051/ssv6051-generic-wlan.c b/drivers/net/wireless/ssv6051/ssv6051-generic-wlan.c new file mode 100644 -index 000000000000..10a9a77081db +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/ssv6051-generic-wlan.c @@ -0,0 +1,76 @@ @@ -47390,7 +47332,7 @@ index 000000000000..10a9a77081db + diff --git a/drivers/net/wireless/ssv6051/ssvdevice/ssv_cmd.c b/drivers/net/wireless/ssv6051/ssvdevice/ssv_cmd.c new file mode 100644 -index 000000000000..503df1ea6dc3 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/ssvdevice/ssv_cmd.c @@ -0,0 +1,1765 @@ @@ -49161,7 +49103,7 @@ index 000000000000..503df1ea6dc3 +} diff --git a/drivers/net/wireless/ssv6051/ssvdevice/ssv_cmd.h b/drivers/net/wireless/ssv6051/ssvdevice/ssv_cmd.h new file mode 100644 -index 000000000000..d96bfcc54954 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/ssvdevice/ssv_cmd.h @@ -0,0 +1,50 @@ @@ -49217,7 +49159,7 @@ index 000000000000..d96bfcc54954 +#endif diff --git a/drivers/net/wireless/ssv6051/ssvdevice/ssvdevice.c b/drivers/net/wireless/ssv6051/ssvdevice/ssvdevice.c new file mode 100644 -index 000000000000..eb848553798f +index 000000000000..111111111111 --- /dev/null +++ b/drivers/net/wireless/ssv6051/ssvdevice/ssvdevice.c @@ -0,0 +1,256 @@ @@ -49478,5 +49420,5 @@ index 000000000000..eb848553798f +EXPORT_SYMBOL(ssvdevice_init); +EXPORT_SYMBOL(ssvdevice_exit); -- -2.34.1 +Armbian