From patchwork Sun Apr 7 01:30:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Life is hard, and then you die" X-Patchwork-Id: 10888301 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8D3D917E0 for ; Sun, 7 Apr 2019 01:30:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5113C285F7 for ; Sun, 7 Apr 2019 01:30:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3E9D428760; Sun, 7 Apr 2019 01:30:15 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 711CE285F7 for ; Sun, 7 Apr 2019 01:30:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726495AbfDGBaN (ORCPT ); Sat, 6 Apr 2019 21:30:13 -0400 Received: from chill.innovation.ch ([216.218.245.220]:43802 "EHLO chill.innovation.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726144AbfDGBaN (ORCPT ); Sat, 6 Apr 2019 21:30:13 -0400 Received: from localhost (localhost [127.0.0.1]) by chill.innovation.ch (Postfix) with ESMTP id 446E2640194; Sat, 6 Apr 2019 18:30:12 -0700 (PDT) X-Virus-Scanned: amavisd-new at Received: from chill.innovation.ch ([127.0.0.1]) by localhost (chill.innovation.ch [127.0.0.1]) (amavisd-new, port 10024) with LMTP id jGCV3lwdIN7W; Sat, 6 Apr 2019 18:30:08 -0700 (PDT) From: =?utf-8?q?Ronald_Tschal=C3=A4r?= DKIM-Filter: OpenDKIM Filter v2.10.3 chill.innovation.ch 9FE05640073 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=innovation.ch; s=default; t=1554600608; bh=uCk7C+VD0Jjudh+SgQzld/4m5vNzQ2MlsNbG8OGwEnI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Acori4O3wqdcp+PmcOf5FEJS9frDVgSOAiNh8pA7Tf+Hv1rhrjbpgs6X/K2j5zRrl VDoqLqAhF0RAJeY0cRQ1eZZwqHu5FnqHaKD8OQOSTKCHVxGeYty6010bX+dH/g1zWJ vL/H56xbaJH0Idxo0ZYz/sP90ojlizDcekzewhfakPP5rkgiv0PHIPgv5a4miTOkkx QJk/jPqWmM/YEW5CP25d5+ItjrY6JG4YaoevaSufCteDF3TaIoJxnGydtKxL/2rAru BtldMmi637nHVFhpQhvDgW9BSm1XD1Z8cgy6B57BOwuW4Hco8Z0yxIujgTnZoF9z5K bfW1ln9JUBpGA== To: Andrzej Hajda , Inki Dae Cc: Laurent Pinchart , Dmitry Torokhov , Lukas Wunner , dri-devel@lists.freedesktop.org, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Laurent Pinchart Subject: [PATCH v3] drm/bridge: sil_sii8620: make remote control optional. Date: Sat, 6 Apr 2019 18:30:01 -0700 Message-Id: <20190407013001.25598-1-ronald@innovation.ch> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190125013355.GA6722@innovation.ch> References: <20190125013355.GA6722@innovation.ch> MIME-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP commit d6abe6df706c (drm/bridge: sil_sii8620: do not have a dependency of RC_CORE) changed the driver to select both RC_CORE and INPUT. However, this causes problems with other drivers, in particular an input driver that depends on MFD_INTEL_LPSS_PCI (to be added in a separate commit): drivers/clk/Kconfig:9:error: recursive dependency detected! drivers/clk/Kconfig:9: symbol COMMON_CLK is selected by MFD_INTEL_LPSS drivers/mfd/Kconfig:566: symbol MFD_INTEL_LPSS is selected by MFD_INTEL_LPSS_PCI drivers/mfd/Kconfig:580: symbol MFD_INTEL_LPSS_PCI is implied by KEYBOARD_APPLESPI drivers/input/keyboard/Kconfig:73: symbol KEYBOARD_APPLESPI depends on INPUT drivers/input/Kconfig:8: symbol INPUT is selected by DRM_SIL_SII8620 drivers/gpu/drm/bridge/Kconfig:83: symbol DRM_SIL_SII8620 depends on DRM_BRIDGE drivers/gpu/drm/bridge/Kconfig:1: symbol DRM_BRIDGE is selected by DRM_PL111 drivers/gpu/drm/pl111/Kconfig:1: symbol DRM_PL111 depends on COMMON_CLK According to the docs and general consensus, select should only be used for non user-visible symbols, but both RC_CORE and INPUT are user-visible. Furthermore almost all other references to INPUT throughout the kernel config are depends, not selects. For this reason the first part of this change reverts commit d6abe6df706c. In order to address the original reason for commit d6abe6df706c, namely that not all boards use the remote controller functionality and hence should not need have to deal with RC_CORE, the second part of this change now makes the remote control support in the driver optional and contingent on RC_CORE being defined. And with this the hard dependency on INPUT also goes away as that is only needed if RC_CORE is defined (which in turn already depends on INPUT). CC: Inki Dae CC: Andrzej Hajda CC: Laurent Pinchart CC: Dmitry Torokhov Signed-off-by: Ronald Tschalär --- Changes in v3, from review by Andrzej Hajda: - imply RC_CORE in Kconfig to avoid the possibility of sii8620 being built-in but rc-core being a module - completely stub out sii8620_detach() to make it consistent with the approach taken for the other rc-related functions drivers/gpu/drm/bridge/Kconfig | 3 +-- drivers/gpu/drm/bridge/sil-sii8620.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig index 8840f396a7b6..298189067929 100644 --- a/drivers/gpu/drm/bridge/Kconfig +++ b/drivers/gpu/drm/bridge/Kconfig @@ -86,8 +86,7 @@ config DRM_SIL_SII8620 depends on OF select DRM_KMS_HELPER imply EXTCON - select INPUT - select RC_CORE + imply RC_CORE help Silicon Image SII8620 HDMI/MHL bridge chip driver. diff --git a/drivers/gpu/drm/bridge/sil-sii8620.c b/drivers/gpu/drm/bridge/sil-sii8620.c index 0cc293a6ac24..9cac00579414 100644 --- a/drivers/gpu/drm/bridge/sil-sii8620.c +++ b/drivers/gpu/drm/bridge/sil-sii8620.c @@ -66,7 +66,9 @@ enum sii8620_mt_state { struct sii8620 { struct drm_bridge bridge; struct device *dev; +#if IS_ENABLED(CONFIG_RC_CORE) struct rc_dev *rc_dev; +#endif struct clk *clk_xtal; struct gpio_desc *gpio_reset; struct gpio_desc *gpio_int; @@ -1756,6 +1758,7 @@ static void sii8620_send_features(struct sii8620 *ctx) sii8620_write_buf(ctx, REG_MDT_XMIT_WRITE_PORT, buf, ARRAY_SIZE(buf)); } +#if IS_ENABLED(CONFIG_RC_CORE) static bool sii8620_rcp_consume(struct sii8620 *ctx, u8 scancode) { bool pressed = !(scancode & MHL_RCP_KEY_RELEASED_MASK); @@ -1774,6 +1777,12 @@ static bool sii8620_rcp_consume(struct sii8620 *ctx, u8 scancode) return true; } +#else +static bool sii8620_rcp_consume(struct sii8620 *ctx, u8 scancode) +{ + return false; +} +#endif static void sii8620_msc_mr_set_int(struct sii8620 *ctx) { @@ -2097,6 +2106,7 @@ static void sii8620_cable_in(struct sii8620 *ctx) enable_irq(to_i2c_client(ctx->dev)->irq); } +#if IS_ENABLED(CONFIG_RC_CORE) static void sii8620_init_rcp_input_dev(struct sii8620 *ctx) { struct rc_dev *rc_dev; @@ -2126,6 +2136,11 @@ static void sii8620_init_rcp_input_dev(struct sii8620 *ctx) } ctx->rc_dev = rc_dev; } +#else +static void sii8620_init_rcp_input_dev(struct sii8620 *ctx) +{ +} +#endif static void sii8620_cable_out(struct sii8620 *ctx) { @@ -2212,12 +2227,18 @@ static int sii8620_attach(struct drm_bridge *bridge) return sii8620_clear_error(ctx); } +#if IS_ENABLED(CONFIG_RC_CORE) static void sii8620_detach(struct drm_bridge *bridge) { struct sii8620 *ctx = bridge_to_sii8620(bridge); rc_unregister_device(ctx->rc_dev); } +#else +static void sii8620_detach(struct drm_bridge *bridge) +{ +} +#endif static int sii8620_is_packing_required(struct sii8620 *ctx, const struct drm_display_mode *mode)