diff options
| author | Tony Lindgren <tony@atomide.com> | 2020-02-27 08:57:48 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2020-02-27 08:57:48 -0800 |
| commit | 697b4f1603e7358a02027ce4310fee0fe43cb286 (patch) | |
| tree | 60930b21c7a0792be2af485ff812934a45255b4a /drivers | |
| parent | e500ba0e71f0b8652e67f8801cf7c33dad3ee4a4 (diff) | |
| parent | 51c22d7b40dca8b39a33b2c3b03f13122a2a1af3 (diff) | |
| download | linux-697b4f1603e7358a02027ce4310fee0fe43cb286.tar.gz linux-697b4f1603e7358a02027ce4310fee0fe43cb286.tar.bz2 linux-697b4f1603e7358a02027ce4310fee0fe43cb286.zip | |
Merge branch 'omap-for-v5.6/fixes-rc3' into fixes
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/bus/ti-sysc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c index f702c85c81b6..6113fc0a52ae 100644 --- a/drivers/bus/ti-sysc.c +++ b/drivers/bus/ti-sysc.c @@ -1400,7 +1400,7 @@ static void sysc_init_revision_quirks(struct sysc *ddata) } /* 1-wire needs module's internal clocks enabled for reset */ -static void sysc_clk_enable_quirk_hdq1w(struct sysc *ddata) +static void sysc_pre_reset_quirk_hdq1w(struct sysc *ddata) { int offset = 0x0c; /* HDQ_CTRL_STATUS */ u16 val; @@ -1488,7 +1488,7 @@ static void sysc_init_module_quirks(struct sysc *ddata) return; if (ddata->cfg.quirks & SYSC_MODULE_QUIRK_HDQ1W) { - ddata->clk_enable_quirk = sysc_clk_enable_quirk_hdq1w; + ddata->clk_disable_quirk = sysc_pre_reset_quirk_hdq1w; return; } |