Commit e582e08e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'auxdisplay-for-linus-v5.16' of git://github.com/ojeda/linux 

Pull auxdisplay updates from Miguel Ojeda:

 - 4-digit 7-segment and quad alphanumeric display support for the
   ht16k33 driver, allowing the user to display and scroll text
   messages, from Geert Uytterhoeven.

 - An assortment of fixes and cleanups from Geert Uytterhoeven.

 - Header cleanups from Mianhan Liu.

 - Whitespace cleanup from Huiquan Deng.

* tag 'auxdisplay-for-linus-v5.16' of git://github.com/ojeda/linux: (26 commits)
  MAINTAINERS: Add DT Bindings for Auxiliary Display Drivers
  auxdisplay: cfag12864bfb: code indent should use tabs where possible
  auxdisplay: ht16k33: remove superfluous header files
  auxdisplay: ks0108: remove superfluous header files
  auxdisplay: cfag12864bfb: remove superfluous header files
  auxdisplay: ht16k33: Make use of device properties
  auxdisplay: ht16k33: Add LED support
  dt-bindings: auxdisplay: ht16k33: Document LED subnode
  auxdisplay: ht16k33: Add support for segment displays
  auxdisplay: ht16k33: Extract frame buffer probing
  auxdisplay: ht16k33: Extract ht16k33_brightness_set()
  auxdisplay: ht16k33: Move delayed work
  auxdisplay: ht16k33: Add helper variable dev
  auxdisplay: ht16k33: Convert to simple i2c probe function
  auxdisplay: ht16k33: Remove unneeded error check in keypad probe()
  auxdisplay: ht16k33: Use HT16K33_FB_SIZE in ht16k33_initialize()
  auxdisplay: ht16k33: Fix frame buffer device blanking
  auxdisplay: ht16k33: Connect backlight to fbdev
  auxdisplay: linedisp: Add support for changing scroll rate
  auxdisplay: linedisp: Use kmemdup_nul() helper
  ...
parents e54ffb96 97fbb29f

Documentation/devicetree/bindings/auxdisplay/holtek,ht16k33.yaml

+29 −3
Original line number Diff line number Diff line
@@ -14,14 +14,21 @@ allOf: 


properties:

  compatible:

    const: holtek,ht16k33

    oneOf:

      - items:

          - enum:

              - adafruit,3108  # 0.56" 4-Digit 7-Segment FeatherWing Display (Red)

              - adafruit,3130  # 0.54" Quad Alphanumeric FeatherWing Display (Red)

          - const: holtek,ht16k33



      - const: holtek,ht16k33     # Generic 16*8 LED controller with dot-matrix display



  reg:

    maxItems: 1



  refresh-rate-hz:

    maxItems: 1

    description: Display update interval in Hertz

    description: Display update interval in Hertz for dot-matrix displays



  interrupts:

    maxItems: 1
@@ -41,9 +48,21 @@ properties: 
    default: 16

    description: Initial brightness level



  led:

    type: object

    $ref: /schemas/leds/common.yaml#

    unevaluatedProperties: false



required:

  - compatible

  - reg



if:

  properties:

    compatible:

      const: holtek,ht16k33

then:

  required:

    - refresh-rate-hz



additionalProperties: false
@@ -52,6 +71,7 @@ examples: 
  - |

    #include <dt-bindings/interrupt-controller/irq.h>

    #include <dt-bindings/input/input.h>

    #include <dt-bindings/leds/common.h>

    i2c1 {

            #address-cells = <1>;

            #size-cells = <0>;
@@ -73,5 +93,11 @@ examples: 
                                   <MATRIX_KEY(4, 1, KEY_F9)>,

                                   <MATRIX_KEY(5, 1, KEY_F3)>,

                                   <MATRIX_KEY(6, 1, KEY_F1)>;



                    led {

                            color = <LED_COLOR_ID_RED>;

                            function = LED_FUNCTION_BACKLIGHT;

                            linux,default-trigger = "backlight";

                    };

            };

      };

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -3170,6 +3170,7 @@ F: lib/*audit.c 
AUXILIARY DISPLAY DRIVERS

M:	Miguel Ojeda <ojeda@kernel.org>

S:	Maintained

F:	Documentation/devicetree/bindings/auxdisplay/

F:	drivers/auxdisplay/

F:	include/linux/cfag12864b.h
































drivers/auxdisplay/Kconfig



+11
−1






























Original line number
Diff line number
Diff line







@@ -25,6 +25,12 @@ config CHARLCD







	  This is some character LCD core interface that multiple drivers can









	  use.



















config LINEDISP









	tristate "Character line display core support" if COMPILE_TEST









	help









	  This is the core support for single-line character displays, to be









	  selected by drivers that use it.



















config HD44780_COMMON









	tristate "Common functions for HD44780 (and compatibles) LCD displays" if COMPILE_TEST









	select CHARLCD








@@ -155,6 +161,7 @@ config IMG_ASCII_LCD







	depends on HAS_IOMEM









	default y if MIPS_MALTA









	select MFD_SYSCON









	select LINEDISP









	help









	  Enable this to support the simple ASCII LCD displays found on









	  development boards such as the MIPS Boston, MIPS Malta & MIPS SEAD3








@@ -162,13 +169,16 @@ config IMG_ASCII_LCD

















config HT16K33









	tristate "Holtek Ht16K33 LED controller with keyscan"









	depends on FB && OF && I2C && INPUT









	depends on FB && I2C && INPUT









	select FB_SYS_FOPS









	select FB_SYS_FILLRECT









	select FB_SYS_COPYAREA









	select FB_SYS_IMAGEBLIT









	select INPUT_MATRIXKMAP









	select FB_BACKLIGHT









	select NEW_LEDS









	select LEDS_CLASS









	select LINEDISP









	help









	  Say yes here to add support for Holtek HT16K33, RAM mapping 16*8









	  LED controller driver with keyscan.
































drivers/auxdisplay/Makefile



+1
−0






























Original line number
Diff line number
Diff line







@@ -13,3 +13,4 @@ obj-$(CONFIG_HD44780)		+= hd44780.o







obj-$(CONFIG_HT16K33)		+= ht16k33.o









obj-$(CONFIG_PARPORT_PANEL)	+= panel.o









obj-$(CONFIG_LCD2S)		+= lcd2s.o









obj-$(CONFIG_LINEDISP)		+= line-display.o
























drivers/auxdisplay/cfag12864bfb.c



+3
−6






























Original line number
Diff line number
Diff line







@@ -12,13 +12,10 @@







#include <linux/init.h>









#include <linux/module.h>









#include <linux/kernel.h>









#include <linux/delay.h>









#include <linux/errno.h>









#include <linux/fb.h>









#include <linux/mm.h>









#include <linux/platform_device.h>









#include <linux/string.h>









#include <linux/uaccess.h>









#include <linux/cfag12864b.h>



















#define CFAG12864BFB_NAME "cfag12864bfb"