diff options
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/linux.scm | 11 | ||||
| -rw-r--r-- | gnu/packages/patches/linux-libre-arm64-generic-pinebook-lcd.patch | 40 |
3 files changed, 50 insertions, 2 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 23ffaea1b2..f7b14ee333 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1375,6 +1375,7 @@ dist_patch_DATA = \ %D%/packages/patches/linkchecker-tests-require-network.patch \ %D%/packages/patches/linphone-desktop-without-sdk.patch \ %D%/packages/patches/linux-libre-support-for-Pinebook-Pro.patch \ + %D%/packages/patches/linux-libre-arm64-generic-pinebook-lcd.patch \ %D%/packages/patches/linux-pam-no-setfsuid.patch \ %D%/packages/patches/lirc-localstatedir.patch \ %D%/packages/patches/lirc-reproducible-build.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3807ecad63..a155c29f8b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -481,7 +481,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (define-public linux-libre-5.11-source (source-with-patches linux-libre-5.11-pristine-source (list %boot-logo-patch - %linux-libre-arm-export-__sync_icache_dcache-patch))) + %linux-libre-arm-export-__sync_icache_dcache-patch + ;; Pinebook Pro patch to fix LCD display + (search-patch + "linux-libre-arm64-generic-pinebook-lcd.patch")))) (define-public linux-libre-5.10-source (source-with-patches linux-libre-5.10-pristine-source @@ -1044,7 +1047,11 @@ It has been modified to remove all non-free binary blobs.") ("CONFIG_BATTERY_AXP20X" . m) ("CONFIG_PINCTRL_AXP209" . m) ("CONFIG_AXP20X_POWER" . m) - ("CONFIG_AXP20X_ADC" . m)) + ("CONFIG_AXP20X_ADC" . m) + ;; Pinebook PRO battery and sound support + ("CONFIG_BATTERY_CW2015" . m) + ("CONFIG_CHARGER_GPIO" . m) + ("CONFIG_SND_SOC_ES8316" . m)) %default-extra-linux-options))) (define-public linux-libre-arm64-generic-5.10 diff --git a/gnu/packages/patches/linux-libre-arm64-generic-pinebook-lcd.patch b/gnu/packages/patches/linux-libre-arm64-generic-pinebook-lcd.patch new file mode 100644 index 0000000000..51ab544d5e --- /dev/null +++ b/gnu/packages/patches/linux-libre-arm64-generic-pinebook-lcd.patch @@ -0,0 +1,40 @@ +From 3a75704e99a118f2d8a4d70f07781558bde85770 Mon Sep 17 00:00:00 2001 +From: Jian-Hong Pan <jhp@endlessos.org> +Date: Thu, 24 Sep 2020 14:30:43 +0800 +Subject: [PATCH] arm64: dts: rockchip: disable USB type-c DisplayPort + +The cdn-dp sub driver probes the device failed on PINEBOOK Pro. + +kernel: cdn-dp fec00000.dp: [drm:cdn_dp_probe [rockchipdrm]] *ERROR* missing extcon or phy +kernel: cdn-dp: probe of fec00000.dp failed with error -22 + +Then, the device halts all of the DRM related device jobs. For example, +the operations: vop_component_ops, vop_component_ops and +rockchip_dp_component_ops cannot be bound to corresponding devices. So, +Xorg cannot find the correct DRM device. + +The USB type-C DisplayPort does not work for now. So, disable the +DisplayPort node until the type-C phy work has been done. + +Link: https://patchwork.kernel.org/patch/11794141/#23639877 +Signed-off-by: Jian-Hong Pan <jhp@endlessos.org> +--- + arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts +index 219b7507a10f..45769764425d 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts +@@ -380,7 +380,7 @@ + }; + + &cdn_dp { +- status = "okay"; ++ status = "disabled"; + }; + + &cpu_b0 { +-- +2.30.2 + |