From patchwork Fri Dec 2 10:17:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 9458113 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 1C8ED60585 for ; Fri, 2 Dec 2016 10:17:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 01BA42852C for ; Fri, 2 Dec 2016 10:17:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EAF3B28540; Fri, 2 Dec 2016 10:17:48 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=unavailable 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 AE7B92852C for ; Fri, 2 Dec 2016 10:17:48 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A8EBA6E939; Fri, 2 Dec 2016 10:17:41 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by gabe.freedesktop.org (Postfix) with ESMTPS id E21E26E937; Fri, 2 Dec 2016 10:17:39 +0000 (UTC) Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 610999D1EF; Fri, 2 Dec 2016 10:17:39 +0000 (UTC) Received: from shalem.localdomain.com (vpn1-7-92.ams2.redhat.com [10.36.7.92]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uB2AHbva013630; Fri, 2 Dec 2016 05:17:37 -0500 From: Hans de Goede To: Thierry Reding , Daniel Vetter , Jani Nikula , =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= Date: Fri, 2 Dec 2016 11:17:35 +0100 Message-Id: <20161202101736.12236-1-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 02 Dec 2016 10:17:39 +0000 (UTC) Cc: linux-pwm@vger.kernel.org, intel-gfx , dri-devel@lists.freedesktop.org, Hans de Goede Subject: [Intel-gfx] [PATCH 1/2] pwm: lpss: Make builtin and add lookup-table so that i915 can find the pwm_backlight X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP The primary consumer of the lpss pwm is the i915 kms driver, but currently that driver cannot get the pwm because i915 platforms are not using devicetree and pwm-lpss does not call pwm_add_table. Another problem is that i915 does not support get_pwm returning -EPROBE_DEFER and i915's init is very complex and this is almost impossible to fix. This commit changes the PWM_LPSS Kconfig from a tristate to a bool, so that when the i915 driver loads the lpss pwm will be available avoiding the -EPROBE_DEFER issue. Note that this is identical to how the same problem was solved for the pwm-crc driver. Being builtin also allows calling pwm_add_table directly from the pwm-lpss code, otherwise the pwm_add_table call would need to be put somewhere else to ensure it happens before i915 calls pwm_get, even if i915 would support -EPROBE_DEFER. Signed-off-by: Hans de Goede Acked-by: Jani Nikula --- drivers/pwm/Kconfig | 12 +++--------- drivers/pwm/pwm-lpss.c | 11 +++++++++++ 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig index bf01288..cda31ea 100644 --- a/drivers/pwm/Kconfig +++ b/drivers/pwm/Kconfig @@ -240,28 +240,22 @@ config PWM_LPC32XX will be called pwm-lpc32xx. config PWM_LPSS - tristate + bool config PWM_LPSS_PCI - tristate "Intel LPSS PWM PCI driver" + bool "Intel LPSS PWM PCI driver" depends on X86 && PCI select PWM_LPSS help The PCI driver for Intel Low Power Subsystem PWM controller. - To compile this driver as a module, choose M here: the module - will be called pwm-lpss-pci. - config PWM_LPSS_PLATFORM - tristate "Intel LPSS PWM platform driver" + bool "Intel LPSS PWM platform driver" depends on X86 && ACPI select PWM_LPSS help The platform driver for Intel Low Power Subsystem PWM controller. - To compile this driver as a module, choose M here: the module - will be called pwm-lpss-platform. - config PWM_MESON tristate "Amlogic Meson PWM driver" depends on ARCH_MESON diff --git a/drivers/pwm/pwm-lpss.c b/drivers/pwm/pwm-lpss.c index 72c0bce..b4d8835 100644 --- a/drivers/pwm/pwm-lpss.c +++ b/drivers/pwm/pwm-lpss.c @@ -161,6 +161,12 @@ static const struct pwm_ops pwm_lpss_ops = { .owner = THIS_MODULE, }; +/* PWM consumed by the Intel GFX */ +static struct pwm_lookup pwm_lpss_lookup[] = { + PWM_LOOKUP("pwm-lpss", 0, "0000:00:02.0", "pwm_backlight", 0, + PWM_POLARITY_NORMAL), +}; + struct pwm_lpss_chip *pwm_lpss_probe(struct device *dev, struct resource *r, const struct pwm_lpss_boardinfo *info) { @@ -193,12 +199,17 @@ struct pwm_lpss_chip *pwm_lpss_probe(struct device *dev, struct resource *r, return ERR_PTR(ret); } + /* Add lookup table for pwm_backlight */ + pwm_lpss_lookup[0].provider = dev_name(dev); + pwm_add_table(pwm_lpss_lookup, ARRAY_SIZE(pwm_lpss_lookup)); + return lpwm; } EXPORT_SYMBOL_GPL(pwm_lpss_probe); int pwm_lpss_remove(struct pwm_lpss_chip *lpwm) { + pwm_remove_table(pwm_lpss_lookup, ARRAY_SIZE(pwm_lpss_lookup)); return pwmchip_remove(&lpwm->chip); } EXPORT_SYMBOL_GPL(pwm_lpss_remove);