Commit 7423fd7a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'auxdisplay-for-linus-v4.18-rc1' of git://github.com/ojeda/linux 

Pull auxdisplay updates from Miguel Ojeda:
 "Mostly small fixes and cleanups, plus a non-trivial fix for charlcd

  - charlcd: fixes and cleanups (Robert Abel and Sean Young)

  - Kconfig fixes (Randy Dunlap, Corentin Labbe and Ulf Magnusson)

  - cfag12864bfb: const cleanup (Gustavo A. R. Silva)

  - Docs/licenses/warnings cleanups"

* tag 'auxdisplay-for-linus-v4.18-rc1' of git://github.com/ojeda/linux:
  auxdisplay: Replace licenses with SPDX identifiers
  auxdisplay: make PANEL a menuconfig
  auxdisplay: fix broken menu
  auxdisplay: charlcd: Fix and clean up handling of x/y commands
  auxdisplay: charlcd: fix hex literal ranges for graphics command
  auxdisplay: charlcd: fix two-line command ^[[LN not marked as processed
  auxdisplay: charlcd: replace octal literal with form-feed escape sequence
  auxdisplay: charlcd: use null character instead of zero literal to terminate strings
  auxdisplay: charlcd: no need to call charlcd_gotoxy() if nothing changes
  auxdisplay: cfag12864bfb: constify fb_fix_screeninfo and fb_var_screeninfo structures
  auxdisplay: img-ascii-lcd: fix typo on select SYSCON/MFD_SYSCON
  auxdisplay: img-ascii-lcd: kconfig: Remove MIPS_SEAD3 reference
  auxdisplay: arm-charlcd: Fix struct charlcd doc line
  MAINTAINERS: auxdisplay: remove obsolete webpages
  Doc: misc-devices: move lcd-panel-cgram.txt to auxdisplay/
parents edb2a385 351f683b

MAINTAINERS

+0 −8
Original line number Diff line number Diff line
@@ -2533,8 +2533,6 @@ F: kernel/audit* 


AUXILIARY DISPLAY DRIVERS

M:	Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>

W:	http://miguelojeda.es/auxdisplay.htm

W:	http://jair.lab.fi.uva.es/~migojed/auxdisplay.htm

S:	Maintained

F:	drivers/auxdisplay/

F:	include/linux/cfag12864b.h
@@ -3384,16 +3382,12 @@ F: include/linux/usb/wusb* 


CFAG12864B LCD DRIVER

M:	Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>

W:	http://miguelojeda.es/auxdisplay.htm

W:	http://jair.lab.fi.uva.es/~migojed/auxdisplay.htm

S:	Maintained

F:	drivers/auxdisplay/cfag12864b.c

F:	include/linux/cfag12864b.h



CFAG12864BFB LCD FRAMEBUFFER DRIVER

M:	Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>

W:	http://miguelojeda.es/auxdisplay.htm

W:	http://jair.lab.fi.uva.es/~migojed/auxdisplay.htm

S:	Maintained

F:	drivers/auxdisplay/cfag12864bfb.c

F:	include/linux/cfag12864b.h
@@ -7977,8 +7971,6 @@ F: kernel/kprobes.c 


KS0108 LCD CONTROLLER DRIVER

M:	Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>

W:	http://miguelojeda.es/auxdisplay.htm

W:	http://jair.lab.fi.uva.es/~migojed/auxdisplay.htm

S:	Maintained

F:	Documentation/auxdisplay/ks0108

F:	drivers/auxdisplay/ks0108.c

drivers/auxdisplay/Kconfig

+8 −8
Original line number Diff line number Diff line
@@ -14,9 +14,6 @@ menuconfig AUXDISPLAY 


	  If you say N, all options in this submenu will be skipped and disabled.



config CHARLCD

	tristate "Character LCD core support" if COMPILE_TEST



if AUXDISPLAY



config HD44780
@@ -137,8 +134,8 @@ config CFAG12864B_RATE 
config IMG_ASCII_LCD

	tristate "Imagination Technologies ASCII LCD Display"

	depends on HAS_IOMEM

	default y if MIPS_MALTA || MIPS_SEAD3

	select SYSCON

	default y if MIPS_MALTA

	select MFD_SYSCON

	help

	  Enable this to support the simple ASCII LCD displays found on

	  development boards such as the MIPS Boston, MIPS Malta & MIPS SEAD3
@@ -157,8 +154,6 @@ config HT16K33 
	  Say yes here to add support for Holtek HT16K33, RAM mapping 16*8

	  LED controller driver with keyscan.



endif # AUXDISPLAY



config ARM_CHARLCD

	bool "ARM Ltd. Character LCD Driver"

	depends on PLAT_VERSATILE
@@ -169,7 +164,9 @@ config ARM_CHARLCD 
	  line and the Linux version on the second line, but that's

	  still useful.



config PANEL

endif # AUXDISPLAY



menuconfig PANEL

	tristate "Parallel port LCD/Keypad Panel support"

	depends on PARPORT

	select CHARLCD
@@ -448,3 +445,6 @@ config PANEL_BOOT_MESSAGE 
	  printf()-formatted message is valid with newline and escape codes.



endif # PANEL



config CHARLCD

	tristate "Character LCD core support" if COMPILE_TEST

drivers/auxdisplay/arm-charlcd.c

+3 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Driver for the on-board character LCD found on some ARM reference boards

 * This is basically an Hitachi HD44780 LCD with a custom IP block to drive it

 * http://en.wikipedia.org/wiki/HD44780_Character_LCD

 * Currently it will just display the text "ARM Linux" and the linux version

 *

 * License terms: GNU General Public License (GPL) version 2

 * Author: Linus Walleij <triad@df.lth.se>

 */

#include <linux/init.h>
@@ -54,12 +54,14 @@ 
#define HD_BUSY_FLAG			0x80U



/**

 * struct charlcd - Private data structure

 * @dev: a pointer back to containing device

 * @phybase: the offset to the controller in physical memory

 * @physize: the size of the physical page

 * @virtbase: the offset to the controller in virtual memory

 * @irq: reserved interrupt number

 * @complete: completion structure for the last LCD command

 * @init_work: delayed work structure to initialize the display on boot

 */

struct charlcd {

	struct device *dev;

drivers/auxdisplay/cfag12864b.c

+1 −15
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 *    Filename: cfag12864b.c

 *     Version: 0.1.0

 * Description: cfag12864b LCD driver

 *     License: GPLv2

 *     Depends: ks0108

 *

 *      Author: Copyright (C) Miguel Ojeda Sandonis

 *        Date: 2006-10-31

 *

 *  This program is free software; you can redistribute it and/or modify

 *  it under the terms of the GNU General Public License version 2 as

 *  published by the Free Software Foundation.

 *

 *  This program is distributed in the hope that it will be useful,

 *  but WITHOUT ANY WARRANTY; without even the implied warranty of

 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *  GNU General Public License for more details.

 *

 *  You should have received a copy of the GNU General Public License

 *  along with this program; if not, write to the Free Software

 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 *

 */



#include <linux/init.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE