[PATCH 08/17] rockchip: odroid-go2: Include pinctrl for sdmmc, sfc and uart in SPL

[Jonas Karlman]

Hi Kever,

On 8/31/2025 10:46 AM, Kever Yang wrote:
> Hi Jonas,
> 
> On 2025/7/14 07:33, Jonas Karlman wrote:
>> Include pinctrl nodes and props for sdmmc, sfc and uart in SPL to ensure
>> pins are configured according to the device tree.
>>
>> Signed-off-by: Jonas Karlman <jonas at kwiboo.se>
>> ---
>>   arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi | 10 ++++
>>   arch/arm/dts/rk3326-u-boot.dtsi            | 58 ++++++++++++++++++++++
>>   configs/odroid-go2_defconfig               |  2 +-
> 
> 
> In this Series, you update the dtsi and defconfig.
> 
> For board level dtsi update with the board defconfig, it's OK to go 
> together for me,
> 
> but for soc level dtsi, it would be better not go with defconfig because 
> it may affect other boards.

In normal circumstances with an existing soc u-boot.dtsi I fully agree
on such split.

The soc rk3326-u-boot.dtsi is added/extracted from the rk3326-odroid-go2
-u-boot.dtsi as part of this series, so there is no other board that can
be affected by changes in soc rk3326-u-boot.dtsi.

Because of this I have tried to keep all related changes together in
single patches to make it easier to review. I have also runtime tested
each step in this series to ensure bisect-ability.

> 
> You can update dtsi first, and then update/cleanup the board level 
> defconfig with correct commit message.
> 

I truly fail to see any benefit of this because of above, so I will
chose to ignore this request in v2, and will only address the remark
from Quentin on the patch "rockchip: odroid-go2: Remove u-boot.dtsi
props already defined".

Regards,
Jonas

> 
> Thanks,
> 
> - Kever
> 
>>   3 files changed, 69 insertions(+), 1 deletion(-)
>>
>> diff --git a/arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi b/arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi
>> index 06e2c190b1f9..6f40654d5e84 100644
>> --- a/arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi
>> +++ b/arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi
>> @@ -35,3 +35,13 @@
>>   	bootph-all;
>>   	clock-frequency = <24000000>;
>>   };
>> +
>> +&uart1_cts {
>> +	bootph-pre-sram;
>> +	bootph-pre-ram;
>> +};
>> +
>> +&uart1_xfer {
>> +	bootph-pre-sram;
>> +	bootph-pre-ram;
>> +};
>> diff --git a/arch/arm/dts/rk3326-u-boot.dtsi b/arch/arm/dts/rk3326-u-boot.dtsi
>> index 2894133cfe6d..196604a9987c 100644
>> --- a/arch/arm/dts/rk3326-u-boot.dtsi
>> +++ b/arch/arm/dts/rk3326-u-boot.dtsi
>> @@ -46,6 +46,24 @@
>>   	bootph-all;
>>   };
>>   
>> +&pcfg_pull_none {
>> +	bootph-all;
>> +};
>> +
>> +&pcfg_pull_none_8ma {
>> +	bootph-pre-ram;
>> +	bootph-some-ram;
>> +};
>> +
>> +&pcfg_pull_up {
>> +	bootph-all;
>> +};
>> +
>> +&pcfg_pull_up_8ma {
>> +	bootph-pre-ram;
>> +	bootph-some-ram;
>> +};
>> +
>>   &pmucru {
>>   	bootph-all;
>>   };
>> @@ -62,15 +80,55 @@
>>   	u-boot,spl-fifo-mode;
>>   };
>>   
>> +&sdmmc_bus4 {
>> +	bootph-pre-ram;
>> +	bootph-some-ram;
>> +};
>> +
>> +&sdmmc_clk {
>> +	bootph-pre-ram;
>> +	bootph-some-ram;
>> +};
>> +
>> +&sdmmc_cmd {
>> +	bootph-pre-ram;
>> +	bootph-some-ram;
>> +};
>> +
>> +&sdmmc_det {
>> +	bootph-pre-ram;
>> +	bootph-some-ram;
>> +};
>> +
>>   &sfc {
>>   	bootph-some-ram;
>>   };
>>   
>> +&sfc_bus2 {
>> +	bootph-pre-ram;
>> +	bootph-some-ram;
>> +};
>> +
>> +&sfc_clk {
>> +	bootph-pre-ram;
>> +	bootph-some-ram;
>> +};
>> +
>> +&sfc_cs0 {
>> +	bootph-pre-ram;
>> +	bootph-some-ram;
>> +};
>> +
>>   &uart2 {
>>   	bootph-all;
>>   	clock-frequency = <24000000>;
>>   };
>>   
>> +&uart2m1_xfer {
>> +	bootph-pre-sram;
>> +	bootph-pre-ram;
>> +};
>> +
>>   &xin24m {
>>   	bootph-all;
>>   };
>> diff --git a/configs/odroid-go2_defconfig b/configs/odroid-go2_defconfig
>> index 6bc0d12440c9..b0947fe2c8b2 100644
>> --- a/configs/odroid-go2_defconfig
>> +++ b/configs/odroid-go2_defconfig
>> @@ -51,7 +51,7 @@ CONFIG_CMD_USB_MASS_STORAGE=y
>>   CONFIG_EFI_PARTITION_ENTRIES_NUMBERS=64
>>   CONFIG_SPL_OF_CONTROL=y
>>   CONFIG_OF_LIVE=y
>> -CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
>> +CONFIG_OF_SPL_REMOVE_PROPS="interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
>>   CONFIG_ENV_IS_IN_MMC=y
>>   CONFIG_SPL_DM_SEQ_ALIAS=y
>>   CONFIG_REGMAP=y