71 lines
3.8 KiB
Diff
71 lines
3.8 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 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 <[email protected]>
|
|
> 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 <[email protected]>
|
|
> X-Git-Archeology: Subject: bump rockchip family edge kernel to 6.9
|
|
> X-Git-Archeology:
|
|
> X-Git-Archeology: - Revision 7da7bbf61cb776a054219e35926d391dad9a67a7: https://github.com/armbian/build/commit/7da7bbf61cb776a054219e35926d391dad9a67a7
|
|
> X-Git-Archeology: Date: Mon, 22 Jul 2024 19:18:14 +0200
|
|
> X-Git-Archeology: From: Paolo Sabatino <[email protected]>
|
|
> X-Git-Archeology: Subject: rockchip: bump edge kernel to 6.10
|
|
> X-Git-Archeology:
|
|
> X-Git-Archeology: - Revision 94ec783de0dad381b3e2e71d646d8428af4d5051: https://github.com/armbian/build/commit/94ec783de0dad381b3e2e71d646d8428af4d5051
|
|
> X-Git-Archeology: Date: Wed, 18 Sep 2024 14:03:19 +0200
|
|
> X-Git-Archeology: From: Paolo Sabatino <[email protected]>
|
|
> X-Git-Archeology: Subject: bump rockchip 32 bit edge kernel to 6.11
|
|
> X-Git-Archeology:
|
|
> X-Git-Archeology: - Revision c90a0f7890bddc8e755847fc8227e15828950251: https://github.com/armbian/build/commit/c90a0f7890bddc8e755847fc8227e15828950251
|
|
> X-Git-Archeology: Date: Sat, 30 Nov 2024 13:07:31 +0100
|
|
> X-Git-Archeology: From: Paolo Sabatino <[email protected]>
|
|
> X-Git-Archeology: Subject: rockchip: bump edge kernel to 6.12
|
|
> 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
|
|
|