From patchwork Mon May 22 15:20:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9740747 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AACAD6034C for ; Mon, 22 May 2017 15:21:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9DC932873B for ; Mon, 22 May 2017 15:21:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8F58128756; Mon, 22 May 2017 15:21:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.7 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BB78F28739 for ; Mon, 22 May 2017 15:21:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C194E89DCF; Mon, 22 May 2017 15:21:10 +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 [212.227.17.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9F78B89DCF for ; Mon, 22 May 2017 15:21:08 +0000 (UTC) Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.145]) with ESMTPA (Nemesis) id 0Lw14n-1e2VxA2ip3-017pui; Mon, 22 May 2017 17:21:01 +0200 From: Arnd Bergmann To: Eric Anholt , David Airlie Subject: [PATCH] drm/pl111: add ARM_AMBA dependency Date: Mon, 22 May 2017 17:20:08 +0200 Message-Id: <20170522152058.3346428-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:dnpnckp70lFrtxhPJCXPvGDweDWuftUgBXbnvNdoCnYIiJOG8JD O9QxOW7C7jREXcbYKH9198aw9zpkJBv6kwbxyl5NwKGv6pRtJPmGFzUXAXuiCyA5bBt7fLg jrXn7enQOcM74Bdh/uo6oVk5Gmd0F9OZaUWLRHUgN9r98eOroRGwaAG1Gz8qYplgx0UzE1B 6UTudDvRuaZAXzWNyM1Bg== X-UI-Out-Filterresults: notjunk:1; V01:K0:ngoN190yWb8=:wbUU1obHlAJ8Lf2bxUsBg1 8GWV2XdvktZMEL1uZBi1HYy2WVDBXiTC+kV35rWbwt0dA2Qi2Mi0AnwBcjN5LCDGNM7WfM4pp 5smaodk8jlyqsr6wYZg6U99ZacmfUYUECRw3qPc20Ok3QywPHmcM2vo8uQUCHLSpgzeRr+mlC 3Ge/jctuYJCbm5jwFUa+KbWctD4SWZnQbeuj8XHqy3N2MpCaQVGLR3Js2CAwrWUemL1eaLCE0 0QI40SOUkHK3u3l2UdqkrzeZc2mwK4mKheUEa1VgyCW4o9iB0GGyd3muhk5Any1GJ3f5+OD3w xXV1FZKJoMXnN+jxRGsNf6sDOCFeLsoZOfjWYRRSEDVjzTiv1U51Pmn0WlHBRJtGiqOmYPwUo PXcEPwaM6C26rEWAdRd7A9EWaJtYQkPv+uqBBwqzgWvRuPNvrWICLo7NG4g/4lMQyVfqUIe1t lLFoWECXaxsg2vhYxrJIqejUlmT8EVCRuRy/umljY1lBMzzHKWeRBEj9k45F8nHPGTlJQzIEw wiErSXYrlrYndX6LfhIBF9bhSUaysDfIWPWdesn6DGiT7b+lLJ9+tCiEIL66Nm1sQOQPtLrF+ FjzLSn7jyducvMESIxEKZ7LvoPNcVRgszAv62C6VylktyQ+FSGohbMz4fG88vMeh51QKiRtdc ZnE33+hITTTtzpxKHBDBwA+npWIxi1kOvp+DBBuob6IDjZsM78wH5DOgbtCwBo7b5Hss= Cc: linux-samsung-soc@vger.kernel.org, Arnd Bergmann , linux-kernel@vger.kernel.org, Krzysztof Kozlowski , Kukjin Kim , dri-devel@lists.freedesktop.org, Colin Ian King , 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-Virus-Scanned: ClamAV using ClamSMTP The driver is written in a way to enable compile-testing without CONFIG_ARM_AMBA, but it just causes needless warnings: drivers/gpu/drm/pl111/pl111_drv.c:149:26: error: 'pl111_drm_driver' defined but not used [-Werror=unused-variable] drivers/gpu/drm/pl111/pl111_drv.c:81:12: error: 'pl111_modeset_init' defined but not used [-Werror=unused-function] This removes the #ifdef instead, and adds a dependency on ARM_AMBA to only let us build the driver when the base support is enabled. Unfortunately, this requires removing one redundant 'select ARM_AMBA' line from mach-s3c64xx to avoid a circular dependency. It might be good to allow manually enabling ARM_AMBA when COMPILE_TEST is turned on, but that should be a separate patch and may cause other build regressions. Fixes: bed41005e617 ("drm/pl111: Initial drm/kms driver for pl111") Signed-off-by: Arnd Bergmann Acked-by: Krzysztof Kozlowski --- arch/arm/mach-s3c64xx/Kconfig | 1 - drivers/gpu/drm/pl111/Kconfig | 1 + drivers/gpu/drm/pl111/pl111_drv.c | 2 -- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig index 459214fa20b4..5ee5ad74a3d6 100644 --- a/arch/arm/mach-s3c64xx/Kconfig +++ b/arch/arm/mach-s3c64xx/Kconfig @@ -40,7 +40,6 @@ config CPU_S3C6410 config S3C64XX_PL080 def_bool DMADEVICES - select ARM_AMBA select AMBA_PL08X config S3C64XX_SETUP_SDHCI diff --git a/drivers/gpu/drm/pl111/Kconfig b/drivers/gpu/drm/pl111/Kconfig index 309f4fd52de7..e2f393fcc4bf 100644 --- a/drivers/gpu/drm/pl111/Kconfig +++ b/drivers/gpu/drm/pl111/Kconfig @@ -2,6 +2,7 @@ config DRM_PL111 tristate "DRM Support for PL111 CLCD Controller" depends on DRM depends on ARM || ARM64 || COMPILE_TEST + depends on ARM_AMBA depends on COMMON_CLK select DRM_KMS_HELPER select DRM_KMS_CMA_HELPER diff --git a/drivers/gpu/drm/pl111/pl111_drv.c b/drivers/gpu/drm/pl111/pl111_drv.c index 97095b1aa961..dce382f97f8c 100644 --- a/drivers/gpu/drm/pl111/pl111_drv.c +++ b/drivers/gpu/drm/pl111/pl111_drv.c @@ -179,7 +179,6 @@ static struct drm_driver pl111_drm_driver = { #endif }; -#ifdef CONFIG_ARM_AMBA static int pl111_amba_probe(struct amba_device *amba_dev, const struct amba_id *id) { @@ -262,7 +261,6 @@ static struct amba_driver pl111_amba_driver = { }; module_amba_driver(pl111_amba_driver); -#endif /* CONFIG_ARM_AMBA */ MODULE_DESCRIPTION(DRIVER_DESC); MODULE_AUTHOR("ARM Ltd.");