From c3bb3ac94310206d53b1045d7d47091c9320a04a Mon Sep 17 00:00:00 2001 From: weishanshan1084 Date: Thu, 25 Apr 2024 15:24:57 +0800 Subject: [PATCH] x100: update patch Signed-off-by: weishanshan1084 --- configs/x100.config | 2 +- .../kernel-patches/x100/0001-disable-dc.patch | 30 +++---- .../x100/0002-disable-vpu.patch | 86 +++++++++++++++++++ 3 files changed, 102 insertions(+), 16 deletions(-) create mode 100644 linux/kernel-patches/x100/0002-disable-vpu.patch diff --git a/configs/x100.config b/configs/x100.config index 35f3f27c..a710c20e 100644 --- a/configs/x100.config +++ b/configs/x100.config @@ -1,2 +1,2 @@ # kernel patch for E2000+X100 -BR2_LINUX_KERNEL_PATCH="$(LINUX_PKGDIR)/kernel-patches/x100/0001-disable-dc.patch $(LINUX_PKGDIR)/kernel-patches/0001-disable-smmu-in-dts.patch" +BR2_LINUX_KERNEL_PATCH="$(LINUX_PKGDIR)/kernel-patches/x100/0001-disable-dc.patch $(LINUX_PKGDIR)/kernel-patches/x100/0002-disable-vpu.patch $(LINUX_PKGDIR)/kernel-patches/0001-disable-smmu-in-dts.patch" diff --git a/linux/kernel-patches/x100/0001-disable-dc.patch b/linux/kernel-patches/x100/0001-disable-dc.patch index 4b2c2668..99017baf 100644 --- a/linux/kernel-patches/x100/0001-disable-dc.patch +++ b/linux/kernel-patches/x100/0001-disable-dc.patch @@ -1,6 +1,6 @@ -From 84e6cbf229bf9fb67f0f7b5bf96ac247c8e4872e Mon Sep 17 00:00:00 2001 +From 49cd7fd9e836d96991def4da63bc2f4ad9f76eba Mon Sep 17 00:00:00 2001 From: weishanshan1084 -Date: Thu, 28 Dec 2023 11:42:27 +0800 +Date: Tue, 23 Apr 2024 09:41:49 +0800 Subject: [PATCH] disable dc Signed-off-by: weishanshan1084 @@ -17,7 +17,7 @@ Signed-off-by: weishanshan1084 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm64/boot/dts/phytium/e2000d-chillipi-edu-board.dts b/arch/arm64/boot/dts/phytium/e2000d-chillipi-edu-board.dts -index 28a1f0d47..d4283b24a 100644 +index 0ab55a50ff..7da2850bca 100644 --- a/arch/arm64/boot/dts/phytium/e2000d-chillipi-edu-board.dts +++ b/arch/arm64/boot/dts/phytium/e2000d-chillipi-edu-board.dts @@ -311,7 +311,7 @@ &i2s0 { @@ -30,7 +30,7 @@ index 28a1f0d47..d4283b24a 100644 &i2s_dp1 { diff --git a/arch/arm64/boot/dts/phytium/e2000d-demo-board.dts b/arch/arm64/boot/dts/phytium/e2000d-demo-board.dts -index 63f54c4cd..6eabc2bed 100644 +index 681e7b1e53..1f63817f69 100644 --- a/arch/arm64/boot/dts/phytium/e2000d-demo-board.dts +++ b/arch/arm64/boot/dts/phytium/e2000d-demo-board.dts @@ -251,7 +251,7 @@ &i2s0 { @@ -43,7 +43,7 @@ index 63f54c4cd..6eabc2bed 100644 &i2s_dp1 { diff --git a/arch/arm64/boot/dts/phytium/e2000d-miniitx-board.dts b/arch/arm64/boot/dts/phytium/e2000d-miniitx-board.dts -index e85d27a82..1637daa93 100644 +index 6f38e532a2..4ffdf093e4 100644 --- a/arch/arm64/boot/dts/phytium/e2000d-miniitx-board.dts +++ b/arch/arm64/boot/dts/phytium/e2000d-miniitx-board.dts @@ -279,7 +279,7 @@ &sata1 { @@ -56,7 +56,7 @@ index e85d27a82..1637daa93 100644 edp_mask = [00]; }; diff --git a/arch/arm64/boot/dts/phytium/e2000d-power-board.dts b/arch/arm64/boot/dts/phytium/e2000d-power-board.dts -index afefcc7e7..c65a0da69 100755 +index 1726a84fa7..fee349c8ac 100755 --- a/arch/arm64/boot/dts/phytium/e2000d-power-board.dts +++ b/arch/arm64/boot/dts/phytium/e2000d-power-board.dts @@ -162,7 +162,7 @@ &macb3 { @@ -69,7 +69,7 @@ index afefcc7e7..c65a0da69 100755 &can0 { diff --git a/arch/arm64/boot/dts/phytium/e2000q-come-board.dts b/arch/arm64/boot/dts/phytium/e2000q-come-board.dts -index 804146468..99896e6c6 100755 +index 1ce5c0034d..6670686ff6 100755 --- a/arch/arm64/boot/dts/phytium/e2000q-come-board.dts +++ b/arch/arm64/boot/dts/phytium/e2000q-come-board.dts @@ -229,7 +229,7 @@ &hda0 { @@ -82,7 +82,7 @@ index 804146468..99896e6c6 100755 edp_mask = [00]; }; diff --git a/arch/arm64/boot/dts/phytium/e2000q-demo-board.dts b/arch/arm64/boot/dts/phytium/e2000q-demo-board.dts -index a9d892fbb..4e413ad32 100644 +index 71292b08c8..785a3b61d7 100644 --- a/arch/arm64/boot/dts/phytium/e2000q-demo-board.dts +++ b/arch/arm64/boot/dts/phytium/e2000q-demo-board.dts @@ -251,7 +251,7 @@ &i2s0 { @@ -95,7 +95,7 @@ index a9d892fbb..4e413ad32 100644 &i2s_dp0 { diff --git a/arch/arm64/boot/dts/phytium/e2000q-edu-board.dts b/arch/arm64/boot/dts/phytium/e2000q-edu-board.dts -index 5e9dd98c0..14982ca93 100755 +index 96c84e5eab..19afde2a13 100755 --- a/arch/arm64/boot/dts/phytium/e2000q-edu-board.dts +++ b/arch/arm64/boot/dts/phytium/e2000q-edu-board.dts @@ -264,7 +264,7 @@ &sata1 { @@ -108,20 +108,20 @@ index 5e9dd98c0..14982ca93 100755 edp_mask = [00]; }; diff --git a/arch/arm64/boot/dts/phytium/e2000q-miniitx-board.dts b/arch/arm64/boot/dts/phytium/e2000q-miniitx-board.dts -index e2adaa4d5..d362d2517 100644 +index 26c25c1603..9d91bd9f45 100644 --- a/arch/arm64/boot/dts/phytium/e2000q-miniitx-board.dts +++ b/arch/arm64/boot/dts/phytium/e2000q-miniitx-board.dts -@@ -223,7 +223,7 @@ &dc0 { - <0x0 0xf4000000 0x0 0x4000000>; // (optional) - pipe_mask = [03]; - edp_mask = [00]; +@@ -234,7 +234,7 @@ &dc0 { + memory-region = <&display_reserved>; + pipe_mask = /bits/ 8 <0x3>; + edp_mask = /bits/ 8 <0x0>; - status = "okay"; + status = "disabled"; }; &i2s0 { diff --git a/arch/arm64/boot/dts/phytium/e2000q-vpx-board.dts b/arch/arm64/boot/dts/phytium/e2000q-vpx-board.dts -index ce2bc39bc..1f965cf82 100755 +index c3a6950a46..367b136ef7 100755 --- a/arch/arm64/boot/dts/phytium/e2000q-vpx-board.dts +++ b/arch/arm64/boot/dts/phytium/e2000q-vpx-board.dts @@ -231,7 +231,7 @@ &macb3 { diff --git a/linux/kernel-patches/x100/0002-disable-vpu.patch b/linux/kernel-patches/x100/0002-disable-vpu.patch new file mode 100644 index 00000000..0c09d48b --- /dev/null +++ b/linux/kernel-patches/x100/0002-disable-vpu.patch @@ -0,0 +1,86 @@ +From 58b7e0798b9671a609b3e24405285bcf4c3fb345 Mon Sep 17 00:00:00 2001 +From: weishanshan1084 +Date: Tue, 23 Apr 2024 09:56:56 +0800 +Subject: [PATCH] disable vpu + +Signed-off-by: weishanshan1084 +--- + arch/arm64/boot/dts/phytium/e2000q-come-board.dts | 2 +- + arch/arm64/boot/dts/phytium/e2000q-demo-board.dts | 2 +- + arch/arm64/boot/dts/phytium/e2000q-edu-board.dts | 2 +- + arch/arm64/boot/dts/phytium/e2000q-hanwei-board.dts | 2 +- + arch/arm64/boot/dts/phytium/e2000q-miniitx-board.dts | 2 +- + arch/arm64/boot/dts/phytium/e2000q-vpx-board.dts | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/arch/arm64/boot/dts/phytium/e2000q-come-board.dts b/arch/arm64/boot/dts/phytium/e2000q-come-board.dts +index 6670686ff6..4d8cebb697 100755 +--- a/arch/arm64/boot/dts/phytium/e2000q-come-board.dts ++++ b/arch/arm64/boot/dts/phytium/e2000q-come-board.dts +@@ -264,5 +264,5 @@ &pwm1 { + }; + + &vpu0 { +- status = "okay"; ++ status = "disabled"; + }; +diff --git a/arch/arm64/boot/dts/phytium/e2000q-demo-board.dts b/arch/arm64/boot/dts/phytium/e2000q-demo-board.dts +index 785a3b61d7..ce8b35d6fd 100644 +--- a/arch/arm64/boot/dts/phytium/e2000q-demo-board.dts ++++ b/arch/arm64/boot/dts/phytium/e2000q-demo-board.dts +@@ -273,5 +273,5 @@ &rng0 { + }; + + &vpu0 { +- status = "okay"; ++ status = "disabled"; + }; +diff --git a/arch/arm64/boot/dts/phytium/e2000q-edu-board.dts b/arch/arm64/boot/dts/phytium/e2000q-edu-board.dts +index 19afde2a13..f78f4b0c42 100755 +--- a/arch/arm64/boot/dts/phytium/e2000q-edu-board.dts ++++ b/arch/arm64/boot/dts/phytium/e2000q-edu-board.dts +@@ -270,7 +270,7 @@ &dc0 { + }; + + &vpu0 { +- status = "okay"; ++ status = "disabled"; + }; + + &i2s0 { +diff --git a/arch/arm64/boot/dts/phytium/e2000q-hanwei-board.dts b/arch/arm64/boot/dts/phytium/e2000q-hanwei-board.dts +index 02b635dd48..11a438fd64 100755 +--- a/arch/arm64/boot/dts/phytium/e2000q-hanwei-board.dts ++++ b/arch/arm64/boot/dts/phytium/e2000q-hanwei-board.dts +@@ -214,5 +214,5 @@ &gpio5 { + }; + + &vpu0 { +- status = "okay"; ++ status = "disabled"; + }; +diff --git a/arch/arm64/boot/dts/phytium/e2000q-miniitx-board.dts b/arch/arm64/boot/dts/phytium/e2000q-miniitx-board.dts +index 9d91bd9f45..5e7a22eee5 100644 +--- a/arch/arm64/boot/dts/phytium/e2000q-miniitx-board.dts ++++ b/arch/arm64/boot/dts/phytium/e2000q-miniitx-board.dts +@@ -339,5 +339,5 @@ &rng0 { + }; + + &vpu0 { +- status = "okay"; ++ status = "disabled"; + }; +diff --git a/arch/arm64/boot/dts/phytium/e2000q-vpx-board.dts b/arch/arm64/boot/dts/phytium/e2000q-vpx-board.dts +index 367b136ef7..3a7c9ec9f3 100755 +--- a/arch/arm64/boot/dts/phytium/e2000q-vpx-board.dts ++++ b/arch/arm64/boot/dts/phytium/e2000q-vpx-board.dts +@@ -321,5 +321,5 @@ &rng0 { + }; + + &vpu0 { +- status = "okay"; ++ status = "disabled"; + }; +-- +2.25.1 +