Skip to content

Commit

Permalink
rockchip64-6.10: rebase/rewrite all patches against v6.10.10
Browse files Browse the repository at this point in the history
  • Loading branch information
@rpardini @igorpecovnik
rpardini authored and igorpecovnik committed Sep 14, 2024
1 parent a223553 commit 17aeec9
Show file tree
Hide file tree
Showing 94 changed files with 1,033 additions and 848 deletions.
46 changes: 23 additions & 23 deletions patch/kernel/archive/rockchip64-6.10/add-board-helios64.patch
View file
Original file line number Diff line number Diff line change
@@ -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 <aditya@kobol.io>
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
Expand All @@ -10,11 +10,11 @@ is the complete set of changes actually done.

Signed-off-by: Aditya Prayoga <aditya@kobol.io>
---
.../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 @@
Expand Down Expand Up @@ -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>;
};

Expand Down Expand Up @@ -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>;
};
Expand Down Expand Up @@ -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>;
};

Expand All @@ -379,7 +379,7 @@ index 9586bb12a5d8..09e2cfe40696 100644
&emmc_phy {
status = "okay";
};
@@ -296,6 +500,11 @@ &gmac {
@@ -296,6 +502,11 @@ &gmac {
status = "okay";
};

Expand All @@ -391,15 +391,15 @@ 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;
+
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 {
Expand All @@ -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>;
Expand Down Expand Up @@ -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>;
Expand Down Expand Up @@ -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>;
Expand Down Expand Up @@ -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";

Expand Down Expand Up @@ -671,15 +671,15 @@ 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";
+ pinctrl-0 = <&pcie_prst &pcie_clkreqn_cpm>;
status = "okay";

vpcie12v-supply = <&vcc12v_dcin>;
@@ -437,36 +831,116 @@ &pcie0 {
@@ -437,36 +833,116 @@ &pcie0 {
};

&pinctrl {
Expand Down Expand Up @@ -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 {
Expand All @@ -813,7 +813,7 @@ index 9586bb12a5d8..09e2cfe40696 100644
};
};
};
@@ -506,10 +980,29 @@ &pwm1 {
@@ -506,10 +982,29 @@ &pwm1 {
status = "okay";
};

Expand Down Expand Up @@ -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;
Expand All @@ -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";
};

Expand Down Expand Up @@ -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";
};

Expand Down Expand Up @@ -1034,5 +1034,5 @@ index 9586bb12a5d8..09e2cfe40696 100644
+ status = "okay";
+};
--
2.43.0
Armbian

76 changes: 57 additions & 19 deletions patch/kernel/archive/rockchip64-6.10/board-firefly-rk3399-dts.patch
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,42 @@
index c654b6b02f3..f73f792eb44 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: chainsx <chainsx@outlook.com>
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 <chainsx@outlook.com>
> 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 <chainsx@outlook.com>
> 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 <chainsx@outlook.com>
> 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 <paolo.sabatino@gmail.com>
> 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 <paolo.sabatino@gmail.com>
> 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";
Expand All @@ -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";
Expand All @@ -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>;
};
Expand Down Expand Up @@ -51,7 +86,7 @@ index c654b6b02f3..f73f792eb44 100644
};

&cpu_l0 {
@@ -306,6 +329,8 @@
@@ -306,6 +330,8 @@ &gpu {
};

&hdmi {
Expand All @@ -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;

Expand Down Expand Up @@ -89,7 +124,7 @@ index c654b6b02f3..f73f792eb44 100644

regulators {
vdd_center: DCDC_REG1 {
@@ -389,8 +414,8 @@
@@ -389,8 +415,8 @@ regulator-state-mem {
};
};

Expand All @@ -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 {
};
};

Expand All @@ -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 {
};
};

Expand All @@ -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>;
Expand All @@ -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>;
Expand All @@ -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 {
Expand All @@ -179,7 +214,7 @@ index c654b6b02f3..f73f792eb44 100644
reg = <0x22>;
interrupt-parent = <&gpio1>;
interrupts = <RK_PA2 IRQ_TYPE_LEVEL_LOW>;
@@ -638,7 +667,7 @@
@@ -638,7 +668,7 @@ &i2s2 {
&io_domains {
status = "okay";

Expand All @@ -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";
Expand All @@ -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>;
};
Expand All @@ -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>;
};
Expand All @@ -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>;
};
};
Expand All @@ -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>;
Expand All @@ -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";
Expand All @@ -280,3 +315,6 @@ index c654b6b02f3..f73f792eb44 100644
};

&uart2 {
--
Armbian

Loading

0 comments on commit 17aeec9

Please sign in to comment.