diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-12-07 07:13:44 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-12-07 07:13:44 -0800 |
| commit | fa4327d76c4468db89ae2417677775e0d709e60c (patch) | |
| tree | 0b5583fb0a741023f49cf93e588fbfeb085afe74 | |
| parent | 9f03bf58bd76b997072e37b7907b7451770bef8d (diff) | |
| parent | 80654ebda525935e4c35d2e7c3c60ac2d3457521 (diff) | |
Merge "Revert "drivers:soc:qcom: Disable fw loading for SPSS"" into LA.AU.0.1.1_rb1.3LA.AU.0.1.1-03710-gen3meta.0
| -rw-r--r-- | drivers/soc/qcom/spss_utils.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/drivers/soc/qcom/spss_utils.c b/drivers/soc/qcom/spss_utils.c index 36b57308cc78..6ce328a1d2ca 100644 --- a/drivers/soc/qcom/spss_utils.c +++ b/drivers/soc/qcom/spss_utils.c @@ -22,6 +22,7 @@ * 2. SPSS HW version (selected via Device Tree). * */ + #define pr_fmt(fmt) "spss_utils [%s]: " fmt, __func__ #include <linux/kernel.h> /* min() */ @@ -329,9 +330,7 @@ static int spss_parse_dt(struct device_node *node) firmware_type = SPSS_FW_TYPE_TEST; else firmware_type = SPSS_FW_TYPE_PROD; -#ifdef CONFIG_HIBERNATION - firmware_type = SPSS_FW_TYPE_NONE; -#endif + iounmap(spss_fuse1_reg); iounmap(spss_fuse2_reg); @@ -408,25 +407,13 @@ static int spss_probe(struct platform_device *pdev) switch (firmware_type) { case SPSS_FW_TYPE_DEV: -#ifdef CONFIG_HIBERNATION - firmware_name = none_firmware_name; -#else firmware_name = dev_firmware_name; -#endif break; case SPSS_FW_TYPE_TEST: -#ifdef CONFIG_HIBERNATION - firmware_name = none_firmware_name; -#else firmware_name = test_firmware_name; -#endif break; case SPSS_FW_TYPE_PROD: -#ifdef CONFIG_HIBERNATION - firmware_name = none_firmware_name; -#else firmware_name = prod_firmware_name; -#endif break; case SPSS_FW_TYPE_NONE: firmware_name = none_firmware_name; |