[PATCH 3/4] arm64: dts: rockchip: Move RK3399 eDP pinctrl to boards

[Robin Murphy]

On 2026-01-14 11:49 am, Dragan Simic wrote:
> Hello Robin,
> 
> On Tuesday, December 30, 2025 18:20 CET, Robin Murphy <robin.murphy at arm.com> wrote:
>> The EDP_HOTPLUG pin is optional, and muxed with other functions (notably
>> HDMI CEC), so move its selection from the SoC DTSI to the boards which
>> apparently want it, namely those which enable eDP without "force-hpd".
>> By the same token we drop it from Pinebook Pro, which already uses
>> "force-hpd", and according to the schematics does not have the pin wired
>> at all.
>>
>> Signed-off-by: Robin Murphy <robin.murphy at arm.com>
>> ---
>>   arch/arm64/boot/dts/rockchip/rk3399-base.dtsi              | 2 --
>>   arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi    | 2 ++
>>   arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts       | 2 --
>>   arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts | 2 ++
>>   4 files changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi
>> index 4dcceb9136b7..19a312baa9f1 100644
>> --- a/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi
>> +++ b/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi
>> @@ -2145,8 +2145,6 @@ edp: dp at ff970000 {
>>   		interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH 0>;
>>   		clocks = <&cru PCLK_EDP>, <&cru PCLK_EDP_CTRL>, <&cru PCLK_VIO_GRF>;
>>   		clock-names = "dp", "pclk", "grf";
>> -		pinctrl-names = "default";
>> -		pinctrl-0 = <&edp_hpd>;
>>   		power-domains = <&power RK3399_PD_EDP>;
>>   		resets = <&cru SRST_P_EDP_CTRL>;
>>   		reset-names = "dp";
>> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi
>> index 9d07353df52c..3f3cb0eb5809 100644
>> --- a/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi
>> +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi
>> @@ -241,6 +241,8 @@ &dmc {
>>   };
>>   
>>   &edp {
>> +	pinctrl-names = "default";
>> +	pinctrl-0 = <&edp_hpd>;
>>   	status = "okay";
>>   
>>   	/*
>> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
>> index eaaca08a7601..dcab04863d28 100644
>> --- a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
>> +++ b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
>> @@ -401,8 +401,6 @@ &cpu_l3 {
>>   
>>   &edp {
>>   	force-hpd;
>> -	pinctrl-names = "default";
>> -	pinctrl-0 = <&edp_hpd>;
>>   	status = "okay";
>>   };
>>   
>> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts
>> index a4ceafe6dd7a..80d6ea0eda84 100644
>> --- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts
>> +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts
>> @@ -141,6 +141,8 @@ sdio_pwrseq: sdio-pwrseq {
>>   };
>>   
>>   &edp {
>> +	pinctrl-names = "default";
>> +	pinctrl-0 = <&edp_hpd>;
>>   	status = "okay";
>>   };
> 
> Thanks for this patch!  These changes are looking good to me, and the
> board dts files changed in this patch are the right ones, i.e. those that
> enable the "edp" node without specifying the "force-hpd" property.
> 
> Additionally,"/omit-if-no-ref/" should be added to the "edp" pinctrl node
> in rk3399-base.dtsi, to not include the "edp_hpd" pinctrl definition in
> the board dtb files where that actuually isn't used.

Ah, indeed - I can't think of a realistic good reason for the pinctrl to 
only be selected by an overlay rather than the base board, and even if 
anyone did conjure up some such crazy modular system, they could always 
change it back. Good thing I got distracted and didn't get round to 
sending v2 last night :)

> With the note above addressed, please feel free to include
> 
> Reviewed-by: Dragan Simic <dsimic at manjaro.org>

Thanks!

Robin.