Commit 27c146e3 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'omap-for-v6.5/ti-sysc' into omap-for-v6.5/fixes 



Merge in a missed change into fixes.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parents 06c2afb8 34539b44

drivers/bus/ti-sysc.c

+2 −0
Original line number Diff line number Diff line
@@ -2142,6 +2142,8 @@ static int sysc_reset(struct sysc *ddata) 
		sysc_val = sysc_read_sysconfig(ddata);

		sysc_val |= sysc_mask;

		sysc_write(ddata, sysc_offset, sysc_val);

		/* Flush posted write */

		sysc_val = sysc_read_sysconfig(ddata);

	}



	if (ddata->cfg.srst_udelay)