From patchwork Mon Oct 8 18:06:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leonard Crestez X-Patchwork-Id: 980711 X-Patchwork-Delegate: lorenzo.pieralisi@arm.com 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-pci-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="dKpkc4Au"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42TSxF4Lmzz9vZs for ; Tue, 9 Oct 2018 05:06:57 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726522AbeJIBTV (ORCPT ); Mon, 8 Oct 2018 21:19:21 -0400 Received: from mail-he1eur01on0075.outbound.protection.outlook.com ([104.47.0.75]:22699 "EHLO EUR01-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726458AbeJIBTV (ORCPT ); Mon, 8 Oct 2018 21:19:21 -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=iTAQxeK72dH2BB+VvpRxlviTntU5UH4iTQNVCXJfbiA=; b=dKpkc4AuQ5PTLsa/eNFN4y1OB+0N7k9eejppwX5Vmbdasl0tpW9tXXOZE9DOuc5M6J/l7BAWRtanfKxuqgirBalUzQr/UDb8Ii7iZtq4VIBmz9WdNptvtT8QRFw93FDlQH87bVP56BGizZcVHJnZfSe/ffGMQ6aGpBuWMAiDH1c= Received: from AM0PR04MB4290.eurprd04.prod.outlook.com (52.134.126.145) by AM0PR04MB5172.eurprd04.prod.outlook.com (20.177.42.13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.22; Mon, 8 Oct 2018 18:06:19 +0000 Received: from AM0PR04MB4290.eurprd04.prod.outlook.com ([fe80::3836:6416:4ebd:34ef]) by AM0PR04MB4290.eurprd04.prod.outlook.com ([fe80::3836:6416:4ebd:34ef%3]) with mapi id 15.20.1207.024; Mon, 8 Oct 2018 18:06:19 +0000 From: Leonard Crestez To: Shawn Guo , Lucas Stach , Richard Zhu CC: Lorenzo Pieralisi , Fabio Estevam , Stefan Agner , Marek Vasut , Ulf Hansson , Rob Herring , Mark Rutland , "linux-pm@vger.kernel.org" , "devicetree@vger.kernel.org" , "linux-pci@vger.kernel.org" , "dri-devel@lists.freedesktop.org" , dl-linux-imx , "kernel@pengutronix.de" , "linux-kernel@vger.kernel.org" Subject: [PATCH v2 1/4] soc: imx: gpc: Increase GPC_CLK_MAX to 7 Thread-Topic: [PATCH v2 1/4] soc: imx: gpc: Increase GPC_CLK_MAX to 7 Thread-Index: AQHUXzGdTEA4i3oy80C5E2NGCyQNsg== Date: Mon, 8 Oct 2018 18:06:19 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [95.76.156.53] x-mailer: git-send-email 2.17.1 x-clientproxiedby: AM6PR0102CA0011.eurprd01.prod.exchangelabs.com (2603:10a6:209:14::24) To AM0PR04MB4290.eurprd04.prod.outlook.com (2603:10a6:208:67::17) authentication-results: spf=none (sender IP is ) smtp.mailfrom=leonard.crestez@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM0PR04MB5172; 6:IVG61SGEvEcKd7JIB7jADN3axd/amaHumNwuCUMspyeroVvT+JS5TuplTCmMausyryUYKdL6/Q1h2x5ODaGwvVI0pREuYMOYW95W1MTRAWS4GcHlTh6z161ZHg9G8fSqp7YUWSFpphRQo0J6kIxnMZ24rQJOomaX/CI3mud+nCVgnhTfm1gPcz8GR8DVSrQx6Fc/WZ6R1hvaZkPYf1dK2A8lCH3enMIH3AemLyv9oFmG5QJRSMnHfa+8mUy3Tj8qcHBtb0h7eEldWMZYO/BaqZkICMS6x1Xy1NInBZ5C62ClVZ6WjuV/uFMskvZ3YNFTG2LFB8ufzFC1PmouM0o8Anglw9aIKqiVflFW1YlETpds3Rg7BChmpTBcoezbMJbmQJfrpG24yO8NUDYl6109xm40wYL5TrFh6TiGBdMwuF4c4u6fVadwlkzeqZJ6u/tldHaMrzt7tityuSiP/Kq7Ig==; 5:bSKEUza1JyHR9ENieV80AI740w7EyEW3WcAZCl/OcguUd6mpJABJaXlEkUq63pRxCyKjFn0SIu0s7QZWDr+XwOK5U6n4FoFBC2u4sZJdKl05TRplilNMKQfLz1MpQiwFYAIC9bfyGP3EK9QbxjY0jrE44+SBRqmNC4wLRwJG3XQ=; 7:vQ6VW82/4dpTGtiHVGpFyb2x9evx4XeLkpKW+4kdGHSZrUEqevUh2lQ3E3KrtZRAlcxtW5PLhCDdhWSESaaO3vXl+Zgz0b5IdiwIAtzlBc2t9WNwyeOpOESB2szCi0idwHEC1DpfdSGVZ85axlxH7gFrV1ATGs+VcWhIYCRnPNIgb9EHYXex1ueO5WmKjqbJpeg+y3cd69Fb/enOmMlw1+BtRbszhxUZeGTOGYB0yU9Gl18s/RPDvYf5/8qRrVQV x-ms-office365-filtering-correlation-id: ec6e9b39-4356-466b-3bdf-08d62d48bf5d x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB5172; x-ms-traffictypediagnostic: AM0PR04MB5172: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(269456686620040)(185117386973197); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3002001)(3231355)(944501410)(52105095)(6055026)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123562045)(20161123558120)(20161123560045)(201708071742011)(7699051); SRVR:AM0PR04MB5172; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB5172; x-forefront-prvs: 081904387B x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(39860400002)(346002)(136003)(376002)(366004)(199004)(189003)(2906002)(54906003)(25786009)(2900100001)(186003)(575784001)(14454004)(66066001)(110136005)(53936002)(6512007)(6436002)(36756003)(97736004)(71190400001)(26005)(102836004)(76176011)(6116002)(6486002)(3846002)(4326008)(86362001)(256004)(14444005)(71200400001)(5250100002)(316002)(7736002)(446003)(105586002)(68736007)(7416002)(8936002)(118296001)(8676002)(81156014)(106356001)(478600001)(6636002)(5660300001)(44832011)(2616005)(476003)(486006)(305945005)(52116002)(6506007)(386003)(11346002)(81166006)(50226002)(99286004); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB5172; H:AM0PR04MB4290.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: 8QhPDdNnbWeWRWeApe/3q+JYY482KB8aGTDkhZVwq6cSnZGL1w4AeClkKkhZQqaWJbLqmxjT70B8ktdc+s4iLXBcItK2hscPCaCGGrYyYKL7a25Chg6+7MP/vVHeUwq+9PEe64T0k2BxFfLBnyM/4Y2i/mONuDCLQw7ZXrt2d+vl82kZr6JVh2LLHDlVZrYJvTpcyKC9ZsETAyD0fHeT0MxhTrCAjv6g0otHYc/fO5XA+EKjM36luPr/AGfSf2ihIdDztgBJakcpvDKgUobY7XlR0fJWw8PARB8uIMY+3OQXDvqA1hNZsbes91xnQIFjXyGf3lIHMpfcoIIO112Y9jcxAFG80+hpm6h7bdSnqfY= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ec6e9b39-4356-466b-3bdf-08d62d48bf5d X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Oct 2018 18:06:19.4459 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5172 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org The DISPLAY power domain on imx6sx has 7 clocks. Signed-off-by: Leonard Crestez --- drivers/soc/imx/gpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/soc/imx/gpc.c b/drivers/soc/imx/gpc.c index aa3729ecaa9e..7d14a4b4e82a 100644 --- a/drivers/soc/imx/gpc.c +++ b/drivers/soc/imx/gpc.c @@ -33,11 +33,11 @@ #define GPC_PGC_DISP_SR 0x24c #define GPU_VPU_PUP_REQ BIT(1) #define GPU_VPU_PDN_REQ BIT(0) -#define GPC_CLK_MAX 6 +#define GPC_CLK_MAX 7 #define PGC_DOMAIN_FLAG_NO_PD BIT(0) struct imx_pm_domain { struct generic_pm_domain base; From patchwork Mon Oct 8 18:06:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leonard Crestez X-Patchwork-Id: 980709 X-Patchwork-Delegate: lorenzo.pieralisi@arm.com 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-pci-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="KUGcksuR"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42TSx36TRxz9sjF for ; Tue, 9 Oct 2018 05:06:47 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726613AbeJIBTY (ORCPT ); Mon, 8 Oct 2018 21:19:24 -0400 Received: from mail-he1eur01on0075.outbound.protection.outlook.com ([104.47.0.75]:22699 "EHLO EUR01-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726291AbeJIBTX (ORCPT ); Mon, 8 Oct 2018 21:19:23 -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=0OICJA84Kpbp+o5PF0RBF+mWQIjpD7go7k+ONlnEhH0=; b=KUGcksuRY1hyLEY1uggWiU5bYALp5MHJg1Uc7r99KVsB0lzxEN97ePf+KpzL41E1fPb2OTOyI7fjS0WScVYNM9cPgwrtbkPzmupPLCei3oFh+CtxVvQ5Y82TzIYM1Lhh3klZGFfo6L00kFMUtXX0Ipoq9yiYNVjVws7WoxB8Qj0= Received: from AM0PR04MB4290.eurprd04.prod.outlook.com (52.134.126.145) by AM0PR04MB5172.eurprd04.prod.outlook.com (20.177.42.13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.22; Mon, 8 Oct 2018 18:06:20 +0000 Received: from AM0PR04MB4290.eurprd04.prod.outlook.com ([fe80::3836:6416:4ebd:34ef]) by AM0PR04MB4290.eurprd04.prod.outlook.com ([fe80::3836:6416:4ebd:34ef%3]) with mapi id 15.20.1207.024; Mon, 8 Oct 2018 18:06:20 +0000 From: Leonard Crestez To: Shawn Guo , Lucas Stach , Richard Zhu CC: Lorenzo Pieralisi , Fabio Estevam , Stefan Agner , Marek Vasut , Ulf Hansson , Rob Herring , Mark Rutland , "linux-pm@vger.kernel.org" , "devicetree@vger.kernel.org" , "linux-pci@vger.kernel.org" , "dri-devel@lists.freedesktop.org" , dl-linux-imx , "kernel@pengutronix.de" , "linux-kernel@vger.kernel.org" Subject: [PATCH v2 2/4] dt-bindings: imx6q-pcie: Add multi-pd bindings for imx6sx Thread-Topic: [PATCH v2 2/4] dt-bindings: imx6q-pcie: Add multi-pd bindings for imx6sx Thread-Index: AQHUXzGdQHtjla47r0y4gaeEfNFd9Q== Date: Mon, 8 Oct 2018 18:06:20 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [95.76.156.53] x-mailer: git-send-email 2.17.1 x-clientproxiedby: AM6PR0102CA0011.eurprd01.prod.exchangelabs.com (2603:10a6:209:14::24) To AM0PR04MB4290.eurprd04.prod.outlook.com (2603:10a6:208:67::17) authentication-results: spf=none (sender IP is ) smtp.mailfrom=leonard.crestez@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM0PR04MB5172; 6:HZcWNLa5NjBEn8RZkC4PYqYTUoDXFn5vUgh+JAec8GWwl2/OBrmWCj/47+GCXgxRejDY8o2Ua1yoVyI5lvrw4fQT2IX4uK4k1t5lr0x2JSqYq7WhS2OjQAuBtf021WMxL5kJU9fe4os1zds4bpEoeaO0OI0k6sHmuwQdos4qQkPcOCLp5zOkvekUPUBBZyFhnKPCs7WOaKnCtNNbCuuEcttmce2CWxFOkCMsyMkh8UrFO4eD6zO59NMuDzoBtDVazQ5rRsKEk5O0nAeQG6AaSxc3eF7TKgnelQBkf5IG47set+E0KpHKOdDICrqC8vuQXZlhsVNiL/qtgSMqoojp2TZVqnYPdBl7NCxo7dj1UIJ7EYZXXYhN8AAREy7eJKlJ8hqryky6WI8OLI20HneOHJhqraoopXlGsjR7zVu3Hp1lBpboid4quWcSsZc8uyHhH3viW67TQouGj/p3TChWtA==; 5:0rCpUs2Neq6pIXCgKt6hC+PD71O1hr2mJMUH1fzRbvgSYOa3bLaSKO20lQniwsR4hg5B7owSxNsl+JAi5ZJ4lB57Bpx5mItIuv0bKYVilF1m0fHvk30iIuGtKFenKbscLLkYo3sJy02eN20KIwBv49WPo0a+4AfJ+Yh9A/AmvqU=; 7:+2F07jSqlZT+CjUzzecJEilYDobZhOwb1RvB6/UOQxY/8mqb3/hw3fGKKbtdA5DtkGcs5Tak3j3fS2Ty3uildTXB/bly4wTAEPuTe8pRAGo3Oi3pUZzYOk+no1qhkjb5HMHKt4dEEijpY4a1uvneZ9hCYU+RgkG0QfJKxfh+3U9nC7lmKozztOsPT60VQaa7QG1nTRHLgrI7wANhJPyDyAgPKULl/OfFBsnt272lMiBDx3C/BoxBSOFJTJ52oH81 x-ms-office365-filtering-correlation-id: ab408df0-1080-46d0-2590-08d62d48c016 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB5172; x-ms-traffictypediagnostic: AM0PR04MB5172: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(269456686620040)(185117386973197); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3002001)(3231355)(944501410)(52105095)(6055026)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123562045)(20161123558120)(20161123560045)(201708071742011)(7699051); SRVR:AM0PR04MB5172; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB5172; x-forefront-prvs: 081904387B x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(39860400002)(346002)(136003)(376002)(366004)(199004)(189003)(2906002)(54906003)(25786009)(2900100001)(186003)(14454004)(66066001)(110136005)(53936002)(6512007)(6436002)(36756003)(97736004)(71190400001)(26005)(102836004)(76176011)(6116002)(6486002)(3846002)(4326008)(86362001)(256004)(14444005)(71200400001)(5250100002)(316002)(7736002)(446003)(105586002)(68736007)(7416002)(8936002)(118296001)(8676002)(81156014)(106356001)(478600001)(6636002)(5660300001)(44832011)(2616005)(476003)(486006)(305945005)(52116002)(6506007)(386003)(11346002)(81166006)(50226002)(99286004)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB5172; H:AM0PR04MB4290.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: GDeeGYqkqGnhEaNxoexXU9Dx/wvWMiCQJBa/K9Uf89z+npOa1bd8hL0oWMinuntfmERC7WU1taP5E3yDAjiRytXDNWIlzWhFRJhMgUXMf9yrNBdaVSKU3K1EBQw5XY6JoDwXfKaqgREudiZZh9RcWI51LhB/pDhfDSw00KNTP5a7SCis/7ZOeOOkcQL/1xKrDXXuIBPyzuPxiqIi9yMBINiCGbi1SIYlYOEBnrSy+tlX4gwzvyU4L1yr6fQHUfxtotjUzpjg0phM5zVmSQ2KgA4U++pR4hW4vgzI0xo55d0TVq7+yiWl1MakdOOEO4TA/oj00menzC3nT5I2Targ64FIKlQz9N9uh42IoYSf3/M= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ab408df0-1080-46d0-2590-08d62d48c016 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Oct 2018 18:06:20.6228 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5172 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org The PCIE and PCIE_PHY blocks are in different power domains on imx6sx and this needs to be described using multi-pd bindings. This was not required until now because the power-domain of the PCIE block (DISPLAY) was always on. Signed-off-by: Leonard Crestez Reviewed-by: Rob Herring --- Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt b/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt index f37494d5a7be..d514c1f2365f 100644 --- a/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt +++ b/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt @@ -39,11 +39,13 @@ Optional properties: host. Additional required properties for imx6sx-pcie: - clock names: Must include the following additional entries: - "pcie_inbound_axi" -- power-domains: Must be set to a phandle pointing to the PCIE_PHY power domain +- power-domains: Must be set to phandles pointing to the DISPLAY and + PCIE_PHY power domains +- power-domain-names: Must be "pcie", "pcie_phy" Additional required properties for imx7d-pcie: - power-domains: Must be set to a phandle pointing to PCIE_PHY power domain - resets: Must contain phandles to PCIe-related reset lines exposed by SRC IP block From patchwork Mon Oct 8 18:06:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leonard Crestez X-Patchwork-Id: 980708 X-Patchwork-Delegate: lorenzo.pieralisi@arm.com 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-pci-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="txUO29hh"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42TSx11sHNz9sjF for ; Tue, 9 Oct 2018 05:06:45 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726671AbeJIBT1 (ORCPT ); Mon, 8 Oct 2018 21:19:27 -0400 Received: from mail-he1eur01on0075.outbound.protection.outlook.com ([104.47.0.75]:22699 "EHLO EUR01-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726458AbeJIBT0 (ORCPT ); Mon, 8 Oct 2018 21:19:26 -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=pgpkZIpWxJFAJA7TB0jtCajuEm+sgeJ1lXTVJFdWclQ=; b=txUO29hhPQi14Tbd7BNICwE1K6Lmyi+s2AHqUcsy5p7vFvAgWSRDrN+yal53olQ4zK51lx7+U3OWUTrwJt499U/RF9//mi6mOUR4de6bMiXYwr260YrOQxbbDYrfh2lQzTp41RqhbA8e9LX41UwTjEQrAIh9hiK74ixCglER6Yc= Received: from AM0PR04MB4290.eurprd04.prod.outlook.com (52.134.126.145) by AM0PR04MB5172.eurprd04.prod.outlook.com (20.177.42.13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.22; Mon, 8 Oct 2018 18:06:21 +0000 Received: from AM0PR04MB4290.eurprd04.prod.outlook.com ([fe80::3836:6416:4ebd:34ef]) by AM0PR04MB4290.eurprd04.prod.outlook.com ([fe80::3836:6416:4ebd:34ef%3]) with mapi id 15.20.1207.024; Mon, 8 Oct 2018 18:06:21 +0000 From: Leonard Crestez To: Shawn Guo , Lucas Stach , Richard Zhu CC: Lorenzo Pieralisi , Fabio Estevam , Stefan Agner , Marek Vasut , Ulf Hansson , Rob Herring , Mark Rutland , "linux-pm@vger.kernel.org" , "devicetree@vger.kernel.org" , "linux-pci@vger.kernel.org" , "dri-devel@lists.freedesktop.org" , dl-linux-imx , "kernel@pengutronix.de" , "linux-kernel@vger.kernel.org" Subject: [PATCH v2 3/4] PCI: imx: Add multi-pd support Thread-Topic: [PATCH v2 3/4] PCI: imx: Add multi-pd support Thread-Index: AQHUXzGe6SZqbrUj90aARl9niCeThw== Date: Mon, 8 Oct 2018 18:06:21 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [95.76.156.53] x-mailer: git-send-email 2.17.1 x-clientproxiedby: AM6PR0102CA0011.eurprd01.prod.exchangelabs.com (2603:10a6:209:14::24) To AM0PR04MB4290.eurprd04.prod.outlook.com (2603:10a6:208:67::17) authentication-results: spf=none (sender IP is ) smtp.mailfrom=leonard.crestez@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM0PR04MB5172; 6:GCa+V63Mn3Q1CXixI3YpB2f3Y2GRET9KrZEkxVAKwJY0zHV73j8/SZrR/uKXscBN0kNhINuRC9NFxMC3yN/QTvxxKF/aaoq27Uza3jJpeBji8bl5HjFeTSu05wistpr+mWsa2SbvenKxZcxDekE3i+/riWN8blJNWae1rbDsJqgFRkV8k4VF7l8rmyqoMl6w2dUJ+23QI1tmdBmrRE2fZA6ip2IlSfd1TTSbmYTHPzeeupepRuz95UsX8m2LIsLtfpDyFqsyO5SRPxsVg8QcIHV+tHp2FlKpc0zbY+F6X89NK9HGQxLFac2eNurcHwilAnOLS6P/VT5wScTw9bVuvEakaJP6WCoib8LoktuPafHv+gtdGJvEjgcuwN9EwdyI32Ag5vtIsTNJhYSDVeC2ZcVLDRwSwbKdR+JnC+ZZygQO3UifhYIr9UtPfzgukNyntMtCDNzSisqGf6wxcepH5w==; 5:BKvFlCb1UfHKz7hBHVajWUFXWeWv/k6T7M83Pm02jE4fPO64BKoLo51i/LA/LFCZ+t6W7kv8dwp0gwPOl9yTdPp2IKQ919JlJPWSyfxhg+VOS9dLnO4pFRaoiNYl9xOD++sbKv5/L4rtyhZY0qhIRia/k6wRrCOzoWlC6DIQvG8=; 7:KVc9YbsyF4h9hPiav5KhgmgR49ooJpFwlXPP6IoRBp+NnlPLS2LDAp9ulvxSdNUbu+fQN9JDORK39NNhyNThf9CyrxAgI3WKIyj/cPGjMjCdmeeUQS6y1a5ssn7qhb9/gn0yjkjalRZ1FKtJ1IBkDAZE5JLURaVohY83UdVuT3CC6NgnDTjd1UIQ+WHWhV8XGjAbzdh0wRLYFue7e//hNHW/JaSb8vfhjAEivOkM+TCDrJbs5KUQI8Qqk9J4o++i x-ms-office365-filtering-correlation-id: 19faf96a-684d-4e03-68fb-08d62d48c0c9 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB5172; x-ms-traffictypediagnostic: AM0PR04MB5172: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(269456686620040)(185117386973197); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3002001)(3231355)(944501410)(52105095)(6055026)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123562045)(20161123558120)(20161123560045)(201708071742011)(7699051); SRVR:AM0PR04MB5172; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB5172; x-forefront-prvs: 081904387B x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(39860400002)(346002)(136003)(376002)(366004)(199004)(189003)(2906002)(54906003)(25786009)(2900100001)(186003)(14454004)(66066001)(110136005)(53936002)(6512007)(6436002)(36756003)(97736004)(71190400001)(26005)(102836004)(76176011)(6116002)(6486002)(3846002)(4326008)(86362001)(256004)(5024004)(14444005)(71200400001)(5250100002)(316002)(7736002)(446003)(105586002)(68736007)(7416002)(8936002)(118296001)(8676002)(81156014)(106356001)(478600001)(6636002)(5660300001)(44832011)(2616005)(476003)(486006)(305945005)(52116002)(6506007)(386003)(11346002)(81166006)(50226002)(99286004); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB5172; H:AM0PR04MB4290.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: WFrNgwPoI5ToMbtWFIJkh0VvRXf0lkK+Xc/bU43rActH30b3kLPqFGc6oM82yozyoHCXw8J/gA0l2gglSUTFTKy4gSiQAfLgYj2dmqHNZVXbqXgHdJiIvYyE+mSqibZUQapvuaitc9zVoWQEUtYwsEl9SDRdYQ6EyoVM+amM7zfaCZ1cx1XjPPCoLn9nkd0grLL0aJshz5iBAQkDQ/UWSbOBCC1H1DPsbFDwsrnvLHOQ/p6afNKXFS+1cNtrHCAoNY4Zgkr0CKUTP9rfJ/x5txjrgsDLaceH7L1c4S39pIWL/9QPxdF7O2C0m75reY8hXNkAqC9BTqDrUuuLAomlEn1fh+8A5QZqZcvuowXZ4WI= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 19faf96a-684d-4e03-68fb-08d62d48c0c9 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Oct 2018 18:06:21.8176 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5172 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org On some chips the PCIE and PCIE_PHY blocks are in separate power domains which can be power-gated independently. The pci driver needs to handle this by keeping both domain active. This is intended for imx6sx where PCIE is in DISPLAY and PCIE_PHY in it's own domain. Defining the DISPLAY domain requires a way for pcie to keep it active or it will break when displays are off. The power-domains on imx6sx are meant to look like this: power-domains = <&pd_disp>, <&pd_pci>; power-domain-names = "pcie", "pcie_phy"; Signed-off-by: Leonard Crestez Reviewed-by: Ulf Hansson Acked-by: Lorenzo Pieralisi --- drivers/pci/controller/dwc/pci-imx6.c | 48 +++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 6171171db1fc..a482f86b02e6 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -25,10 +25,12 @@ #include #include #include #include #include +#include +#include #include "pcie-designware.h" #define to_imx6_pcie(x) dev_get_drvdata((x)->dev) @@ -57,10 +59,15 @@ struct imx6_pcie { u32 tx_deemph_gen2_6db; u32 tx_swing_full; u32 tx_swing_low; int link_gen; struct regulator *vpcie; + + /* power domain for pcie */ + struct device *pd_pcie; + /* power domain for pcie phy */ + struct device *pd_pcie_phy; }; /* Parameters for the waiting for PCIe PHY PLL to lock on i.MX7 */ #define PHY_PLL_LOCK_WAIT_MAX_RETRIES 2000 #define PHY_PLL_LOCK_WAIT_USLEEP_MIN 50 @@ -290,10 +297,47 @@ static int imx6q_pcie_abort_handler(unsigned long addr, } return 1; } +static int imx6_pcie_attach_pd(struct device *dev) +{ + struct imx6_pcie *imx6_pcie = dev_get_drvdata(dev); + struct device_link *link; + + /* Do nothing when in a single power domain */ + if (dev->pm_domain) + return 0; + + imx6_pcie->pd_pcie = dev_pm_domain_attach_by_name(dev, "pcie"); + if (IS_ERR(imx6_pcie->pd_pcie)) + return PTR_ERR(imx6_pcie->pd_pcie); + link = device_link_add(dev, imx6_pcie->pd_pcie, + DL_FLAG_STATELESS | + DL_FLAG_PM_RUNTIME | + DL_FLAG_RPM_ACTIVE); + if (IS_ERR(link)) { + dev_err(dev, "Failed to add device_link to pcie pd: %ld\n", PTR_ERR(link)); + return PTR_ERR(link); + } + + imx6_pcie->pd_pcie_phy = dev_pm_domain_attach_by_name(dev, "pcie_phy"); + if (IS_ERR(imx6_pcie->pd_pcie_phy)) + return PTR_ERR(imx6_pcie->pd_pcie_phy); + + device_link_add(dev, imx6_pcie->pd_pcie_phy, + DL_FLAG_STATELESS | + DL_FLAG_PM_RUNTIME | + DL_FLAG_RPM_ACTIVE); + if (IS_ERR(link)) { + dev_err(dev, "Failed to add device_link to pcie_phy pd: %ld\n", PTR_ERR(link)); + return PTR_ERR(link); + } + + return 0; +} + static void imx6_pcie_assert_core_reset(struct imx6_pcie *imx6_pcie) { struct device *dev = imx6_pcie->pci->dev; switch (imx6_pcie->variant) { @@ -1013,10 +1057,14 @@ static int imx6_pcie_probe(struct platform_device *pdev) imx6_pcie->vpcie = NULL; } platform_set_drvdata(pdev, imx6_pcie); + ret = imx6_pcie_attach_pd(dev); + if (ret) + return ret; + ret = imx6_add_pcie_port(imx6_pcie, pdev); if (ret < 0) return ret; return 0; From patchwork Mon Oct 8 18:06:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leonard Crestez X-Patchwork-Id: 980710 X-Patchwork-Delegate: lorenzo.pieralisi@arm.com 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-pci-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="Nlkk7pW8"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42TSx53sgrz9sj6 for ; Tue, 9 Oct 2018 05:06:49 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726828AbeJIBTn (ORCPT ); Mon, 8 Oct 2018 21:19:43 -0400 Received: from mail-he1eur01on0075.outbound.protection.outlook.com ([104.47.0.75]:22699 "EHLO EUR01-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726291AbeJIBTm (ORCPT ); Mon, 8 Oct 2018 21:19:42 -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=jU4sh9p0QI3JnHWKdhC4KTppA+o50FhN3OVg8t8iO44=; b=Nlkk7pW8wgUxlnl92IcBX4zeFf9K1D9pzUUY8SAtjBbUU6HIc3BGKeM63/F0VFZ5IHtDeIy5kPo/e+SQ9a4O5nEnpKpMqR+twlBvjCm9xwgwL0B0K63aw2kSScmUa2MUZkti6R8yeH4JmEPVtWGQ6kydKfhgSnbCuJm3J94kfDM= Received: from AM0PR04MB4290.eurprd04.prod.outlook.com (52.134.126.145) by AM0PR04MB5172.eurprd04.prod.outlook.com (20.177.42.13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.22; Mon, 8 Oct 2018 18:06:23 +0000 Received: from AM0PR04MB4290.eurprd04.prod.outlook.com ([fe80::3836:6416:4ebd:34ef]) by AM0PR04MB4290.eurprd04.prod.outlook.com ([fe80::3836:6416:4ebd:34ef%3]) with mapi id 15.20.1207.024; Mon, 8 Oct 2018 18:06:23 +0000 From: Leonard Crestez To: Shawn Guo , Lucas Stach , Richard Zhu CC: Lorenzo Pieralisi , Fabio Estevam , Stefan Agner , Marek Vasut , Ulf Hansson , Rob Herring , Mark Rutland , "linux-pm@vger.kernel.org" , "devicetree@vger.kernel.org" , "linux-pci@vger.kernel.org" , "dri-devel@lists.freedesktop.org" , dl-linux-imx , "kernel@pengutronix.de" , "linux-kernel@vger.kernel.org" Subject: [PATCH v2 4/4] ARM: dts: imx6sx: Add DISPLAY power domain support Thread-Topic: [PATCH v2 4/4] ARM: dts: imx6sx: Add DISPLAY power domain support Thread-Index: AQHUXzGf8guh/Nb5iEavRi81Wh8wzA== Date: Mon, 8 Oct 2018 18:06:23 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [95.76.156.53] x-mailer: git-send-email 2.17.1 x-clientproxiedby: AM6PR0102CA0011.eurprd01.prod.exchangelabs.com (2603:10a6:209:14::24) To AM0PR04MB4290.eurprd04.prod.outlook.com (2603:10a6:208:67::17) authentication-results: spf=none (sender IP is ) smtp.mailfrom=leonard.crestez@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM0PR04MB5172; 6:JqlnMqd77xCXajVbZs6yPxo1Q03ExFCze/xJunOxYE3tHf4gXPhwV6k/HFIMjW2erHuGAhKZdSA1HoK8RKaLldLmdCsFxFAZoZdETyFTmpctkd5KRcU7DD0onqj5pD5/Dlj45J6Sp2REbyAxDgjtt/HTWOScZcNoUs2Zi8Xq2SH2VOH1L4vg1zlRA5gcBvu5Mv5ou27PGn/qHb8d6dVby2Ld8k+U2oYCdcwfs5S3gST/afa2xUmQ3r/VMKyBuEvJqbPyyUf2KuSteaP36zGRYmK++MRsB4v5zePgueGPK+YdtKi5iZvt9Oid4qKBZwUnD1k4QT95vrbR70Vf+b/r8hS271Z1IrxxdrXObizaE0dTe+d6m/6MH/B8EWmPDAnRlGMLL/dk5qK5wPNV/pSTG54Ytzfh0rt9MKz1nfkuW3ntmjM4W5466YkSnE/oTLvGtTh8qNlrjNB6mAGSaqA1uw==; 5:q9zlt/rqly/L7m20KpzdbwjaWv4luMhy31CDGOunH0+kcs/c1oO+pg1Z2nLLHRH6PPba1vEmmwoIfTlzZv7heumgrZxoLMthm1OAONW+SR4u8M3Yrfgr1453dtdmVoSyZ/piMN9N16iDWHS+xHGFgVJpIFhnf8PytQCoTM9qXkU=; 7:2Y1aKL4rik5xTckcUHTde/qX0suGl/dVZ7JrM8WiJmS1bMlPzgy4AgqihaTLDKKFwMO5Dn/9WO7hAd4mxCbPZeLBBoDtYLvxcfEpf/Q1JBtvwwYHlPhzUl+MAhhtvGc6zAY9P10Q3SHDj2L9xBtDSEHNJCA9uNOm3x7loeLlEP582RbO3qb2VZAE4QBNjNaM5q/RdR9JOI3ivfNI0SaOtko6xiHRjs9sUwf+eDibS+UHtnUsXblJylSAwcsqBS+4 x-ms-office365-filtering-correlation-id: 497742ac-5de6-41cd-e134-08d62d48c17f x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB5172; x-ms-traffictypediagnostic: AM0PR04MB5172: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(269456686620040)(17755550239193)(185117386973197); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3002001)(3231355)(944501410)(52105095)(6055026)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123562045)(20161123558120)(20161123560045)(201708071742011)(7699051); SRVR:AM0PR04MB5172; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB5172; x-forefront-prvs: 081904387B x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(39860400002)(346002)(136003)(376002)(366004)(199004)(189003)(2906002)(54906003)(25786009)(2900100001)(186003)(14454004)(66066001)(110136005)(53936002)(6512007)(6436002)(36756003)(97736004)(71190400001)(26005)(102836004)(76176011)(6116002)(6486002)(3846002)(4326008)(86362001)(256004)(14444005)(71200400001)(5250100002)(316002)(7736002)(446003)(105586002)(68736007)(7416002)(8936002)(118296001)(8676002)(81156014)(106356001)(478600001)(6636002)(5660300001)(44832011)(2616005)(476003)(486006)(305945005)(52116002)(6506007)(386003)(11346002)(81166006)(50226002)(99286004)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB5172; H:AM0PR04MB4290.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: VJvKZjje/mZwsBkhxpZzEr0E5RHN8tQUID5PEIYHHMDwRABxEImnqCpr+nVAEw3+OQtGH9MzD84oCjwv5jRTO/WDkymlTVyV5hUYRfyIJqak8Wz/OCNIuCCHfftEvPDsxq4tBSsknK1FOxBo8cjoxaZCXhXG2Vho9OeRNnzTWticOzryCsW2N+M1xdqSUlpVHKZ0Xqx3gnKrddpvDLiLJxUc0KlAfxMcIkYj0TjMPbsIvEoSLtNFrQIHjQUf2DDc2chNp2Pl10pJ7tqT2mWvJZRA/FG4adVKwVKo8A1o+dLz5oqOqsDLyW4T9Kgw7tl3NJLA+1Af0TwWauaaufdTOQG9gtLuy+vTs/MkxBcP1QY= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 497742ac-5de6-41cd-e134-08d62d48c17f X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Oct 2018 18:06:23.0184 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5172 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org This was implemented in the driver but not actually defined and referenced in dts. This makes it always on. From reference manual in section "10.4.1.4.1 Power Distribution": "Display domain - The DISPLAY domain contains GIS, CSI, PXP, LCDIF, PCIe, DCIC, and LDB. It is supplied by internal regulator." The current pd_pcie is actually only for PCIE_PHY, the PCIE ip block is actually inside the DISPLAY domain. Handle this by adding the pcie node in both power domains. Signed-off-by: Leonard Crestez --- arch/arm/boot/dts/imx6sx.dtsi | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi index 95a3c1cb877d..b7f815d82d1b 100644 --- a/arch/arm/boot/dts/imx6sx.dtsi +++ b/arch/arm/boot/dts/imx6sx.dtsi @@ -778,10 +778,22 @@ #power-domain-cells = <0>; power-supply = <®_soc>; clocks = <&clks IMX6SX_CLK_GPU>; }; + pd_disp: power-domain@2 { + reg = <2>; + #power-domain-cells = <0>; + clocks = <&clks IMX6SX_CLK_PXP_AXI>, + <&clks IMX6SX_CLK_DISPLAY_AXI>, + <&clks IMX6SX_CLK_LCDIF1_PIX>, + <&clks IMX6SX_CLK_LCDIF_APB>, + <&clks IMX6SX_CLK_LCDIF2_PIX>, + <&clks IMX6SX_CLK_CSI>, + <&clks IMX6SX_CLK_VADC>; + }; + pd_pci: power-domain@3 { reg = <3>; #power-domain-cells = <0>; power-supply = <®_pcie>; }; @@ -1196,10 +1208,11 @@ reg = <0x02218000 0x4000>; interrupts = ; clocks = <&clks IMX6SX_CLK_PXP_AXI>, <&clks IMX6SX_CLK_DISPLAY_AXI>; clock-names = "pxp-axi", "disp-axi"; + power-domains = <&pd_disp>; status = "disabled"; }; csi2: csi@221c000 { reg = <0x0221c000 0x4000>; @@ -1217,10 +1230,11 @@ interrupts = ; clocks = <&clks IMX6SX_CLK_LCDIF1_PIX>, <&clks IMX6SX_CLK_LCDIF_APB>, <&clks IMX6SX_CLK_DISPLAY_AXI>; clock-names = "pix", "axi", "disp_axi"; + power-domains = <&pd_disp>; status = "disabled"; }; lcdif2: lcdif@2224000 { compatible = "fsl,imx6sx-lcdif", "fsl,imx28-lcdif"; @@ -1228,19 +1242,21 @@ interrupts = ; clocks = <&clks IMX6SX_CLK_LCDIF2_PIX>, <&clks IMX6SX_CLK_LCDIF_APB>, <&clks IMX6SX_CLK_DISPLAY_AXI>; clock-names = "pix", "axi", "disp_axi"; + power-domains = <&pd_disp>; status = "disabled"; }; vadc: vadc@2228000 { reg = <0x02228000 0x4000>, <0x0222c000 0x4000>; reg-names = "vadc-vafe", "vadc-vdec"; clocks = <&clks IMX6SX_CLK_VADC>, <&clks IMX6SX_CLK_CSI>; clock-names = "vadc", "csi"; + power-domains = <&pd_disp>; status = "disabled"; }; }; adc1: adc@2280000 { @@ -1361,10 +1377,11 @@ clocks = <&clks IMX6SX_CLK_PCIE_AXI>, <&clks IMX6SX_CLK_LVDS1_OUT>, <&clks IMX6SX_CLK_PCIE_REF_125M>, <&clks IMX6SX_CLK_DISPLAY_AXI>; clock-names = "pcie", "pcie_bus", "pcie_phy", "pcie_inbound_axi"; - power-domains = <&pd_pci>; + power-domains = <&pd_disp>, <&pd_pci>; + power-domain-names = "pcie", "pcie_phy"; status = "disabled"; }; }; };