From patchwork Wed Mar 19 19:29:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 3861331 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2EC8F9F373 for ; Wed, 19 Mar 2014 21:10:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5B5A3201ED for ; Wed, 19 Mar 2014 21:10:06 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5E624201F4 for ; Wed, 19 Mar 2014 21:10:05 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQMIJ-0002uv-TN; Wed, 19 Mar 2014 19:36:56 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQMHq-00064Y-91; Wed, 19 Mar 2014 19:36:26 +0000 Received: from moutng.kundenserver.de ([212.227.17.10]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQMD2-0005aw-6x for linux-arm-kernel@lists.infradead.org; Wed, 19 Mar 2014 19:31:30 +0000 Received: from wuerfel.lan (HSI-KBW-134-3-135-108.hsi14.kabel-badenwuerttemberg.de [134.3.135.108]) by mrelayeu.kundenserver.de (node=mreue105) with ESMTP (Nemesis) id 0MQOHk-1WXxxa41Ea-00Tkb4; Wed, 19 Mar 2014 20:30:39 +0100 From: Arnd Bergmann To: arm@kernel.org Subject: [PATCH 28/62] ARM: pxa: FB_W100 must be built-in Date: Wed, 19 Mar 2014 20:29:25 +0100 Message-Id: <1395257399-359545-29-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1395257399-359545-1-git-send-email-arnd@arndb.de> References: <1395257399-359545-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:WMBlT7enNR6gfo/iNBk7mlEUSZkEb0NTK40HcYqHIpu ngO2C/KBuU6Ru6OZCdLA+ahsW/i3f2HsVBKFEOrtgjWNthpls6 KrjHlI1CZn176mpXeTh7GfynkzLsmzxz6sjdqtVMrnlbGW/UUv wPKRgZSNcE9ppC1uesmD6tfw7sYX9qfEJzg9swLKqjgjhEvxlN IXHyBjViOWw6hiPLNAWR9LnZLND+CZMGnKyerrcwVvj1koMtsm gMlFJfMXpOl37/4ZZO7xm847EmsRUkdQqlhs9wjAMhBiijiPN+ h6uSHkSZvdQyljxos0wNURONq2OcCb4LScRV+KcxI0YR/O3DkH zGPyKwkVUVl7bqZljmyjuJrCIKcK8SAB2Xsgvzohv X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140319_153128_659203_D4EF8B7E X-CRM114-Status: GOOD ( 13.62 ) X-Spam-Score: -1.9 (-) Cc: Russell King , Arnd Bergmann , Haojian Zhuang , Daniel Mack , Eric Miao , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 The pxa platform code directly calls into the W100 framebuffer driver for eseries. This means it cannot be a loadable module and we also have to ensure that the core framebuffer code is built-in. Signed-off-by: Arnd Bergmann Cc: Eric Miao Cc: Russell King Cc: Haojian Zhuang Cc: Daniel Mack --- arch/arm/mach-pxa/Kconfig | 1 + drivers/video/Kconfig | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index 96100db..562b17f 100644 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig @@ -556,6 +556,7 @@ config MACH_ICONTROL config ARCH_PXA_ESERIES bool "PXA based Toshiba e-series PDAs" select FB_W100 + select FB select PXA25x config MACH_E330 diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index dade5b7..86873ff 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -1996,8 +1996,8 @@ config FB_FSL_DIU Framebuffer driver for the Freescale SoC DIU config FB_W100 - tristate "W100 frame buffer support" - depends on FB && ARCH_PXA + bool "W100 frame buffer support" + depends on FB=y && ARCH_PXA select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT