166 lines
3.1 KiB
Diff
166 lines
3.1 KiB
Diff
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 @@
|
|
/ {
|
|
model = "FriendlyElec NanoPC-T4";
|
|
compatible = "friendlyelec,nanopc-t4", "rockchip,rk3399";
|
|
+
|
|
+ fiq_debugger: fiq-debugger {
|
|
+ compatible = "rockchip,fiq-debugger";
|
|
+ rockchip,serial-id = <2>;
|
|
+ rockchip,signal-irq = <182>;
|
|
+ rockchip,wake-irq = <0>;
|
|
+ rockchip,irq-mode-enable = <1>; /* If enable uart uses irq instead of fiq */
|
|
+ rockchip,baudrate = <1500000>; /* Only 115200 and 1500000 */
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&uart2c_xfer>;
|
|
+ };
|
|
+
|
|
+ xin32k: xin32k {
|
|
+ compatible = "fixed-clock";
|
|
+ clock-frequency = <32768>;
|
|
+ clock-output-names = "xin32k";
|
|
+ #clock-cells = <0>;
|
|
+ };
|
|
+
|
|
+ cdn_dp: dp@fec00000 {
|
|
+ status = "okay";
|
|
+ };
|
|
+
|
|
+ edp: edp@ff970000 {
|
|
+ status = "disabled";
|
|
+ /delete-node/ edp_hpd;
|
|
+ };
|
|
+
|
|
+};
|
|
+
|
|
+&display_subsystem {
|
|
+
|
|
+ route {
|
|
+ route_hdmi: route-hdmi {
|
|
+ status = "okay";
|
|
+ };
|
|
+
|
|
+ route_edp: route-edp {
|
|
+ status = "okay";
|
|
+ };
|
|
+ };
|
|
+
|
|
};
|
|
|
|
&mach {
|
|
@@ -38,0 +81,10 @@
|
|
+
|
|
+
|
|
+&edp {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&cdn_dp {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
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 = <edp>;
|
|
+
|
|
+ __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 = <edp>;
|
|
+ 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 {
|