From patchwork Mon May 2 10:59:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 8991021 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 89399BF29F for ; Mon, 2 May 2016 11:00:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ADF51201FA for ; Mon, 2 May 2016 11:00:27 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id DC0042014A for ; Mon, 2 May 2016 11:00:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 13F786E589; Mon, 2 May 2016 11:00:26 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.kundenserver.de (mout.kundenserver.de [217.72.192.73]) by gabe.freedesktop.org (Postfix) with ESMTPS id C9ACA6E589 for ; Mon, 2 May 2016 11:00:24 +0000 (UTC) Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue104) with ESMTPA (Nemesis) id 0LbJZC-1bPLO51FhC-00kwdf; Mon, 02 May 2016 13:00:11 +0200 From: Arnd Bergmann To: Maxime Ripard , David Airlie , Chen-Yu Tsai Subject: [PATCH] drm/sun4i: add COMMON_CLK dependency Date: Mon, 2 May 2016 12:59:48 +0200 Message-Id: <1462186805-2211918-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:9hqo8puWvIpPyc5lcNBfwiIcogh7ZGEQZbLQ8ZE0rx1aDeyJAeX aKDzdOL4+I5Avya7GMKNNYf8eZE6BopFR8kyZGvBhTMVySsjoLBt1m++dHGsK7cb1FTk/Q0 F38z1B+OxXTMYFQXw3on0RpEG7M/gTbekTvWFDXX96HsdO2tXEtsNUVCUzbylUEKbv5TNtv JzPHujQT6ktsjMTrmMIWg== X-UI-Out-Filterresults: notjunk:1; V01:K0:bWx/s7FDWOE=:7HB4cYgjJXFNkSEstX2oxi utMVYjNYKLktPSX8+DYqXhY8jHJq/YsbsIyocMVBtibGa86W3HrEwc/thfV8N67KufTMXx/kc lznD7vDCxu3hplVzswMHIuClxGRc1ZIDNOLi0ZT9HNV3Bq7eHiD3fe81sjEXAXpWBrP1Mr45s cwIGZgrYjYs9+CD7EzVUCYKLSiQVWl9oPPrRrQ7dquYklgKsLw8PB5dXMMpCXrBEy8OCL0v1H MLAnlqCQ2mNNGjlQCsV6AIoEP8dMwJNs1wsCQ4M8RgfasY7YMNSspNp+4wyaDhlsaLs6qhYs/ YJ15VMi55pG5S/09dPrEadzvioK7jzNZoEU/HxRGfzQweB0fx5aPGefs24XtCoZC1Z7eNQpzZ DQWrn1GDZE2JZ5jHFJN80jIf984kFx+hlQlZ/OCIricM9T1jhnEA4Hxa6FWE2YdNxCPPA2y3u t2TBi5pg3pBFxuQYTARZLN88/ZsN9bCqWiAEdPR7YDljnymnM6aSJ6n8Mn90SOomPCXujCGJ3 zZ/c3wfARVI2lmClJo3YUn5NiiF1fBZ1tIy3J4DgcTJjwXGttQRoz/7s/5zZgLqQt6f6e+3O7 Xziu3h8Fx3pyv4C5GqHF6+CczCbaT7w0xvfo5O9mqs1OV2u5Yo5H6hs1Uj9xOFWA19MWaXVC/ OZ9RH8qcM+P2T8WJVSZ7yZtJNuAtYVhmfJ+VnVx7WTuThOw5G8bycDV3RTRd/u+aikjM= Cc: Arnd Bergmann , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Dave Airlie , linux-arm-kernel@lists.infradead.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-5.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 sun4i drm driver uses the clk-provider interfaces, which are not available when CONFIG_COMMON_CLK is disabled: drivers/gpu/drm/sun4i/sun4i_dotclock.c:19:16: error: field 'hw' has incomplete type struct clk_hw hw; In file included from ../include/asm-generic/bug.h:13:0, from ../arch/arm/include/asm/bug.h:59, from ../include/linux/bug.h:4, from ../include/linux/io.h:23, from ../include/linux/clk-provider.h:14, from ../drivers/gpu/drm/sun4i/sun4i_dotclock.c:13: drivers/gpu/drm/sun4i/sun4i_dotclock.c: In function 'hw_to_dclk': include/linux/kernel.h:831:48: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types] ... This adds a Kconfig dependency to prevent the driver from being enabled in this case. Signed-off-by: Arnd Bergmann Fixes: 9026e0d122ac ("drm: Add Allwinner A10 Display Engine support") --- drivers/gpu/drm/sun4i/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/sun4i/Kconfig b/drivers/gpu/drm/sun4i/Kconfig index 99510e64e91a..a4b357db8856 100644 --- a/drivers/gpu/drm/sun4i/Kconfig +++ b/drivers/gpu/drm/sun4i/Kconfig @@ -1,6 +1,6 @@ config DRM_SUN4I tristate "DRM Support for Allwinner A10 Display Engine" - depends on DRM && ARM + depends on DRM && ARM && COMMON_CLK depends on ARCH_SUNXI || COMPILE_TEST select DRM_GEM_CMA_HELPER select DRM_KMS_HELPER