[PATCH] arm: dts: rockchip: fix dts for Radxa ROCK 4C+

[FUKAUMI Naoki]

Hi,

On 8/9/24 18:16, Kever Yang wrote:
> 
> On 2024/8/9 06:19, FUKAUMI Naoki wrote:
>> Radxa ROCK Pi 4 series and Radxa ROCK 4C+ are not compatible.
> 
> A little bit more detail about why not compatible?
> 
> The eMMC is different?

I should say "ROCK Pi 4 series and ROCK 4C+ cannot share dts file."

$ grep rk3399-rock-pi-4.dtsi dts/upstream/src/arm64/rockchip/*
dts/upstream/src/arm64/rockchip/rk3399-rock-4se.dts:#include 
"rk3399-rock-pi-4.dtsi"
dts/upstream/src/arm64/rockchip/rk3399-rock-pi-4a-plus.dts:#include 
"rk3399-rock-pi-4.dtsi"
dts/upstream/src/arm64/rockchip/rk3399-rock-pi-4a.dts:#include 
"rk3399-rock-pi-4.dtsi"
dts/upstream/src/arm64/rockchip/rk3399-rock-pi-4b-plus.dts:#include 
"rk3399-rock-pi-4.dtsi"
dts/upstream/src/arm64/rockchip/rk3399-rock-pi-4b.dts:#include 
"rk3399-rock-pi-4.dtsi"
dts/upstream/src/arm64/rockchip/rk3399-rock-pi-4c.dts:#include 
"rk3399-rock-pi-4.dtsi"

4C+ is different board.

Best regards,

--
FUKAUMI Naoki
Radxa Computer (Shenzhen) Co., Ltd.

> Thanks,
> 
> - Kever
> 
>> add
>> rk3399-rock-pi-4-u-boot.dtsi contents and remove dependency of it.
>>
>> no functional change is intended.
>>
>> Fixes: 71a95e2efd30 ("arm: dts: rockchip: add Radxa ROCK 4C+")
>> Suggested-by: Dragan Simic <dsimic at manjaro.org>
>> Signed-off-by: FUKAUMI Naoki <naoki at radxa.com>
>> ---
>>   arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi | 16 ++++++++++++++--
>>   1 file changed, 14 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi 
>> b/arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi
>> index 5ec15a845c1..50dae5cb5ef 100644
>> --- a/arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi
>> +++ b/arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi
>> @@ -1,8 +1,10 @@
>> -// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
>> +// SPDX-License-Identifier: GPL-2.0+
>>   /*
>> + * Copyright (C) 2019 Jagan Teki <jagan at amarulasolutions.com>
>>    * Copyright (c) 2023 Radxa Limited
>>    */
>> -#include "rk3399-rock-pi-4-u-boot.dtsi"
>> +#include "rk3399-u-boot.dtsi"
>> +#include "rk3399-sdram-lpddr4-100.dtsi"
>>   &pcfg_pull_none_18ma {
>>       bootph-pre-ram;
>> @@ -14,6 +16,12 @@
>>       bootph-some-ram;
>>   };
>> +&sdhci {
>> +    cap-mmc-highspeed;
>> +    mmc-ddr-1_8v;
>> +    mmc-hs200-1_8v;
>> +};
>> +
>>   &spi1 {
>>       status = "okay";
>> @@ -25,3 +33,7 @@
>>           spi-max-frequency = <10000000>;
>>       };
>>   };
>> +
>> +&vdd_log {
>> +    regulator-init-microvolt = <950000>;
>> +};
>