71 lines
3.9 KiB
Diff
71 lines
3.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Paolo Sabatino <[email protected]>
|
|
Date: Tue, 26 Dec 2023 16:45:30 +0100
|
|
Subject: [ARCHEOLOGY] consolidate rk322x and rockchip 32 bit families
|
|
|
|
> X-Git-Archeology: > recovered message: > * merge patches from rockchip and rk322x families for current and edge
|
|
> X-Git-Archeology: > recovered message: > kernels
|
|
> X-Git-Archeology: > recovered message: > * adjust patches for tinkerboard to remove some cruft and overclocking
|
|
> X-Git-Archeology: > recovered message: > * rework kernel configs
|
|
> X-Git-Archeology: > recovered message: > * fix rk322x dmc to avoid lockup on rk3288
|
|
> X-Git-Archeology: > recovered message: > * migrate rockchip-6.6 into patch series, rename all patches with
|
|
> X-Git-Archeology: > recovered message: > more understandable names
|
|
> X-Git-Archeology: > recovered message: > * add gen-series.sh script in tools directory (it is a naive tool to
|
|
> X-Git-Archeology: > recovered message: > create patch series when you don't want to rebase everything)
|
|
> X-Git-Archeology: - Revision 562d96128ba6a511a8a06c0f4d29946ab80b8969: https://github.com/armbian/build/commit/562d96128ba6a511a8a06c0f4d29946ab80b8969
|
|
> X-Git-Archeology: Date: Tue, 26 Dec 2023 16:45:30 +0100
|
|
> X-Git-Archeology: From: Paolo Sabatino <[email protected]>
|
|
> X-Git-Archeology: Subject: consolidate rk322x and rockchip 32 bit families
|
|
> X-Git-Archeology:
|
|
> X-Git-Archeology: - Revision 54628d7d3e11824e560b77e905f69d52feb0fbd0: https://github.com/armbian/build/commit/54628d7d3e11824e560b77e905f69d52feb0fbd0
|
|
> X-Git-Archeology: Date: Wed, 01 Jan 2025 19:38:55 +0100
|
|
> X-Git-Archeology: From: Paolo Sabatino <[email protected]>
|
|
> X-Git-Archeology: Subject: rockchip: bump edge kernel to 6.13-rc5
|
|
> X-Git-Archeology:
|
|
> X-Git-Archeology: - Revision 7c55b4fce91f38383398a7498dde1c6d69a70495: https://github.com/armbian/build/commit/7c55b4fce91f38383398a7498dde1c6d69a70495
|
|
> X-Git-Archeology: Date: Wed, 26 Mar 2025 22:23:29 +0100
|
|
> X-Git-Archeology: From: Paolo Sabatino <[email protected]>
|
|
> X-Git-Archeology: Subject: bump rockchip 32bit edge kernel to v6.14
|
|
> X-Git-Archeology:
|
|
> X-Git-Archeology: - Revision cc4cb72d4069147ea1b5e6936de3b49aace21967: https://github.com/armbian/build/commit/cc4cb72d4069147ea1b5e6936de3b49aace21967
|
|
> X-Git-Archeology: Date: Tue, 03 Jun 2025 09:53:37 +0200
|
|
> X-Git-Archeology: From: Paolo Sabatino <[email protected]>
|
|
> X-Git-Archeology: Subject: bump rockchip 32 bit edge kernel to 6.15
|
|
> X-Git-Archeology:
|
|
> X-Git-Archeology: - Revision 96fe7dee19eaec6d9c5159a5cc50e33ca9c96096: https://github.com/armbian/build/commit/96fe7dee19eaec6d9c5159a5cc50e33ca9c96096
|
|
> X-Git-Archeology: Date: Mon, 28 Jul 2025 20:45:52 +0800
|
|
> X-Git-Archeology: From: Paolo Sabatino <[email protected]>
|
|
> X-Git-Archeology: Subject: bump rockchip edge to kernel 6.16
|
|
> X-Git-Archeology:
|
|
> X-Git-Archeology: - Revision 29317c6f7e33f2cc509acc0da23b615a7d9d8c31: https://github.com/armbian/build/commit/29317c6f7e33f2cc509acc0da23b615a7d9d8c31
|
|
> X-Git-Archeology: Date: Thu, 18 Sep 2025 22:48:06 +0200
|
|
> X-Git-Archeology: From: Paolo Sabatino <[email protected]>
|
|
> X-Git-Archeology: Subject: update rockchip 32 bit edge kernel to 6.17
|
|
> X-Git-Archeology:
|
|
---
|
|
arch/arm/boot/dts/rockchip/rk3288.dtsi | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/arch/arm/boot/dts/rockchip/rk3288.dtsi b/arch/arm/boot/dts/rockchip/rk3288.dtsi
|
|
index 111111111111..222222222222 100644
|
|
--- a/arch/arm/boot/dts/rockchip/rk3288.dtsi
|
|
+++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi
|
|
@@ -34,10 +34,10 @@ aliases {
|
|
i2c3 = &i2c3;
|
|
i2c4 = &i2c4;
|
|
i2c5 = &i2c5;
|
|
- mshc0 = &emmc;
|
|
- mshc1 = &sdmmc;
|
|
- mshc2 = &sdio0;
|
|
- mshc3 = &sdio1;
|
|
+ mmc0 = &sdmmc;
|
|
+ mmc1 = &sdio0;
|
|
+ mmc2 = &emmc;
|
|
+ mmc3 = &sdio1;
|
|
serial0 = &uart0;
|
|
serial1 = &uart1;
|
|
serial2 = &uart2;
|
|
--
|
|
Armbian
|
|
|