[PATCH 1/2] auxdisplay: move the ARM LCD driver into auxdisplay

From: Linus Walleij
Date: Fri Apr 15 2016 - 07:42:34 EST


This driver most definately belongs in this subsystem. It is a
simple hardware block wrapping the Hitachi HD44780 LCD into
a system peripheral, and if there is ever going to be shared
code amongst LCD drivers, it will happen in this subsystem,
so move it.

Cc: Arnd Bergmann <arnd@xxxxxxxx>
Cc: Robin van der Gracht <robin@xxxxxxxxxxx>
Cc: Sudip Mukherjee <sudip@xxxxxxxxxxxxxxx>
Cc: Paulo Marques <pmarques@xxxxxxxxxxxx>
Cc: Miguel Ojeda Sandonis <maxextreme@xxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxx>
---
Miguel: if you ACK this I guess I can get it merged through the
ARM SoC tree.
Arnd: another misc exodus I'm trying to engineer.
---
drivers/auxdisplay/Kconfig | 10 ++++++++++
drivers/auxdisplay/Makefile | 1 +
drivers/{misc => auxdisplay}/arm-charlcd.c | 0
drivers/misc/Kconfig | 10 ----------
drivers/misc/Makefile | 1 -
5 files changed, 11 insertions(+), 11 deletions(-)
rename drivers/{misc => auxdisplay}/arm-charlcd.c (100%)

diff --git a/drivers/auxdisplay/Kconfig b/drivers/auxdisplay/Kconfig
index c07e725ea93d..caa68daf3fd4 100644
--- a/drivers/auxdisplay/Kconfig
+++ b/drivers/auxdisplay/Kconfig
@@ -15,6 +15,16 @@ menuconfig AUXDISPLAY

if AUXDISPLAY

+config ARM_CHARLCD
+ bool "ARM Ltd. Character LCD Driver"
+ depends on PLAT_VERSATILE
+ help
+ This is a driver for the character LCD found on the ARM Ltd.
+ Versatile and RealView Platform Baseboards. It doesn't do
+ very much more than display the text "ARM Linux" on the first
+ line and the Linux version on the second line, but that's
+ still useful.
+
config KS0108
tristate "KS0108 LCD Controller"
depends on PARPORT_PC
diff --git a/drivers/auxdisplay/Makefile b/drivers/auxdisplay/Makefile
index 8a8936a468b9..b34a99fa0d82 100644
--- a/drivers/auxdisplay/Makefile
+++ b/drivers/auxdisplay/Makefile
@@ -2,5 +2,6 @@
# Makefile for the kernel auxiliary displays device drivers.
#

+obj-$(CONFIG_ARM_CHARLCD) += arm-charlcd.o
obj-$(CONFIG_KS0108) += ks0108.o
obj-$(CONFIG_CFAG12864B) += cfag12864b.o cfag12864bfb.o
diff --git a/drivers/misc/arm-charlcd.c b/drivers/auxdisplay/arm-charlcd.c
similarity index 100%
rename from drivers/misc/arm-charlcd.c
rename to drivers/auxdisplay/arm-charlcd.c
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index a216b4667742..5398a1bc031c 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -429,16 +429,6 @@ config VMWARE_BALLOON
To compile this driver as a module, choose M here: the
module will be called vmw_balloon.

-config ARM_CHARLCD
- bool "ARM Ltd. Character LCD Driver"
- depends on PLAT_VERSATILE
- help
- This is a driver for the character LCD found on the ARM Ltd.
- Versatile and RealView Platform Baseboards. It doesn't do
- very much more than display the text "ARM Linux" on the first
- line and the Linux version on the second line, but that's
- still useful.
-
config BMP085
tristate
depends on SYSFS
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index b2fb6dbffcef..86c4b6583f3c 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -41,7 +41,6 @@ obj-y += eeprom/
obj-y += cb710/
obj-$(CONFIG_SPEAR13XX_PCIE_GADGET) += spear13xx_pcie_gadget.o
obj-$(CONFIG_VMWARE_BALLOON) += vmw_balloon.o
-obj-$(CONFIG_ARM_CHARLCD) += arm-charlcd.o
obj-$(CONFIG_PCH_PHUB) += pch_phub.o
obj-y += ti-st/
obj-y += lis3lv02d/
--
2.4.3