diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-22 09:25:48 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-22 09:25:48 -0800 |
commit | 66615c4ee2874f07f09caa45c0c3f80973a75952 (patch) | |
tree | b335b133025fd6490708064d80b1e0b451f6d28d /MAINTAINERS | |
parent | a2590d69893f232cbb79d149dbbb456a1febca22 (diff) | |
parent | b45616445a6e346daf8a173a0c51413aec067ebb (diff) |
Merge tag 'auxdisplay-for-linus-v5.12' of git://github.com/ojeda/linux
Pull auxdisplay updates from Miguel Ojeda:
"A set of auxdisplay fixes and improvements from Geert Uytterhoeven,
and one from Robin van der Gracht that got lost a long time ago"
* tag 'auxdisplay-for-linus-v5.12' of git://github.com/ojeda/linux:
auxdisplay: Fix duplicate CHARLCD config symbol
auxdisplay: ht16k33: Fix refresh rate handling
dt-bindings: auxdisplay: ht16k33: Convert to json-schema
dt-bindings: auxdisplay: ht16k33: Fix default-brightness-level range
dt-bindings: auxdisplay: ht16k33: Keyscan function should be optional
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 555c944b3b27..283b1385fd29 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8141,7 +8141,7 @@ F: net/hsr/ HT16K33 LED CONTROLLER DRIVER M: Robin van der Gracht <robin@protonic.nl> S: Maintained -F: Documentation/devicetree/bindings/display/ht16k33.txt +F: Documentation/devicetree/bindings/auxdisplay/holtek,ht16k33.yaml F: drivers/auxdisplay/ht16k33.c HTCPEN TOUCHSCREEN DRIVER |