From patchwork Sat Dec 21 07:58:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Shiyan X-Patchwork-Id: 3393281 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E961BC0D4A for ; Sat, 21 Dec 2013 08:01:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F04492052F for ; Sat, 21 Dec 2013 08:01:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C9D3A201DC for ; Sat, 21 Dec 2013 08:01:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751192Ab3LUIBR (ORCPT ); Sat, 21 Dec 2013 03:01:17 -0500 Received: from fallback3.mail.ru ([94.100.176.58]:45265 "EHLO fallback3.mail.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751067Ab3LUIBQ (ORCPT ); Sat, 21 Dec 2013 03:01:16 -0500 Received: from smtp40.i.mail.ru (smtp40.i.mail.ru [94.100.177.100]) by fallback3.mail.ru (mPOP.Fallback_MX) with ESMTP id 38A8A105EB281 for ; Sat, 21 Dec 2013 12:01:01 +0400 (MSK) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mail.ru; s=mail2; h=Message-Id:Date:Subject:Cc:To:From; bh=H/5h37u1PNPWbIema1TqDFOvqWt7I9vHTx0wdXNS+9E=; b=bNNGvEq5DLBefPk1enCOGdCTQhDFOWSk9DEKL/Hrz+p27nwawlKEy/ZVTU8r0iircsL3QKX/ElRn5vInkcosqGPPfm/sP4597gcre7IjTJYbvkjD6s08vxJYH1NuIWoAvV5rDAvvdNLLs84P0gKNeuyQ2uayLZCjZDBOn2LyC70=; Received: from [188.134.40.128] (port=8697 helo=shc.zet) by smtp40.i.mail.ru with esmtpa (envelope-from ) id 1VuHS9-0003AX-HE; Sat, 21 Dec 2013 11:58:29 +0400 From: Alexander Shiyan To: linux-arm-kernel@lists.infradead.org Cc: linux-fbdev@vger.kernel.org, Shawn Guo , Sascha Hauer , Jean-Christophe Plagniol-Villard , Tomi Valkeinen , Alexander Shiyan Subject: [PATCH] ARM: i.MX: Remove IMX_HAVE_PLATFORM_IMX_FB symbol Date: Sat, 21 Dec 2013 11:58:23 +0400 Message-Id: <1387612703-18512-1-git-send-email-shc_work@mail.ru> X-Mailer: git-send-email 1.8.3.2 X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Mras: Ok Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Spam-Status: No, score=-1.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RDNS_NONE, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=no 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 Symbol IMX_HAVE_PLATFORM_IMX_FB is selected by boards which use it, so there is no way to compile the FB driver only with DT configuration. This patch removes this dependency completely. Signed-off-by: Alexander Shiyan --- arch/arm/mach-imx/Kconfig | 10 ---------- arch/arm/mach-imx/devices/Kconfig | 3 --- arch/arm/mach-imx/devices/Makefile | 3 +-- drivers/video/Kconfig | 2 +- 4 files changed, 2 insertions(+), 16 deletions(-) diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index d511e054..9498878 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -179,7 +179,6 @@ comment "MX21 platforms:" config MACH_MX21ADS bool "MX21ADS platform" - select IMX_HAVE_PLATFORM_IMX_FB select IMX_HAVE_PLATFORM_IMX_UART select IMX_HAVE_PLATFORM_MXC_MMC select IMX_HAVE_PLATFORM_MXC_NAND @@ -196,7 +195,6 @@ config MACH_MX25_3DS select IMX_HAVE_PLATFORM_FSL_USB2_UDC select IMX_HAVE_PLATFORM_IMX2_WDT select IMX_HAVE_PLATFORM_IMXDI_RTC - select IMX_HAVE_PLATFORM_IMX_FB select IMX_HAVE_PLATFORM_IMX_I2C select IMX_HAVE_PLATFORM_IMX_KEYPAD select IMX_HAVE_PLATFORM_IMX_UART @@ -211,7 +209,6 @@ config MACH_EUKREA_CPUIMX25SD select IMX_HAVE_PLATFORM_FSL_USB2_UDC select IMX_HAVE_PLATFORM_IMX2_WDT select IMX_HAVE_PLATFORM_IMXDI_RTC - select IMX_HAVE_PLATFORM_IMX_FB select IMX_HAVE_PLATFORM_IMX_I2C select IMX_HAVE_PLATFORM_IMX_UART select IMX_HAVE_PLATFORM_MXC_EHCI @@ -248,7 +245,6 @@ comment "MX27 platforms:" config MACH_MX27ADS bool "MX27ADS platform" - select IMX_HAVE_PLATFORM_IMX_FB select IMX_HAVE_PLATFORM_IMX_I2C select IMX_HAVE_PLATFORM_IMX_UART select IMX_HAVE_PLATFORM_MXC_MMC @@ -281,7 +277,6 @@ choice config MACH_PCM970_BASEBOARD bool "PHYTEC PCM970 development board" - select IMX_HAVE_PLATFORM_IMX_FB select IMX_HAVE_PLATFORM_MXC_MMC help This adds board specific devices that can be found on Phytec's @@ -326,7 +321,6 @@ choice config MACH_EUKREA_MBIMX27_BASEBOARD bool "Eukrea MBIMX27 development board" - select IMX_HAVE_PLATFORM_IMX_FB select IMX_HAVE_PLATFORM_IMX_KEYPAD select IMX_HAVE_PLATFORM_IMX_SSI select IMX_HAVE_PLATFORM_IMX_UART @@ -343,7 +337,6 @@ config MACH_MX27_3DS bool "MX27PDK platform" select IMX_HAVE_PLATFORM_FSL_USB2_UDC select IMX_HAVE_PLATFORM_IMX2_WDT - select IMX_HAVE_PLATFORM_IMX_FB select IMX_HAVE_PLATFORM_IMX_I2C select IMX_HAVE_PLATFORM_IMX_KEYPAD select IMX_HAVE_PLATFORM_IMX_SSI @@ -389,7 +382,6 @@ config MACH_PCA100 bool "Phytec phyCARD-s (pca100)" select IMX_HAVE_PLATFORM_FSL_USB2_UDC select IMX_HAVE_PLATFORM_IMX2_WDT - select IMX_HAVE_PLATFORM_IMX_FB select IMX_HAVE_PLATFORM_IMX_I2C select IMX_HAVE_PLATFORM_IMX_SSI select IMX_HAVE_PLATFORM_IMX_UART @@ -406,7 +398,6 @@ config MACH_PCA100 config MACH_MXT_TD60 bool "Maxtrack i-MXT TD60" - select IMX_HAVE_PLATFORM_IMX_FB select IMX_HAVE_PLATFORM_IMX_I2C select IMX_HAVE_PLATFORM_IMX_UART select IMX_HAVE_PLATFORM_MXC_MMC @@ -633,7 +624,6 @@ config MACH_MX35_3DS bool "Support MX35PDK platform" select IMX_HAVE_PLATFORM_FSL_USB2_UDC select IMX_HAVE_PLATFORM_IMX2_WDT - select IMX_HAVE_PLATFORM_IMX_FB select IMX_HAVE_PLATFORM_IMX_I2C select IMX_HAVE_PLATFORM_IMX_UART select IMX_HAVE_PLATFORM_IPU_CORE diff --git a/arch/arm/mach-imx/devices/Kconfig b/arch/arm/mach-imx/devices/Kconfig index 68c74fb..99951a6 100644 --- a/arch/arm/mach-imx/devices/Kconfig +++ b/arch/arm/mach-imx/devices/Kconfig @@ -25,9 +25,6 @@ config IMX_HAVE_PLATFORM_IMX2_WDT config IMX_HAVE_PLATFORM_IMXDI_RTC bool -config IMX_HAVE_PLATFORM_IMX_FB - bool - config IMX_HAVE_PLATFORM_IMX_I2C bool diff --git a/arch/arm/mach-imx/devices/Makefile b/arch/arm/mach-imx/devices/Makefile index 67416fb..ba2642d 100644 --- a/arch/arm/mach-imx/devices/Makefile +++ b/arch/arm/mach-imx/devices/Makefile @@ -9,8 +9,7 @@ obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX21_HCD) += platform-imx21-hcd.o obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX27_CODA) += platform-imx27-coda.o obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX2_WDT) += platform-imx2-wdt.o obj-$(CONFIG_IMX_HAVE_PLATFORM_IMXDI_RTC) += platform-imxdi_rtc.o -obj-y += platform-imx-dma.o -obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_FB) += platform-imx-fb.o +obj-y += platform-imx-dma.o platform-imx-fb.o obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_I2C) += platform-imx-i2c.o obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_KEYPAD) += platform-imx-keypad.o obj-$(CONFIG_IMX_HAVE_PLATFORM_PATA_IMX) += platform-pata_imx.o diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 4f2e1b3..e7d8d88 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -363,7 +363,7 @@ config FB_SA1100 config FB_IMX tristate "Freescale i.MX1/21/25/27 LCD support" - depends on FB && IMX_HAVE_PLATFORM_IMX_FB + depends on FB && (SOC_IMX1 || SOC_IMX21 || SOC_IMX25 || SOC_IMX27) select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT