From patchwork Tue Jan 25 20:21:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 536946 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B25DBC433EF for ; Tue, 25 Jan 2022 20:21:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231918AbiAYUVj (ORCPT ); Tue, 25 Jan 2022 15:21:39 -0500 Received: from mga18.intel.com ([134.134.136.126]:32383 "EHLO mga18.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229565AbiAYUVZ (ORCPT ); Tue, 25 Jan 2022 15:21:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1643142085; x=1674678085; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6zue4ppucen/ANYQA3c/xAkoOYydv3PMPDvmLNWSzoI=; b=fMS+0UxDVKq//sO/sdRxpq48Q8rVPiOX9LD+IVeW/mHte5hE71TX20ms AX8SJhHaQIUDbI9coQ5+orYdnD59rOO1dI2lvIXCI9477/592ZgXAWKiZ mUhwAswuWDEFHQLV7tyqWM2fny061Jdk13GG5c1DletZItgVDFMxx3gZV Bowk0JHhPh0LFFb4uFmkBRscKLYBpxe8D3xDz3GZwfcpnTIb6JJiyW57F eXTMWMlTYuJZS605ZQN52ttN4Y7uHvB1fP92DJHEsJlPyJI2CeIMy+EmK qhJVCLwGNljiehqqyaJKeMOmwoJps9DVWB64FGD8Nm1nfuFMl8qOJSNOP A==; X-IronPort-AV: E=McAfee;i="6200,9189,10238"; a="229983923" X-IronPort-AV: E=Sophos;i="5.88,315,1635231600"; d="scan'208";a="229983923" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Jan 2022 12:21:13 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,315,1635231600"; d="scan'208";a="495130326" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga002.jf.intel.com with ESMTP; 25 Jan 2022 12:21:09 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 67655B9; Tue, 25 Jan 2022 22:21:22 +0200 (EET) From: Andy Shevchenko To: Greg Kroah-Hartman , Phillip Potter , Andy Shevchenko , Lee Jones , Heiner Kallweit , Carlis , linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev, linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org Cc: Michael Hennerich , Helge Deller , Andy Shevchenko Subject: [PATCH v1 1/4] fbtft: Unorphan the driver Date: Tue, 25 Jan 2022 22:21:14 +0200 Message-Id: <20220125202118.63362-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220125202118.63362-1-andriy.shevchenko@linux.intel.com> References: <20220125202118.63362-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org Let's maintain occasional fixes to the fbtft driver. Signed-off-by: Andy Shevchenko --- MAINTAINERS | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index ea3e6c914384..16e614606ac1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7372,9 +7372,11 @@ F: Documentation/fault-injection/ F: lib/fault-inject.c FBTFT Framebuffer drivers +M: Andy Shevchenko L: dri-devel@lists.freedesktop.org L: linux-fbdev@vger.kernel.org -S: Orphan +S: Maintained +T: git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-fbtft.git F: drivers/staging/fbtft/ FC0011 TUNER DRIVER From patchwork Tue Jan 25 20:21:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 536948 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8B773C433F5 for ; Tue, 25 Jan 2022 20:21:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231661AbiAYUVQ (ORCPT ); Tue, 25 Jan 2022 15:21:16 -0500 Received: from mga09.intel.com ([134.134.136.24]:58611 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229755AbiAYUVP (ORCPT ); Tue, 25 Jan 2022 15:21:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1643142075; x=1674678075; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=IFz3nUGKP1Br+iYMI85YwEwstVhziXjn5Y7bO34ZEVI=; b=aZV3UHrTlZ4ROpwGx47jLoYzhNpcRPFT/qnUkhN8jn/RddEkaIbTF3Qp u+9O46DHMCkPJLgjV0/62I3veVexyQmFVq+2ShKK4bntUI6Yn7yIbCxRv u6iNgA9hNYglMRN7Arr0QiONPEwS9FIc/7rnxG3Em8ORFCVxpG6uiJ42U PIKsfJlFN07wtf3GR30gfydGSnZIeAv2eM/X3varNjRFwDpkErkl7R4QH kW8E8Cf+aKMdELgYtTRi9doiT6Z/WxYMgCiHyJtUSvQwR6RHaDgPyBH2L TuYm1C/6WeiQIHJyxLfNum8g1swpQ8bcx4Wi/BeBtqk43eaWi1RJmlU5Y A==; X-IronPort-AV: E=McAfee;i="6200,9189,10238"; a="246189308" X-IronPort-AV: E=Sophos;i="5.88,315,1635231600"; d="scan'208";a="246189308" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Jan 2022 12:21:13 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,315,1635231600"; d="scan'208";a="628073594" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga004.jf.intel.com with ESMTP; 25 Jan 2022 12:21:09 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 71154198; Tue, 25 Jan 2022 22:21:22 +0200 (EET) From: Andy Shevchenko To: Greg Kroah-Hartman , Phillip Potter , Andy Shevchenko , Lee Jones , Heiner Kallweit , Carlis , linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev, linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org Cc: Michael Hennerich , Helge Deller , Andy Shevchenko Subject: [PATCH v1 2/4] fbtft: Move driver out from staging Date: Tue, 25 Jan 2022 22:21:15 +0200 Message-Id: <20220125202118.63362-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220125202118.63362-1-andriy.shevchenko@linux.intel.com> References: <20220125202118.63362-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org The driver is under maintenance mode, but some of the devices supported by it are not going to be converted to (tiny) DRM in the feasible future. In order to support them, move driver out from staging. Signed-off-by: Andy Shevchenko --- MAINTAINERS | 2 +- drivers/staging/Kconfig | 2 -- drivers/staging/Makefile | 1 - drivers/video/Kconfig | 1 + drivers/video/Makefile | 1 + drivers/{staging => video}/fbtft/Kconfig | 0 drivers/{staging => video}/fbtft/Makefile | 0 drivers/{staging => video}/fbtft/README | 0 drivers/{staging => video}/fbtft/TODO | 0 drivers/{staging => video}/fbtft/fb_agm1264k-fl.c | 0 drivers/{staging => video}/fbtft/fb_bd663474.c | 0 drivers/{staging => video}/fbtft/fb_hx8340bn.c | 0 drivers/{staging => video}/fbtft/fb_hx8347d.c | 0 drivers/{staging => video}/fbtft/fb_hx8353d.c | 0 drivers/{staging => video}/fbtft/fb_hx8357d.c | 0 drivers/{staging => video}/fbtft/fb_hx8357d.h | 0 drivers/{staging => video}/fbtft/fb_ili9163.c | 0 drivers/{staging => video}/fbtft/fb_ili9320.c | 0 drivers/{staging => video}/fbtft/fb_ili9325.c | 0 drivers/{staging => video}/fbtft/fb_ili9340.c | 0 drivers/{staging => video}/fbtft/fb_ili9341.c | 0 drivers/{staging => video}/fbtft/fb_ili9481.c | 0 drivers/{staging => video}/fbtft/fb_ili9486.c | 0 drivers/{staging => video}/fbtft/fb_pcd8544.c | 0 drivers/{staging => video}/fbtft/fb_ra8875.c | 0 drivers/{staging => video}/fbtft/fb_s6d02a1.c | 0 drivers/{staging => video}/fbtft/fb_s6d1121.c | 0 drivers/{staging => video}/fbtft/fb_seps525.c | 0 drivers/{staging => video}/fbtft/fb_sh1106.c | 0 drivers/{staging => video}/fbtft/fb_ssd1289.c | 0 drivers/{staging => video}/fbtft/fb_ssd1305.c | 0 drivers/{staging => video}/fbtft/fb_ssd1306.c | 0 drivers/{staging => video}/fbtft/fb_ssd1325.c | 0 drivers/{staging => video}/fbtft/fb_ssd1331.c | 0 drivers/{staging => video}/fbtft/fb_ssd1351.c | 0 drivers/{staging => video}/fbtft/fb_st7735r.c | 0 drivers/{staging => video}/fbtft/fb_st7789v.c | 0 drivers/{staging => video}/fbtft/fb_tinylcd.c | 0 drivers/{staging => video}/fbtft/fb_tls8204.c | 0 drivers/{staging => video}/fbtft/fb_uc1611.c | 0 drivers/{staging => video}/fbtft/fb_uc1701.c | 0 drivers/{staging => video}/fbtft/fb_upd161704.c | 0 drivers/{staging => video}/fbtft/fbtft-bus.c | 0 drivers/{staging => video}/fbtft/fbtft-core.c | 0 drivers/{staging => video}/fbtft/fbtft-io.c | 0 drivers/{staging => video}/fbtft/fbtft-sysfs.c | 0 drivers/{staging => video}/fbtft/fbtft.h | 0 drivers/{staging => video}/fbtft/internal.h | 0 48 files changed, 3 insertions(+), 4 deletions(-) rename drivers/{staging => video}/fbtft/Kconfig (100%) rename drivers/{staging => video}/fbtft/Makefile (100%) rename drivers/{staging => video}/fbtft/README (100%) rename drivers/{staging => video}/fbtft/TODO (100%) rename drivers/{staging => video}/fbtft/fb_agm1264k-fl.c (100%) rename drivers/{staging => video}/fbtft/fb_bd663474.c (100%) rename drivers/{staging => video}/fbtft/fb_hx8340bn.c (100%) rename drivers/{staging => video}/fbtft/fb_hx8347d.c (100%) rename drivers/{staging => video}/fbtft/fb_hx8353d.c (100%) rename drivers/{staging => video}/fbtft/fb_hx8357d.c (100%) rename drivers/{staging => video}/fbtft/fb_hx8357d.h (100%) rename drivers/{staging => video}/fbtft/fb_ili9163.c (100%) rename drivers/{staging => video}/fbtft/fb_ili9320.c (100%) rename drivers/{staging => video}/fbtft/fb_ili9325.c (100%) rename drivers/{staging => video}/fbtft/fb_ili9340.c (100%) rename drivers/{staging => video}/fbtft/fb_ili9341.c (100%) rename drivers/{staging => video}/fbtft/fb_ili9481.c (100%) rename drivers/{staging => video}/fbtft/fb_ili9486.c (100%) rename drivers/{staging => video}/fbtft/fb_pcd8544.c (100%) rename drivers/{staging => video}/fbtft/fb_ra8875.c (100%) rename drivers/{staging => video}/fbtft/fb_s6d02a1.c (100%) rename drivers/{staging => video}/fbtft/fb_s6d1121.c (100%) rename drivers/{staging => video}/fbtft/fb_seps525.c (100%) rename drivers/{staging => video}/fbtft/fb_sh1106.c (100%) rename drivers/{staging => video}/fbtft/fb_ssd1289.c (100%) rename drivers/{staging => video}/fbtft/fb_ssd1305.c (100%) rename drivers/{staging => video}/fbtft/fb_ssd1306.c (100%) rename drivers/{staging => video}/fbtft/fb_ssd1325.c (100%) rename drivers/{staging => video}/fbtft/fb_ssd1331.c (100%) rename drivers/{staging => video}/fbtft/fb_ssd1351.c (100%) rename drivers/{staging => video}/fbtft/fb_st7735r.c (100%) rename drivers/{staging => video}/fbtft/fb_st7789v.c (100%) rename drivers/{staging => video}/fbtft/fb_tinylcd.c (100%) rename drivers/{staging => video}/fbtft/fb_tls8204.c (100%) rename drivers/{staging => video}/fbtft/fb_uc1611.c (100%) rename drivers/{staging => video}/fbtft/fb_uc1701.c (100%) rename drivers/{staging => video}/fbtft/fb_upd161704.c (100%) rename drivers/{staging => video}/fbtft/fbtft-bus.c (100%) rename drivers/{staging => video}/fbtft/fbtft-core.c (100%) rename drivers/{staging => video}/fbtft/fbtft-io.c (100%) rename drivers/{staging => video}/fbtft/fbtft-sysfs.c (100%) rename drivers/{staging => video}/fbtft/fbtft.h (100%) rename drivers/{staging => video}/fbtft/internal.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 16e614606ac1..1c2787d22132 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7377,7 +7377,7 @@ L: dri-devel@lists.freedesktop.org L: linux-fbdev@vger.kernel.org S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-fbtft.git -F: drivers/staging/fbtft/ +F: drivers/video/fbtft/ FC0011 TUNER DRIVER M: Michael Buesch diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 8d41fdd40657..0ed757061e58 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -72,8 +72,6 @@ source "drivers/staging/unisys/Kconfig" source "drivers/staging/clocking-wizard/Kconfig" -source "drivers/staging/fbtft/Kconfig" - source "drivers/staging/most/Kconfig" source "drivers/staging/ks7010/Kconfig" diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index 02b01949b94e..77d8e385498b 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -26,7 +26,6 @@ obj-$(CONFIG_FIREWIRE_SERIAL) += fwserial/ obj-$(CONFIG_GS_FPGABOOT) += gs_fpgaboot/ obj-$(CONFIG_UNISYSSPAR) += unisys/ obj-$(CONFIG_COMMON_CLK_XLNX_CLKWZRD) += clocking-wizard/ -obj-$(CONFIG_FB_TFT) += fbtft/ obj-$(CONFIG_MOST) += most/ obj-$(CONFIG_KS7010) += ks7010/ obj-$(CONFIG_GREYBUS) += greybus/ diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 427a993c7f57..5903cb4db1a4 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -21,6 +21,7 @@ source "drivers/gpu/drm/Kconfig" menu "Frame buffer Devices" source "drivers/video/fbdev/Kconfig" +source "drivers/video/fbtft/Kconfig" endmenu source "drivers/video/backlight/Kconfig" diff --git a/drivers/video/Makefile b/drivers/video/Makefile index df7650adede9..323d002f404d 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -8,6 +8,7 @@ obj-$(CONFIG_LOGO) += logo/ obj-y += backlight/ obj-y += fbdev/ +obj-y += fbtft/ obj-$(CONFIG_VIDEOMODE_HELPERS) += display_timing.o videomode.o ifeq ($(CONFIG_OF),y) diff --git a/drivers/staging/fbtft/Kconfig b/drivers/video/fbtft/Kconfig similarity index 100% rename from drivers/staging/fbtft/Kconfig rename to drivers/video/fbtft/Kconfig diff --git a/drivers/staging/fbtft/Makefile b/drivers/video/fbtft/Makefile similarity index 100% rename from drivers/staging/fbtft/Makefile rename to drivers/video/fbtft/Makefile diff --git a/drivers/staging/fbtft/README b/drivers/video/fbtft/README similarity index 100% rename from drivers/staging/fbtft/README rename to drivers/video/fbtft/README diff --git a/drivers/staging/fbtft/TODO b/drivers/video/fbtft/TODO similarity index 100% rename from drivers/staging/fbtft/TODO rename to drivers/video/fbtft/TODO diff --git a/drivers/staging/fbtft/fb_agm1264k-fl.c b/drivers/video/fbtft/fb_agm1264k-fl.c similarity index 100% rename from drivers/staging/fbtft/fb_agm1264k-fl.c rename to drivers/video/fbtft/fb_agm1264k-fl.c diff --git a/drivers/staging/fbtft/fb_bd663474.c b/drivers/video/fbtft/fb_bd663474.c similarity index 100% rename from drivers/staging/fbtft/fb_bd663474.c rename to drivers/video/fbtft/fb_bd663474.c diff --git a/drivers/staging/fbtft/fb_hx8340bn.c b/drivers/video/fbtft/fb_hx8340bn.c similarity index 100% rename from drivers/staging/fbtft/fb_hx8340bn.c rename to drivers/video/fbtft/fb_hx8340bn.c diff --git a/drivers/staging/fbtft/fb_hx8347d.c b/drivers/video/fbtft/fb_hx8347d.c similarity index 100% rename from drivers/staging/fbtft/fb_hx8347d.c rename to drivers/video/fbtft/fb_hx8347d.c diff --git a/drivers/staging/fbtft/fb_hx8353d.c b/drivers/video/fbtft/fb_hx8353d.c similarity index 100% rename from drivers/staging/fbtft/fb_hx8353d.c rename to drivers/video/fbtft/fb_hx8353d.c diff --git a/drivers/staging/fbtft/fb_hx8357d.c b/drivers/video/fbtft/fb_hx8357d.c similarity index 100% rename from drivers/staging/fbtft/fb_hx8357d.c rename to drivers/video/fbtft/fb_hx8357d.c diff --git a/drivers/staging/fbtft/fb_hx8357d.h b/drivers/video/fbtft/fb_hx8357d.h similarity index 100% rename from drivers/staging/fbtft/fb_hx8357d.h rename to drivers/video/fbtft/fb_hx8357d.h diff --git a/drivers/staging/fbtft/fb_ili9163.c b/drivers/video/fbtft/fb_ili9163.c similarity index 100% rename from drivers/staging/fbtft/fb_ili9163.c rename to drivers/video/fbtft/fb_ili9163.c diff --git a/drivers/staging/fbtft/fb_ili9320.c b/drivers/video/fbtft/fb_ili9320.c similarity index 100% rename from drivers/staging/fbtft/fb_ili9320.c rename to drivers/video/fbtft/fb_ili9320.c diff --git a/drivers/staging/fbtft/fb_ili9325.c b/drivers/video/fbtft/fb_ili9325.c similarity index 100% rename from drivers/staging/fbtft/fb_ili9325.c rename to drivers/video/fbtft/fb_ili9325.c diff --git a/drivers/staging/fbtft/fb_ili9340.c b/drivers/video/fbtft/fb_ili9340.c similarity index 100% rename from drivers/staging/fbtft/fb_ili9340.c rename to drivers/video/fbtft/fb_ili9340.c diff --git a/drivers/staging/fbtft/fb_ili9341.c b/drivers/video/fbtft/fb_ili9341.c similarity index 100% rename from drivers/staging/fbtft/fb_ili9341.c rename to drivers/video/fbtft/fb_ili9341.c diff --git a/drivers/staging/fbtft/fb_ili9481.c b/drivers/video/fbtft/fb_ili9481.c similarity index 100% rename from drivers/staging/fbtft/fb_ili9481.c rename to drivers/video/fbtft/fb_ili9481.c diff --git a/drivers/staging/fbtft/fb_ili9486.c b/drivers/video/fbtft/fb_ili9486.c similarity index 100% rename from drivers/staging/fbtft/fb_ili9486.c rename to drivers/video/fbtft/fb_ili9486.c diff --git a/drivers/staging/fbtft/fb_pcd8544.c b/drivers/video/fbtft/fb_pcd8544.c similarity index 100% rename from drivers/staging/fbtft/fb_pcd8544.c rename to drivers/video/fbtft/fb_pcd8544.c diff --git a/drivers/staging/fbtft/fb_ra8875.c b/drivers/video/fbtft/fb_ra8875.c similarity index 100% rename from drivers/staging/fbtft/fb_ra8875.c rename to drivers/video/fbtft/fb_ra8875.c diff --git a/drivers/staging/fbtft/fb_s6d02a1.c b/drivers/video/fbtft/fb_s6d02a1.c similarity index 100% rename from drivers/staging/fbtft/fb_s6d02a1.c rename to drivers/video/fbtft/fb_s6d02a1.c diff --git a/drivers/staging/fbtft/fb_s6d1121.c b/drivers/video/fbtft/fb_s6d1121.c similarity index 100% rename from drivers/staging/fbtft/fb_s6d1121.c rename to drivers/video/fbtft/fb_s6d1121.c diff --git a/drivers/staging/fbtft/fb_seps525.c b/drivers/video/fbtft/fb_seps525.c similarity index 100% rename from drivers/staging/fbtft/fb_seps525.c rename to drivers/video/fbtft/fb_seps525.c diff --git a/drivers/staging/fbtft/fb_sh1106.c b/drivers/video/fbtft/fb_sh1106.c similarity index 100% rename from drivers/staging/fbtft/fb_sh1106.c rename to drivers/video/fbtft/fb_sh1106.c diff --git a/drivers/staging/fbtft/fb_ssd1289.c b/drivers/video/fbtft/fb_ssd1289.c similarity index 100% rename from drivers/staging/fbtft/fb_ssd1289.c rename to drivers/video/fbtft/fb_ssd1289.c diff --git a/drivers/staging/fbtft/fb_ssd1305.c b/drivers/video/fbtft/fb_ssd1305.c similarity index 100% rename from drivers/staging/fbtft/fb_ssd1305.c rename to drivers/video/fbtft/fb_ssd1305.c diff --git a/drivers/staging/fbtft/fb_ssd1306.c b/drivers/video/fbtft/fb_ssd1306.c similarity index 100% rename from drivers/staging/fbtft/fb_ssd1306.c rename to drivers/video/fbtft/fb_ssd1306.c diff --git a/drivers/staging/fbtft/fb_ssd1325.c b/drivers/video/fbtft/fb_ssd1325.c similarity index 100% rename from drivers/staging/fbtft/fb_ssd1325.c rename to drivers/video/fbtft/fb_ssd1325.c diff --git a/drivers/staging/fbtft/fb_ssd1331.c b/drivers/video/fbtft/fb_ssd1331.c similarity index 100% rename from drivers/staging/fbtft/fb_ssd1331.c rename to drivers/video/fbtft/fb_ssd1331.c diff --git a/drivers/staging/fbtft/fb_ssd1351.c b/drivers/video/fbtft/fb_ssd1351.c similarity index 100% rename from drivers/staging/fbtft/fb_ssd1351.c rename to drivers/video/fbtft/fb_ssd1351.c diff --git a/drivers/staging/fbtft/fb_st7735r.c b/drivers/video/fbtft/fb_st7735r.c similarity index 100% rename from drivers/staging/fbtft/fb_st7735r.c rename to drivers/video/fbtft/fb_st7735r.c diff --git a/drivers/staging/fbtft/fb_st7789v.c b/drivers/video/fbtft/fb_st7789v.c similarity index 100% rename from drivers/staging/fbtft/fb_st7789v.c rename to drivers/video/fbtft/fb_st7789v.c diff --git a/drivers/staging/fbtft/fb_tinylcd.c b/drivers/video/fbtft/fb_tinylcd.c similarity index 100% rename from drivers/staging/fbtft/fb_tinylcd.c rename to drivers/video/fbtft/fb_tinylcd.c diff --git a/drivers/staging/fbtft/fb_tls8204.c b/drivers/video/fbtft/fb_tls8204.c similarity index 100% rename from drivers/staging/fbtft/fb_tls8204.c rename to drivers/video/fbtft/fb_tls8204.c diff --git a/drivers/staging/fbtft/fb_uc1611.c b/drivers/video/fbtft/fb_uc1611.c similarity index 100% rename from drivers/staging/fbtft/fb_uc1611.c rename to drivers/video/fbtft/fb_uc1611.c diff --git a/drivers/staging/fbtft/fb_uc1701.c b/drivers/video/fbtft/fb_uc1701.c similarity index 100% rename from drivers/staging/fbtft/fb_uc1701.c rename to drivers/video/fbtft/fb_uc1701.c diff --git a/drivers/staging/fbtft/fb_upd161704.c b/drivers/video/fbtft/fb_upd161704.c similarity index 100% rename from drivers/staging/fbtft/fb_upd161704.c rename to drivers/video/fbtft/fb_upd161704.c diff --git a/drivers/staging/fbtft/fbtft-bus.c b/drivers/video/fbtft/fbtft-bus.c similarity index 100% rename from drivers/staging/fbtft/fbtft-bus.c rename to drivers/video/fbtft/fbtft-bus.c diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/video/fbtft/fbtft-core.c similarity index 100% rename from drivers/staging/fbtft/fbtft-core.c rename to drivers/video/fbtft/fbtft-core.c diff --git a/drivers/staging/fbtft/fbtft-io.c b/drivers/video/fbtft/fbtft-io.c similarity index 100% rename from drivers/staging/fbtft/fbtft-io.c rename to drivers/video/fbtft/fbtft-io.c diff --git a/drivers/staging/fbtft/fbtft-sysfs.c b/drivers/video/fbtft/fbtft-sysfs.c similarity index 100% rename from drivers/staging/fbtft/fbtft-sysfs.c rename to drivers/video/fbtft/fbtft-sysfs.c diff --git a/drivers/staging/fbtft/fbtft.h b/drivers/video/fbtft/fbtft.h similarity index 100% rename from drivers/staging/fbtft/fbtft.h rename to drivers/video/fbtft/fbtft.h diff --git a/drivers/staging/fbtft/internal.h b/drivers/video/fbtft/internal.h similarity index 100% rename from drivers/staging/fbtft/internal.h rename to drivers/video/fbtft/internal.h From patchwork Tue Jan 25 20:21:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 536643 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3C42BC43219 for ; Tue, 25 Jan 2022 20:21:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229755AbiAYUVW (ORCPT ); Tue, 25 Jan 2022 15:21:22 -0500 Received: from mga04.intel.com ([192.55.52.120]:36582 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231707AbiAYUVU (ORCPT ); Tue, 25 Jan 2022 15:21:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1643142080; x=1674678080; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=irQ3/6gwBL9yizU5uUBclawuANglylnqeXDX3dUW+3M=; b=G9HHXI4g5N0BXoa51DwKu3YN3CzLGPTl1U4laIYCOwfVKz6VIhIH8KRW fdSFRgwFrL17kNjl5hdoDC9Lkxho5cjlx5LImZsSQ5EMBMIU7uiG3HVQV NKbRW89mx3wr2kZTRJvOx4scjTsrn+3j7pMyjVNxT8KLcr82YHFx9Tlqd mhgqIIbMRLaJESyVPkGJb8fqD2MgPrqPUAq/X+ukn9sSuJgjwUkbAmpyW l0oAFgwUs848r0aftlSUUKUci8tSv90qQiaPzkBKnb1BfcSi37+f6wFoD /y8tzBM5L58CC2BWCQaYSlFpef5wqBxwEBuLnNICnKpDbBkWOGxm4KLUV Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10238"; a="245242271" X-IronPort-AV: E=Sophos;i="5.88,315,1635231600"; d="scan'208";a="245242271" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Jan 2022 12:21:13 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,315,1635231600"; d="scan'208";a="477249112" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga003.jf.intel.com with ESMTP; 25 Jan 2022 12:21:09 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 7A8921F1; Tue, 25 Jan 2022 22:21:22 +0200 (EET) From: Andy Shevchenko To: Greg Kroah-Hartman , Phillip Potter , Andy Shevchenko , Lee Jones , Heiner Kallweit , Carlis , linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev, linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org Cc: Michael Hennerich , Helge Deller , Andy Shevchenko Subject: [PATCH v1 3/4] fbtft: Kill outdated documentation Date: Tue, 25 Jan 2022 22:21:16 +0200 Message-Id: <20220125202118.63362-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220125202118.63362-1-andriy.shevchenko@linux.intel.com> References: <20220125202118.63362-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org The driver is in maintenance mode, i.e. no new drivers will be accepted, and for a long time it is part of the kernel, means no need to clone any separate sources. Signed-off-by: Andy Shevchenko --- drivers/video/fbtft/README | 32 -------------------------------- drivers/video/fbtft/TODO | 3 --- 2 files changed, 35 deletions(-) delete mode 100644 drivers/video/fbtft/README delete mode 100644 drivers/video/fbtft/TODO diff --git a/drivers/video/fbtft/README b/drivers/video/fbtft/README deleted file mode 100644 index ba4c74c92e4c..000000000000 --- a/drivers/video/fbtft/README +++ /dev/null @@ -1,32 +0,0 @@ - FBTFT -========= - -Linux Framebuffer drivers for small TFT LCD display modules. -The module 'fbtft' makes writing drivers for some of these displays very easy. - -Development is done on a Raspberry Pi running the Raspbian "wheezy" distribution. - -INSTALLATION - Download kernel sources - - From Linux 3.15 - cd drivers/video/fbdev/fbtft - git clone https://github.com/notro/fbtft.git - - Add to drivers/video/fbdev/Kconfig: source "drivers/video/fbdev/fbtft/Kconfig" - Add to drivers/video/fbdev/Makefile: obj-y += fbtft/ - - Before Linux 3.15 - cd drivers/video - git clone https://github.com/notro/fbtft.git - - Add to drivers/video/Kconfig: source "drivers/video/fbtft/Kconfig" - Add to drivers/video/Makefile: obj-y += fbtft/ - - Enable driver(s) in menuconfig and build the kernel - - -See wiki for more information: https://github.com/notro/fbtft/wiki - - -Source: https://github.com/notro/fbtft/ diff --git a/drivers/video/fbtft/TODO b/drivers/video/fbtft/TODO deleted file mode 100644 index e72a08bf221c..000000000000 --- a/drivers/video/fbtft/TODO +++ /dev/null @@ -1,3 +0,0 @@ -* convert all these over to drm_simple_display_pipe and submit for inclusion - into the DRM subsystem under drivers/gpu/drm - fbdev doesn't take any new - drivers anymore. From patchwork Tue Jan 25 20:21:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 536947 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7D325C4332F for ; Tue, 25 Jan 2022 20:21:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231663AbiAYUVV (ORCPT ); Tue, 25 Jan 2022 15:21:21 -0500 Received: from mga03.intel.com ([134.134.136.65]:16186 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231687AbiAYUVU (ORCPT ); Tue, 25 Jan 2022 15:21:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1643142080; x=1674678080; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=5bzSfljY1YSz8887v/yq7xlM6sikYIoDRsSS5+W86wQ=; b=PwurqGaDbIUN6c3pVDM4Tpx0bSEGFG41pElQeFEs70aQwxdlcL/cXtjl YbmIWuksrBakBWKelrxxeSrTejIqPg6e7MoBKuJJ8AqxF2GCCUG7cqZ4h RAZYFGX1KbYKqAqMv4qzTii03L7n/FB8mbEytEfMVL68VQVCKmLW/q3Zk lgoXvhAjNZF5Ew0hOyB4p9s4Dsx1WMkZ6die+h8pVqRw0dIpqfD3opXkz mpeHaD9vDmvLieASYMsLtM2K3Nk1nn6cOTb+7Z2KHwq1VBrv+JT0/6rt5 OHnBCcmtv/1co7YHlTEeUEoKIh98Qhtx0rfnvVWHQ2FokX3E4Y9nLBefD w==; X-IronPort-AV: E=McAfee;i="6200,9189,10238"; a="246353990" X-IronPort-AV: E=Sophos;i="5.88,315,1635231600"; d="scan'208";a="246353990" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Jan 2022 12:21:13 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,315,1635231600"; d="scan'208";a="624600071" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga002.fm.intel.com with ESMTP; 25 Jan 2022 12:21:09 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 83E2F287; Tue, 25 Jan 2022 22:21:22 +0200 (EET) From: Andy Shevchenko To: Greg Kroah-Hartman , Phillip Potter , Andy Shevchenko , Lee Jones , Heiner Kallweit , Carlis , linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev, linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org Cc: Michael Hennerich , Helge Deller , Andy Shevchenko Subject: [PATCH v1 4/4] fbtft: Replace 'depends on FB_TFT' by 'if FB_TFT ... endif' Date: Tue, 25 Jan 2022 22:21:17 +0200 Message-Id: <20220125202118.63362-5-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220125202118.63362-1-andriy.shevchenko@linux.intel.com> References: <20220125202118.63362-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org Replace 'depends on FB_TFT' by 'if FB_TFT ... endif' for the sake of deduplication. Signed-off-by: Andy Shevchenko --- drivers/video/fbtft/Kconfig | 33 ++++----------------------------- 1 file changed, 4 insertions(+), 29 deletions(-) diff --git a/drivers/video/fbtft/Kconfig b/drivers/video/fbtft/Kconfig index 4d29e8c1014e..14ea3c6a60da 100644 --- a/drivers/video/fbtft/Kconfig +++ b/drivers/video/fbtft/Kconfig @@ -10,87 +10,75 @@ menuconfig FB_TFT select FB_DEFERRED_IO select FB_BACKLIGHT +if FB_TFT + config FB_TFT_AGM1264K_FL tristate "FB driver for the AGM1264K-FL LCD display" - depends on FB_TFT help Framebuffer support for the AGM1264K-FL LCD display (two Samsung KS0108 compatible chips) config FB_TFT_BD663474 tristate "FB driver for the BD663474 LCD Controller" - depends on FB_TFT help Generic Framebuffer support for BD663474 config FB_TFT_HX8340BN tristate "FB driver for the HX8340BN LCD Controller" - depends on FB_TFT help Generic Framebuffer support for HX8340BN config FB_TFT_HX8347D tristate "FB driver for the HX8347D LCD Controller" - depends on FB_TFT help Generic Framebuffer support for HX8347D config FB_TFT_HX8353D tristate "FB driver for the HX8353D LCD Controller" - depends on FB_TFT help Generic Framebuffer support for HX8353D config FB_TFT_HX8357D tristate "FB driver for the HX8357D LCD Controller" - depends on FB_TFT help Generic Framebuffer support for HX8357D config FB_TFT_ILI9163 tristate "FB driver for the ILI9163 LCD Controller" - depends on FB_TFT help Generic Framebuffer support for ILI9163 config FB_TFT_ILI9320 tristate "FB driver for the ILI9320 LCD Controller" - depends on FB_TFT help Generic Framebuffer support for ILI9320 config FB_TFT_ILI9325 tristate "FB driver for the ILI9325 LCD Controller" - depends on FB_TFT help Generic Framebuffer support for ILI9325 config FB_TFT_ILI9340 tristate "FB driver for the ILI9340 LCD Controller" - depends on FB_TFT help Generic Framebuffer support for ILI9340 config FB_TFT_ILI9341 tristate "FB driver for the ILI9341 LCD Controller" - depends on FB_TFT help Generic Framebuffer support for ILI9341 config FB_TFT_ILI9481 tristate "FB driver for the ILI9481 LCD Controller" - depends on FB_TFT help Generic Framebuffer support for ILI9481 config FB_TFT_ILI9486 tristate "FB driver for the ILI9486 LCD Controller" - depends on FB_TFT help Generic Framebuffer support for ILI9486 config FB_TFT_PCD8544 tristate "FB driver for the PCD8544 LCD Controller" - depends on FB_TFT help Generic Framebuffer support for PCD8544 @@ -108,62 +96,52 @@ config FB_TFT_S6D02A1 config FB_TFT_S6D1121 tristate "FB driver for the S6D1211 LCD Controller" - depends on FB_TFT help Generic Framebuffer support for S6D1121 config FB_TFT_SEPS525 tristate "FB driver for the SEPS525 LCD Controller" - depends on FB_TFT help Generic Framebuffer support for SEPS525 Say Y if you have such a display that utilizes this controller. config FB_TFT_SH1106 tristate "FB driver for the SH1106 OLED Controller" - depends on FB_TFT help Framebuffer support for SH1106 config FB_TFT_SSD1289 tristate "FB driver for the SSD1289 LCD Controller" - depends on FB_TFT help Framebuffer support for SSD1289 config FB_TFT_SSD1305 tristate "FB driver for the SSD1305 OLED Controller" - depends on FB_TFT help Framebuffer support for SSD1305 config FB_TFT_SSD1306 tristate "FB driver for the SSD1306 OLED Controller" - depends on FB_TFT help Framebuffer support for SSD1306 config FB_TFT_SSD1331 tristate "FB driver for the SSD1331 LCD Controller" - depends on FB_TFT help Framebuffer support for SSD1331 config FB_TFT_SSD1351 tristate "FB driver for the SSD1351 LCD Controller" - depends on FB_TFT help Framebuffer support for SSD1351 config FB_TFT_ST7735R tristate "FB driver for the ST7735R LCD Controller" - depends on FB_TFT help Generic Framebuffer support for ST7735R config FB_TFT_ST7789V tristate "FB driver for the ST7789V LCD Controller" - depends on FB_TFT help This enables generic framebuffer support for the Sitronix ST7789V display controller. The controller is intended for small color @@ -173,30 +151,27 @@ config FB_TFT_ST7789V config FB_TFT_TINYLCD tristate "FB driver for tinylcd.com display" - depends on FB_TFT help Custom Framebuffer support for tinylcd.com display config FB_TFT_TLS8204 tristate "FB driver for the TLS8204 LCD Controller" - depends on FB_TFT help Generic Framebuffer support for TLS8204 config FB_TFT_UC1611 tristate "FB driver for the UC1611 LCD controller" - depends on FB_TFT help Generic Framebuffer support for UC1611 config FB_TFT_UC1701 tristate "FB driver for the UC1701 LCD Controller" - depends on FB_TFT help Generic Framebuffer support for UC1701 config FB_TFT_UPD161704 tristate "FB driver for the uPD161704 LCD Controller" - depends on FB_TFT help Generic Framebuffer support for uPD161704 + +endif