| From 170a18b2728da8fca9e741a2a4748f038caf2ff1 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org> |
| Date: Tue, 17 Sep 2019 19:18:41 +0200 |
| Subject: [PATCH] staging/fbtft: Depend on OF |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| commit 63f2b1677fba11c5bd02089f25c13421948905f5 upstream. |
| |
| Commit c440eee1a7a1 ("Staging: fbtft: Switch to the gpio descriptor |
| interface") removed setting gpios via platform data. This means that |
| fbtft will now only work with Device Tree so set the dependency. |
| |
| This also prevents a NULL pointer deref on non-DT platform because |
| fbtftops.request_gpios is not set in that case anymore. |
| |
| Fixes: c440eee1a7a1 ("Staging: fbtft: Switch to the gpio descriptor interface") |
| Cc: stable <stable@vger.kernel.org> |
| Signed-off-by: Noralf TrΓΈnnes <noralf@tronnes.org> |
| Link: https://lore.kernel.org/r/20190917171843.10334-1-noralf@tronnes.org |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/staging/fbtft/Kconfig b/drivers/staging/fbtft/Kconfig |
| index 8ec524a95ec8..4e5d860fd788 100644 |
| --- a/drivers/staging/fbtft/Kconfig |
| +++ b/drivers/staging/fbtft/Kconfig |
| @@ -1,7 +1,7 @@ |
| # SPDX-License-Identifier: GPL-2.0 |
| menuconfig FB_TFT |
| tristate "Support for small TFT LCD display modules" |
| - depends on FB && SPI |
| + depends on FB && SPI && OF |
| depends on GPIOLIB || COMPILE_TEST |
| select FB_SYS_FILLRECT |
| select FB_SYS_COPYAREA |
| -- |
| 2.7.4 |
| |
