diff --git a/patch/kernel/archive/rk3399-4.4/zz-003-nanopct4-enable-dp.patch b/patch/kernel/archive/rk3399-4.4/zz-003-nanopct4-enable-dp.patch index 31e39bd1a..e2a9a0500 100644 --- a/patch/kernel/archive/rk3399-4.4/zz-003-nanopct4-enable-dp.patch +++ b/patch/kernel/archive/rk3399-4.4/zz-003-nanopct4-enable-dp.patch @@ -1,16 +1,5 @@ -From 0a9aaba73fd285d0654bfba5ffdeffff15e8ed55 Mon Sep 17 00:00:00 2001 -From: JMCC -Date: Thu, 18 Feb 2021 18:36:07 +0100 -Subject: [PATCH] nanopct4-enable-dp - -Signed-off-by: JMCC ---- - .../dts/rockchip/rk3399-nanopi4-rev00.dts | 52 +++++++++++++++++++ - 1 file changed, 52 insertions(+) - -diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4-rev00.dts b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4-rev00.dts -index e0c98dc0..f57c23ba 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4-rev00.dts +unchanged: +--- b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4-rev00.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4-rev00.dts @@ -22,6 +22,48 @@ / { @@ -40,7 +29,7 @@ index e0c98dc0..f57c23ba 100644 + }; + + edp: edp@ff970000 { -+ status = "okay"; ++ status = "disabled"; + /delete-node/ edp_hpd; + }; + @@ -61,10 +50,7 @@ index e0c98dc0..f57c23ba 100644 }; &mach { -@@ -36,3 +78,13 @@ - num-lanes = <4>; - max-link-speed = <2>; - }; +@@ -38,0 +81,10 @@ + + +&edp { @@ -75,6 +61,105 @@ index e0c98dc0..f57c23ba 100644 + status = "okay"; +}; + --- -Created with Armbian build tools https://github.com/armbian/build - +unchanged: +--- a/arch/arm64/boot/dts/rockchip/overlay/README.rockchip-overlays ++++ b/arch/arm64/boot/dts/rockchip/overlay/README.rockchip-overlays +@@ -8,10 +8,14 @@ rockchip (Rockchip) + + ### Provided overlays: + +-- i2c7, i2c8, pcie-gen2, spi-spidev, uart4, w1-gpio ++- i2c7, i2c8, pcie-gen2, spi-spidev, uart4, w1-gpio, enable-edp + + ### Overlay details: + ++### enable-edp ++ ++Enables the eDP display out on NanoPC-T4 and others ++ + ### i2c7 + + Activates TWI/I2C bus 7 +unchanged: +--- /dev/null ++++ b/arch/arm64/boot/dts/rockchip/overlay/rockchip-enable-edp.dts +@@ -0,0 +1,15 @@ ++/dts-v1/; ++/plugin/; ++ ++/ { ++ compatible = "friendlyelec,nanopc-t4", "rockchip,rk3399"; ++ ++ fragment@0 { ++ target = ; ++ ++ __overlay__ { ++ status = "okay"; ++ }; ++ }; ++ ++}; +only in patch2: +unchanged: +--- a/arch/arm64/boot/dts/rockchip/overlay/Makefile ++++ b/arch/arm64/boot/dts/rockchip/overlay/Makefile +@@ -1,5 +1,6 @@ + # SPDX-License-Identifier: GPL-2.0 + dtbo-$(CONFIG_ARCH_ROCKCHIP) += \ ++ rockchip-enable-edp.dtbo \ + rockchip-i2c7.dtbo \ + rockchip-i2c8.dtbo \ + rockchip-pcie-gen2.dtbo \ +only in patch2: +unchanged: +--- a/arch/arm64/boot/dts/rockchip/overlay/rockchip-enable-edp.dts ++++ b/arch/arm64/boot/dts/rockchip/overlay/rockchip-enable-edp.dts +@@ -5,7 +5,25 @@ + compatible = "friendlyelec,nanopc-t4", "rockchip,rk3399"; + + fragment@0 { +- target = ; ++ target-path = "/edp@ff970000"; ++ ++ __overlay__ { ++ status = "okay"; ++ }; ++ }; ++ ++ fragment@1 { ++ target = <&display_subsystem>; ++ ++ __overlay__ { ++ route_edp: route-edp { ++ status = "okay"; ++ }; ++ }; ++ }; ++ ++ fragment@2 { ++ target = <&edp>; + + __overlay__ { + status = "okay"; +only in patch2: +unchanged: +--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4-rev00.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4-rev00.dts +@@ -60,7 +60,7 @@ + }; + + route_edp: route-edp { +- status = "okay"; ++ status = "disabled"; + }; + }; + +@@ -81,7 +81,7 @@ + + + &edp { +- status = "okay"; ++ status = "disabled"; + }; + + &cdn_dp {