From patchwork Thu Oct 24 08:01:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Denis Carikli X-Patchwork-Id: 285812 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from casper.infradead.org (unknown [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1D8682C007B for ; Thu, 24 Oct 2013 19:03:05 +1100 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VZFs4-0005hy-Fr; Thu, 24 Oct 2013 08:02:20 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VZFru-0000WY-3E; Thu, 24 Oct 2013 08:02:10 +0000 Received: from smtp4-g21.free.fr ([2a01:e0c:1:1599::13]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VZFrW-0000SQ-E2 for linux-arm-kernel@lists.infradead.org; Thu, 24 Oct 2013 08:01:48 +0000 Received: from denis-N73SV.local.eukrea.com (unknown [88.170.243.169]) by smtp4-g21.free.fr (Postfix) with ESMTP id 231604C81FF; Thu, 24 Oct 2013 10:01:19 +0200 (CEST) From: Denis Carikli To: Sascha Hauer Subject: [PATCHv6][ 3/7] ARM: imx{25, 27} DT: Permit the selection of the imxfb framebuffer driver. Date: Thu, 24 Oct 2013 10:01:01 +0200 Message-Id: <1382601665-6830-3-git-send-email-denis@eukrea.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1382601665-6830-1-git-send-email-denis@eukrea.com> References: <1382601665-6830-1-git-send-email-denis@eukrea.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131024_040147_178190_8AC690C4 X-CRM114-Status: GOOD ( 13.28 ) X-Spam-Score: -1.2 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.7 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Mark Rutland , devicetree@vger.kernel.org, Russell King , Pawel Moll , Stephen Warren , Ian Campbell , Rob Herring , Denis Carikli , =?UTF-8?q?Eric=20B=C3=A9nard?= , Shawn Guo , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Without that patch, a user can't select the imxfb driver when the i.MX25 and/or the i.MX27 device tree board are selected and that no boards that selects IMX_HAVE_PLATFORM_IMX_FB are compiled in. Cc: Rob Herring Cc: Pawel Moll Cc: Mark Rutland Cc: Stephen Warren Cc: Ian Campbell Cc: devicetree@vger.kernel.org Cc: Sascha Hauer Cc: linux-arm-kernel@lists.infradead.org Cc: Russell King Cc: Eric Bénard Signed-off-by: Denis Carikli --- ChangeLog v5->v6: - Reworked the patch not to make DT boards depend on IMX_HAVE_PLATFORM_IMX_FB. - Added better explanations of why that patch is needed in the commit message. --- arch/arm/mach-imx/Kconfig | 5 +++++ arch/arm/mach-imx/devices/Kconfig | 1 + drivers/video/Kconfig | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 9f67338..3ccb5d5 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -64,6 +64,9 @@ config ARCH_HAS_RNGA config HAVE_IMX_ANATOP bool +config HAVE_IMX_FB + bool + config HAVE_IMX_GPC bool @@ -254,6 +257,7 @@ endchoice config MACH_IMX25_DT bool "Support i.MX25 platforms from device tree" select SOC_IMX25 + select HAVE_IMX_FB help Include support for Freescale i.MX25 based platforms using the device tree for discovery @@ -442,6 +446,7 @@ config MACH_IMX27IPCAM config MACH_IMX27_DT bool "Support i.MX27 platforms from device tree" select SOC_IMX27 + select HAVE_IMX_FB help Include support for Freescale i.MX27 based platforms using the device tree for discovery diff --git a/arch/arm/mach-imx/devices/Kconfig b/arch/arm/mach-imx/devices/Kconfig index 68c74fb..a7af9f4 100644 --- a/arch/arm/mach-imx/devices/Kconfig +++ b/arch/arm/mach-imx/devices/Kconfig @@ -26,6 +26,7 @@ config IMX_HAVE_PLATFORM_IMXDI_RTC bool config IMX_HAVE_PLATFORM_IMX_FB + select HAVE_IMX_FB bool config IMX_HAVE_PLATFORM_IMX_I2C diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 14317b7..a97529f 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 && HAVE_IMX_FB select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT