JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

Switch sunxi: current to 5.15.90, edge to 6.1.8 (#4757)

Browse Source 
* switch-sunxi: CURRENT to 5.15.90, EDGE to 6.1.8

* sunxi-6.1: update upstream to tag orange-pi-6.1-20230118-1327

sunxi-5.15: rebase
This commit is contained in:
The-going
2023-01-27 15:25:50 +03:00
committed by GitHub
parent 1f35491cb7
commit 4a61f38df8
8 changed files with 107 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/sources/families/include/sunxi64_common.inc
View File

@@ -18,12 +18,12 @@ case $BRANCH in
current)
KERNEL_VERSION_LEVEL="5.15"
KERNELSWITCHOBJ="tag=v5.15.89"
KERNELSWITCHOBJ="tag=v5.15.90"
;;
edge)
KERNEL_VERSION_LEVEL=${KERNEL_VERSION_LEVEL:-6.1}
KERNELSWITCHOBJ=${KERNELSWITCHOBJ:-'tag=v6.1.7'}
KERNELSWITCHOBJ=${KERNELSWITCHOBJ:-'tag=v6.1.8'}
;;
esac

4
config/sources/families/include/sunxi_common.inc
View File

@@ -18,11 +18,11 @@ case $BRANCH in
;;
current)
KERNEL_VERSION_LEVEL="5.15"
KERNELSWITCHOBJ="tag=v5.15.89"
KERNELSWITCHOBJ="tag=v5.15.90"
;;
edge)
KERNEL_VERSION_LEVEL=${KERNEL_VERSION_LEVEL:-6.1}
KERNELSWITCHOBJ=${KERNELSWITCHOBJ:-'tag=v6.1.7'}
KERNELSWITCHOBJ=${KERNELSWITCHOBJ:-'tag=v6.1.8'}
;;
esac

16
patch/kernel/archive/sunxi-5.15/megous/mmc-sunxi-mmc-Remove-runtime-PM.patch
View File

@@ -95,15 +95,21 @@ index 2702736a1..55ca34803 100644
ret = mmc_add_host(mmc);
if (ret)
@@ -1482,7 +1488,7 @@ static int sunxi_mmc_remove(struct platform_device *pdev)
@@ -1483,11 +1483,11 @@ static int sunxi_mmc_remove(struct platform_device *pdev)
struct sunxi_mmc_host *host = mmc_priv(mmc);
mmc_remove_host(mmc);
- pm_runtime_force_suspend(&pdev->dev);
+ //pm_runtime_force_suspend(&pdev->dev);
disable_irq(host->irq);
sunxi_mmc_disable(host);
- pm_runtime_disable(&pdev->dev);
- if (!pm_runtime_status_suspended(&pdev->dev)) {
+ //pm_runtime_disable(&pdev->dev);
+ //if (!pm_runtime_status_suspended(&pdev->dev)) {
disable_irq(host->irq);
sunxi_mmc_disable(host);
- }
+ //}
dma_free_coherent(&pdev->dev, PAGE_SIZE, host->sg_cpu, host->sg_dma);
mmc_free_host(mmc);
@@ -1521,7 +1527,6 @@ static int sunxi_mmc_runtime_suspend(struct device *dev)
* Disabling the irq will prevent this.
*/

29
patch/kernel/archive/sunxi-6.1/patches.megous/arm64-dts-rockchip-rk3399-pinebook-pro-Fix-VDO-display-output.patch Normal file
View File

