summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFerry Toth <ftoth@exalondelft.nl>2021-05-18 23:27:09 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-07-19 09:45:00 +0200
commit418b333afbd55e67f7911868515051e0a7a37658 (patch)
tree45a7ac4e3dddbc114527dfb5c6e97ff5f55f2baa
parentaf092ec16e06c179632ee69e1e1713308b1e8d7d (diff)
downloadlinux-stable-418b333afbd55e67f7911868515051e0a7a37658.tar.gz
linux-stable-418b333afbd55e67f7911868515051e0a7a37658.tar.bz2
linux-stable-418b333afbd55e67f7911868515051e0a7a37658.zip
extcon: intel-mrfld: Sync hardware and software state on init
commit ecb5bdff901139850fb3ca3ae2d0cccac045bc52 upstream. extcon driver for Basin Cove PMIC shadows the switch status used for dwc3 DRD to detect a change in the switch position. This change initializes the status at probe time. Cc: stable@vger.kernel.org Fixes: 492929c54791 ("extcon: mrfld: Introduce extcon driver for Basin Cove PMIC") Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Signed-off-by: Ferry Toth <ftoth@exalondelft.nl> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/extcon/extcon-intel-mrfld.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/extcon/extcon-intel-mrfld.c b/drivers/extcon/extcon-intel-mrfld.c
index f47016fb28a8..cd1a5f230077 100644
--- a/drivers/extcon/extcon-intel-mrfld.c
+++ b/drivers/extcon/extcon-intel-mrfld.c
@@ -197,6 +197,7 @@ static int mrfld_extcon_probe(struct platform_device *pdev)
struct intel_soc_pmic *pmic = dev_get_drvdata(dev->parent);
struct regmap *regmap = pmic->regmap;
struct mrfld_extcon_data *data;
+ unsigned int status;
unsigned int id;
int irq, ret;
@@ -244,6 +245,14 @@ static int mrfld_extcon_probe(struct platform_device *pdev)
/* Get initial state */
mrfld_extcon_role_detect(data);
+ /*
+ * Cached status value is used for cable detection, see comments
+ * in mrfld_extcon_cable_detect(), we need to sync cached value
+ * with a real state of the hardware.
+ */
+ regmap_read(regmap, BCOVE_SCHGRIRQ1, &status);
+ data->status = status;
+
mrfld_extcon_clear(data, BCOVE_MIRQLVL1, BCOVE_LVL1_CHGR);
mrfld_extcon_clear(data, BCOVE_MCHGRIRQ1, BCOVE_CHGRIRQ_ALL);