From patchwork Thu Apr 24 12:28:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 4050351 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 4880F9F4F4 for ; Thu, 24 Apr 2014 12:29:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5EC0920304 for ; Thu, 24 Apr 2014 12:29:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5F72A20303 for ; Thu, 24 Apr 2014 12:29:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757031AbaDXM3B (ORCPT ); Thu, 24 Apr 2014 08:29:01 -0400 Received: from mail-wg0-f50.google.com ([74.125.82.50]:61501 "EHLO mail-wg0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756993AbaDXM27 (ORCPT ); Thu, 24 Apr 2014 08:28:59 -0400 Received: by mail-wg0-f50.google.com with SMTP id x13so2135566wgg.33 for ; Thu, 24 Apr 2014 05:28:58 -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=UJArefZlOVcMaXJ7jCNib1ySxyMqjmziLDz99VxPXwU=; b=UPfWUqCq8PPy5ywloOiFebGkwby7ly7EGhViJ8G3hP0D9nXnGyW7XcPZJkUUb8NDl+ zxd1CeRC6jY78DEu+pnYT34rGi0c+youQ9iFzCTXOdyKmLHqppC3ujwc4j0Dl8NTlhxD SBESxMLNlTZ06YRwrn6q+mfDQZ81kMzS3XfkUzJNd6erhBOefLnsdGuDwMiNjVb1PnHy LYaq0nERpNTIAygwckDOTCcWQWrqW1GAN3T5wl8WlDX/WyDYzJ7iSWf9MyihdbMeIyxA uinnZeMec8P/4Rp+2eh347pNKfAAaErIuCyfOBbwkxC/I0+3+6RqnpKztflxRmaoF1L/ 9Wbw== X-Gm-Message-State: ALoCoQlflUaIKSfjSAxsPiEiHwKolrNWzhdu7ERdh2cYU3vagozcJ6N3XAarI+S+EFiZKurcp6cY X-Received: by 10.194.188.41 with SMTP id fx9mr1493558wjc.56.1398342538524; Thu, 24 Apr 2014 05:28:58 -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.57 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 24 Apr 2014 05:28:58 -0700 (PDT) From: Peter Griffin To: linux-kernel@vger.kernel.org Cc: linaro-kernel@lists.linaro.org, Arnd Bergmann , Peter Griffin , Jean-Christophe Plagniol-Villard , Tomi Valkeinen , linux-fbdev@vger.kernel.org, Russell King , Anatolij Gustschin Subject: [PATCH 03/13] video: clarify I2C dependencies Date: Thu, 24 Apr 2014 13:28:19 +0100 Message-Id: <1398342509-10243-4-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 We can only use I2C support in frame buffer drivers if Either I2C is built-in, or both I2C and the driver itself are loadable modules. Fix this dependency for MB862XX and CyberPro frame buffers. Signed-off-by: Arnd Bergmann Signed-off-by: Peter Griffin Cc: Jean-Christophe Plagniol-Villard Cc: Tomi Valkeinen Cc: linux-fbdev@vger.kernel.org Cc: Russell King Cc: Anatolij Gustschin --- drivers/video/fbdev/Kconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index a4116bf..5577a94 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -360,6 +360,7 @@ config FB_CYBER2000_DDC config FB_CYBER2000_I2C bool "CyberPro 2000/2010/5000 I2C support" depends on FB_CYBER2000 && I2C && ARCH_NETWINDER + depends on I2C=y || FB_CYBER2000=m select I2C_ALGOBIT help Enable support for the I2C video decoder interface on the @@ -2296,6 +2297,7 @@ endchoice config FB_MB862XX_I2C bool "Support I2C bus on MB862XX GDC" depends on FB_MB862XX && I2C + depends on FB_MB862XX=m || I2C=y default y help Selecting this option adds Coral-P(A)/Lime GDC I2C bus adapter