github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-01 11:03:43 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

arm64: dts: rockchip: Move RK3399 eDP pinctrl to boards

Browse Source 
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.

Reviewed-by: Dragan Simic <dsimic@manjaro.org>
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Link: https://patch.msgid.link/c7d972d07875241805db8659305b26bd694867d4.1769191673.git.robin.murphy@arm.com
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
This commit is contained in:
Robin Murphy 2026-01-23 19:22:22 +00:00 committed by Heiko Stuebner
parent 5fdd6701fa
commit 638fa970ac
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm64/boot/dts/rockchip/rk3399-base.dtsi
View File

@ -2145,8 +2145,6 @@ edp: dp@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";
@ -2384,6 +2382,7 @@ cif_clkouta: cif-clkouta {
};
edp {
/omit-if-no-ref/
edp_hpd: edp-hpd {
rockchip,pins =
<4 RK_PC7 2 &pcfg_pull_none>;

2
arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi
View File

@ -241,6 +241,8 @@ &dmc {
};
&edp {
pinctrl-names = "default";
pinctrl-0 = <&edp_hpd>;
status = "okay";
/*

2
arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
View File

@ -401,8 +401,6 @@ &cpu_l3 {
&edp {
force-hpd;
pinctrl-names = "default";
pinctrl-0 = <&edp_hpd>;
status = "okay";
};

2
arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts
View File

@ -141,6 +141,8 @@ sdio_pwrseq: sdio-pwrseq {
};
&edp {
pinctrl-names = "default";
pinctrl-0 = <&edp_hpd>;
status = "okay";
};