From patchwork Mon Nov 5 14:08:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dong Aisheng X-Patchwork-Id: 993080 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-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="gd/1CeE1"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42pZKH1pfMz9s7T for ; Tue, 6 Nov 2018 01:08:35 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728890AbeKEX22 (ORCPT ); Mon, 5 Nov 2018 18:28:28 -0500 Received: from mail-ve1eur01on0072.outbound.protection.outlook.com ([104.47.1.72]:27829 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728543AbeKEX21 (ORCPT ); Mon, 5 Nov 2018 18:28:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VY6TU6r9bNkOmW/c95tOMTewUG1EfG/3l+sZN/5Ij2c=; b=gd/1CeE1LkQqB9Rdiiyb/HDDFSKnbJhnBd52/4NlJvlYTmU+ei1N7Bm4qvaJJ2iJ9HiN6shyM9UBiLdRA8JgeAK4GmIG9XlgXsLKJIz8hON2i/PHPs/aJw5r2oR22+HX5nz7kwm6iKyakQ8SZozKldRvHXYDNqBOBPOdgvn34gk= Received: from AM0PR04MB4211.eurprd04.prod.outlook.com (52.134.126.21) by AM0PR04MB5316.eurprd04.prod.outlook.com (20.177.42.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.26; Mon, 5 Nov 2018 14:08:29 +0000 Received: from AM0PR04MB4211.eurprd04.prod.outlook.com ([fe80::797a:f972:9281:6d10]) by AM0PR04MB4211.eurprd04.prod.outlook.com ([fe80::797a:f972:9281:6d10%2]) with mapi id 15.20.1294.032; Mon, 5 Nov 2018 14:08:29 +0000 From: "A.s. Dong" To: "linux-arm-kernel@lists.infradead.org" CC: "dongas86@gmail.com" , "kernel@pengutronix.de" , "shawnguo@kernel.org" , Fabio Estevam , "robh+dt@kernel.org" , dl-linux-imx , "linux@armlinux.org.uk" , "A.s. Dong" , Linus Walleij , Stefan Agner , "linux-gpio@vger.kernel.org" Subject: [PATCH V5 1/1] gpio: vf610: add optional clock support Thread-Topic: [PATCH V5 1/1] gpio: vf610: add optional clock support Thread-Index: AQHUdREH/NcydLeLTUC6HH6QA9fwZA== Date: Mon, 5 Nov 2018 14:08:29 +0000 Message-ID: <1541426614-17299-1-git-send-email-aisheng.dong@nxp.com> References: In-Reply-To: Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.7.4 x-clientproxiedby: HK0PR03CA0064.apcprd03.prod.outlook.com (2603:1096:203:52::28) To AM0PR04MB4211.eurprd04.prod.outlook.com (2603:10a6:208:66::21) authentication-results: spf=none (sender IP is ) smtp.mailfrom=aisheng.dong@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.66] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM0PR04MB5316; 6:Ui8oNHOnZhOgpC1nebxxOWA9EG3je1pKh1lEaeaJbkwQW/gnux4H5Pvrqk2jIIpr57T9slhJhDjGMrC4u4yIZOlei67cbncgojcOBsioP+fJSQNWGxZbZX7J22jQ6cRuoGuJQtzRJcTq2eRC4TgbotDY4cAFRbZxAR1u4D7QxL78arLSVWOB7wM+m7O1vacaz5Fa7sSr10IzXpQ48KUPBaMVMTZMh68xGpiQFhGYvOdDRiQcUxz/DGnZ50xYxRCvX+qudhx04ld0v0ydthc4eUdFhJecDXcjxy5gfNAMuBqS34yJi002zi6Ge7KM6j5955gUr7qoclwF5+d1euSRW23LLyQM2eNvS/6CMECqqUhy7yCkLIOBcyeOsNR3ok3QBJTejJ+hqHHA5AG8+vtFlv41xwCdy0gNQaRwqG53U7GBBVw/6lt37sYBn1gcHy8UPjTjlJlbK3MxULxwP96Ujw==; 5:yHu5ykV8CeEl2TarLQfpp1V2MJxcqPaHa5UUg7E/iTcp7efzCvSecsp7GuyO4LUKdmF+1Hk4x5FF9OR2L/Zyv0zkoV8wzwZwHB4cR10rdxxDBJmr8Z717SsmmCCEW5dLTxDiDeRfnv9yKK8ug25PVCNd4lt4gozwYybZ6M4OKLc=; 7:vaHkyjuBg21XH3krEbCrsD+pTD2pjDPTnQbo2+fZg46MC9B8C2DxoqsAGgaN8IaO/wprbGuvFBtptYGBpxTdSXT6uj3bDnFZf/lp2FHu3bbfEQyLpP9NYQdPrsWMnf0+om0s9kRdO8U7Gb8NAXOPKg== x-ms-office365-filtering-correlation-id: a6648090-4776-42f8-a053-08d643282947 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(5600074)(711020)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB5316; x-ms-traffictypediagnostic: AM0PR04MB5316: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(9452136761055)(185117386973197); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231382)(944501410)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(148016)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(20161123564045)(20161123558120)(201708071742011)(7699051)(76991095); SRVR:AM0PR04MB5316; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB5316; x-forefront-prvs: 08476BC6EF x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(346002)(136003)(376002)(39860400002)(366004)(199004)(189003)(3846002)(486006)(8936002)(6436002)(105586002)(71190400001)(71200400001)(53936002)(86362001)(6116002)(5660300001)(5640700003)(66066001)(106356001)(50226002)(8676002)(2351001)(316002)(54906003)(6486002)(81156014)(14454004)(81166006)(478600001)(68736007)(2906002)(4326008)(6506007)(386003)(6916009)(186003)(102836004)(26005)(76176011)(7736002)(97736004)(256004)(6512007)(39060400002)(2501003)(52116002)(25786009)(11346002)(305945005)(36756003)(99286004)(446003)(2900100001)(476003)(2616005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB5316; H:AM0PR04MB4211.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: Lu5Fa2AuYlR5M2lgQuqaRPoZEs2b2i9bA5ZQ+H+R6G50KZAUo8/fBorzgrhW8lnkhpnFcuC6k8gMMGRo3qzLOAxGyC5lra4dhnXTr9eFYLKe/k4tDZki66YUjgiYLJGHWgRju8zRjcSuprPUAj8rxjXjD7afmhnnBzoXO0/SKOz8nFf0QfzyS9UwKkMYZ6ys7+Ow+uI9g2QZLQuwlmAkkDALVnwd04YFl0sdrWUk3YMiNw6yw3z/dpxv5VNyR0BvQWW8VmxBNRmo/pPJLdJGOkQUvAxP7NWEWYlEJFKVtWFcTQVBS5ZhXeFq0awHzRgkC8Wl3Y05f2GM+jkXFCI28pu7T9uFJMtv+K/8sh3J/gw= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a6648090-4776-42f8-a053-08d643282947 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Nov 2018 14:08:29.3589 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5316 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Some SoCs need the gpio clock to be enabled before accessing HW registers. This patch add the optional clock handling. Cc: Linus Walleij Cc: Stefan Agner Cc: Shawn Guo Cc: linux-gpio@vger.kernel.org Signed-off-by: Dong Aisheng --- v4->v5: * refine gpio clk get * add remove v3->v4: no changes v2->v3: * error checking updated according to Russell's suggestion: ptr == ERR_PTR(-EPROBE_DEFER) * clock independently checking v1->v2: * new patch --- drivers/gpio/gpio-vf610.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/drivers/gpio/gpio-vf610.c b/drivers/gpio/gpio-vf610.c index d4ad6d0..23fdb77 100644 --- a/drivers/gpio/gpio-vf610.c +++ b/drivers/gpio/gpio-vf610.c @@ -16,6 +16,7 @@ */ #include +#include #include #include #include @@ -41,6 +42,8 @@ struct vf610_gpio_port { void __iomem *gpio_base; const struct fsl_gpio_soc_data *sdata; u8 irqc[VF610_GPIO_PER_PORT]; + struct clk *clk_port; + struct clk *clk_gpio; int irq; }; @@ -280,6 +283,33 @@ static int vf610_gpio_probe(struct platform_device *pdev) if (port->irq < 0) return port->irq; + port->clk_port = devm_clk_get(&pdev->dev, "port"); + if (!IS_ERR(port->clk_port)) { + ret = clk_prepare_enable(port->clk_port); + if (ret) + return ret; + } else if (port->clk_port == ERR_PTR(-EPROBE_DEFER)) { + /* + * Percolate deferrals, for anything else, + * just live without the clocking. + */ + return PTR_ERR(port->clk_port); + } + + port->clk_gpio = devm_clk_get(&pdev->dev, "gpio"); + if (!IS_ERR(port->clk_gpio)) { + ret = clk_prepare_enable(port->clk_gpio); + if (ret) { + clk_disable_unprepare(port->clk_port); + return ret; + } + } else if (port->clk_gpio == ERR_PTR(-EPROBE_DEFER)) { + clk_disable_unprepare(port->clk_port); + return PTR_ERR(port->clk_gpio); + } + + platform_set_drvdata(pdev, port); + gc = &port->gc; gc->of_node = np; gc->parent = dev; @@ -314,12 +344,26 @@ static int vf610_gpio_probe(struct platform_device *pdev) return 0; } +static int vf610_gpio_remove(struct platform_device *pdev) +{ + struct vf610_gpio_port *port = platform_get_drvdata(pdev); + + gpiochip_remove(&port->gc); + if (!IS_ERR(port->clk_port)) + clk_disable_unprepare(port->clk_port); + if (!IS_ERR(port->clk_gpio)) + clk_disable_unprepare(port->clk_gpio); + + return 0; +} + static struct platform_driver vf610_gpio_driver = { .driver = { .name = "gpio-vf610", .of_match_table = vf610_gpio_dt_ids, }, .probe = vf610_gpio_probe, + .remove = vf610_gpio_remove, }; builtin_platform_driver(vf610_gpio_driver);