From patchwork Fri Aug 7 13:01:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudip Mukherjee X-Patchwork-Id: 6969001 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B3714C05AC for ; Fri, 7 Aug 2015 13:01:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8D942205DF for ; Fri, 7 Aug 2015 13:01:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 64695205D1 for ; Fri, 7 Aug 2015 13:01:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753237AbbHGNB0 (ORCPT ); Fri, 7 Aug 2015 09:01:26 -0400 Received: from mail-pd0-f174.google.com ([209.85.192.174]:34304 "EHLO mail-pd0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753234AbbHGNBZ (ORCPT ); Fri, 7 Aug 2015 09:01:25 -0400 Received: by pdbfa8 with SMTP id fa8so5392807pdb.1; Fri, 07 Aug 2015 06:01:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=h3gKTMN8upNfLSPUXxjgRNmmVF2CcbR8aNGCW175wI8=; b=dNx4UI+xnv+ykH/heW12YuG5NczF+UUymJbHuwNe16brygKv0PeYjw2D/dPhuDTSDK y7I7m+knjTmoM7AL9GEeZwwLxfu31hKVeh71lhWaPICu89VUYWF4I0RCq0CE0rmJVFXv ndrMhYKxD/uof8kHlp1MXDkadKQ3tJJ8UwqtM45I4IR01CSVVdBYQ6uL3KAl4eNXF5PZ fS3rRWDltd7ccyOce8M50oGxWiOfSp6KSj7VAE9pRE7/qBiRf9P1KfMAfbcadqC72Xjf GWuwjs63EZ5UcgaikYhS+KvnVqG277m3eMTdqSypWd3upe0uii1HsGAPQaf+AccrL9Bl dCiQ== X-Received: by 10.70.37.207 with SMTP id a15mr14582329pdk.4.1438952484623; Fri, 07 Aug 2015 06:01:24 -0700 (PDT) Received: from localhost.localdomain ([49.206.246.113]) by smtp.gmail.com with ESMTPSA id un2sm10148354pac.28.2015.08.07.06.01.21 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 07 Aug 2015 06:01:23 -0700 (PDT) From: Sudip Mukherjee To: Jean-Christophe Plagniol-Villard , Tomi Valkeinen , Jonathan Corbet , Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, linux-fbdev@vger.kernel.org, linux-doc@vger.kernel.org, devel@driverdev.osuosl.org, Sudip Mukherjee Subject: [PATCH RESEND 1/3] staging: sm7xxfb: merge sm712fb with fbdev Date: Fri, 7 Aug 2015 18:31:13 +0530 Message-Id: <1438952475-22151-1-git-send-email-sudipm.mukherjee@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Now since all cleanups are done and the code is ready to be merged lets move it out of staging into fbdev location. Signed-off-by: Sudip Mukherjee --- Hi Greg, Resending the patch series as discussed with you. Patch generated with -M, thought it will be easy for you to review. drivers/staging/Kconfig | 2 -- drivers/staging/Makefile | 1 - drivers/staging/sm7xxfb/Kconfig | 13 ------------- drivers/staging/sm7xxfb/Makefile | 1 - drivers/staging/sm7xxfb/TODO | 12 ------------ drivers/video/fbdev/Kconfig | 14 ++++++++++++++ drivers/video/fbdev/Makefile | 1 + drivers/{staging/sm7xxfb/sm7xx.h => video/fbdev/sm712.h} | 0 .../{staging/sm7xxfb/sm7xxfb.c => video/fbdev/sm712fb.c} | 2 +- 9 files changed, 16 insertions(+), 30 deletions(-) delete mode 100644 drivers/staging/sm7xxfb/Kconfig delete mode 100644 drivers/staging/sm7xxfb/Makefile delete mode 100644 drivers/staging/sm7xxfb/TODO rename drivers/{staging/sm7xxfb/sm7xx.h => video/fbdev/sm712.h} (100%) rename drivers/{staging/sm7xxfb/sm7xxfb.c => video/fbdev/sm712fb.c} (99%) diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 4f0b12d..39c5df6 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -56,8 +56,6 @@ source "drivers/staging/vt6656/Kconfig" source "drivers/staging/iio/Kconfig" -source "drivers/staging/sm7xxfb/Kconfig" - source "drivers/staging/sm750fb/Kconfig" source "drivers/staging/xgifb/Kconfig" diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index 37149ca..018093d 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -22,7 +22,6 @@ obj-$(CONFIG_VT6655) += vt6655/ obj-$(CONFIG_VT6656) += vt6656/ obj-$(CONFIG_VME_BUS) += vme/ obj-$(CONFIG_IIO) += iio/ -obj-$(CONFIG_FB_SM7XX) += sm7xxfb/ obj-$(CONFIG_FB_SM750) += sm750fb/ obj-$(CONFIG_FB_XGI) += xgifb/ obj-$(CONFIG_USB_EMXX) += emxx_udc/ diff --git a/drivers/staging/sm7xxfb/Kconfig b/drivers/staging/sm7xxfb/Kconfig deleted file mode 100644 index e2922ae..0000000 --- a/drivers/staging/sm7xxfb/Kconfig +++ /dev/null @@ -1,13 +0,0 @@ -config FB_SM7XX - tristate "Silicon Motion SM7XX framebuffer support" - depends on FB && PCI - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT - help - Frame buffer driver for the Silicon Motion SM710, SM712, SM721 - and SM722 chips. - - This driver is also available as a module. The module will be - called sm7xxfb. If you want to compile it as a module, say M - here and read . diff --git a/drivers/staging/sm7xxfb/Makefile b/drivers/staging/sm7xxfb/Makefile deleted file mode 100644 index 48f471c..0000000 --- a/drivers/staging/sm7xxfb/Makefile +++ /dev/null @@ -1 +0,0 @@ -obj-$(CONFIG_FB_SM7XX) += sm7xxfb.o diff --git a/drivers/staging/sm7xxfb/TODO b/drivers/staging/sm7xxfb/TODO deleted file mode 100644 index 7cb0b24..0000000 --- a/drivers/staging/sm7xxfb/TODO +++ /dev/null @@ -1,12 +0,0 @@ -TODO: -- Dual head support -- 2D acceleration support -- use kernel coding style -- refine the code and remove unused code -- move it to drivers/video/fbdev/sm7xxfb.c - -Please send any patches to - Greg Kroah-Hartman - Sudip Mukherjee - Teddy Wang - Sudip Mukherjee diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index 2d98de5..2307909 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -2475,3 +2475,17 @@ config FB_SSD1307 help This driver implements support for the Solomon SSD1307 OLED controller over I2C. + +config FB_SM712 + tristate "Silicon Motion SM712 framebuffer support" + depends on FB && PCI + select FB_CFB_FILLRECT + select FB_CFB_COPYAREA + select FB_CFB_IMAGEBLIT + help + Frame buffer driver for the Silicon Motion SM710, SM712, SM721 + and SM722 chips. + + This driver is also available as a module. The module will be + called sm712fb. If you want to compile it as a module, say M + here and read . diff --git a/drivers/video/fbdev/Makefile b/drivers/video/fbdev/Makefile index cecea50..50ed1b4 100644 --- a/drivers/video/fbdev/Makefile +++ b/drivers/video/fbdev/Makefile @@ -131,6 +131,7 @@ obj-$(CONFIG_FB_JZ4740) += jz4740_fb.o obj-$(CONFIG_FB_PUV3_UNIGFX) += fb-puv3.o obj-$(CONFIG_FB_HYPERV) += hyperv_fb.o obj-$(CONFIG_FB_OPENCORES) += ocfb.o +obj-$(CONFIG_FB_SM712) += sm712fb.o # Platform or fallback drivers go here obj-$(CONFIG_FB_UVESA) += uvesafb.o diff --git a/drivers/staging/sm7xxfb/sm7xx.h b/drivers/video/fbdev/sm712.h similarity index 100% rename from drivers/staging/sm7xxfb/sm7xx.h rename to drivers/video/fbdev/sm712.h diff --git a/drivers/staging/sm7xxfb/sm7xxfb.c b/drivers/video/fbdev/sm712fb.c similarity index 99% rename from drivers/staging/sm7xxfb/sm7xxfb.c rename to drivers/video/fbdev/sm712fb.c index 07c2199..629bfa2 100644 --- a/drivers/staging/sm7xxfb/sm7xxfb.c +++ b/drivers/video/fbdev/sm712fb.c @@ -32,7 +32,7 @@ #include #endif -#include "sm7xx.h" +#include "sm712.h" /* * Private structure