457cc59795
This allows cleanly backporting more recent stuff that's important for OpenWrt. Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
47 lines
1.7 KiB
Diff
47 lines
1.7 KiB
Diff
From c813bb37bd32cb967060a2c573fae4ea518d32eb Mon Sep 17 00:00:00 2001
|
|
From: Rajendra Nayak <rnayak@codeaurora.org>
|
|
Date: Fri, 11 Jun 2021 09:33:46 +0100
|
|
Subject: [PATCH] nvmem: qfprom: minor nit fixes
|
|
|
|
Fix a missed newline, change an 'if' to 'else if' and update
|
|
a comment which is stale after the merge of '5a1bea2a: nvmem:
|
|
qfprom: Add support for fuseblowing on sc7280'
|
|
|
|
Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
|
|
Reviewed-by: Douglas Anderson <dianders@chromium.org>
|
|
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
|
Link: https://lore.kernel.org/r/20210611083348.20170-8-srinivas.kandagatla@linaro.org
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/nvmem/qfprom.c | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/nvmem/qfprom.c
|
|
+++ b/drivers/nvmem/qfprom.c
|
|
@@ -122,6 +122,7 @@ static const struct qfprom_soc_compatibl
|
|
.keepout = sc7280_qfprom_keepout,
|
|
.nkeepout = ARRAY_SIZE(sc7280_qfprom_keepout)
|
|
};
|
|
+
|
|
/**
|
|
* qfprom_disable_fuse_blowing() - Undo enabling of fuse blowing.
|
|
* @priv: Our driver data.
|
|
@@ -195,7 +196,7 @@ static int qfprom_enable_fuse_blowing(co
|
|
}
|
|
|
|
/*
|
|
- * Hardware requires 1.8V min for fuse blowing; this may be
|
|
+ * Hardware requires a min voltage for fuse blowing; this may be
|
|
* a rail shared do don't specify a max--regulator constraints
|
|
* will handle.
|
|
*/
|
|
@@ -399,7 +400,7 @@ static int qfprom_probe(struct platform_
|
|
|
|
if (major_version == 7 && minor_version == 8)
|
|
priv->soc_data = &qfprom_7_8_data;
|
|
- if (major_version == 7 && minor_version == 15)
|
|
+ else if (major_version == 7 && minor_version == 15)
|
|
priv->soc_data = &qfprom_7_15_data;
|
|
|
|
priv->vcc = devm_regulator_get(&pdev->dev, "vcc");
|