forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

device/main/linux-postmarketos-allwinner: upgrade to 6.1.9 (MR 3858)

Browse source 
Also added: 0013-media-ov5640-Update-last-busy-timestamp-to-reset-aut.patch
This solves bug of taking greenish pictures with Megapixels, due to
sensor being shutdown to early after taking a picture.

[ci:skip-build]: already built successfully in CI
This commit is contained in:
Jan Jasper de Kroon 2023-02-09 16:32:40 +00:00 committed by Oliver Smith
parent 41a8429257
commit fecd1c038d
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
4 changed files with 80 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
device/main/linux-postmarketos-allwinner/0013-media-ov5640-Update-last-busy-timestamp-to-reset-aut.patch Normal file
View file

@ -0,0 +1,69 @@
From: Andrey Skvortsov <andrej.skvortzov@gmail.com>
Date: Tue, 10 Jan 2023 02:00:03 +0300
Subject: [PATCH] media: ov5640: Update last busy timestamp to reset
autosuspend timer
Otherwise autosuspend delay doesn't work and power is cut off
immediately as device is freed.
Signed-off-by: Andrey Skvortsov <andrej.skvortzov@gmail.com>
---
drivers/media/i2c/ov5640.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c
index ac35350..f71c0f7 100644
--- a/drivers/media/i2c/ov5640.c
+++ b/drivers/media/i2c/ov5640.c
@@ -1238,6 +1238,7 @@ static int ov5640_write_reg(struct ov5640_dev *sensor, u16 reg, u8 val)
return ret;
}
+ pm_runtime_mark_last_busy(&sensor->i2c_client->dev);
return 0;
}
@@ -1305,6 +1306,7 @@ static int ov5640_read_reg(struct ov5640_dev *sensor, u16 reg, u8 *val)
}
*val = buf[0];
+ pm_runtime_mark_last_busy(&sensor->i2c_client->dev);
return 0;
}
@@ -3615,6 +3617,7 @@ static int ov5640_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
break;
}
+ pm_runtime_mark_last_busy(&sensor->i2c_client->dev);
pm_runtime_put_autosuspend(&sensor->i2c_client->dev);
return 0;
@@ -3702,6 +3705,7 @@ static int ov5640_s_ctrl(struct v4l2_ctrl *ctrl)
break;
}
+ pm_runtime_mark_last_busy(&sensor->i2c_client->dev);
pm_runtime_put_autosuspend(&sensor->i2c_client->dev);
return ret;
@@ -4034,8 +4038,10 @@ static int ov5640_s_stream(struct v4l2_subdev *sd, int enable)
out:
mutex_unlock(&sensor->lock);
- if (!enable || ret)
+ if (!enable || ret) {
+ pm_runtime_mark_last_busy(&sensor->i2c_client->dev);
pm_runtime_put_autosuspend(&sensor->i2c_client->dev);
+ }
return ret;
}
@@ -4203,6 +4209,7 @@ static int ov5640_probe(struct i2c_client *client)
pm_runtime_enable(dev);
pm_runtime_set_autosuspend_delay(dev, 1000);
pm_runtime_use_autosuspend(dev);
+ pm_runtime_mark_last_busy(dev);
return 0;

12
device/main/linux-postmarketos-allwinner/APKBUILD
View file

