From 32afb3851a9f206030ebc6a780e491f2ad5a80b6 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Mon, 23 Jun 2025 17:26:54 +0200 Subject: [PATCH] linux-samsung-dream: cleanup patches Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6706 --- ... => 0001-Decrease-ext4-debug-prints.patch} | 14 +++++++++- ...=> 0002-Fix-decon_reg-variable-type.patch} | 7 +++-- ... => 0003-Change-dtb-config-variable.patch} | 14 +++++++++- ... => 0004-Fix-wireless-firmware-path.patch} | 14 +++++++++- ...splay-colors-use-RGB-instead-of-BGR.patch} | 14 +++++++++- .../downstream/linux-samsung-dream/APKBUILD | 26 ++++++++++--------- 6 files changed, 71 insertions(+), 18 deletions(-) rename device/downstream/linux-samsung-dream/{01-disable-ext4-debug.patch => 0001-Decrease-ext4-debug-prints.patch} (60%) rename device/downstream/linux-samsung-dream/{02-fix-decon_reg.patch => 0002-Fix-decon_reg-variable-type.patch} (88%) rename device/downstream/linux-samsung-dream/{03-change-dtb-config-var.patch => 0003-Change-dtb-config-variable.patch} (74%) rename device/downstream/linux-samsung-dream/{04-firmware-path.patch => 0004-Fix-wireless-firmware-path.patch} (71%) rename device/downstream/linux-samsung-dream/{05-BGR-to-RGB-colors.patch => 0005-Fix-display-colors-use-RGB-instead-of-BGR.patch} (61%) diff --git a/device/downstream/linux-samsung-dream/01-disable-ext4-debug.patch b/device/downstream/linux-samsung-dream/0001-Decrease-ext4-debug-prints.patch similarity index 60% rename from device/downstream/linux-samsung-dream/01-disable-ext4-debug.patch rename to device/downstream/linux-samsung-dream/0001-Decrease-ext4-debug-prints.patch index 97d59eb03..41d7d4a19 100644 --- a/device/downstream/linux-samsung-dream/01-disable-ext4-debug.patch +++ b/device/downstream/linux-samsung-dream/0001-Decrease-ext4-debug-prints.patch @@ -1,5 +1,14 @@ +From da741e27ea3b8d3012f4c1fb6f544692fd2b77d1 Mon Sep 17 00:00:00 2001 +From: Henrik Grimler +Date: Mon, 23 Jun 2025 16:16:57 +0200 +Subject: [PATCH] Decrease ext4 debug prints + +--- + fs/ext4/super.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + diff --git a/fs/ext4/super.c b/fs/ext4/super.c -index 414e8b11..d66fd851 100644 +index 414e8b117ec5..d66fd85188d9 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -4150,8 +4150,8 @@ cantfind_ext4: @@ -13,3 +22,6 @@ index 414e8b11..d66fd851 100644 /* for debugging */ if (!silent) +-- +2.50.0 + diff --git a/device/downstream/linux-samsung-dream/02-fix-decon_reg.patch b/device/downstream/linux-samsung-dream/0002-Fix-decon_reg-variable-type.patch similarity index 88% rename from device/downstream/linux-samsung-dream/02-fix-decon_reg.patch rename to device/downstream/linux-samsung-dream/0002-Fix-decon_reg-variable-type.patch index 956136db4..8e58837fb 100644 --- a/device/downstream/linux-samsung-dream/02-fix-decon_reg.patch +++ b/device/downstream/linux-samsung-dream/0002-Fix-decon_reg-variable-type.patch @@ -1,7 +1,7 @@ -From f1b806dd501eeca56d591da1b668d874e8e843c5 Mon Sep 17 00:00:00 2001 +From c866f097c4684d183ceb9f5812924916377040d7 Mon Sep 17 00:00:00 2001 From: Daniele Debernardi Date: Wed, 4 Nov 2020 01:50:15 +0100 -Subject: [PATCH] Fix decon_reg.c +Subject: [PATCH] Fix decon_reg variable type --- drivers/video/fbdev/exynos/dpu/decon_reg.c | 2 +- @@ -20,3 +20,6 @@ index 589d79f8fed8..226e601cc8a0 100644 /* VCLK, ECLK, ACLK, PCLK, DISP_PLL, resolution, MIC_ratio, DSC count */ { 71, 168, 400, 66, 71, 1080 * 1920, MIC_COMP_BYPASS, 0}, { 63, 168, 400, 66, 63, 1440 * 2560, MIC_COMP_RATIO_1_2, 0}, +-- +2.50.0 + diff --git a/device/downstream/linux-samsung-dream/03-change-dtb-config-var.patch b/device/downstream/linux-samsung-dream/0003-Change-dtb-config-variable.patch similarity index 74% rename from device/downstream/linux-samsung-dream/03-change-dtb-config-var.patch rename to device/downstream/linux-samsung-dream/0003-Change-dtb-config-variable.patch index 9fa629a3a..16b87ba2f 100644 --- a/device/downstream/linux-samsung-dream/03-change-dtb-config-var.patch +++ b/device/downstream/linux-samsung-dream/0003-Change-dtb-config-variable.patch @@ -1,5 +1,14 @@ +From fdb2ab17589bccba7aabe6b2fda7568f3c60d95b Mon Sep 17 00:00:00 2001 +From: Daniele Debernardi +Date: Mon, 23 Jun 2025 16:18:40 +0200 +Subject: [PATCH] Change dtb config variable + +--- + arch/arm64/boot/dts/exynos/Makefile | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + diff --git a/arch/arm64/boot/dts/exynos/Makefile b/arch/arm64/boot/dts/exynos/Makefile -index 4c7b0e624cd1..77a728a4ee47 100644 +index 4c7b0e624cd1..a166857ec3f3 100644 --- a/arch/arm64/boot/dts/exynos/Makefile +++ b/arch/arm64/boot/dts/exynos/Makefile @@ -1,17 +1,17 @@ @@ -23,3 +32,6 @@ index 4c7b0e624cd1..77a728a4ee47 100644 exynos8895-greatlte_eur_open_06.dtb always := $(dtb-y) $(dtbo-y) +-- +2.50.0 + diff --git a/device/downstream/linux-samsung-dream/04-firmware-path.patch b/device/downstream/linux-samsung-dream/0004-Fix-wireless-firmware-path.patch similarity index 71% rename from device/downstream/linux-samsung-dream/04-firmware-path.patch rename to device/downstream/linux-samsung-dream/0004-Fix-wireless-firmware-path.patch index c7e6e1e97..be7dd1365 100644 --- a/device/downstream/linux-samsung-dream/04-firmware-path.patch +++ b/device/downstream/linux-samsung-dream/0004-Fix-wireless-firmware-path.patch @@ -1,5 +1,14 @@ +From 59c9643809d98c6d9f458a57c8fecdd891bc22d9 Mon Sep 17 00:00:00 2001 +From: Henrik Grimler +Date: Mon, 23 Jun 2025 16:19:45 +0200 +Subject: [PATCH] Fix wireless firmware path + +--- + drivers/net/wireless/bcmdhd4361/dhd.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + diff --git a/drivers/net/wireless/bcmdhd4361/dhd.h b/drivers/net/wireless/bcmdhd4361/dhd.h -index df9f668aa1c8..6aa707fb5945 100644 +index df9f668aa1c8..77cdb50b49bb 100644 --- a/drivers/net/wireless/bcmdhd4361/dhd.h +++ b/drivers/net/wireless/bcmdhd4361/dhd.h @@ -376,7 +376,7 @@ enum dhd_op_flags { @@ -20,3 +29,6 @@ index df9f668aa1c8..6aa707fb5945 100644 #endif /* ANDROID_PLATFORM_VERSION < 7 */ #else #define VENDOR_PATH "" +-- +2.50.0 + diff --git a/device/downstream/linux-samsung-dream/05-BGR-to-RGB-colors.patch b/device/downstream/linux-samsung-dream/0005-Fix-display-colors-use-RGB-instead-of-BGR.patch similarity index 61% rename from device/downstream/linux-samsung-dream/05-BGR-to-RGB-colors.patch rename to device/downstream/linux-samsung-dream/0005-Fix-display-colors-use-RGB-instead-of-BGR.patch index 6bd113312..9a608f78d 100644 --- a/device/downstream/linux-samsung-dream/05-BGR-to-RGB-colors.patch +++ b/device/downstream/linux-samsung-dream/0005-Fix-display-colors-use-RGB-instead-of-BGR.patch @@ -1,5 +1,14 @@ +From 31c9667cbc59c8711ed77cc4a260d0acc0dada3a Mon Sep 17 00:00:00 2001 +From: Henrik Grimler +Date: Mon, 23 Jun 2025 16:20:26 +0200 +Subject: [PATCH] Fix display colors, use RGB instead of BGR + +--- + drivers/video/fbdev/exynos/dpu/decon_dsi.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + diff --git a/drivers/video/fbdev/exynos/dpu/decon_dsi.c b/drivers/video/fbdev/exynos/dpu/decon_dsi.c -index eeaa2ba19778..3e597a145432 100644 +index eeaa2ba19778..b9ddbdf96716 100644 --- a/drivers/video/fbdev/exynos/dpu/decon_dsi.c +++ b/drivers/video/fbdev/exynos/dpu/decon_dsi.c @@ -862,11 +862,11 @@ int decon_check_var(struct fb_var_screeninfo *var, struct fb_info *info) @@ -16,3 +25,6 @@ index eeaa2ba19778..3e597a145432 100644 var->blue.length = 8; break; +-- +2.50.0 + diff --git a/device/downstream/linux-samsung-dream/APKBUILD b/device/downstream/linux-samsung-dream/APKBUILD index bed071e33..305901e21 100644 --- a/device/downstream/linux-samsung-dream/APKBUILD +++ b/device/downstream/linux-samsung-dream/APKBUILD @@ -24,11 +24,11 @@ _config="config-$_flavor.$arch" source=" $pkgname-$_commit.tar.gz::https://github.com/exynos8895/$_repository/archive/$_commit.tar.gz $_config - 01-disable-ext4-debug.patch - 02-fix-decon_reg.patch - 03-change-dtb-config-var.patch - 04-firmware-path.patch - 05-BGR-to-RGB-colors.patch + 0001-Decrease-ext4-debug-prints.patch + 0002-Fix-decon_reg-variable-type.patch + 0003-Change-dtb-config-variable.patch + 0004-Fix-wireless-firmware-path.patch + 0005-Fix-display-colors-use-RGB-instead-of-BGR.patch linux4.2-gcc10-extern_YYLOC_global_declaration.patch " builddir="$srcdir/$_repository-$_commit" @@ -77,11 +77,13 @@ kernel_dream2lte() { "$subpkgdir"/boot/dt.img } -sha512sums="a7c6d55d12ec5ef2bb388fae4106c63eb89ea0d4f8a682f45a0e15899484b633883cd40138eb2d36ef040b49301e48e3fdb44be92ecbfa20a7bbcda35f326a9c linux-samsung-dream-abd876b3b5fc80dc302183cd372067bab40efab5.tar.gz +sha512sums=" +a7c6d55d12ec5ef2bb388fae4106c63eb89ea0d4f8a682f45a0e15899484b633883cd40138eb2d36ef040b49301e48e3fdb44be92ecbfa20a7bbcda35f326a9c linux-samsung-dream-abd876b3b5fc80dc302183cd372067bab40efab5.tar.gz 14aa04acd6f265fb5bfa482743ba523b0f9df6d325fdca0d12041955b370dd70425610457c066d05e437481a60b7686eaeebf21a60d5c4b535346779c3852bc4 config-samsung-dream.aarch64 -1779761fd276e3edc083d5d823c254da0606824157c353a52c35a81ca95b3ce5741fc42cd5cf9b5846ca9f2c823e207c97fc2c970254ee8d9c83c0e240b2ba6b 01-disable-ext4-debug.patch -939b2f5b569c3c9d8e088762e394edc6f4eae4a0f08e8c428f687e4e559bb278cefdd377023271487b6c937a6c5421050d7821cefa34c10d44e7cd904fd12b9a 02-fix-decon_reg.patch -6ad12c90f66b10e6b58e161e44841cbbb73e0aef22e4a32fa390ac664451287c253501c9cf84b87aeac41c13fa29b1d8330df3dd58f890567d8a8543a2432505 03-change-dtb-config-var.patch -18082be5bcb4eec18b4916a116a40653826e45ccc52b6cc364790c37ba9056f383c82ae2027a613b9f1973463ea9dfc09ea2d3e19c0cccb16e65507b42931ec9 04-firmware-path.patch -3b76da1513001f7b926e90d46f1435a86d99884ef8f6fe6d2b49d9b6b152a9a0939b4d9e0933b4b7d34a69ad13ae2782e65ee1e29832598eb5ed9aab4bc12ed1 05-BGR-to-RGB-colors.patch -eaf2e61fcb508cdd239b8fed209d2a09ecac77287f6b46d003918fdf1c6fa2ee63f7390f3ff7c49029b8ed6cbcdd81c7e9a4b1ece9f5060b6fc84e322bd47f41 linux4.2-gcc10-extern_YYLOC_global_declaration.patch" +bc035012f50c5f4736f54c15d1c46822ab5c99d055cc6428dd80c523bd308b4477a47c7afd5627cbbefea487e8f1d482ec4a7d5a69705d4f190a4f1af7cfa604 0001-Decrease-ext4-debug-prints.patch +2ca6fb824afe860baaffbefb680e8463affd5ccf49d255060afdaca564ce3f9a2b1574c48fe2e357e3a2e58bcbfc66fe7ae0e7da4a7d3d0f0b2c31292d24b6d8 0002-Fix-decon_reg-variable-type.patch +79e3b877ed125b1aa4dda684af44f2dccd52e4025908323c2b4c14484e5aab5dd4956a7d1ca7096bfc1d7427a25a2e18f5b07bcaebbf8f9e07433f918b0c4a36 0003-Change-dtb-config-variable.patch +41a91d28c55243e6cbc2b56a7ec2c8e62f51f2ee5b889cd0629eb886d9b5b71fc1b7a2f9cca643026ae564c91f449e22ded53a6b3c361d02a27c4b4f7e8e9fe3 0004-Fix-wireless-firmware-path.patch +b4b209f3de5de68377a2f7e518c0279c11972bc6b1369f09408acdfa9859206283bab8fe548626bc0fdd364e6adcb7eb197575fb711f805a03dad27c6c10c6fc 0005-Fix-display-colors-use-RGB-instead-of-BGR.patch +eaf2e61fcb508cdd239b8fed209d2a09ecac77287f6b46d003918fdf1c6fa2ee63f7390f3ff7c49029b8ed6cbcdd81c7e9a4b1ece9f5060b6fc84e322bd47f41 linux4.2-gcc10-extern_YYLOC_global_declaration.patch +"