linux-postmarketos-stericsson: upgrade to 6.7.0 (MR 4443)

[ci:skip-build]: already built successfully in CI
This commit is contained in:
Stefan Hansson 2024-01-14 12:28:56 +01:00 committed by Pablo Correa Gómez
parent 1ad76090c0
commit 9ef583c26a
No known key found for this signature in database
GPG key ID: 7A342565FF635F79
4 changed files with 221 additions and 1295 deletions

View file

@ -1,58 +0,0 @@
From 6a5a212f9907a5da764878a7b0059da33371e36f Mon Sep 17 00:00:00 2001
From: Linus Walleij <linus.walleij@linaro.org>
Date: Sat, 15 Jan 2022 01:54:57 +0100
Subject: [PATCH 2/2] pwm: ab8500: Get HW ID from reg value
Instead of relying on the platform device ID which is just
assigned by the order of appearance of nodes in the device tree
if we're lucky, rely on the reg value which is stable and
predictable.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
drivers/pwm/pwm-ab8500.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/drivers/pwm/pwm-ab8500.c b/drivers/pwm/pwm-ab8500.c
index ad37bc46f272..338e046e89ea 100644
--- a/drivers/pwm/pwm-ab8500.c
+++ b/drivers/pwm/pwm-ab8500.c
@@ -11,6 +11,7 @@
#include <linux/mfd/abx500.h>
#include <linux/mfd/abx500/ab8500.h>
#include <linux/module.h>
+#include <linux/property.h>
/*
* PWM Out generators
@@ -93,10 +94,16 @@ static const struct pwm_ops ab8500_pwm_ops = {
static int ab8500_pwm_probe(struct platform_device *pdev)
{
struct ab8500_pwm_chip *ab8500;
+ u32 hwid;
int err;
- if (pdev->id < 1 || pdev->id > 31)
- return dev_err_probe(&pdev->dev, EINVAL, "Invalid device id %d\n", pdev->id);
+ err = device_property_read_u32(&pdev->dev, "reg", &hwid);
+ if (err) {
+ dev_err_probe(&pdev->dev, err, "missing reg property\n");
+ return err;
+ }
+ if (hwid < 1 || hwid > 31)
+ return dev_err_probe(&pdev->dev, EINVAL, "Invalid device id %d\n", hwid);
/*
* Nothing to be done in probe, this is required to get the
@@ -109,7 +116,7 @@ static int ab8500_pwm_probe(struct platform_device *pdev)
ab8500->chip.dev = &pdev->dev;
ab8500->chip.ops = &ab8500_pwm_ops;
ab8500->chip.npwm = 1;
- ab8500->hwid = pdev->id - 1;
+ ab8500->hwid = hwid;
err = devm_pwmchip_add(&pdev->dev, &ab8500->chip);
if (err < 0)
--
2.38.1

View file

@ -4,8 +4,8 @@
_flavor="postmarketos-stericsson"
_config="config-$_flavor.armv7"
pkgname=linux-$_flavor
pkgver=6.3.5
pkgrel=1
pkgver=6.7.0
pkgrel=0
pkgdesc="Mainline kernel for ST-Ericsson NovaThor devices"
arch="armv7"
_carch="arm"
@ -37,8 +37,6 @@ esac
source="
https://cdn.kernel.org/pub/linux/kernel/v${_kernver%%.*}.x/linux-$_kernver.tar.xz
config-$_flavor.armv7
0001-fix-busydetect-ux500.patch
0002-pwm-ab8500-Get-HW-ID-from-reg-value.patch
"
builddir="$srcdir/linux-${_kernver//_/-}"
@ -67,8 +65,6 @@ package() {
}
sha512sums="
91a98c56191645c4ba32f657da59b6be92021b37a698eaf79e1ed3a79b959626386e7b69c8cb0c9eab0645c287a3e53393b1710158eca67b2f66a8d3eaec13de linux-6.3.5.tar.xz
9760c63cbe1319363df137c641d24bfd9c054f5bcee26977fa996baa912511ee119950bcce87e583412ade626bba6dd6cc2139cedb4670f2bf6eda79e294e057 config-postmarketos-stericsson.armv7
10df6cacbed7b76d23a879aea4b9913b22551a6e4f9cd49814f491af4b8121dccbae4b3f1400584917f071355bdcd298f900b712ce31905c4ec561247dbb14e0 0001-fix-busydetect-ux500.patch
3abf1a2b28077a2784c33f468facf44c2312f8bb54422463cffcb92a0eaa1f8954f1fa5f8f5acac0262495c08692a2161325c1ca68f7d23aecb36c1f9138d7ef 0002-pwm-ab8500-Get-HW-ID-from-reg-value.patch
de06de556191614bd9daf077ae239360352a402bab407748e67f1e5108c92fd933e451707840ab22fe0f9976db3d1e1b60ca9d41cf894f015ca09b3f652b74ad linux-6.7.tar.xz
2f71e984835fe838031d07ea084a6179674c09ba1a9688c84d4eff0d1c19686475cd92bb2519e033f557f781aea056efcddbe2bb2d6092eb3cf39d577c96ea89 config-postmarketos-stericsson.armv7
"