diff mbox series

[v2,15/23] rockchip: rk3588-toybrick: Add missing Kconfig options

Message ID 20240413181425.1384357-16-jonas@kwiboo.se
State Superseded
Delegated to: Kever Yang
Headers show
Series rockchip: rk35xx: Miscellaneous fixes and updates | expand

Commit Message

Jonas Karlman April 13, 2024, 6:13 p.m. UTC
Add .dtb-file entry to Makefile and enable Kconfig options required to
configure pinctrl in SPL. Also add missing PHY_ROCKCHIP_NANENG_COMBOPHY.

Fixes: 9fdd9a546986 ("board: rockchip: add Rockchip Toybrick TB-RK3588X board")
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
---
v2: Fix Makefile entry from .dts to .dtb (Quentin)
---
 arch/arm/dts/Makefile             | 1 +
 configs/toybrick-rk3588_defconfig | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

Comments

Quentin Schulz April 15, 2024, 8:58 a.m. UTC | #1
Hi Jonas,

On 4/13/24 20:13, Jonas Karlman wrote:
> Add .dtb-file entry to Makefile and enable Kconfig options required to
> configure pinctrl in SPL. Also add missing PHY_ROCKCHIP_NANENG_COMBOPHY.
> 

Separate commits please.

Sum of changes is fine though (but a bit more verbose commit log would 
be welcome, why SPL_DM_SEQ_ALIAS for example).

Cheers,
Quentin
Dragan Simic April 15, 2024, 9:04 a.m. UTC | #2
On 2024-04-15 10:58, Quentin Schulz wrote:
> On 4/13/24 20:13, Jonas Karlman wrote:
>> Add .dtb-file entry to Makefile and enable Kconfig options required to
>> configure pinctrl in SPL. Also add missing 
>> PHY_ROCKCHIP_NANENG_COMBOPHY.
> 
> Separate commits please.

Perhaps the Makefile changes from a couple of different patches
could be put together into another, separate patch.  Those are all
related changes, and it would result in one less patch in the v3
of this series.

> Sum of changes is fine though (but a bit more verbose commit log would
> be welcome, why SPL_DM_SEQ_ALIAS for example).
Quentin Schulz April 15, 2024, 9:10 a.m. UTC | #3
Hi Dragan,

On 4/15/24 11:04, Dragan Simic wrote:
> On 2024-04-15 10:58, Quentin Schulz wrote:
>> On 4/13/24 20:13, Jonas Karlman wrote:
>>> Add .dtb-file entry to Makefile and enable Kconfig options required to
>>> configure pinctrl in SPL. Also add missing PHY_ROCKCHIP_NANENG_COMBOPHY.
>>
>> Separate commits please.
> 
> Perhaps the Makefile changes from a couple of different patches
> could be put together into another, separate patch.  Those are all
> related changes, and it would result in one less patch in the v3
> of this series.
> 

That would be fine with me.

But always better have too many patches than too few, it's easier to 
later squash than separate them :)

Cheers,
Quentin
Jonas Karlman April 15, 2024, 2:17 p.m. UTC | #4
Hi Quentin and Dragan,

On 2024-04-15 11:10, Quentin Schulz wrote:
> Hi Dragan,
> 
> On 4/15/24 11:04, Dragan Simic wrote:
>> On 2024-04-15 10:58, Quentin Schulz wrote:
>>> On 4/13/24 20:13, Jonas Karlman wrote:
>>>> Add .dtb-file entry to Makefile and enable Kconfig options required to
>>>> configure pinctrl in SPL. Also add missing PHY_ROCKCHIP_NANENG_COMBOPHY.
>>>
>>> Separate commits please.
>>
>> Perhaps the Makefile changes from a couple of different patches
>> could be put together into another, separate patch.  Those are all
>> related changes, and it would result in one less patch in the v3
>> of this series.
>>
> 
> That would be fine with me.
> 
> But always better have too many patches than too few, it's easier to 
> later squash than separate them :)

Sure, I will split these patches into smaller single purpose patches in v3.

Regards,
Jonas

> 
> Cheers,
> Quentin
diff mbox series

Patch

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 38d259a7035c..d5393429f6c5 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -180,6 +180,7 @@  dtb-$(CONFIG_ROCKCHIP_RK3588) += \
 	rk3588-quartzpro64.dtb \
 	rk3588s-rock-5a.dtb \
 	rk3588-rock-5b.dtb \
+	rk3588-toybrick-x0.dtb \
 	rk3588-turing-rk1.dtb
 
 dtb-$(CONFIG_ROCKCHIP_RV1108) += \
diff --git a/configs/toybrick-rk3588_defconfig b/configs/toybrick-rk3588_defconfig
index 38fc7906eef2..0168e014103e 100644
--- a/configs/toybrick-rk3588_defconfig
+++ b/configs/toybrick-rk3588_defconfig
@@ -33,8 +33,9 @@  CONFIG_CMD_REGULATOR=y
 # CONFIG_SPL_DOS_PARTITION is not set
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_LIVE=y
-CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SPL_REGMAP=y
 CONFIG_SPL_SYSCON=y
 CONFIG_SPL_CLK=y
@@ -53,6 +54,8 @@  CONFIG_PHY_REALTEK=y
 CONFIG_DWC_ETH_QOS=y
 CONFIG_DWC_ETH_QOS_ROCKCHIP=y
 CONFIG_PHY_ROCKCHIP_INNO_USB2=y
+CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y
+CONFIG_SPL_PINCTRL=y
 CONFIG_PWM_ROCKCHIP=y
 CONFIG_SPL_RAM=y
 CONFIG_BAUDRATE=1500000