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

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

Pull auxdisplay fixes from Miguel Ojeda:
 "A few minor auxdisplay improvements:

   - A couple of small header cleanups for charlcd (Masahiro Yamada)

   - A trivial typo fix for the examples of cfag12864b (Masahiro Yamada)

   - An Kconfig help text improvement for charlcd (Mans Rullgard)

   - An error path fix for panel (zhengbin)"

* tag 'auxdisplay-for-linus-v5.3-rc5' of git://github.com/ojeda/linux:
  auxdisplay: Fix a typo in cfag12864b-example.c
  auxdisplay: charlcd: add include guard to charlcd.h
  auxdisplay: charlcd: move charlcd.h to drivers/auxdisplay
  auxdisplay: charlcd: add help text for backlight initial state
  auxdisplay: panel: need to delete scan_timer when misc_register fails in panel_attach
parents 2b245b8b 6c4d6bc5

drivers/auxdisplay/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -448,6 +448,11 @@ config PANEL_BOOT_MESSAGE 
choice

	prompt "Backlight initial state"

	default CHARLCD_BL_FLASH

	---help---

	  Select the initial backlight state on boot or module load.



	  Previously, there was no option for this: the backlight flashed

	  briefly on init. Now you can also turn it off/on.



	config CHARLCD_BL_OFF

		bool "Off"

drivers/auxdisplay/charlcd.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 


#include <generated/utsrelease.h>



#include <misc/charlcd.h>

#include "charlcd.h"



#define LCD_MINOR		156

include/misc/charlcd.h→drivers/auxdisplay/charlcd.h

+5 −0
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ 
 * Copyright (C) 2016-2017 Glider bvba

 */



#ifndef _CHARLCD_H

#define _CHARLCD_H



struct charlcd {

	const struct charlcd_ops *ops;

	const unsigned char *char_conv;	/* Optional */
@@ -37,3 +40,5 @@ int charlcd_register(struct charlcd *lcd); 
int charlcd_unregister(struct charlcd *lcd);



void charlcd_poke(struct charlcd *lcd);



#endif /* CHARLCD_H */

drivers/auxdisplay/hd44780.c

+1 −2
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ 
#include <linux/property.h>

#include <linux/slab.h>



#include <misc/charlcd.h>



#include "charlcd.h"



enum hd44780_pin {

	/* Order does matter due to writing to GPIO array subsets! */

drivers/auxdisplay/panel.c

+3 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
#include <linux/io.h>

#include <linux/uaccess.h>



#include <misc/charlcd.h>

#include "charlcd.h"



#define KEYPAD_MINOR		185
@@ -1617,6 +1617,8 @@ static void panel_attach(struct parport *port) 
	return;



err_lcd_unreg:

	if (scan_timer.function)

		del_timer_sync(&scan_timer);

	if (lcd.enabled)

		charlcd_unregister(lcd.charlcd);

err_unreg_device:

CRA Git | Maintained and supported by SUSTech CRA and CCSE