96 lines
1.9 KiB
Diff
96 lines
1.9 KiB
Diff
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4-common.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4-common.dtsi
|
||
|
|
index c2918c3f..dcf79320 100644
|
||
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4-common.dtsi
|
||
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4-common.dtsi
|
||
|
|
@@ -74,24 +74,6 @@
|
||
|
|
spi1 = &spi1;
|
||
|
|
};
|
||
|
|
|
||
|
|
- 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>;
|
||
|
|
- };
|
||
|
|
-
|
||
|
|
clkin_gmac: external-gmac-clock {
|
||
|
|
compatible = "fixed-clock";
|
||
|
|
clock-frequency = <125000000>;
|
||
|
|
@@ -526,16 +508,12 @@
|
||
|
|
//allocator = <0>;
|
||
|
|
};
|
||
|
|
|
||
|
|
-&rga {
|
||
|
|
- status = "disabled";
|
||
|
|
-};
|
||
|
|
-
|
||
|
|
&display_subsystem {
|
||
|
|
status = "okay";
|
||
|
|
};
|
||
|
|
|
||
|
|
&edp {
|
||
|
|
- status = "okay";
|
||
|
|
+ status = "disabled";
|
||
|
|
force-hpd;
|
||
|
|
/delete-property/ pinctrl-0;
|
||
|
|
|
||
|
|
@@ -556,29 +534,22 @@
|
||
|
|
|
||
|
|
&route_edp {
|
||
|
|
status = "okay";
|
||
|
|
- logo,mode = "center";
|
||
|
|
};
|
||
|
|
|
||
|
|
&cdn_dp {
|
||
|
|
- status = "okay";
|
||
|
|
+ status = "disabled";
|
||
|
|
extcon = <&fusb0>;
|
||
|
|
phys = <&tcphy0_dp>;
|
||
|
|
};
|
||
|
|
|
||
|
|
&hdmi {
|
||
|
|
- /* remove the hdmi_i2c_xfer */
|
||
|
|
- pinctrl-0 = <&hdmi_cec>;
|
||
|
|
+ /* remove the hdmi_cec, reused by edp_hpd */
|
||
|
|
+ pinctrl-0 = <&hdmi_i2c_xfer>;
|
||
|
|
#address-cells = <1>;
|
||
|
|
#size-cells = <0>;
|
||
|
|
#sound-dai-cells = <0>;
|
||
|
|
status = "okay";
|
||
|
|
ddc-i2c-bus = <&i2c7>;
|
||
|
|
- rockchip,defaultmode = <16>; /* CEA 1920x1080@60Hz */
|
||
|
|
-};
|
||
|
|
-
|
||
|
|
-&route_hdmi {
|
||
|
|
- status = "okay";
|
||
|
|
- logo,mode = "center";
|
||
|
|
};
|
||
|
|
|
||
|
|
&i2c0 {
|
||
|
|
@@ -1118,14 +1095,6 @@
|
||
|
|
};
|
||
|
|
|
||
|
|
&pinctrl {
|
||
|
|
- edp {
|
||
|
|
- /delete-node/ edp-hpd;
|
||
|
|
- };
|
||
|
|
-
|
||
|
|
- hdmi {
|
||
|
|
- /delete-node/ hdmi-i2c-xfer;
|
||
|
|
- };
|
||
|
|
-
|
||
|
|
pmic {
|
||
|
|
pmic_int_l: pmic-int-l {
|
||
|
|
rockchip,pins = <1 21 RK_FUNC_GPIO &pcfg_pull_up>;
|