mirror of
https://github.com/Fishwaldo/build.git
synced 2025-07-23 21:39:02 +00:00
150ac0c2af
AR-1 - Adding support category for distributions AR-4 - Remove Allwinner legacy AR-5 - Drop Udoo family and move Udoo board into newly created imx6 family AR-9 - Rename sunxi-next to sunxi-legacy AR-10 - Rename sunxi-dev to sunxi-current AR-11 - Adding Radxa Rockpi S support AR-13 - Rename rockchip64-default to rockchip64-legacy AR-14 - Add rockchip64-current as mainline source AR-15 - Drop Rockchip 4.19.y NEXT, current become 5.3.y AR-16 - Rename RK3399 default to legacy AR-17 - Rename Odroid XU4 next and default to legacy 4.14.y, add DEV 5.4.y AR-18 - Add Odroid N2 current mainline AR-19 - Move Odroid C1 to meson family AR-20 - Rename mvebu64-default to mvebu64-legacy AR-21 - Rename mvebu-default to mvebu-legacy AR-22 - Rename mvebu-next to mvebu-current AR-23 - Drop meson64 default and next, current becomes former DEV 5.3.y AR-24 - Drop cubox family and move Cubox/Hummingboard boards under imx6 AR-26 - Adjust motd AR-27 - Enabling distribution release status AR-28 - Added new GCC compilers AR-29 - Implementing Ubuntu Eoan AR-30 - Add desktop packages per board or family AR-31 - Remove (Ubuntu/Debian) distribution name from image filename AR-32 - Move arch configs from configuration.sh to separate arm64 and armhf config files AR-33 - Revision numbers for beta builds changed to day_in_the_year AR-34 - Patches support linked patches AR-35 - Break meson64 family into gxbb and gxl AR-36 - Add Nanopineo2 Black AR-38 - Upgrade option from old branches to new one via armbian-config AR-41 - Show full timezone info AR-43 - Merge Odroid N2 to meson64 AR-44 - Enable FORCE_BOOTSCRIPT_UPDATE for all builds
95 lines
1.9 KiB
Diff
95 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>;
|