Merge tag 'hdq-fix' into omap-for-v5.6/fixes-rc2

tmlind · tmlind · commit 5267244ddc62 · 2020-02-26T10:48:42.000-08:00
diff --git 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;
 	}

Original file line number	Diff line number	Diff line change
`@@ -1400,7 +1400,7 @@ static void sysc_init_revision_quirks(struct sysc *ddata)`
`1400`	`1400`	`}`
`1401`	`1401`
`1402`	`1402`	`/* 1-wire needs module's internal clocks enabled for reset */`
`1403`		`-static void sysc_clk_enable_quirk_hdq1w(struct sysc *ddata)`
	`1403`	`+static void sysc_pre_reset_quirk_hdq1w(struct sysc *ddata)`
`1404`	`1404`	`{`
`1405`	`1405`	`int offset = 0x0c; /* HDQ_CTRL_STATUS */`
`1406`	`1406`	`u16 val;`
`@@ -1488,7 +1488,7 @@ static void sysc_init_module_quirks(struct sysc *ddata)`
`1488`	`1488`	`return;`
`1489`	`1489`
`1490`	`1490`	`if (ddata->cfg.quirks & SYSC_MODULE_QUIRK_HDQ1W) {`
`1491`		`- ddata->clk_enable_quirk = sysc_clk_enable_quirk_hdq1w;`
	`1491`	`+ ddata->clk_disable_quirk = sysc_pre_reset_quirk_hdq1w;`
`1492`	`1492`
`1493`	`1493`	`return;`
`1494`	`1494`	`}`