@@ -0,0 +1,29 @@
From d41ae304d92b52940bc605ac430e55a4bb787b82 Mon Sep 17 00:00:00 2001
From: Ondrej Jirman <megi@xff.cz>
Date: Wed, 18 Jan 2023 10:55:52 +0100
Subject: [PATCH 391/391] arm64: dts: rockchip: rk3399-pinebook-pro: Fix VDO /
display output
This fixes Alt-DP mode on Pinebook Pro.
Signed-off-by: Ondrej Jirman <megi@xff.cz>
---
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 7f60bf0595dc..a82296572e15 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
@@ -733,7 +733,7 @@ connector {
altmodes {
dp {
svid = <0xff01>;
- vdo = <0x0c0046>;
+ vdo = <0x0c46>;
};
};
--
2.35.3

46
patch/kernel/archive/sunxi-6.1/patches.megous/media-ov5640-Fix-sensor-probe-with-the-anti-click-patch.patch Normal file
View File

@@ -0,0 +1,46 @@
From c28bf075d09c0c97c0abe57001b3bf1f85790ed0 Mon Sep 17 00:00:00 2001
From: Ondrej Jirman <megi@xff.cz>
Date: Mon, 2 Jan 2023 10:10:25 +0100
Subject: [PATCH 390/391] media: ov5640: Fix sensor probe with the "anti-click"
patch
The focus anti-click patch got broken in rebase onto 6.1. Fix it.
Signed-off-by: Ondrej Jirman <megi@xff.cz>
---
drivers/media/i2c/ov5640.c | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c
index 86c9ec111b80..47524fdc94f7 100644
--- a/drivers/media/i2c/ov5640.c
+++ b/drivers/media/i2c/ov5640.c
@@ -4196,24 +4196,15 @@ static int ov5640_probe(struct i2c_client *client)
if (ret)
goto entity_cleanup;
- ret = ov5640_sensor_resume(dev);
- if (ret) {
- dev_err(dev, "failed to power on\n");
- goto entity_cleanup;
- }
-
- pm_runtime_get_noresume(dev);
- pm_runtime_enable(dev);
-
ret = v4l2_async_register_subdev_sensor(&sensor->sd);
if (ret) {
dev_err_probe(dev, ret, "Failed to register sensor\n");
goto err_pm_runtime;
}
+ pm_runtime_enable(dev);
pm_runtime_set_autosuspend_delay(dev, 1000);
pm_runtime_use_autosuspend(dev);
- pm_runtime_put_autosuspend(dev);
return 0;
--
2.35.3

16
patch/kernel/archive/sunxi-6.1/patches.megous/mmc-sunxi-mmc-Remove-runtime-PM.patch
View File

@@ -95,15 +95,21 @@ index b16e12e62e72..d34cdb3f8d48 100644
ret = mmc_add_host(mmc);
if (ret)
@@ -1492,7 +1498,7 @@ static int sunxi_mmc_remove(struct platform_device *pdev)
@@ -1492,11 +1492,11 @@ static int sunxi_mmc_remove(struct platform_device *pdev)
struct sunxi_mmc_host *host = mmc_priv(mmc);
mmc_remove_host(mmc);
- pm_runtime_force_suspend(&pdev->dev);
+ //pm_runtime_force_suspend(&pdev->dev);
disable_irq(host->irq);
sunxi_mmc_disable(host);
- pm_runtime_disable(&pdev->dev);
- if (!pm_runtime_status_suspended(&pdev->dev)) {
+ //pm_runtime_disable(&pdev->dev);
+ //if (!pm_runtime_status_suspended(&pdev->dev)) {
disable_irq(host->irq);
sunxi_mmc_disable(host);
- }
+ //}
dma_free_coherent(&pdev->dev, PAGE_SIZE, host->sg_cpu, host->sg_dma);
mmc_free_host(mmc);
@@ -1531,7 +1537,6 @@ static int sunxi_mmc_runtime_suspend(struct device *dev)
* Disabling the irq will prevent this.
*/

4
patch/kernel/archive/sunxi-6.1/series.conf
View File

@@ -390,7 +390,9 @@
patches.megous/ASoC-codec-rt5640-Fix-hpout-restore-when-lout-is-enabled.patch
patches.megous/ASoC-codec-rt5640-Resolve-failure-to-set-DMIC-clock-after-playb.patch
# tag orange-pi-6.1-20221211-1046
patches.megous/media-ov5640-Fix-sensor-probe-with-the-anti-click-patch.patch
patches.megous/arm64-dts-rockchip-rk3399-pinebook-pro-Fix-VDO-display-output.patch
# tag orange-pi-6.1-20230118-1327
########### Fixes applied after megous patches ###################
#
patches.fixses/Fix-ISO-C90-forbids-mixed-declarations.patch

3
patch/kernel/archive/sunxi-6.1/series.megous
View File

@@ -390,3 +390,6 @@
patches.megous/ASoC-codec-rt5640-Fix-hpout-restore-when-lout-is-enabled.patch
patches.megous/ASoC-codec-rt5640-Resolve-failure-to-set-DMIC-clock-after-playb.patch
# tag orange-pi-6.1-20221211-1046
patches.megous/media-ov5640-Fix-sensor-probe-with-the-anti-click-patch.patch
patches.megous/arm64-dts-rockchip-rk3399-pinebook-pro-Fix-VDO-display-output.patch
# tag orange-pi-6.1-20230118-1327