github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-04 20:46:48 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

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

Browse Source 
A fix for masking bool variables that can wait for the merge window
 no problem.
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCAAvFiEEkgNvrZJU/QSQYIcQG9Q+yVyrpXMFAmR5vhgRHHRvbnlAYXRv
 bWlkZS5jb20ACgkQG9Q+yVyrpXNNBQ//aBx5HBJA5j4JyFznMyl7wK58vx1zzo8L
 6OZLHeoViG8hPUwWgnmgyL8ht68XK0h/HUqS1g+7Q1gRc8CF9iNKHaN6IVJI+1TW
 00t6YQnUdKYf4mO0uTybrKPdhpwwjVAxb1Kayw8gfHU+s6uQiKFHvdh5TLLQj9Rw
 Pwuw+rmm2DEUKs1jOVgBe+pk1J6OlhPde2bsBvSc7/DCnjWiXbH9/66ll1VDc1iC
 cvZLGR7VV7pEiRbnOL3Cd/mbNF0/OYVlqYtBsd8dkeFYM3s2vGqj8gOs6qMQIWuz
 N2BWDJd3qv0zBLEGQD0SRJ9qYqi7kouv9jvbL63orUYTO+2LcMVbPtMITQ7DvAXR
 fKTjhsKet9xo718jNDY+KfmdaGgZlyTBjKNFNi+ZuKIRYd7AEccpSEMmorDQGiNf
 bbVsYsT7TuioWJpfk69TYSrlHJzWeu9cmuyCJkdCyBDvVn+imEM9wLPiEwYsCezX
 /DZw4qa6UZmmacEsUYyTdz6N9WQsgG4Ntkrmp04TIfwlBptnA8WzxlqW6f9nMaiu
 5ife07uLqejqGPMhsp7wxgCjfeIeTXZ6vganWTSv/uTels9g1KAWCTAWabLzpZkZ
 7CJxpdeCZaylSgkrx1nsmjcdkO+2ix0d1t1IkyPaDIpHvq5ZD/H2gb1tPzCq2MYy
 H1Lsle53sio=
 =J6Bc
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmSDH10ACgkQYKtH/8kJ
 Uidevw//VWsJQ/w5291eYokWBQgOgC+5nbaOQZreMsS/Oqo3t2JMQoAnDYGF11KU
 ZTugeTxYE+hGYenVFGMEsLLDzHptQ25EBg6F1p3hWBvY85xsIkdd8uEhKC5gQPG5
 CTl7EcLTivoq2FaWu1IDd4EeWxLhYYliu2EcVHKeZVfEIwGcGiYNM8ai8WDvlgiT
 kuQ3BObh3VCNUEFIE5zhiTzkrp+3Qa+fNCtjIESz4qtfHg2BNr0DzSZL/xy73wjh
 ZQ0c+UWafTjNTqE7teiBkFmRnG9/m9TQNL+hG01zrNzfzzR/9pw0IDG63YvOZ66l
 GZqZAcnDE7pAa7yF927VV9+RY8FjoGSjgj5x4jL8jO99u7i0JgWDZ0GPmTXQLZKR
 GwkCJpusP0gl1vTVhe51hD4RICEpikyvUojE9hjwSmlVxTO/mDDcl1LwXa0VYnd9
 hEDj5i6bmcQD9DMVOT2kxwLZVZzxIxuz91mGsVfSlxNLxkbtYq7Enwg73ZYF8PfY
 O3nX9SZi+tvhxjmfWex8q1XPeMIgWUhTiKr+HsOF2bX1F6z1YckkHM0jUHdz55Oi
 0sRdrm8iY9oPUxUx/K992F9KlIUTHEqcbNXVyBWsuGwhGZakH+VrFviT8qHUnTL2
 JZEl7Y+/Ots2vWGZOeILUakNQ3BKB4tqQ06H3n+/TfsUGaOi6RE=
 =4vB+
 -----END PGP SIGNATURE-----

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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2023-06-09 14:47:25 +02:00
commit 24138ec0a3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/bus/ti-sysc.c
View File

@ -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));