[PATCH v3 2/7] arm64: dts: rockchip: add NanoPC-T6 LTS

[Krzysztof Kozlowski]

On 21/08/2024 16:39, Dragan Simic wrote:
> Hello Krzysztof,
> 
> On 2024-08-21 15:13, Krzysztof Kozlowski wrote:
>> On 21/08/2024 12:26, Marcin Juszkiewicz wrote:
>>> FriendlyELEC introduced a second version of NanoPC-T6 SBC.
>>>
>>> The miniPCIe slot got removed and USB 2.0 configuration has changed.
>>> There are two external accessible ports and two ports on the internal
>>> header.
>>>
>>> There is an on-board USB hub which provides:
>>> - one external connector (bottom one)
>>> - two internal ports on pin header
>>> - one port for m.2 E connector
>>>
>>> The top USB 2.0 connector comes directly from the SoC.
>>>
>>> Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz at linaro.org>
>>> ---
>>>  arch/arm64/boot/dts/rockchip/Makefile              |  1 +
>>>  .../boot/dts/rockchip/rk3588-nanopc-t6-lts.dts     | 61 
>>> ++++++++++++++++++++++
>>>  2 files changed, 62 insertions(+)
>>>
>>> diff --git a/arch/arm64/boot/dts/rockchip/Makefile 
>>> b/arch/arm64/boot/dts/rockchip/Makefile
>>> index fda1b980eb4b..0f982c741243 100644
>>> --- a/arch/arm64/boot/dts/rockchip/Makefile
>>> +++ b/arch/arm64/boot/dts/rockchip/Makefile
>>> @@ -128,6 +128,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-evb1-v10.dtb
>>>  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-friendlyelec-cm3588-nas.dtb
>>>  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-jaguar.dtb
>>>  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-nanopc-t6.dtb
>>> +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-nanopc-t6-lts.dtb
>>>  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-ok3588-c.dtb
>>>  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-orangepi-5-plus.dtb
>>>  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-quartzpro64.dtb
>>> diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts.dts 
>>> b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts.dts
>>> new file mode 100644
>>> index 000000000000..e950e40632cf
>>> --- /dev/null
>>> +++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts.dts
>>> @@ -0,0 +1,61 @@
>>> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
>>> +/*
>>> + * Copyright (c) 2021 Rockchip Electronics Co., Ltd.
>>> + * Copyright (c) 2023 Thomas McKahan
>>> + * Copyright (c) 2024 Linaro Ltd.
>>> + *
>>> + */
>>> +
>>> +/dts-v1/;
>>> +
>>> +#include "rk3588-nanopc-t6.dts"
>>
>> Do not include DTS files. Please rename board to DTSI (which is for
>> includes) and then include it in respective boards. Remember to 
>> generate
>> patches with proper -M/-B/-C so the rename will be properly recognize.
> 
> This is perhaps a good opportunity to discuss this.  I already saw at
> least half a dozen of instances where a board dts file is included in
> another board dts file that modifies or extends it for another version
> of the same board, or something like that.
> 
> Moreover, we'll most likely have to introduce quite a few new board dts
> files, for board versions that use different type of DRAM and so far 
> were
> handled in U-Boot only. [1]
> 
> Thus, I think this is a good opportunity to conclude what to do there.
> If you insist on converting already existing dts files into dtsi files,

I did not write anything about this.

> we'll be introducing much more changes, which I'd be fine with, but I'd
> then also like to convert _all_ existing cases of dts file inclusion 
> into

Don't understand. If I insist on converting already existing DTS, then
convert all existing DTS?

> proper inclusion of dtsi files, which will result in even more new files
> being introduced, etc.
> 
> [1] 
> https://lore.kernel.org/linux-rockchip/172408433165.1619643.7928785825448507704.robh@kernel.org/T/#m52de793f30579a8063f66eb2e64026776da55a66

Best regards,
Krzysztof