HID: hid-picolcd depends on LCD_CLASS_DEVICE

HID_PICOLCD should depend on LCD_CLASS_DEVICE, otherwise the
build fails when HID_PICOLCD=y and LCD_CLASS_DEVICE=m:

hid-picolcd.c:(.text+0x84523f): undefined reference to `lcd_device_unregister'
hid-picolcd.c:(.text+0x8478ab): undefined reference to `lcd_device_register'
hid-picolcd.c:(.text+0x84c15f): undefined reference to `lcd_device_unregister'

Same applies to FB, BACKLIGHT_CLASS_DEVICE and LEDS_CLASS.

Add suboptions for those features to handle the deps on kbuild side
and just check HID_PICOLCD_* in the code.

Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Bruno Prémont <bonbons@linux-vserver.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

1 files changed, 44 insertions, 9 deletions

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index a2ecd83bfe89..0e8aa63e3f55 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -265,11 +265,6 @@ config HID_PETALYNX
 config HID_PICOLCD
         tristate "PicoLCD (graphic version)"
         depends on USB_HID
-        select FB_DEFERRED_IO if FB
-        select FB_SYS_FILLRECT if FB
-        select FB_SYS_COPYAREA if FB
-        select FB_SYS_IMAGEBLIT if FB
-        select FB_SYS_FOPS if FB
         ---help---
           This provides support for Minibox PicoLCD devices, currently
           only the graphical ones are supported.
@@ -277,14 +272,54 @@ config HID_PICOLCD
           This includes support for the following device features:
           - Keypad
           - Switching between Firmware and Flash mode
-          - Framebuffer for monochrome 256x64 display
-          - Backlight control         (needs CONFIG_BACKLIGHT_CLASS_DEVICE)
-          - Contrast control          (needs CONFIG_LCD_CLASS_DEVICE)
-          - General purpose outputs   (needs CONFIG_LEDS_CLASS)
           - EEProm / Flash access     (via debugfs)
+          Features selectively enabled:
+          - Framebuffer for monochrome 256x64 display
+          - Backlight control
+          - Contrast control
+          - General purpose outputs
           Features that are not (yet) supported:
           - IR
 
+config HID_PICOLCD_FB
+        bool "Framebuffer support" if EMBEDDED
+        default !EMBEDDED
+        depends on HID_PICOLCD
+        depends on HID_PICOLCD=FB || FB=y
+        select FB_DEFERRED_IO
+        select FB_SYS_FILLRECT
+        select FB_SYS_COPYAREA
+        select FB_SYS_IMAGEBLIT
+        select FB_SYS_FOPS
+        ---help---
+          Provide access to PicoLCD's 256x64 monochrome display via a
+          frambuffer device.
+
+config HID_PICOLCD_BACKLIGHT
+        bool "Backlight control" if EMBEDDED
+        default !EMBEDDED
+        depends on HID_PICOLCD
+        depends on HID_PICOLCD=BACKLIGHT_CLASS_DEVICE || BACKLIGHT_CLASS_DEVICE=y
+        ---help---
+          Provide access to PicoLCD's backlight control via backlight
+          class.
+
+config HID_PICOLCD_LCD
+        bool "Contrast control" if EMBEDDED
+        default !EMBEDDED
+        depends on HID_PICOLCD
+        depends on HID_PICOLCD=LCD_CLASS_DEVICE || LCD_CLASS_DEVICE=y
+        ---help---
+          Provide access to PicoLCD's LCD contrast via lcd class.
+
+config HID_PICOLCD_LEDS
+        bool "GPO via leds class" if EMBEDDED
+        default !EMBEDDED
+        depends on HID_PICOLCD
+        depends on HID_PICOLCD=LEDS_CLASS || LEDS_CLASS=y
+        ---help---
+          Provide access to PicoLCD's GPO pins via leds class.
+
 config HID_QUANTA
         tristate "Quanta Optical Touch"
         depends on USB_HID