From patchwork Wed Oct 31 14:43:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dong Aisheng X-Patchwork-Id: 991466 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="iLnV5Mhw"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42lWKV1YSSz9s3Z for ; Thu, 1 Nov 2018 01:43:10 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729543AbeJaXl2 (ORCPT ); Wed, 31 Oct 2018 19:41:28 -0400 Received: from mail-eopbgr70085.outbound.protection.outlook.com ([40.107.7.85]:61495 "EHLO EUR04-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729492AbeJaXl2 (ORCPT ); Wed, 31 Oct 2018 19:41:28 -0400 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=+a/JPR/N7yd4dqx7dmW9PbemOj0hclXJMZRCvnTbm9I=; b=iLnV5MhwRtfDuunxisd7FY2iP+CCln76tWiaHqQwjTNrfmsie6mUknBXCxI0IECCdRGV4eCP1YqWU9Nh5RLV2b8++Khd8rl8UFNyFET+DKe665KyrMnb23EGYCWwwwvE7RqdRDjLouNYA1Uj21qsRnLSWoQeP8jLKfcRoNYhaYc= Received: from AM0PR04MB4211.eurprd04.prod.outlook.com (52.134.126.21) by AM0PR04MB4052.eurprd04.prod.outlook.com (52.134.125.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.21; Wed, 31 Oct 2018 14:43:04 +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.1273.028; Wed, 31 Oct 2018 14:43:04 +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 , Mark Rutland , Stefan Agner , "linux-gpio@vger.kernel.org" , "devicetree@vger.kernel.org" Subject: [PATCH V3 03/10] dt-bindings: gpio: vf610: add optional clocks property Thread-Topic: [PATCH V3 03/10] dt-bindings: gpio: vf610: add optional clocks property Thread-Index: AQHUcSgHU3aCJ39Ou0GpmOYq3EJuyg== Date: Wed, 31 Oct 2018 14:43:04 +0000 Message-ID: <1540996688-23681-4-git-send-email-aisheng.dong@nxp.com> References: <1540996688-23681-1-git-send-email-aisheng.dong@nxp.com> In-Reply-To: <1540996688-23681-1-git-send-email-aisheng.dong@nxp.com> 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: HK0PR03CA0016.apcprd03.prod.outlook.com (2603:1096:203:2e::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; AM0PR04MB4052; 6:Y2cEtKdTEqYfXvcHPCq0colYQ0g9fabX1L8wh2Dw+E3fHzKrQR5G2qIDndOqq+BR+8dVHury51g2c8Y6GWFqldEq1FUPuZYDw/wH8uaXC0B04v+R+TCMZEyKpMz7NGQ0lWhAjAjPFsEHQaFy0DYLhByTWyJ7+PzWnmsjcjEs2sOKOd8M1UiOkPa+m1ZyCx8GgtKE4J+5RXp15+0wcuxcsLeINFUUjwRnpVJbWMYPe0us6KuGZKaWs8tFfUbd9btTv/9rXLRQQ8K5aScGcDuDjSRlouwomyuZqkjHHoZr3IZfEAe3JDXe7m2ZNJ61R4EA4BTJWttbBj/pDSH7Z0eks3rUmI1D8l5TLSw5s6KN16p9hOE5Rhmh1k7Iy2P4KouWxatjf4YhDp+8hCoTpH7DYYfdS1AfLIiZIAoFck+87wMX/VpUWynmsLUz1bR24uc+mU2wDt4tG70s/FtCrxThRw==; 5:GYqLkWKGfhnAW4cYhKQH0yuv/swjLPxSopogjTN82Upmsfl5E7TLRK6Z3zM4bcEo9Iy6cFxSh0cErfW49kbq7fO6Sk3NymIVQufV8AHTYuxXDX9ruY5zHlBdkpyDbe4VH6LZytoUE8gNg3ldR5i50UnELdcUyg1vyJIWdWVt9vU=; 7:KpYSZ4BR0LdXuFBrkOxRXk/fsSizp01H/EcslTxoa/k/hCBXiItG5CF3S5XBDUxZSKwxcxZ4qLGnKOXxB8+EB6SjsjrRx/8YMmOApT/gWDQbWrXcy5qOxGcb99TllE+S7MY7yUlVs/IbhJZRd/pvXA== x-ms-office365-filtering-correlation-id: 0362462a-0221-4a4b-0ed6-08d63f3f2a23 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:AM0PR04MB4052; x-ms-traffictypediagnostic: AM0PR04MB4052: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(9452136761055)(180628864354917)(185117386973197); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3231382)(944501410)(52105095)(10201501046)(3002001)(6055026)(148016)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(201708071742011)(7699051)(76991095); SRVR:AM0PR04MB4052; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4052; x-forefront-prvs: 084285FC5C x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(376002)(366004)(346002)(39860400002)(136003)(189003)(199004)(11346002)(99286004)(26005)(316002)(7416002)(305945005)(66066001)(2900100001)(386003)(6506007)(7736002)(102836004)(86362001)(2616005)(36756003)(476003)(71190400001)(71200400001)(446003)(6116002)(186003)(97736004)(76176011)(54906003)(52116002)(3846002)(5250100002)(486006)(2501003)(2906002)(50226002)(8936002)(106356001)(8676002)(14454004)(81156014)(81166006)(39060400002)(68736007)(6512007)(6436002)(6486002)(105586002)(6916009)(2351001)(4326008)(478600001)(53936002)(5660300001)(256004)(25786009)(14444005)(5640700003); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4052; H:AM0PR04MB4211.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: d9kjxEpNzjzggw8AA51aQkeD6VFD0kFEt+mwLEvzgONUbo8E3Ehk8t6DfGDQWtwbAmpGjyP8EstrNMO8cgjJazOqQBWV2fJr6nmuyLQ1L5pw5E2S9u6kbBNdxHE1WlWBLdV9mCw616TJg58ckCXceMnFDunjPRv5Ic8PVYk00u91ja7MMl8ZPzLu8afGTPt7j5bvz/L+cdyChqLjkPTl+4O5Ls+V+P7WzHXEXnbwyZO65eF/KTGNQqTfD9Uov2XDzcKkPuibWM9cTFiEc+5srFaVAmOwvPpwl3IrXYGoPpcY9NdKJXWiilAIO2yWzZM/mR+2kfUDbzmt7bmoZe/BNEuts/mwIXmHwT/fc9RO2Ds= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0362462a-0221-4a4b-0ed6-08d63f3f2a23 X-MS-Exchange-CrossTenant-originalarrivaltime: 31 Oct 2018 14:43:04.5096 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4052 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org On some SoCs(e.g. MX7ULP), GPIO clock is gatable and maybe disabled by default. Users have to make sure it's enabled before being able to access controller registers, otherwise an external abort error may occur. Let's add the optional clocks property to handle this case. For ULP GPIO clock, it includes two separate clocks: one is for GPIO controller Input/Output function clock while another is GPIO port control clock for interrupt function. Cc: Linus Walleij Cc: Mark Rutland Cc: Stefan Agner Cc: linux-gpio@vger.kernel.org Cc: devicetree@vger.kernel.org Reviewed-by: Rob Herring Signed-off-by: Dong Aisheng --- v2->v3: * no changes v1->v2: * new patch --- Documentation/devicetree/bindings/gpio/gpio-vf610.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/gpio/gpio-vf610.txt b/Documentation/devicetree/bindings/gpio/gpio-vf610.txt index 0ccbae4..ae254aa 100644 --- a/Documentation/devicetree/bindings/gpio/gpio-vf610.txt +++ b/Documentation/devicetree/bindings/gpio/gpio-vf610.txt @@ -24,6 +24,12 @@ Required properties for GPIO node: 4 = active high level-sensitive. 8 = active low level-sensitive. +Optional properties: +-clocks: Must contain an entry for each entry in clock-names. + See common clock-bindings.txt for details. +-clock-names: A list of clock names. For imx7ulp, it must contain + "gpio", "port". + Note: Each GPIO port should have an alias correctly numbered in "aliases" node. From patchwork Wed Oct 31 14:43:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dong Aisheng X-Patchwork-Id: 991468 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="gDKyrMnd"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42lWKZ5c3hz9s3Z for ; Thu, 1 Nov 2018 01:43:14 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729649AbeJaXlc (ORCPT ); Wed, 31 Oct 2018 19:41:32 -0400 Received: from mail-eopbgr70057.outbound.protection.outlook.com ([40.107.7.57]:33328 "EHLO EUR04-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729492AbeJaXlc (ORCPT ); Wed, 31 Oct 2018 19:41:32 -0400 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=ZN4sieQCwosGKPOMQODlhKuvpSjWE7y6mo10PtMjMYM=; b=gDKyrMnd+JhPED/XH1KkT4Mt5dCBgbTI/5MWym93biMOt+NIRWmi8DZsTDjH8/w/PMhIrll9luv+CkDOXzsTsr+PsC73NscSFfWbnbW5OEo3UJFP969K3Wbxb9PkX/qDWFTCU4AGb1OPwM/9Q2AnK+vTZVrJ6T9ydUg0eQnquSc= Received: from AM0PR04MB4211.eurprd04.prod.outlook.com (52.134.126.21) by AM0PR04MB4052.eurprd04.prod.outlook.com (52.134.125.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.21; Wed, 31 Oct 2018 14:43:09 +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.1273.028; Wed, 31 Oct 2018 14:43:09 +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 V3 04/10] gpio: vf610: add optional clock support Thread-Topic: [PATCH V3 04/10] gpio: vf610: add optional clock support Thread-Index: AQHUcSgKotZRX/Ai70yIZ2JJm3n/0A== Date: Wed, 31 Oct 2018 14:43:08 +0000 Message-ID: <1540996688-23681-5-git-send-email-aisheng.dong@nxp.com> References: <1540996688-23681-1-git-send-email-aisheng.dong@nxp.com> In-Reply-To: <1540996688-23681-1-git-send-email-aisheng.dong@nxp.com> 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: HK0PR03CA0016.apcprd03.prod.outlook.com (2603:1096:203:2e::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; AM0PR04MB4052; 6:v9vQ8D9rZXC8l+cx6/2FdmbxXVmTE0uYUGyc1Fi/Kst+fLyw74QFQWI3H1D+ZRXaULkbgZ4U8gxXUdHLUqzIamiAk6yHOKuiPy4ylD4xeBKbVIfC1woHx/N+2zPA2ozD7baEeSWNMtHoA5g78KfPaMtuaePHe953urc+netPGQUZq4whJ1VygQZ6oC/+/PILwLaeBX3xsj6/QMevb08fE9ouFt6LjnhrirkvIBtv5b5FDzyz1ryr7AzFtZgJqvbmK49UGWQjagl+UWZ5SD9yuzGx5nZvTp5lgwMiwwjzZnywQx4dnujttsl8YE1a+QFpG7h+gddJCHnzJjk7eBiGcqce95U9FcS8uev1je1wA+Vn9/lYbPO787lB2ah75lqi1COhfLQK+VusfNCa+y3oWWxBUVT3SqgnIqFBhS+iXH9dCMaJcpnJVuRrLwcaHPP+ESIbFzy49J2kLC4TEcDPtA==; 5:63bGyBupQvrYU8KnAluFWvLkYHgvQBOERX+Nd7qv7dJRzYpL5zO5X+b69YbAAMx93ZlfooXiovj5W35R3LJ1Q3dGuDpiNRDfMJEaPrwhqSZccWxpuCT7L5Bk1zL/sR6f0BkFjwlquJlhH9tP3PO5nXKJE+zQsTjnYRXMX3q06II=; 7:ufyY4W7zahAcOmzpOkhg7dpcRlSjHx7VnFva8dlIQcnzkWB/7nOB+RVxPqcoziPc45NQdi7335iTe74Nq8jQPZk0yIGrYsBM6OBqe4YkjGBcGXwFpR0tMhKo4eei34KBPkJ7WfbVPQr8ffFLQbKdhA== x-ms-office365-filtering-correlation-id: 28a41d9c-ae13-4910-2e3b-08d63f3f2cbe 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:AM0PR04MB4052; x-ms-traffictypediagnostic: AM0PR04MB4052: 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)(93006095)(93001095)(3231382)(944501410)(52105095)(10201501046)(3002001)(6055026)(148016)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(201708071742011)(7699051)(76991095); SRVR:AM0PR04MB4052; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4052; x-forefront-prvs: 084285FC5C x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(376002)(366004)(346002)(39860400002)(136003)(189003)(199004)(11346002)(99286004)(26005)(316002)(305945005)(66066001)(2900100001)(386003)(6506007)(7736002)(102836004)(86362001)(2616005)(36756003)(476003)(71190400001)(71200400001)(446003)(6116002)(186003)(97736004)(76176011)(54906003)(52116002)(3846002)(5250100002)(486006)(2501003)(2906002)(50226002)(8936002)(106356001)(8676002)(14454004)(81156014)(81166006)(39060400002)(68736007)(6512007)(6436002)(6486002)(105586002)(6916009)(2351001)(4326008)(478600001)(53936002)(5660300001)(256004)(25786009)(5640700003); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4052; H:AM0PR04MB4211.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: iCRzzdZWZ302FuBMV6RJZfDv7Vxyz7t4I6pz83xJMLYzBE/NjHh1mRxSEFF9a35Adk4D47XFoUqxI/EPj4UQCiKwmAEp7draPTVcUBMWHa4jiij/k/vt+WF2sFcx2odOAlacFj82Ae7cAXkFgxImAERaE9VPsAXJrxNBPCqULYa13KNcbhV4qoTUC6VG0E0nJ1g0u6q05leoUQLMdzcZmtmyjuUHc60Kb2laSGEDS07mHcUJ0A5Do9iCZDPaHAfuXJ+mSRIBA+5o5GADJwlFsvm6QF3HDMI6Aa6nTnSFnmgKvcsZdcO6lFMlK83MOOW3qteWiqdlB8ModlTE02y8YAqnY2UkmHyzErKBUMFIkkg= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 28a41d9c-ae13-4910-2e3b-08d63f3f2cbe X-MS-Exchange-CrossTenant-originalarrivaltime: 31 Oct 2018 14:43:09.0007 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4052 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 --- 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 | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/drivers/gpio/gpio-vf610.c b/drivers/gpio/gpio-vf610.c index d4ad6d0..02fb7d8 100644 --- a/drivers/gpio/gpio-vf610.c +++ b/drivers/gpio/gpio-vf610.c @@ -16,6 +16,7 @@ */ #include +#include #include #include #include @@ -256,6 +257,7 @@ static int vf610_gpio_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct device_node *np = dev->of_node; + struct clk *clk_gpio, *clk_port; struct vf610_gpio_port *port; struct resource *iores; struct gpio_chip *gc; @@ -280,6 +282,28 @@ static int vf610_gpio_probe(struct platform_device *pdev) if (port->irq < 0) return port->irq; + clk_port = devm_clk_get(&pdev->dev, "port"); + if (clk_port == ERR_PTR(-EPROBE_DEFER)) + return -EPROBE_DEFER; + + clk_gpio = devm_clk_get(&pdev->dev, "gpio"); + if (clk_gpio == ERR_PTR(-EPROBE_DEFER)) + return -EPROBE_DEFER; + + if (!IS_ERR_OR_NULL(clk_port)) { + ret = clk_prepare_enable(clk_port); + if (ret) + return ret; + } + + if (!IS_ERR_OR_NULL(clk_gpio)) { + ret = clk_prepare_enable(clk_gpio); + if (ret) { + clk_disable_unprepare(clk_port); + return ret; + } + } + gc = &port->gc; gc->of_node = np; gc->parent = dev; From patchwork Wed Oct 31 14:43:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dong Aisheng X-Patchwork-Id: 991470 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="VuEz9LJV"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42lWKg3ZfTz9s2P for ; Thu, 1 Nov 2018 01:43:19 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729652AbeJaXlh (ORCPT ); Wed, 31 Oct 2018 19:41:37 -0400 Received: from mail-eopbgr70059.outbound.protection.outlook.com ([40.107.7.59]:34336 "EHLO EUR04-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729492AbeJaXlh (ORCPT ); Wed, 31 Oct 2018 19:41:37 -0400 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=Bs96e4IIfzkF1qpC229XAOATQR5wRQMEOEJ+G+krhjs=; b=VuEz9LJV4jS5DxmuilqPHvHjE6mLXqa42qRy638GLf2OaJsN+4I3zmxhPdPIiWA1omKA017rI6X+S1Ksj7fIhFbqJBAQ6/nNUNBsDKpaOH68QISbAWvkee1Hq3J7jrt8XXUrPyfJrBthbJhrEPiZ3jVnvvVPj7wkklw3r5yXeX8= Received: from AM0PR04MB4211.eurprd04.prod.outlook.com (52.134.126.21) by AM0PR04MB4052.eurprd04.prod.outlook.com (52.134.125.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.21; Wed, 31 Oct 2018 14:43:14 +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.1273.028; Wed, 31 Oct 2018 14:43:14 +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" , "devicetree@vger.kernel.org" Subject: [PATCH V3 05/10] dt-bindings: pinctrl: imx7ulp: back to imx legacy binding for consistency Thread-Topic: [PATCH V3 05/10] dt-bindings: pinctrl: imx7ulp: back to imx legacy binding for consistency Thread-Index: AQHUcSgNoxDEi5W+9UKo8tChH+m+LQ== Date: Wed, 31 Oct 2018 14:43:13 +0000 Message-ID: <1540996688-23681-6-git-send-email-aisheng.dong@nxp.com> References: <1540996688-23681-1-git-send-email-aisheng.dong@nxp.com> In-Reply-To: <1540996688-23681-1-git-send-email-aisheng.dong@nxp.com> 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: HK0PR03CA0016.apcprd03.prod.outlook.com (2603:1096:203:2e::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; AM0PR04MB4052; 6:+8Amp66mgl0t81zAmgsI17C/C46LGOSAeBIPZbz/vMcsKjDL+A+mh6zNu0wOaxXWz+O+9NHSb2Uz8ULLDUKRK0DUxjnfG1U4IT5UX3bsyRSlhwVa7RLhapZa1SdSWoNuZ475lsOVCA3lCMxejoQ0UPKtY4MKOuyL85ksehIkVIew+MRF+/JY2kG8IzbVU+HAntI9A1wAo4z6QmCS48sXzgzEpLW5sPbiEmSRtEYL9HIO9oYKtRZ16mLFpL4WyTtzQvHiK5Kcj18iWri9bF+ABE1XJ6VyJSzL8IV66uqSKxKwhjeqQrb3iRETeLf7uKgue9K6jGLG3UDYyKbVqOLLSlZ0THC7L9rmske3j1y8pu+ZJaI7l4Fs3mC4wLyjMWsNu35UJWtCRNFVpuQKg/i113fyUXkG2/4SDxoVfOQZWXyutk1cCbLlzHD2J019IThfCxO0oJGqAlndCGLK2whuSA==; 5:0n1xDo4BnFmUpmfHuNB+7KxIldksdd26i37xsJuWxlilZxBW3Dm5S7jrMW2gS4cCuVQQU9VR7/vV6linnOyhNWeH/vszcOIUrDU6LFsST+UFzzHB2wt7VQJNnaOhRTvZddhFfQU+WS09wlDuM9avFrk/NfSxzktgBNnpWcWxDIM=; 7:qKw1QjupR3DkmolLixVlkNjlCF2q+3Sg4Gd9s4huMDyZMpLp6RA6kHELoCMEpmj2HmIUuzXfPfENLZE9gMEBA3UiEdr8D57Lz/e5FxBTOdDTL02sYinW6q7/yh9k4g4fI83fr4dxZqvjvDtOeC/kcw== x-ms-office365-filtering-correlation-id: 996c2fd1-6dbe-4fd7-ec4e-08d63f3f2f95 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:AM0PR04MB4052; x-ms-traffictypediagnostic: AM0PR04MB4052: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(9452136761055)(269456686620040)(185117386973197); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3231382)(944501410)(52105095)(10201501046)(3002001)(6055026)(148016)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(201708071742011)(7699051)(76991095); SRVR:AM0PR04MB4052; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4052; x-forefront-prvs: 084285FC5C x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(376002)(366004)(346002)(39860400002)(136003)(189003)(199004)(54534003)(11346002)(99286004)(26005)(316002)(7416002)(305945005)(66066001)(2900100001)(386003)(6506007)(7736002)(575784001)(102836004)(86362001)(2616005)(36756003)(476003)(71190400001)(71200400001)(446003)(6116002)(186003)(97736004)(76176011)(54906003)(52116002)(3846002)(5250100002)(486006)(2501003)(2906002)(50226002)(8936002)(106356001)(8676002)(14454004)(81156014)(81166006)(39060400002)(68736007)(6512007)(6436002)(6486002)(105586002)(6916009)(2351001)(4326008)(478600001)(53936002)(5660300001)(256004)(25786009)(14444005)(5640700003); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4052; H:AM0PR04MB4211.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: GScBOMZ8zuBo7IxI7MUH4ksp+LOUMbfbDYCe+0d7gNVMu+EiLg38rl5mRS/zC8swy2hE40PM21Mod+W1bwqAMjN+BpLBeA2xMjCcU13D6VHRs+cfK8m0YUKNc2c9tfiw0fJQf/iS1bAJAs31A0kmVFSSuetUaDoYZUGIbAR36UFxCYONPUqU81d/3KlUZMsUOJizE9lEZHITbkK1IlIKVSQucNYN33VRzwodCuQ2tKFNk5XTt0Jdkf62f069QkzPGSduR68+LUzolxylZHdcAdjN5/K06yCMgsB4PCXD2oN8xKqGXKC55VMIVMr98kxHTO3IVt12PIQs/31Xx9DKFkPbsZNxmF8Tki5lKeK72JI= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 996c2fd1-6dbe-4fd7-ec4e-08d63f3f2f95 X-MS-Exchange-CrossTenant-originalarrivaltime: 31 Oct 2018 14:43:13.9372 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4052 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org We already had an earlier conclusion that all new i.MX Socs will keep using the legacy i.MX Pinctrl bindings instead of generic pin config. However, MX7ULP generic pin config binding support has already been in tree before that time. Per SoC maintainers' suggestions, in order to get a better consistency for all i.MX devices, we'd like to go back to imx legacy binding for MX7ULP as well. Cc: Rob Herring Cc: Linus Walleij Cc: Shawn Guo Cc: Stefan Agner Cc: Sascha Hauer Cc: Fabio Estevam Cc: linux-gpio@vger.kernel.org Cc: devicetree@vger.kernel.org Signed-off-by: Dong Aisheng --- ChangeLog: v3: new patch --- .../bindings/pinctrl/fsl,imx7ulp-pinctrl.txt | 66 ++++++++++------------ 1 file changed, 29 insertions(+), 37 deletions(-) diff --git a/Documentation/devicetree/bindings/pinctrl/fsl,imx7ulp-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/fsl,imx7ulp-pinctrl.txt index 44ad670a..bfa3703 100644 --- a/Documentation/devicetree/bindings/pinctrl/fsl,imx7ulp-pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/fsl,imx7ulp-pinctrl.txt @@ -7,55 +7,47 @@ Note: This binding doc is only for the IOMUXC1 support in A7 Domain and it only supports generic pin config. -Please also refer pinctrl-bindings.txt in this directory for generic pinctrl -binding. - -=== Pin Controller Node === +Please refer to fsl,imx-pinctrl.txt in this directory for common binding +part and usage. Required properties: -- compatible: "fsl,imx7ulp-iomuxc1" -- reg: Should contain the base physical address and size of the iomuxc - registers. - -=== Pin Configuration Node === -- pinmux: One integers array, represents a group of pins mux setting. - The format is pinmux = , PIN_FUNC_ID is a pin working on - a specific function. - - NOTE: i.MX7ULP PIN_FUNC_ID consists of 4 integers as it shares one mux - and config register as follows: - - - Refer to imx7ulp-pinfunc.h in in device tree source folder for all - available imx7ulp PIN_FUNC_ID. - -Optional Properties: -- drive-strength Integer. Controls Drive Strength - 0: Standard - 1: Hi Driver -- drive-push-pull Bool. Enable Pin Push-pull -- drive-open-drain Bool. Enable Pin Open-drian -- slew-rate: Integer. Controls Slew Rate - 0: Standard - 1: Slow -- bias-disable: Bool. Pull disabled -- bias-pull-down: Bool. Pull down on pin -- bias-pull-up: Bool. Pull up on pin +- compatible: "fsl,imx7ulp-iomuxc1". +- fsl,pins: Each entry consists of 5 integers which represents the mux + and config setting for one pin. The first 4 integers + are specified + using a PIN_FUNC_ID macro, which can be found in + imx7ulp-pinfunc.h in the device tree source folder. + The last integer CONFIG is the pad setting value like + pull-up on this pin. + + Please refer to i.MX7ULP Reference Manual for detailed + CONFIG settings. + +CONFIG bits definition: +PAD_CTL_OBE (1 << 17) +PAD_CTL_IBE (1 << 16) +PAD_CTL_LK (1 << 16) +PAD_CTL_DSE_HI (1 << 6) +PAD_CTL_DSE_STD (0 << 6) +PAD_CTL_ODE (1 << 5) +PAD_CTL_PUSH_PULL (0 << 5) +PAD_CTL_SRE_SLOW (1 << 2) +PAD_CTL_SRE_STD (0 << 2) +PAD_CTL_PE (1 << 0) Examples: #include "imx7ulp-pinfunc.h" /* Pin Controller Node */ -iomuxc1: iomuxc@40ac0000 { +iomuxc1: pinctrl@40ac0000 { compatible = "fsl,imx7ulp-iomuxc1"; reg = <0x40ac0000 0x1000>; /* Pin Configuration Node */ pinctrl_lpuart4: lpuart4grp { - pinmux = < - IMX7ULP_PAD_PTC3__LPUART4_RX - IMX7ULP_PAD_PTC2__LPUART4_TX + fsl,pins = < + IMX7ULP_PAD_PTC3__LPUART4_RX 0x1 + IMX7ULP_PAD_PTC2__LPUART4_TX 0x1 >; - bias-pull-up; }; }; From patchwork Wed Oct 31 14:43:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dong Aisheng X-Patchwork-Id: 991472 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="SitIk8iO"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42lWKn5c2Bz9s3l for ; Thu, 1 Nov 2018 01:43:25 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729618AbeJaXlm (ORCPT ); Wed, 31 Oct 2018 19:41:42 -0400 Received: from mail-eopbgr20076.outbound.protection.outlook.com ([40.107.2.76]:64300 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729651AbeJaXll (ORCPT ); Wed, 31 Oct 2018 19:41:41 -0400 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=9X6/X03Ex3BQZ42X04EnOUypDBGiD3iMPgyT/ZtVm18=; b=SitIk8iOf4e9cf2+dp49uk/5vg4MnXH+7Mgbmhcaha29PJMwzz/BQhbHOzluqhNL7aLgKEXLft5YykWW/ivKT09zoDUfxKL+lTtSlPzPpJcFGPCi0lPaYTVygS9DgFQLZUNlzwJBOfb2QnUrdWAUvKofMQtbBDKxtcraoVd6YNA= Received: from AM0PR04MB4211.eurprd04.prod.outlook.com (52.134.126.21) by AM0PR04MB4514.eurprd04.prod.outlook.com (52.135.148.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1273.26; Wed, 31 Oct 2018 14:43:18 +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.1273.028; Wed, 31 Oct 2018 14:43:18 +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 V3 06/10] pinctrl: fsl: imx7ulp: change to use imx legacy binding Thread-Topic: [PATCH V3 06/10] pinctrl: fsl: imx7ulp: change to use imx legacy binding Thread-Index: AQHUcSgQ1qnZvTfx9Eu4wKe/BaSwqg== Date: Wed, 31 Oct 2018 14:43:18 +0000 Message-ID: <1540996688-23681-7-git-send-email-aisheng.dong@nxp.com> References: <1540996688-23681-1-git-send-email-aisheng.dong@nxp.com> In-Reply-To: <1540996688-23681-1-git-send-email-aisheng.dong@nxp.com> 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: HK0PR03CA0016.apcprd03.prod.outlook.com (2603:1096:203:2e::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; AM0PR04MB4514; 6:uZWX8PWytSR/wlxiYBuDSBlSYa9tfifG5pY0vWg/dGHmru9qp2+y7/rzgtAFVbFIs2HbhVAu1jlQJZRVuw2LXWLgyG254GGpdpo5T1rQ40xdFFe7BHy2p0cCg+Xeqdly6NRaFjE3lekKxKL1NKDrLSkIz1ScJbEG4NrVj7fxPlBkOQ3960Ehv7VU7Ywyk1XbpM427oie8dZ8PPSkTEffpXpur+Ztz+WVdy+1LpgihezuKj1JvvRGJ9qgrnlUm2TPayHPT4schMdBLykxb6qxgnPQkzdKP9QmnwdvYC+fFsfPpGUcnrxaLsSipqZQ7LEzZuA7vz2wJLJJCBBrABvcVA5yheHzF5O6ELUQejgM8hxYjCXHBdTrSJX7sBEZP3egRz3J/lVjAUTol2zH4MUaxQExxzhQvkeAXimLTVujF9S/Wx/CLpy4pGRHjETIvdRKv2ZSFpE3DicTRD8xfjfT3Q==; 5:5sdoxIrQPEN92ZnIJfOEmSfuZU7jW2R3KBQFhYVfb6kS/rAMt6KQduaYQnz7hKR1JSPoTVhJ67JxHBD2Df3LmvB5CX6g4UYsJUOM8UR9hYNZ8lvhUmAwhWHkTR6xxFwn56TkH0Z/JMU/II0xW9DFrrV2S4IbPyqG4l8i0oKgQZo=; 7:X8rKPbkJeAOU6CfQ2YQzjDcOFk9b9gVb6sErrPBAoMVgMHk9dMV3X1jtz3on5Tvzvn61XkpOrwHnjAXNAtJyLIqOQIrrJtcBNzr+0bKbwxXsXkUnn2ZBav1Ciq3sew9+M14jFS5/C3lBdZ15S+s+Pw== x-ms-office365-filtering-correlation-id: 7d50c6b7-e159-4248-2ca9-08d63f3f325d 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:AM0PR04MB4514; x-ms-traffictypediagnostic: AM0PR04MB4514: 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)(8121501046)(5005006)(3231382)(944501410)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(148016)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201708071742011)(7699051)(76991095); SRVR:AM0PR04MB4514; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4514; x-forefront-prvs: 084285FC5C x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(136003)(366004)(346002)(396003)(376002)(54534003)(189003)(199004)(11346002)(14444005)(446003)(14454004)(2351001)(476003)(2616005)(305945005)(7736002)(6916009)(486006)(105586002)(106356001)(2900100001)(6486002)(6436002)(256004)(2501003)(97736004)(53936002)(5640700003)(186003)(316002)(6506007)(6512007)(4326008)(54906003)(5250100002)(71190400001)(71200400001)(52116002)(575784001)(86362001)(478600001)(66066001)(99286004)(76176011)(39060400002)(36756003)(3846002)(6116002)(68736007)(25786009)(102836004)(50226002)(2906002)(81166006)(8676002)(5660300001)(386003)(8936002)(26005)(81156014); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4514; H:AM0PR04MB4211.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: YWKY1pNRQKFAKFrJ74pbz7AFvehO6c/fflXERbxQQ5PowMZxg7gfT3C4Wm3CjMmeaHzWN5ZEhu8GGzjkM49cKC1Ikq8n6dSYXmLzcByEhSOD5uHVmt3wzYXJfpMArnkeR1YGP9+aqzYOWrFRhPTSWS73Xf9LMiD2HXAqjAPbzdI/qsx1/X+ptt+4cb/oEApMtWFDeaP6en97+aU6XSR0bwQn8bB0wdVNpHgaBJyX69X2UdQDy7jDGigDgk/0WmCkLQCraz4qhaXlupEThMbwTR/3kKWxipNcjV2xE7jfYec1B85xWNxVC+9lw5wXZfF7J6S9A40oHy+A3f1+g23xWub7Z3BiaIt8lRtrOd6pj6Y= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7d50c6b7-e159-4248-2ca9-08d63f3f325d X-MS-Exchange-CrossTenant-originalarrivaltime: 31 Oct 2018 14:43:18.3452 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4514 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org We already had an earlier conclusion that all new i.MX Socs will keep using the legacy i.MX Pinctrl bindings instead of generic pin config. However, MX7ULP generic pin config binding support has already been in tree before that time. Per SoC maintainers' suggestions, in order to get a better consistency for all i.MX devices, we'd like to go back to imx legacy binding for MX7ULP as well. Cc: Linus Walleij Cc: Shawn Guo Cc: Stefan Agner Cc: Sascha Hauer Cc: Fabio Estevam Cc: linux-gpio@vger.kernel.org Signed-off-by: Dong Aisheng --- ChangeLog: v3: new patch --- drivers/pinctrl/freescale/pinctrl-imx7ulp.c | 42 ----------------------------- 1 file changed, 42 deletions(-) diff --git a/drivers/pinctrl/freescale/pinctrl-imx7ulp.c b/drivers/pinctrl/freescale/pinctrl-imx7ulp.c index f521bdb..922ff73 100644 --- a/drivers/pinctrl/freescale/pinctrl-imx7ulp.c +++ b/drivers/pinctrl/freescale/pinctrl-imx7ulp.c @@ -256,46 +256,8 @@ static const struct pinctrl_pin_desc imx7ulp_pinctrl_pads[] = { #define BM_OBE_ENABLED BIT(17) #define BM_IBE_ENABLED BIT(16) -#define BM_LK_ENABLED BIT(15) #define BM_MUX_MODE 0xf00 #define BP_MUX_MODE 8 -#define BM_PULL_ENABLED BIT(1) - -static const struct imx_cfg_params_decode imx7ulp_cfg_decodes[] = { - IMX_CFG_PARAMS_DECODE(PIN_CONFIG_DRIVE_STRENGTH, BIT(6), 6), - IMX_CFG_PARAMS_DECODE(PIN_CONFIG_DRIVE_PUSH_PULL, BIT(5), 5), - IMX_CFG_PARAMS_DECODE(PIN_CONFIG_SLEW_RATE, BIT(2), 2), - IMX_CFG_PARAMS_DECODE(PIN_CONFIG_BIAS_DISABLE, BIT(1), 1), - IMX_CFG_PARAMS_DECODE(PIN_CONFIG_BIAS_PULL_UP, BIT(0), 0), - - IMX_CFG_PARAMS_DECODE_INVERT(PIN_CONFIG_DRIVE_OPEN_DRAIN, BIT(5), 5), - IMX_CFG_PARAMS_DECODE_INVERT(PIN_CONFIG_BIAS_PULL_DOWN, BIT(0), 0), -}; - -static void imx7ulp_cfg_params_fixup(unsigned long *configs, - unsigned int num_configs, - u32 *raw_config) -{ - enum pin_config_param param; - u32 param_val; - int i; - - /* lock field disabled */ - *raw_config &= ~BM_LK_ENABLED; - - for (i = 0; i < num_configs; i++) { - param = pinconf_to_config_param(configs[i]); - param_val = pinconf_to_config_argument(configs[i]); - - if ((param == PIN_CONFIG_BIAS_PULL_UP) || - (param == PIN_CONFIG_BIAS_PULL_DOWN)) { - /* pull enabled */ - *raw_config |= BM_PULL_ENABLED; - - return; - } - } -} static int imx7ulp_pmx_gpio_set_direction(struct pinctrl_dev *pctldev, struct pinctrl_gpio_range *range, @@ -326,10 +288,6 @@ static const struct imx_pinctrl_soc_info imx7ulp_pinctrl_info = { .gpio_set_direction = imx7ulp_pmx_gpio_set_direction, .mux_mask = BM_MUX_MODE, .mux_shift = BP_MUX_MODE, - .generic_pinconf = true, - .decodes = imx7ulp_cfg_decodes, - .num_decodes = ARRAY_SIZE(imx7ulp_cfg_decodes), - .fixup = imx7ulp_cfg_params_fixup, }; static const struct of_device_id imx7ulp_pinctrl_of_match[] = {