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: 28964 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qg0-f69.google.com (mail-qg0-f69.google.com [209.85.192.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 386DB203AC for ; Thu, 24 Apr 2014 12:29:10 +0000 (UTC) Received: by mail-qg0-f69.google.com with SMTP id a108sf5483176qge.8 for ; Thu, 24 Apr 2014 05:29:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=OJmS4/DvjT97hKRd/DEi96ZmN22dSDdAoBtbmjuRZRc=; b=kj1qhtq5NV4sCYW+UW2+aC41dM2FUyeK3FfOQWEmbQ1PmDjpbHFxlTBtbrOY7bY2hm Ty1zb39cNhUcvHU/pDbRhf7uCWTMGg6V10Bw/Ts3qoqrAjNuodA5UsmqahwcsHCxdHtW ldnPodx5mBR3htbJ1OdMueDMsB1yqA8tQtx+FJ/HQr5/OjV1SfEW4e994uIx+yitH5p2 2QdiRwCAbGZubY7YaIMp+LsYGTwhMMVzkvw0tcu9mbuNB+sA/Lt+lkpziiXCdGY48ww7 kNfb7Q6SQo/g4ll9BRZFW1h4EGQRzQnGHu+sPpDXbNiugDv4xprkdSTR6JCNck6XPPp9 twJQ== X-Gm-Message-State: ALoCoQl0ZVDHB45nv1CWLnWoJ216kKBJomqiBzXtLVSme5WfchXBcrK1QkIR/jgD8L4MX23p8bdq X-Received: by 10.58.178.81 with SMTP id cw17mr943818vec.37.1398342549895; Thu, 24 Apr 2014 05:29:09 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.36.33 with SMTP id o30ls1058762qgo.23.gmail; Thu, 24 Apr 2014 05:29:09 -0700 (PDT) X-Received: by 10.220.113.11 with SMTP id y11mr160153vcp.40.1398342549740; Thu, 24 Apr 2014 05:29:09 -0700 (PDT) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id ww7si874672vec.156.2014.04.24.05.29.09 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 24 Apr 2014 05:29:09 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id hr9so2843624vcb.15 for ; Thu, 24 Apr 2014 05:29:09 -0700 (PDT) X-Received: by 10.221.64.80 with SMTP id xh16mr287951vcb.35.1398342549649; Thu, 24 Apr 2014 05:29:09 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp11868vcb; Thu, 24 Apr 2014 05:29:09 -0700 (PDT) X-Received: by 10.68.112.225 with SMTP id it1mr2924213pbb.142.1398342548565; Thu, 24 Apr 2014 05:29:08 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id as3si2601671pbc.178.2014.04.24.05.29.07; Thu, 24 Apr 2014 05:29:07 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756976AbaDXM2v (ORCPT + 27 others); Thu, 24 Apr 2014 08:28:51 -0400 Received: from mail-wg0-f49.google.com ([74.125.82.49]:35949 "EHLO mail-wg0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756944AbaDXM2s (ORCPT ); Thu, 24 Apr 2014 08:28:48 -0400 Received: by mail-wg0-f49.google.com with SMTP id a1so2213307wgh.32 for ; Thu, 24 Apr 2014 05:28:47 -0700 (PDT) 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-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.griffin@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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