Unverified Commit 24138ec0 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v6.5/ti-sysc-signed' of... 

Merge tag 'omap-for-v6.5/ti-sysc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into soc/drivers

Non-urgent ti-sysc driver fix for v6.5 merge window

A fix for masking bool variables that can wait for the merge window
no problem.

* tag 'omap-for-v6.5/ti-sysc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  bus: ti-sysc: Fix dispc quirk masking bool variables

Link: https://lore.kernel.org/r/pull-1685700720-242492@atomide.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents acaa52bc f620596f

drivers/bus/ti-sysc.c

+2 −2
Original line number Diff line number Diff line
@@ -1791,7 +1791,7 @@ static u32 sysc_quirk_dispc(struct sysc *ddata, int dispc_offset, 
	if (!ddata->module_va)

		return -EIO;



	/* DISP_CONTROL */

	/* DISP_CONTROL, shut down lcd and digit on disable if enabled */

	val = sysc_read(ddata, dispc_offset + 0x40);

	lcd_en = val & lcd_en_mask;

	digit_en = val & digit_en_mask;
@@ -1803,7 +1803,7 @@ static u32 sysc_quirk_dispc(struct sysc *ddata, int dispc_offset, 
		else

			irq_mask |= BIT(2) | BIT(3);	/* EVSYNC bits */

	}

	if (disable & (lcd_en | digit_en))

	if (disable && (lcd_en || digit_en))

		sysc_write(ddata, dispc_offset + 0x40,

			   val & ~(lcd_en_mask | digit_en_mask));