diff options
| author |   Tony Lindgren <tony@atomide.com> | 2020-02-26 10:48:42 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2020-02-26 10:48:42 -0800 |
| commit | 5267244ddc62496f1537afffef70e6e2e7d5764c (patch) | |
| tree | 334fbad5ea0f1f5d9aede660e583c0360873e23e | |
| parent | arm: dts: dra76x: Fix mmc3 max-frequency (diff) | |
| parent | bus: ti-sysc: Fix 1-wire reset quirk (diff) | |
Merge tag 'hdq-fix' into omap-for-v5.6/fixes-rc2
| -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; } |