From patchwork Wed Apr 23 17:28:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 28915 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f197.google.com (mail-ig0-f197.google.com [209.85.213.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C0DA5203AC for ; Wed, 23 Apr 2014 17:29:00 +0000 (UTC) Received: by mail-ig0-f197.google.com with SMTP id hn18sf4215056igb.0 for ; Wed, 23 Apr 2014 10:29:00 -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:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=aMKctdTX+QYkWyOVTU9ghcluQi3AARLbyRsJjn+64CU=; b=R3x/XvkuQUhhjUlCP7hduY2F7h9VxXq6bbrN+Cfp1G5CXfKjtdgl1kmS/SGlrA58h8 XfcxdAWSpufYaKKlMoLX8K0jcnTFPzQ3rJJV6XOAlAvjcM65dC90/RHunKRawUEV/E4B zBpK6B0m3Npl6KJEkuRbzAWea1aqZgL80bMoAy9A6+6kONihh24zX64PDkduxoFw00F0 CFdC5Z8EpJvDgwWTCy3gIlQGXm5XygRB6PuOojm2Hp3v6FM3PYv8HKgShHTcE23lrOwh /XkurZ/L7X9iTilRS5FR5AphiL+xAaUoIYMy6AKHUtJHOcBAfH0rgEOSKZQUE1wbY0SS QFpQ== X-Gm-Message-State: ALoCoQnwgdwzSVrmtY5ODPS4QhDDPNjjqsB216H8JHfKrT39Fm0gMRR+YgHF4YZ+Ntpxte+YG1BK X-Received: by 10.43.158.9 with SMTP id ls9mr23209105icc.18.1398274140290; Wed, 23 Apr 2014 10:29:00 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.104.78 with SMTP id z72ls196683qge.37.gmail; Wed, 23 Apr 2014 10:29:00 -0700 (PDT) X-Received: by 10.53.7.67 with SMTP id da3mr105670vdd.84.1398274140096; Wed, 23 Apr 2014 10:29:00 -0700 (PDT) Received: from mail-ve0-f175.google.com (mail-ve0-f175.google.com [209.85.128.175]) by mx.google.com with ESMTPS id u5si301082vdo.184.2014.04.23.10.29.00 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 23 Apr 2014 10:29:00 -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.128.175; Received: by mail-ve0-f175.google.com with SMTP id oz11so1511200veb.6 for ; Wed, 23 Apr 2014 10:29:00 -0700 (PDT) X-Received: by 10.220.5.129 with SMTP id 1mr646815vcv.71.1398274140025; Wed, 23 Apr 2014 10:29:00 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp120697vcb; Wed, 23 Apr 2014 10:28:58 -0700 (PDT) X-Received: by 10.180.77.165 with SMTP id t5mr2831585wiw.38.1398274136205; Wed, 23 Apr 2014 10:28:56 -0700 (PDT) Received: from mail-wg0-f44.google.com (mail-wg0-f44.google.com [74.125.82.44]) by mx.google.com with ESMTPS id m5si1753477wib.26.2014.04.23.10.28.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 23 Apr 2014 10:28:56 -0700 (PDT) Received-SPF: none (google.com: peter.griffin@linaro.org does not designate permitted sender hosts) client-ip=74.125.82.44; Received: by mail-wg0-f44.google.com with SMTP id m15so1149813wgh.15 for ; Wed, 23 Apr 2014 10:28:55 -0700 (PDT) X-Received: by 10.180.219.75 with SMTP id pm11mr2792042wic.8.1398274135545; Wed, 23 Apr 2014 10:28:55 -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 go20sm2372382wjc.18.2014.04.23.10.28.54 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 23 Apr 2014 10:28:54 -0700 (PDT) From: Peter Griffin To: peter.griffin@linaro.org Cc: patches@linaro.org, linaro-kernel@lists.linaro.org Subject: [PATCH 01/13] video: sh_mobile_lcdcfb depends on meram Date: Wed, 23 Apr 2014 18:28:35 +0100 Message-Id: <1398274127-2106-1-git-send-email-peter.griffin@linaro.org> X-Mailer: git-send-email 1.7.9.5 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 Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: 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