RK3399 dts cleanup, restore mesa to upstream on RK3399
This commit is contained in:
parent
16c11b5de0
commit
ff0d82ea3d
1 changed files with 2 additions and 14 deletions
|
@ -32,8 +32,8 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/Makefile linux/arch/arm64/boo
|
|||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-plus.dtb
|
||||
diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399-rg552-linux.dts linux/arch/arm64/boot/dts/rockchip/rk3399-rg552-linux.dts
|
||||
--- linux.orig/arch/arm64/boot/dts/rockchip/rk3399-rg552-linux.dts 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux/arch/arm64/boot/dts/rockchip/rk3399-rg552-linux.dts 2023-07-17 12:54:12.609062891 +0000
|
||||
@@ -0,0 +1,1353 @@
|
||||
+++ linux/arch/arm64/boot/dts/rockchip/rk3399-rg552-linux.dts 2023-07-17 13:40:26.075147554 +0000
|
||||
@@ -0,0 +1,1352 @@
|
||||
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
||||
+/*
|
||||
+ * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd.
|
||||
|
@ -782,7 +782,6 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399-rg552-linux.dts linux/
|
|||
+ interrupt-parent = <&gpio3>;
|
||||
+ interrupts = <10 IRQ_TYPE_LEVEL_LOW>;
|
||||
+ #clock-cells = <1>;
|
||||
+ //clock-output-names = "xin32k", "rk808-clkout2";
|
||||
+ clock-output-names = "rk808-clkout1", "rk808-clkout2";
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&pmic_int_l>;
|
||||
|
@ -1953,17 +1952,6 @@ diff -rupN linux.orig/drivers/gpu/drm/panel/panel-sharp-ls054b3sx01.c linux/driv
|
|||
+MODULE_AUTHOR("Maya Matuszczyk <maccraft123mc@gmail.com>");
|
||||
+MODULE_DESCRIPTION("Panel driver for Sharp LS054B3SX01 1152x1080 Video Mode DSI Panel");
|
||||
+MODULE_LICENSE("GPL v2");
|
||||
diff -rupN linux.orig/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c linux/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
|
||||
--- linux.orig/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c 2023-07-17 00:22:19.297273121 +0000
|
||||
+++ linux/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c 2023-07-02 20:03:42.884909562 +0000
|
||||
@@ -640,7 +640,6 @@ static void dw_hdmi_rockchip_unbind(stru
|
||||
struct rockchip_hdmi *hdmi = dev_get_drvdata(dev);
|
||||
|
||||
dw_hdmi_unbind(hdmi->hdmi);
|
||||
- drm_encoder_cleanup(&hdmi->encoder.encoder);
|
||||
clk_disable_unprepare(hdmi->ref_clk);
|
||||
|
||||
regulator_disable(hdmi->avdd_1v8);
|
||||
diff -rupN linux.orig/drivers/input/Kconfig linux/drivers/input/Kconfig
|
||||
--- linux.orig/drivers/input/Kconfig 2023-06-23 03:53:40.600165543 +0000
|
||||
+++ linux/drivers/input/Kconfig 2023-07-02 20:04:12.325801424 +0000
|
||||
|
|
Loading…
Reference in a new issue