From patchwork Thu Apr 24 12:28:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 4050431 Return-Path: X-Original-To: patchwork-linux-fbdev@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 8A4E29F38C for ; Thu, 24 Apr 2014 12:30:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9EB3720303 for ; Thu, 24 Apr 2014 12:30:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BDC5B202F8 for ; Thu, 24 Apr 2014 12:30:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756950AbaDXM2u (ORCPT ); Thu, 24 Apr 2014 08:28:50 -0400 Received: from mail-we0-f177.google.com ([74.125.82.177]:57783 "EHLO mail-we0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753210AbaDXM2s (ORCPT ); Thu, 24 Apr 2014 08:28:48 -0400 Received: by mail-we0-f177.google.com with SMTP id t60so401781wes.36 for ; Thu, 24 Apr 2014 05:28:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=aMKctdTX+QYkWyOVTU9ghcluQi3AARLbyRsJjn+64CU=; b=fzQaF39ARSvfwgOoXf93cP5Dg7EbDbWsUe2EnzuNhZiNxw45d7kJnhygX+2t5OtVz9 7ohc+rv5eJl5U4FvFdFQkczdMB72fMcDFhrVmF+2pp5srzYDBw+cNEBDLPz0sCh2NdQy gAIwl4JZ+VCZdENfGvtHL+IPawMKzGYTobCcyji7SPrSA5BjjzlDQZLkXgdRe70Vgb4o Hdg0owWmMryWxJR/BdhVtYc7MHSxGJejQb+RHmDGZkwoa9BcvaWBZ1oEcV20jmJ2nRnN PCR4zcRuyRTxEXz2gyw+JMluEOMzIi91Jq73DSmjd0w/96Ahou0Zx0FcVIwbAvc0OFA/ W4JA== X-Gm-Message-State: ALoCoQkfFCCpbcu2jGGjn+l1so1viuRxB3b9EN3x++m0AYeaY4toBof9M8zkL5DHpxCMIw15Dfv/ X-Received: by 10.194.24.74 with SMTP id s10mr1408732wjf.43.1398342527021; Thu, 24 Apr 2014 05:28:47 -0700 (PDT) Received: from localhost.localdomain (cpc14-aztw22-2-0-cust189.18-1.cable.virginm.net. [82.45.1.190]) by mx.google.com with ESMTPSA id y20sm35144777wiv.14.2014.04.24.05.28.46 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 24 Apr 2014 05:28:46 -0700 (PDT) From: Peter Griffin To: linux-kernel@vger.kernel.org Cc: linaro-kernel@lists.linaro.org, Arnd Bergmann , Peter Griffin , Simon Horman , Magnus Damm , linux-sh@vger.kernel.org, Jean-Christophe Plagniol-Villard , Tomi Valkeinen , linux-fbdev@vger.kernel.org Subject: [PATCH 01/13] video: sh_mobile_lcdcfb depends on meram Date: Thu, 24 Apr 2014 13:28:17 +0100 Message-Id: <1398342509-10243-2-git-send-email-peter.griffin@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1398342509-10243-1-git-send-email-peter.griffin@linaro.org> References: <1398342509-10243-1-git-send-email-peter.griffin@linaro.org> Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 From: Arnd Bergmann The sh_mobile_lcdcfb driver calls interfaces provided by the corresponding "meram" helper. This fails if meram is a module but lcdcfb is built-in. To work around it, this uses special Kconfig magic to only allow lcdcfb to be built if a) both are modules, b) meram is built-in, or c) meram is disabled and the helpers stubbed out Changing meram from 'y' to 'm' now forces clcd to be a module as well, which seems to be the desired behavior. Signed-off-by: Arnd Bergmann Signed-off-by: Peter Griffin Cc: Simon Horman Cc: Magnus Damm Cc: linux-sh@vger.kernel.org Cc: Jean-Christophe Plagniol-Villard Cc: Tomi Valkeinen Cc: linux-fbdev@vger.kernel.org --- drivers/video/fbdev/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index e1f4727..a4116bf 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -1971,6 +1971,7 @@ config FB_W100 config FB_SH_MOBILE_LCDC tristate "SuperH Mobile LCDC framebuffer support" depends on FB && (SUPERH || ARCH_SHMOBILE) && HAVE_CLK + depends on FB_SH_MOBILE_MERAM || !FB_SH_MOBILE_MERAM select FB_SYS_FILLRECT select FB_SYS_COPYAREA select FB_SYS_IMAGEBLIT