kernel: bump 5.10 to 5.10.179
[openwrt/openwrt.git] / target / linux / generic / backport-5.10 / 804-v5.14-0004-nvmem-qfprom-minor-nit-fixes.patch
1 From c813bb37bd32cb967060a2c573fae4ea518d32eb Mon Sep 17 00:00:00 2001
2 From: Rajendra Nayak <rnayak@codeaurora.org>
3 Date: Fri, 11 Jun 2021 09:33:46 +0100
4 Subject: [PATCH] nvmem: qfprom: minor nit fixes
5
6 Fix a missed newline, change an 'if' to 'else if' and update
7 a comment which is stale after the merge of '5a1bea2a: nvmem:
8 qfprom: Add support for fuseblowing on sc7280'
9
10 Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
11 Reviewed-by: Douglas Anderson <dianders@chromium.org>
12 Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
13 Link: https://lore.kernel.org/r/20210611083348.20170-8-srinivas.kandagatla@linaro.org
14 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
15 ---
16 drivers/nvmem/qfprom.c | 5 +++--
17 1 file changed, 3 insertions(+), 2 deletions(-)
18
19 --- a/drivers/nvmem/qfprom.c
20 +++ b/drivers/nvmem/qfprom.c
21 @@ -122,6 +122,7 @@ static const struct qfprom_soc_compatibl
22 .keepout = sc7280_qfprom_keepout,
23 .nkeepout = ARRAY_SIZE(sc7280_qfprom_keepout)
24 };
25 +
26 /**
27 * qfprom_disable_fuse_blowing() - Undo enabling of fuse blowing.
28 * @priv: Our driver data.
29 @@ -195,7 +196,7 @@ static int qfprom_enable_fuse_blowing(co
30 }
31
32 /*
33 - * Hardware requires 1.8V min for fuse blowing; this may be
34 + * Hardware requires a min voltage for fuse blowing; this may be
35 * a rail shared do don't specify a max--regulator constraints
36 * will handle.
37 */
38 @@ -399,7 +400,7 @@ static int qfprom_probe(struct platform_
39
40 if (major_version == 7 && minor_version == 8)
41 priv->soc_data = &qfprom_7_8_data;
42 - if (major_version == 7 && minor_version == 15)
43 + else if (major_version == 7 && minor_version == 15)
44 priv->soc_data = &qfprom_7_15_data;
45
46 priv->vcc = devm_regulator_get(&pdev->dev, "vcc");