Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rockchip64-6.10: rebase/rewrite all patches against v6.10.10 #7237

Merged
merged 4 commits into from
Sep 14, 2024
Merged

rockchip64-6.10: rebase/rewrite all patches against v6.10.10 #7237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a54c6e8
rockchip64-6.10: fix `add-board-fine3399-dts.patch` patch headers/for…
rpardini Sep 14, 2024
6bdffc3
rockchip64-6.10: fix `add-board-xiabao-nas-dts.patch` patch headers/f…
rpardini Sep 14, 2024
9f5cc3d
rockchip64-6.10: remove symlinks by replacing with target's content
rpardini Sep 14, 2024
ffe1759
rockchip64-6.10: rebase/rewrite all patches against v6.10.10
rpardini Sep 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,769 changes: 893 additions & 876 deletions patch/kernel/archive/rockchip64-6.10/add-board-fine3399-dts.patch
View file
Open in desktop

Large diffs are not rendered by default.

46 changes: 23 additions & 23 deletions patch/kernel/archive/rockchip64-6.10/add-board-helios64.patch
View file
Open in desktop
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

17 changes: 17 additions & 0 deletions patch/kernel/archive/rockchip64-6.10/add-board-xiaobao-nas-dts.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
Date: Wed, 29 May 2024 13:31:51 +0200
From: Lemon <149338935+Lemon1151@users.noreply.github.com>
Subject: Add board rk3399-xiaobao-nas

> X-Git-Archeology: - Revision 10ce0c9e5f19728e76adc084c9424bc53ad1466e: https://github.com/armbian/build/commit/10ce0c9e5f19728e76adc084c9424bc53ad1466e
> X-Git-Archeology: Date: Wed, 29 May 2024 13:31:51 +0200
> X-Git-Archeology: From: Lemon <149338935+Lemon1151@users.noreply.github.com>
> X-Git-Archeology: Subject: Zhong Ming Ming dd-new-borad-tinker-edge-r.patch -> patch/u-boot/u-boot-rockchip64/add-new-board-tinker-edge-r.patch;Tian Jia Liao Dui xiaobao-nasDe Zhi Chi (#6662)
---
arch/arm64/boot/dts/rockchip/rk3399-xiaobao-nas.dts | 774 ++++++++++
1 file changed, 774 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-xiaobao-nas.dts b/arch/arm64/boot/dts/rockchip/rk3399-xiaobao-nas.dts
new file mode 100644
index 000000000000..111111111111
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3399-xiaobao-nas.dts
@@ -0,0 +1,774 @@
Expand Down Expand Up @@ -777,3 +791,6 @@ new file mode 100644
+&vopl_mmu {
+ status = "okay";
+};
--
Armbian

Loading