From patchwork Tue Aug 21 14:38:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWljaGFsIFZva8OhxI0=?= X-Patchwork-Id: 960437 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pwm-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=ysoft.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=ysoft.com header.i=@ysoft.com header.b="edwEKXR4"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41vtfx2l0Zz9s7c for ; Wed, 22 Aug 2018 00:42:01 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726590AbeHUSC0 (ORCPT ); Tue, 21 Aug 2018 14:02:26 -0400 Received: from mail-eopbgr10062.outbound.protection.outlook.com ([40.107.1.62]:44045 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727599AbeHUSC0 (ORCPT ); Tue, 21 Aug 2018 14:02:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ysoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=yPRPwyg4QSjTNsZ8zyfnCX3H26JR4J8OWB/VpQTNdC0=; b=edwEKXR4NGulil5x4upzFyjOoFN4hX3WQab8k6p71kzy7FgKuE/oc6IigjECcqunowoQzVYJSE8hYEVFC51RCV1neKAjA/VtXkrRUzcMXGvVvFe6E2qx1MtCuS2PWX10NFfn1djhqZLpPJkYE+eNCjw9yKygarAevSQpoZpUTJA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Michal.Vokac@ysoft.com; Received: from iota-build.ysoft.local (89.24.100.190) by AM6PR04MB4661.eurprd04.prod.outlook.com (2603:10a6:20b:1b::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1059.21; Tue, 21 Aug 2018 14:41:07 +0000 From: =?utf-8?b?TWljaGFsIFZva8OhxI0=?= To: Thierry Reding , Rob Herring Cc: Mark Rutland , devicetree@vger.kernel.org, linux-pwm@vger.kernel.org, linux-kernel@vger.kernel.org, Lukasz Majewski , Fabio Estevam , =?utf-8?q?Lothar_Wa?= =?utf-8?b?w59tYW5u?= , =?utf-8?b?TWljaGFsIFZva8OhxI0=?= Subject: [RFC PATCH 2/2] pmw: imx: Configure output to GPIO in disabled state Date: Tue, 21 Aug 2018 16:38:53 +0200 Message-Id: <1534862333-27950-3-git-send-email-michal.vokac@ysoft.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1534862333-27950-1-git-send-email-michal.vokac@ysoft.com> References: <1534862333-27950-1-git-send-email-michal.vokac@ysoft.com> MIME-Version: 1.0 X-Originating-IP: [89.24.100.190] X-ClientProxiedBy: HE1PR0301CA0012.eurprd03.prod.outlook.com (2603:10a6:3:76::22) To AM6PR04MB4661.eurprd04.prod.outlook.com (2603:10a6:20b:1b::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5c32565a-cafe-4227-b6c1-08d607742478 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:AM6PR04MB4661; X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4661; 3:xDgdnsxltKiqPCEhPySvMzgTFPaHVF9/k10UImfF3AX5g9Ap+l3g007Tjj01/RAw3R18xXfbzLa775aGR8NNjD6OxrTCiOOPT6sXiwDW2rhwc++n8u/4gqm4nXiVqdlQyemWBAr13oBIqmPmPl9/aFkK3KcaPtPS35KwMoP2YHdELeC9Y846OYbdKmO6JKiamdyUTEsBIhaU79ZvZE5XIXvhK7/LgBZR0VmqkHPf3CemG+63hBSK9T8W47IOr+aA; 25:IbFl/UMyQEIgfOUyAuCJfAj71bU5hZHyozBsQIsi2bQvcMYOUoiBk2vRvV4upr1pAJ4+CEnIQTX/kOW8KbrlI9pirrRuCABRFcj+sV+JeAfJ8LcaSxIXCK6i0j4R0v32xIFv9/xk/MR1W58P4V12fSvNTLoZXen+5fhOtKZ4F/qqiK8m81pugHyduUBC2EoOEklGHG3kIXsHDqH10QN25OOJf8HfWVmmotsowutFN3IciERCfp7qm1ZwIium6WuGIPwTvak+Q1yPoqnz1TMvUnPdSxdhx/qPpI7q9cZp4f4tCkvTVhAoBqwsKnCImmk29iaS5eiH99QL3raRhPI6rw==; 31:BwapsD1ydm5ZriRFGntDPKVoPGTwX7f4ysGFVhnj3Lzc44KTeSkwhvCbyb95QDyz2uefTlNk5fWChGifjEhURwOySSCwIQe38mx+SxmpWNsN2y0OAW499SiD66VDfrvBcBpdH++loqfmhMhwPdRQLDfg25S2u6TS4o4PcCBe9SQXk7D481oEPr/u7F3xpZUxPBajxzFAoAzDeIym4i55NgYvUTLvDLOJFVcPWxWRWEg= X-MS-TrafficTypeDiagnostic: AM6PR04MB4661: X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4661; 20:DRKbz7bXoA10ruf7fDgRia3ADoXhz7DuCLSFijrY1HSdWWzFGY1GAPiIZkAvJCyEcUExUU51eYegvHYLLQJx0AllGMLWuJPS//V5d6x+Kr0qYN+zttLdCoECHm3aAb1oMtnXWJ+tJoCS++CGBAUNdsDbO6W4RnrPHWqp8Iy/85E0ykWJM0djO0zE+adej674wNJsBPcsKq4aZE0qLATB1gp1xr+IkQq/Dm05jyaOUHe5XWEm6UFZHzmSYx9AHYS5; 4:6ZyigMBm89gpmHYvgbMi6QH7siGvmbgCRaoHmEsoYTOus2W8NOV9gsSsapxf4vPfPk3YLCPTXmggJ3agRgwxpSByQpCYPTsQoK9yhDkGh7qJ5zO6XwPS14kXdDebhe5z+RDzDr3Nxv6MTa2ynPEwitwBAXWib374/bfDaeOxJw3OoAi0H0oRFAR8EGqZydnGb/NA1LtMBUroVh5mQMMbWh40VMSCl3kVbIC3o30GJ9Sc5kMHe/1gk9e52I80pb+4UDBC6q4IXZEUDbjMHAHYcA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(8121501046)(5005006)(3002001)(10201501046)(3231311)(944501410)(52105095)(93006095)(93001095)(149027)(150027)(6041310)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(20161123564045)(201708071742011)(7699016); SRVR:AM6PR04MB4661; BCL:0; PCL:0; RULEID:; SRVR:AM6PR04MB4661; X-Forefront-PRVS: 0771670921 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39850400004)(376002)(366004)(396003)(346002)(136003)(189003)(199004)(7736002)(39060400002)(107886003)(2870700001)(2906002)(25786009)(23676004)(76176011)(52116002)(54906003)(106356001)(50466002)(110136005)(305945005)(6666003)(105586002)(4326008)(86362001)(316002)(72206003)(6506007)(217873002)(66066001)(81166006)(81156014)(8676002)(47776003)(2616005)(6486002)(14444005)(6512007)(486006)(53936002)(6116002)(476003)(956004)(26005)(68736007)(8936002)(478600001)(50226002)(36756003)(446003)(186003)(386003)(97736004)(16526019)(5660300001)(11346002)(3846002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR04MB4661; H:iota-build.ysoft.local; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: ysoft.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BAM6PR04MB4661=3B23=3AHTlE?= =?utf-8?q?DlNSnMXV22wS4Y3IrpQKdGOnCdplPk3K1/VjLvRbPTQ4ISW5NMpESQSq?= =?utf-8?q?EuGQdjkHQQROeibDNi8TzcYHFPRURWxT2T/QoP9uF2PSOkULkmbR4dBO?= =?utf-8?q?zTbFs034y160acjurSOzF9uKLei9d6FSnJN0TcGGfzcJjxGGn+eyiSYu?= =?utf-8?q?juIlusNB3Hhfwft0g7M12Y/GGnUY/POIm70BR4WtNvF0Dk5wHdfkHGMv?= =?utf-8?q?LVqQMaqddS2NY7QIW79T7ThQ8TbBefji+jAabKw+Uv4NH1vGRepEdf43?= =?utf-8?q?0L1YRZbR2DqGUeRf5qO7fTCLxi3r9kKyv+q5yPedosORjJ2KYY6GN9d4?= =?utf-8?q?ItAN/jiAJ7Td7Y/6cWrCoJD4HfW1vOU+UWRUdvjcP+wIeuK0PtDYWWTn?= =?utf-8?q?vykM/+bmX7FlWilyCZsG9QtGh01t0i98OoYM+xR3Fga+zDMxOSjtuRpC?= =?utf-8?q?ThTL7byURDwdw0kWTrF+ZwpKq8Fb/nYt5IBmWfA8Ny6SkllGCV/UH9k/?= =?utf-8?q?PJtgwowSsZuJvjdcmeT+ORWXA9+yF443PiyZyYyFxKpVjIH8ghBm6EgB?= =?utf-8?q?dy4waTUtWH6B8mXhZ2kfN1RKRXm1kqYQ4cw0wySZmnumnSXZArsxGGs3?= =?utf-8?q?1BNCA3Q9982bJtIVqW8XtVe/ITcSqnQckpVv8f/NVJuP4CTV/gi3B4dn?= =?utf-8?q?Bczer2LWStRLM2P++iHsHmPXlis+fS+6rWXQTLlYbFt9D3S6qEciQznF?= =?utf-8?q?3KB3NBqUDSQjrnnklVFOaWtOMmWTMTCv8Bj8TeQ4o17O9wIl1isiVCD7?= =?utf-8?q?Rx4k5Z03KZxdEws1/xgPaXNZhyw5k61PFwTjPkFQENrvN8PXD5YaHOnR?= =?utf-8?q?Bd6aDiGLjehYcTsS0mBJU4t0fR7DFDAuM+Wo37eTKpq4rq0VNubmdrx+?= =?utf-8?q?gQhWBZ22dqB16MRgJKh7SnJ4zyF836WQ4VFccjbQ1Das+LorUkhgzq7e?= =?utf-8?q?7p4mCOvsVCMm/NaErBASxyIo8OiwQyi1ZOjAfvtzGtq1hf+rRLkBl15Z?= =?utf-8?q?S82Z6ecArryh/yhmQHbf0oqfHYTUJORFou8SX6g1wjTxjAtYJrme8dwq?= =?utf-8?q?dP4Umz+n/TcMa5ayl4HMQ4jp86Mq8xEPi0sGntUjXIOYejveHCD/3T1W?= =?utf-8?q?aajS6eMUtk6nik1mInc5lNLjEUMtfnsxFJUliRHMzApRcD1fMIl0dchG?= =?utf-8?q?Juxhs1aFLNWkDXCD+312b1hilzXLng4L0k3ZxI9vjqnMTnLhs7hcM4Yg?= =?utf-8?q?7FfKLf8e3HmAtxOQpNpaKVGAlS2c2zOytu8PpzEkY3c/arT3hV6Gn+bV?= =?utf-8?q?KDzcpQl+Fw=3D=3D?= X-Microsoft-Antispam-Message-Info: IWeaVUUVxIsyxXQ4Jn2qJQgy/1ttTb/lVgzJXv99p0GP09wq7FtJPoM8vmj4SXEEOY8gM8nvWg+0BypQt50m5lBlnxkpia35sfwzm5O/AIUv6iOgLuwtkQtZzSOSPXYAsjm2VFT35QaVhziobwzKFOFH6XnBikwC3WVWlqgDycbcKE/CSum0Gn1/TpyxDQ1xvpLZ++hz+8JTeB70M3IxDElyGoS1/O9lSazf+lQVtznaTq9p6nPSmoEzkFpBMSduNlhGeMxolvvvrOq5IvjjZgstTV0JJkAndpxTwExhRPfN3hImclCjq573N3HaBG+Lr/qk6Q6F7/dfRNh1/JDC2fEz1IC/w1/3x/QEXtdGVjE= X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4661; 6:nIlJ47ZJ/jUprVpWJXo/kweTmKcaKAIJvAJolmVNUOUSNi1W0OnJiY6fTnkIEj06Q/NCw2y1CSL7bpITeH6/aom420mBd9J2wx9dwEhC9mZ9BbxXeLTllC75jXoaW8iWJEShFev/6TXiMbotB2t1pGq5lhh5DNEK2bsM4xf1N/yet0kbtwRxPA2d5bxjlD4qXWJHpkfziryxj/Kbp22m4jEHL4lbA+JBhmFpkG0zYVmQXVGfK3zYOsZ2J09WWAyN8UVHrLajFPCTo6s9cRN5k9GwjoJk7KY31+JkkbuXPCdOYOSThdwHuB35lHNbaJl36qQmojGWbHLWewtr1u6j1FzXl73CFTsbb0fQJgbAiwG5rSCXteY12NiYQ1uvXD9YnacrdbroJ2cI4d0JaN+sBHOzrF7Cx416BGDrSd7dA6SQR0RgBGT4FJXSbYDyNAecIsahlil+D/3kvT0D7DD/Ng==; 5:EUVxFowXIqC65F80HPiVbkep7jeLWhhxqu+8BM4TlQsW3bvOIA29MA+mILurpQiMOMmkrUGoTiVRVyX/aVLtsxH1OKb1+1b06SIxJQhUCl53KZOgIf9Px07XUXd7a8GBU2VQsz27xyD37i1GDFsdnx2M7PhTZwmYSl6LKzIK7i0=; 7:8c5QYHF8mycHXNuZ7GuN+uSBeIsT8G3pHqV9sANDWQYNMwN9+vzUW5TjpAiHsQYKao5lMv3dIl0fgdWpUUZq9oQwqV+a3cge/B/yv2NyiIaWSZjCW9tdgn9cJXoM8aNnItBG6ydR1xM6dsziFg7keuta6qaGK/bvhVqVdw+WhoiTYtn1VNSIno3ypE3fGQ9+UXUC8J1zBnkfCfFPhJPCJqyMBPFId+Q2dIu1qPmhp4XIKJSI1DtXCLXe8+QPnJuS SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: ysoft.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Aug 2018 14:41:07.4446 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5c32565a-cafe-4227-b6c1-08d607742478 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b5839965-430f-4be2-b282-d7a3149f2b37 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4661 Sender: linux-pwm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pwm@vger.kernel.org The PWM output is held at zero whenever the PWM block is disabled. This can cause issues when inverted PWM signal polarity is needed. Allow users to set a "default" pinctrl state that will be used when PWM is disabled and a "pwm" pinctrl state that will be used when PWM output is needed. As an example, with this a PWM controlled backlight with inversed signal polarity can be used in full brightness range. Without this the backlight could not be turned off as brightness = 0 disables the PWM and that in turn set output to 0V, that is full brightness. When the pinctrl states are not correctly specifid in DT the logic will work as before. Signed-off-by: Michal Vokáč --- drivers/pwm/pwm-imx.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c index 1d5242c..6212c98 100644 --- a/drivers/pwm/pwm-imx.c +++ b/drivers/pwm/pwm-imx.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -52,10 +53,39 @@ struct imx_chip { void __iomem *mmio_base; struct pwm_chip chip; + + struct pinctrl *pinctrl; + struct pinctrl_state *pinctrl_pins_default; + struct pinctrl_state *pinctrl_pins_pwm; }; + #define to_imx_chip(chip) container_of(chip, struct imx_chip, chip) +static int imx_pwm_init_pinctrl_info(struct imx_chip *imx_chip, + struct platform_device *pdev) +{ + imx_chip->pinctrl = devm_pinctrl_get(&pdev->dev); + if (!imx_chip->pinctrl || IS_ERR(imx_chip->pinctrl)) { + dev_info(&pdev->dev, "can not get pinctrl\n"); + return PTR_ERR(imx_chip->pinctrl); + } + + imx_chip->pinctrl_pins_default = pinctrl_lookup_state(imx_chip->pinctrl, + PINCTRL_STATE_DEFAULT); + imx_chip->pinctrl_pins_pwm = pinctrl_lookup_state(imx_chip->pinctrl, + "pwm"); + + if (IS_ERR(imx_chip->pinctrl_pins_default) || + IS_ERR(imx_chip->pinctrl_pins_pwm)) { + dev_info(&pdev->dev, "PWM output mux information incomplete\n"); + devm_pinctrl_put(imx_chip->pinctrl); + imx_chip->pinctrl = NULL; + } + + return 0; +} + static int imx_pwm_config_v1(struct pwm_chip *chip, struct pwm_device *pwm, int duty_ns, int period_ns) { @@ -216,7 +246,29 @@ static int imx_pwm_apply_v2(struct pwm_chip *chip, struct pwm_device *pwm, cr |= MX3_PWMCR_POUTC; writel(cr, imx->mmio_base + MX3_PWMCR); + + /* + * If we are in charge of pinctrl then switch output to + * the PWM signal. + */ + if (imx->pinctrl) + pinctrl_select_state(imx->pinctrl, + imx->pinctrl_pins_pwm); } else if (cstate.enabled) { + /* + * PWM block will be disabled. Normally its output will go + * to 0 no matter what polarity is set. In case reversed PWM + * polarity is required reconfigure the output pin to GPIO to + * keep the output at the same level as for duty-cycle = 0. + * + * First switch the muxing and then disable the PWM. In that + * order we do not get unwanted logic level changes on the + * output. + */ + if (imx->pinctrl) + pinctrl_select_state(imx->pinctrl, + imx->pinctrl_pins_default); + writel(0, imx->mmio_base + MX3_PWMCR); clk_disable_unprepare(imx->clk_per); @@ -294,6 +346,10 @@ static int imx_pwm_probe(struct platform_device *pdev) imx->chip.of_pwm_n_cells = 3; } + ret = imx_pwm_init_pinctrl_info(imx, pdev); + if (ret) + return ret; + r = platform_get_resource(pdev, IORESOURCE_MEM, 0); imx->mmio_base = devm_ioremap_resource(&pdev->dev, r); if (IS_ERR(imx->mmio_base))