[PATCH 00/31] rockchip: rk3399: Sync DT with linux v6.8 and update defconfigs

[Jonas Karlman]

On 2024-04-01 12:53, Sumit Garg wrote:
> On Mon, 1 Apr 2024 at 15:31, Jonas Karlman <jonas at kwiboo.se> wrote:
>>
>> On 2024-04-01 11:45, Jonas Karlman wrote:
>>> Hi Sumit,
>>>
>>> On 2024-04-01 10:52, Sumit Garg wrote:
>>>> Hi Jonas,
>>>>
>>>> On Mon, 1 Apr 2024 at 01:59, Jonas Karlman <jonas at kwiboo.se> wrote:
>>>>>
>>>>> This series adds support for new clocks used in linux v6.8 device trees,
>>>>> enables use of FIT signature check for checksum validation and fixes
>>>>> loading FIT from SD-card when loading FIT from eMMC fails.
>>>>>
>>>>> After this series it should be possible to move RK3399 boards to use
>>>>> OF_UPSTREAM in a future patch once dts/upstream move to a v6.8+ tag.
>>>>>
>>>>
>>>> Thanks for putting this effort together. A switch to v6.8 tag for
>>>> OF_UPSTREAM will happen as part of patch [1]. So if you want to save
>>>> further effort then you can just rebase with a switch to OF_UPSTREAM
>>>> once that patch [1] lands in next.
>>>
>>> Because this is a jump of device tree files from v5.14-rc1 to v6.8,
>>> reviewability and being able to cherry-pick these changes to my
>>> rk3xxx-2024.04 branch, I think it is much more appropriate to first sync
>>> everything to v6.8 and then in a separate series move to OF_UPSTREAM.
>>> Else it can be very hard to understand some of the changes that has been
>>> and was needed to be made to u-boot.dtsi files.
>>
>> Also forgot to mention that these synced DT files still contains some
>> minor modification in #include dtsi paths of files that is shared
>> between rk3288 (armv7) and rk3399 (armv8),
> 
> I can only see rockchip-u-boot.dtsi being shared which should be
> handled automatically. Is there anything else I am missing here?

The following is a diff of arch/arm/dts rk3399 DTs after this series
compared to fully synced v6.8.

Also the content of cros-ec-keyboard.dtsi was excluded in this sync
because it initially caused compile issues.

diff --git a/arch/arm/dts/rk3399-gru.dtsi b/arch/arm/dts/rk3399-gru.dtsi
index d90fe4d40d48..789fd0dcc88b 100644
--- a/arch/arm/dts/rk3399-gru.dtsi
+++ b/arch/arm/dts/rk3399-gru.dtsi
@@ -684,8 +684,8 @@ ap_i2c_audio: &i2c8 {
        status = "okay";
 };

-#include <cros-ec-keyboard.dtsi>
-#include <cros-ec-sbs.dtsi>
+#include <arm/cros-ec-keyboard.dtsi>
+#include <arm/cros-ec-sbs.dtsi>

 &pinctrl {
        /*
diff --git a/arch/arm/dts/rk3399pro-rock-pi-n10.dts b/arch/arm/dts/rk3399pro-rock-pi-n10.dts
index bf026786fa92..c58fb7658d7a 100644
--- a/arch/arm/dts/rk3399pro-rock-pi-n10.dts
+++ b/arch/arm/dts/rk3399pro-rock-pi-n10.dts
@@ -8,7 +8,7 @@
 /dts-v1/;
 #include "rk3399.dtsi"
 #include "rk3399-opp.dtsi"
-#include <rockchip-radxa-dalang-carrier.dtsi>
+#include <arm/rockchip/rockchip-radxa-dalang-carrier.dtsi>
 #include "rk3399pro-vmarc-som.dtsi"

 / {

Regards,
Jonas

> 
> -Sumit