@ -6,9 +6,9 @@
_flavor=postmarketos-allwinner
_config="config-$_flavor.$CARCH"
pkgname=linux-$_flavor
pkgver=6.1.7_git20230118
pkgver=6.1.9_git20230201
pkgrel=0
_tag="orange-pi-6.1-20230118-1327"
_tag="orange-pi-6.1-20230201-2322"
pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)"
arch="aarch64 armv7"
url="https://megous.com/git/linux/"
@ -47,6 +47,7 @@ source="$pkgname-$_tag.tar.gz::https://github.com/megous/linux/archive/$_tag.tar
0010-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch
0011-sunxi-mmc-h6-fix.patch
0012-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch
0013-media-ov5640-Update-last-busy-timestamp-to-reset-aut.patch
"
builddir="$srcdir/linux-$_tag"
@ -82,9 +83,9 @@ package() {
}
sha512sums="
e0e67a4ee94c16e053858ed619e756265caede6cfd3472a90ccc3cd085d970155fc0ddeec4842fe54a06bb339cac447834e2e4001fc9ddc802fb18150091c4d1 linux-postmarketos-allwinner-orange-pi-6.1-20230118-1327.tar.gz
a35dd34caef55f0b8f68a3b408a223d373988e9622413f521f681cd3a09104de52ba22da08c6e460295115f217094fd5b8edbc3932d5eaba6022b88842a46f15 config-postmarketos-allwinner.aarch64
ff0cdea2ddc738822215f9d88cac29de40d3acba6929205a73ead6bbc555729151e4145f50ef383a478769724b8c6735d678b6d40563e231776794ad3c10c82a config-postmarketos-allwinner.armv7
02353e5d8a1e244e5b0f57679bd132670e7157bb7c87c65b7f41c2d379d2ce3177cec0305400ac8117825e37d0d4e8cb4c3f8906097b73d2cb1193c09362557e linux-postmarketos-allwinner-orange-pi-6.1-20230201-2322.tar.gz
90836daddf09258fb59fde3efb57f056bfb1c6591688254402c6859ed5b17548993c333ce72b6c3b589997eb24bad0bd9c3e291d77f921f7c9acc9d266fcf55b config-postmarketos-allwinner.aarch64
c7ed9143a2b74d282d0edb5a7d08962a30555b297a224cd211ca110461086977504017288dfe6fdcb7df1ba5501e9710360c859777835565ba93ab5c4e73072e config-postmarketos-allwinner.armv7
126e0a65e04f22f14eac1281a69000d9d5b107ed8fd1b52f37e812751f55e6c45b0240ceac61c9d95ae7f0543aaf9d96b85a8532baf59283c077b9945e615367 0001-dts-add-dontbeevil-pinephone-devkit.patch
1dc710f5abacdd5698169d5e985efeca8114986c774c3d65e89812d08ceb3db5ebdc6dd64dd76a262c761f3bfc3ffb6bc237fd5236bd1f89c5975d12e42eda04 0002-dts-add-pinetab-dev-old-display-panel.patch
96849f40f6defc4ad7646256814bea5ac353c4e0479fd069365ff27456d63da801541ec616f6db736d60f3134384321a9eeb5bfbd555363bf1259c8de63d17fa 0003-dts-pinetab-add-missing-bma223-ohci1.patch
@ -97,4 +98,5 @@ c61d4f86eddecca99df1ea1323f988e575f9c49130b64a0c50d61028ff96e24aaa3131fb3731e62e
902708a5a8dd8a815d3d1793933d307c551e3c10368d1805431b70691ee5d4438b7146c466549f457468e365f94073a35ae3304928af7581e5dc91ba5c8fa682 0010-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch
2feeab0a6c3db46e514d45c9708f351c6d7dfb0bf951a5cb6f2dc01b4bdc8d4c46931000758a819a6d7317b16cb1933bb3946e6a78cbf448cc77f57a56c503bf 0011-sunxi-mmc-h6-fix.patch
22af33264090dac027ee054b4345a07f0b2ee077e2ae1620e83960bfeea096169aec710973fdd50531ed4f1db6cfd59b5796cd235316cb3512aee034f741a694 0012-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch
a05b39a02625c3dd10f90251a2c9b138d6bb9a2fda6a069ffc1875e735d74212201ce88f3f1605d17fcf226f8c7ea45ae04e3ff3ef750c5cdb1d300bc86b54c6 0013-media-ov5640-Update-last-busy-timestamp-to-reset-aut.patch
"

4
device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64
View file

@ -1,8 +1,8 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 6.1.7 Kernel Configuration
# Linux/arm64 6.1.9 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 12.2.1_git20220924-r8) 12.2.1 20220924"
CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 12.2.1_git20220924-r9) 12.2.1 20220924"
CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=120201
CONFIG_CLANG_VERSION=0

4
device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7
View file

@ -1,8 +1,8 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 6.1.7 Kernel Configuration
# Linux/arm 6.1.9 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 12.2.1_git20220924-r8) 12.2.1 20220924"
CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 12.2.1_git20220924-r9) 12.2.1 20220924"
CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=120201
CONFIG_CLANG_VERSION=0