summaryrefslogtreecommitdiffstats
path: root/drivers/bus
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2020-03-03 07:17:43 -0800
committerTony Lindgren <tony@atomide.com>2020-03-03 07:41:08 -0800
commit69e60903aaf5aa56548656897d2b0fbe4431a7fe (patch)
tree414fcc82ed90684697f4edceb2efd957c4069e67 /drivers/bus
parente28bb32b6d9931f325bf0f9678a690bf333e6838 (diff)
downloadlinux-69e60903aaf5aa56548656897d2b0fbe4431a7fe.tar.bz2
bus: ti-sysc: Fix wrong offset for display subsystem reset quirk
Commit 7324a7a0d5e2 ("bus: ti-sysc: Implement display subsystem reset quirk") added support for DSS reset, but is using dispc offset also for DSS also registers as reported by Tomi Valkeinen <tomi.valkeinen@ti.com>. Also, we're not using dispc_offset for dispc IRQSTATUS register so let's fix that too. Fixes: 7324a7a0d5e2 ("bus: ti-sysc: Implement display subsystem reset quirk") Reported-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'drivers/bus')
-rw-r--r--drivers/bus/ti-sysc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c
index e30c97ca5579..46b25fa4237f 100644
--- a/drivers/bus/ti-sysc.c
+++ b/drivers/bus/ti-sysc.c
@@ -1566,7 +1566,7 @@ static void sysc_pre_reset_quirk_dss(struct sysc *ddata)
return;
/* Clear IRQSTATUS */
- sysc_write(ddata, 0x1000 + 0x18, irq_mask);
+ sysc_write(ddata, dispc_offset + 0x18, irq_mask);
/* Disable outputs */
val = sysc_quirk_dispc(ddata, dispc_offset, true);
@@ -1580,14 +1580,14 @@ static void sysc_pre_reset_quirk_dss(struct sysc *ddata)
if (sysc_soc->soc == SOC_3430) {
/* Clear DSS_SDI_CONTROL */
- sysc_write(ddata, dispc_offset + 0x44, 0);
+ sysc_write(ddata, 0x44, 0);
/* Clear DSS_PLL_CONTROL */
- sysc_write(ddata, dispc_offset + 0x48, 0);
+ sysc_write(ddata, 0x48, 0);
}
/* Clear DSS_CONTROL to switch DSS clock sources to PRCM if not */
- sysc_write(ddata, dispc_offset + 0x40, 0);
+ sysc_write(ddata, 0x40, 0);
}
/* 1-wire needs module's internal clocks enabled for reset */