Commit 66615c4e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents a2590d69 b4561644

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

0 → 100644
+77 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/auxdisplay/holtek,ht16k33.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Holtek HT16K33 RAM mapping 16*8 LED controller with keyscan



maintainers:

  - Robin van der Gracht <robin@protonic.nl>



allOf:

  - $ref: "/schemas/input/matrix-keymap.yaml#"



properties:

  compatible:

    const: holtek,ht16k33



  reg:

    maxItems: 1



  refresh-rate-hz:

    maxItems: 1

    description: Display update interval in Hertz



  interrupts:

    maxItems: 1



  debounce-delay-ms:

    maxItems: 1

    description: Debouncing interval time in milliseconds



  linux,keymap: true



  linux,no-autorepeat:

    description: Disable keyrepeat



  default-brightness-level:

    minimum: 1

    maximum: 16

    default: 16

    description: Initial brightness level



required:

  - compatible

  - reg

  - refresh-rate-hz



additionalProperties: false



examples:

  - |

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

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

    i2c1 {

            #address-cells = <1>;

            #size-cells = <0>;



            ht16k33: ht16k33@70 {

                    compatible = "holtek,ht16k33";

                    reg = <0x70>;

                    refresh-rate-hz = <20>;

                    interrupt-parent = <&gpio4>;

                    interrupts = <5 (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_EDGE_RISING)>;

                    debounce-delay-ms = <50>;

                    linux,keymap = <MATRIX_KEY(2, 0, KEY_F6)>,

                                   <MATRIX_KEY(3, 0, KEY_F8)>,

                                   <MATRIX_KEY(4, 0, KEY_F10)>,

                                   <MATRIX_KEY(5, 0, KEY_F4)>,

                                   <MATRIX_KEY(6, 0, KEY_F2)>,

                                   <MATRIX_KEY(2, 1, KEY_F5)>,

                                   <MATRIX_KEY(3, 1, KEY_F7)>,

                                   <MATRIX_KEY(4, 1, KEY_F9)>,

                                   <MATRIX_KEY(5, 1, KEY_F3)>,

                                   <MATRIX_KEY(6, 1, KEY_F1)>;

            };

      };

Documentation/devicetree/bindings/display/ht16k33.txt

deleted100644 → 0
+0 −40
Original line number Diff line number Diff line 
Holtek ht16k33 RAM mapping 16*8 LED controller driver with keyscan

-------------------------------------------------------------------------------



Required properties:

- compatible:		"holtek,ht16k33"

- reg:			I2C slave address of the chip.

- interrupts:		Interrupt specification for the key pressed interrupt.

- refresh-rate-hz:	Display update interval in HZ.

- debounce-delay-ms:	Debouncing interval time in milliseconds.

- linux,keymap: 	The keymap for keys as described in the binding

			document (devicetree/bindings/input/matrix-keymap.txt).



Optional properties:

- linux,no-autorepeat:	Disable keyrepeat.

- default-brightness-level: Initial brightness level [0-15] (default: 15).



Example:



&i2c1 {

	ht16k33: ht16k33@70 {

		compatible = "holtek,ht16k33";

		reg = <0x70>;

		refresh-rate-hz = <20>;

		debounce-delay-ms = <50>;

		interrupt-parent = <&gpio4>;

		interrupts = <5 (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_EDGE_RISING)>;

		linux,keymap = <

			MATRIX_KEY(2, 0, KEY_F6)

			MATRIX_KEY(3, 0, KEY_F8)

			MATRIX_KEY(4, 0, KEY_F10)

			MATRIX_KEY(5, 0, KEY_F4)

			MATRIX_KEY(6, 0, KEY_F2)

			MATRIX_KEY(2, 1, KEY_F5)

			MATRIX_KEY(3, 1, KEY_F7)

			MATRIX_KEY(4, 1, KEY_F9)

			MATRIX_KEY(5, 1, KEY_F3)

			MATRIX_KEY(6, 1, KEY_F1)

		>;

	};

};

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -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
































drivers/auxdisplay/Kconfig



+0
−3






























Original line number
Diff line number
Diff line







@@ -507,6 +507,3 @@ config PANEL







	depends on PARPORT









	select AUXDISPLAY









	select PARPORT_PANEL


















config CHARLCD









	tristate "Character LCD core support" if COMPILE_TEST
























drivers/auxdisplay/ht16k33.c



+7
−10






























Original line number
Diff line number
Diff line







@@ -117,8 +117,7 @@ static void ht16k33_fb_queue(struct ht16k33_priv *priv)







{









	struct ht16k33_fbdev *fbdev = &priv->fbdev;



















	schedule_delayed_work(&fbdev->work,









			      msecs_to_jiffies(HZ / fbdev->refresh_rate));









	schedule_delayed_work(&fbdev->work, HZ / fbdev->refresh_rate);









}



















/*








@@ -402,11 +401,6 @@ static int ht16k33_probe(struct i2c_client *client,







		return -EIO;









	}



















	if (client->irq <= 0) {









		dev_err(&client->dev, "No IRQ specified\n");









		return -EINVAL;









	}



















	priv = devm_kzalloc(&client->dev, sizeof(*priv), GFP_KERNEL);









	if (!priv)









		return -ENOMEM;








@@ -459,9 +453,12 @@ static int ht16k33_probe(struct i2c_client *client,







	if (err)









		goto err_fbdev_info;



















	/* Keypad */









	if (client->irq > 0) {









		err = ht16k33_keypad_probe(client, &priv->keypad);









		if (err)









			goto err_fbdev_unregister;









	}



















	/* Backlight */









	memset(&bl_props, 0, sizeof(struct backlight_properties));