diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2023-06-16 09:16:39 +0200 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2023-07-10 12:54:53 +0200 |
| commit | ef7d8003336544198b83b0b606b9bc0767183f5f (patch) | |
| tree | 793e2b43a24c875db3697affcaf8b1a1a4c0ce34 /target/linux/generic/backport-5.15/813-v6.5-0006-nvmem-rockchip-otp-Use-devm_reset_control_array_get_.patch | |
| parent | f4e1f999617b0d968fcb9ff2e5a4e1171d8d5d9f (diff) | |
| download | upstream-ef7d8003336544198b83b0b606b9bc0767183f5f.tar.gz upstream-ef7d8003336544198b83b0b606b9bc0767183f5f.tar.bz2 upstream-ef7d8003336544198b83b0b606b9bc0767183f5f.zip | |
kernel: backport NVMEM patches queued for the v6.5
This includes some driver changes and support for fixed cells layout.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit 07bdc5551558287f7a99f6ae8e6d82d7d09d5781)
Diffstat (limited to 'target/linux/generic/backport-5.15/813-v6.5-0006-nvmem-rockchip-otp-Use-devm_reset_control_array_get_.patch')
| -rw-r--r-- | target/linux/generic/backport-5.15/813-v6.5-0006-nvmem-rockchip-otp-Use-devm_reset_control_array_get_.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/target/linux/generic/backport-5.15/813-v6.5-0006-nvmem-rockchip-otp-Use-devm_reset_control_array_get_.patch b/target/linux/generic/backport-5.15/813-v6.5-0006-nvmem-rockchip-otp-Use-devm_reset_control_array_get_.patch new file mode 100644 index 0000000000..3a17479d95 --- /dev/null +++ b/target/linux/generic/backport-5.15/813-v6.5-0006-nvmem-rockchip-otp-Use-devm_reset_control_array_get_.patch @@ -0,0 +1,31 @@ +From d325c9dd2b6e94040ca722ddcadcd6af358dd2be Mon Sep 17 00:00:00 2001 +From: Cristian Ciocaltea <cristian.ciocaltea@collabora.com> +Date: Sun, 11 Jun 2023 15:03:15 +0100 +Subject: [PATCH] nvmem: rockchip-otp: Use + devm_reset_control_array_get_exclusive() + +In preparation to support new Rockchip OTP memory devices having +specific reset configurations, switch devm_reset_control_get() to +devm_reset_control_array_get_exclusive(). + +Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com> +Tested-by: Vincent Legoll <vincent.legoll@gmail.com> +Reviewed-by: Heiko Stuebner <heiko@sntech.de> +Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> +Message-ID: <20230611140330.154222-12-srinivas.kandagatla@linaro.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/nvmem/rockchip-otp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/nvmem/rockchip-otp.c ++++ b/drivers/nvmem/rockchip-otp.c +@@ -263,7 +263,7 @@ static int rockchip_otp_probe(struct pla + if (ret) + return ret; + +- otp->rst = devm_reset_control_get(dev, "phy"); ++ otp->rst = devm_reset_control_array_get_exclusive(dev); + if (IS_ERR(otp->rst)) + return PTR_ERR(otp->rst); + |