From patchwork Wed Feb 20 14:38:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aisheng Dong X-Patchwork-Id: 10822233 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 29BD817E9 for ; Wed, 20 Feb 2019 14:40:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 144602E58F for ; Wed, 20 Feb 2019 14:40:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 125A92E5A8; Wed, 20 Feb 2019 14:40:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 53A5E2E6BE for ; Wed, 20 Feb 2019 14:40:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726516AbfBTOkZ (ORCPT ); Wed, 20 Feb 2019 09:40:25 -0500 Received: from mail-eopbgr70085.outbound.protection.outlook.com ([40.107.7.85]:14784 "EHLO EUR04-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726219AbfBTOkZ (ORCPT ); Wed, 20 Feb 2019 09:40:25 -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=rDhpSEnggYlC4rAniuU47I3jqCrYlqv1+iNpmmAMQCU=; b=MVoegQ3YrjtBihRJ0CnhbJB+FpTUAYz8q+tUPtioUXf1EI556UvS4Ae7P8MTy9RGEwq+9btY3QlTkYGcRkjz7t9mkKq6UavySD2hoeAXAG/Aj+dpioxVsx2d/+p0GiRq7qJnipKvi3dUUqIYvNod7XYhDdvNPnVNXSznOkhlkf0= Received: from AM6PR04MB4215.eurprd04.prod.outlook.com (52.135.168.141) by AM6PR04MB4917.eurprd04.prod.outlook.com (20.177.33.156) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1601.21; Wed, 20 Feb 2019 14:38:36 +0000 Received: from AM6PR04MB4215.eurprd04.prod.outlook.com ([fe80::e944:6749:3ee6:4e08]) by AM6PR04MB4215.eurprd04.prod.outlook.com ([fe80::e944:6749:3ee6:4e08%5]) with mapi id 15.20.1622.020; Wed, 20 Feb 2019 14:38:36 +0000 From: Aisheng Dong To: "linux-arm-kernel@lists.infradead.org" CC: "dongas86@gmail.com" , "kernel@pengutronix.de" , "shawnguo@kernel.org" , Fabio Estevam , dl-linux-imx , "rjw@rjwysocki.net" , "ulf.hansson@linaro.org" , "khilman@kernel.org" , "linux-pm@vger.kernel.org" , Aisheng Dong Subject: [PATCH 3/3] firmware: imx: scu-pd: decouple the SS information from domain names Thread-Topic: [PATCH 3/3] firmware: imx: scu-pd: decouple the SS information from domain names Thread-Index: AQHUySn2+FLHWnHhe0qpwYe4cxsiAA== Date: Wed, 20 Feb 2019 14:38:36 +0000 Message-ID: <1550673013-21462-4-git-send-email-aisheng.dong@nxp.com> References: <1550673013-21462-1-git-send-email-aisheng.dong@nxp.com> In-Reply-To: <1550673013-21462-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: HK0PR03CA0074.apcprd03.prod.outlook.com (2603:1096:203:72::14) To AM6PR04MB4215.eurprd04.prod.outlook.com (2603:10a6:209:4f::13) 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-ms-office365-filtering-correlation-id: 8d49c6de-a761-450d-1255-08d697411897 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605104)(4618075)(2017052603328)(7153060)(7193020);SRVR:AM6PR04MB4917; x-ms-traffictypediagnostic: AM6PR04MB4917: x-microsoft-exchange-diagnostics: =?iso-8859-1?q?1=3BAM6PR04MB4917=3B23=3ANB?= =?iso-8859-1?q?RuCZ/yxqn+58FGUJIQYL4GmzZBBHIDV2zmuqf/cAEnZo9hIQeWqxKgI+NUeV?= =?iso-8859-1?q?olwXljrgcmHcvnu8AYn2bltqsJ95kTUyLDekVwY0KHBoQeRvQJgtNP9E3jly?= =?iso-8859-1?q?YemABT0YVnYx97vKTqyUkqERc/6eGxiL6FGGITvKkGSPHJj5JMJR2Pb15DAW?= =?iso-8859-1?q?49PbZ83AqZzQcNBGoZqzkGyo3EE0L3ICUsD3itt5q7Psmih1XbjEKj2MPKzu?= =?iso-8859-1?q?WGrU/L8pasjGL3br7dp8xpNvt1Oe5K5fssQ5nDsLcR81u+cr0arEzVYb9mA0?= =?iso-8859-1?q?2aSW8CEa8bAbxHbzgBcFeeUfRYtAgyX9LZp9t9UnB3CiZAUZlrvmc3FzPNZk?= =?iso-8859-1?q?PuVbw7j5YuoJVKHnAW/YQf1Zi3s7WF+4pr5hdEiJU8248nXDD6ffKsZi/UJP?= =?iso-8859-1?q?PstOHN7vPXoa8tR4JP6zMe3NmNCEwB3CuvHb864FPezCdbaOzGtccWeIw/C+?= =?iso-8859-1?q?Fto6epoKawUJMv1z6DfroTEbBz48dP4u4VffbziUHMmdTtiHyt5dGyBF1kU3?= =?iso-8859-1?q?2qFl+MmCDpnCCA7qK4V+R/puzuGC9HLIOMFQddEZBeiVkkOFnkGePUneGY7F?= =?iso-8859-1?q?cpQM23JiQ4zSuwU5nXNtlTwYdiM+uiLUrB2kUbm/WkKULXBSrfGN77/cTz83?= =?iso-8859-1?q?uKVRrn9nmXNnavOKqTBlsHWGNnG2YwILro/MGC6JQt7UH6r6F/HHDAATIE+4?= =?iso-8859-1?q?H78C13Pe0wa/IVnKsWJdrwNmqD+H6q7hbkAcn4uT/Der0nw21EkPUvIeIWEV?= =?iso-8859-1?q?ZhtI6YTJkfPlDRlVW4vxXWtTpMrxaTiTDfdzacjtGwKUM1M+bndqOJtYeZA4?= =?iso-8859-1?q?ZF05pFrHY3MFrtV59qacmxjW7hSFTpmqMJORoR5wDCro0eX5qOYR7btvYuc4?= =?iso-8859-1?q?UFV1ZO9xE/VEdh0LdhELxe1KeaARwi/OBOYxBRRCkdFdgKdUm5UvK+HHYH+L?= =?iso-8859-1?q?JUuVmZZUPL80KanceHT71AXkoPtlH76IdWp8DQE6bG25xYWdKXaCMd4LdlXe?= =?iso-8859-1?q?HL71NpMIT3Dx3ieFOmEZl1fMf0l7GFK4OA4ZwzIG7tBcUVF6dgjw7HFAtxd+?= =?iso-8859-1?q?rTBNiU/UwA/0bRebu2uxts1WVNwEEeHY975XLvPW1reN5EtTIN2+MGE9dhUu?= =?iso-8859-1?q?PbcHbyNkHsSw7DotlrXUJ17ap40rDfor8B7UZhMDYu5IMSPaEo2yqDG8O+5B?= =?iso-8859-1?q?KYtUOGOLXAZ9JdC5kp19kVbtgUGM3h+cUCMgtNy3tQz7GRtjH53+IjvY2tjB?= =?iso-8859-1?q?2wT5FHBgw1hPbCcCgu?= x-microsoft-antispam-prvs: x-forefront-prvs: 0954EE4910 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(396003)(376002)(136003)(346002)(366004)(39860400002)(189003)(199004)(8676002)(305945005)(97736004)(71190400001)(7736002)(14454004)(81166006)(8936002)(256004)(52116002)(2906002)(81156014)(2501003)(478600001)(6512007)(50226002)(5660300002)(71200400001)(53936002)(68736007)(316002)(54906003)(6486002)(6506007)(6436002)(106356001)(44832011)(86362001)(36756003)(5640700003)(2616005)(486006)(6916009)(186003)(3846002)(476003)(4326008)(25786009)(6116002)(26005)(99286004)(102836004)(2351001)(446003)(11346002)(386003)(105586002)(66066001)(76176011);DIR:OUT;SFP:1101;SCL:1;SRVR:AM6PR04MB4917;H:AM6PR04MB4215.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-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: kffireKtF0YuodszUh3QrxhnweAXS/5rIemMk8eoI8M62swxREBd/+TM1KUYT8oT39+C5U/YYzpAgqzD5faSK+Zoy/gD0osZINloywuGadPsghgF8kM4YEWsmQE25FIbQ0ygFVozTEpv2J/oRB/ZQZijVmqAuCBorNX0NoBakG6yG1RhT9+yttZ+YhV4ZJAsKv9nO9gJsT0euF/6sLtgG+FLg3fRjzhn2PaswZCKVmIooecJbQOzs/ZUD2bpjjBus8EOR11MmrqmYqFyovoMjAwQb+4MHyd8mW4ouTHb/pP75H5ulr/OlVISVeYk1D0Q0yl+1yHeSrZTJEBSid+UCYnYK001SQpyCZFtbn+kZD39zRyifQkqGdGCUlBavmzZevlvTKC6DpZ0dQ2gZjwjNO/R3MXa/8IHIF+iVNQGd7Q= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8d49c6de-a761-450d-1255-08d697411897 X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Feb 2019 14:38:32.6031 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4917 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP As resource power domain service is provided by SCU firmware, no SS information required. So we can remove the SS indicator from the domain names, then the domains defined can be better shared among different SCU based platforms. Cc: Ulf Hansson Cc: Shawn Guo Cc: Sascha Hauer Cc: "Rafael J. Wysocki" Cc: Kevin Hilman Cc: linux-pm@vger.kernel.org Signed-off-by: Dong Aisheng --- drivers/firmware/imx/scu-pd.c | 92 ++++++++++++++++++++++--------------------- 1 file changed, 48 insertions(+), 44 deletions(-) diff --git a/drivers/firmware/imx/scu-pd.c b/drivers/firmware/imx/scu-pd.c index 48f49f8..cd745b9 100644 --- a/drivers/firmware/imx/scu-pd.c +++ b/drivers/firmware/imx/scu-pd.c @@ -87,49 +87,51 @@ struct imx_sc_pd_soc { static const struct imx_sc_pd_range imx8qxp_scu_pd_ranges[] = { /* LSIO SS */ - { "lsio-pwm", IMX_SC_R_PWM_0, 8, true, 0 }, - { "lsio-gpio", IMX_SC_R_GPIO_0, 8, true, 0 }, - { "lsio-gpt", IMX_SC_R_GPT_0, 5, true, 0 }, - { "lsio-kpp", IMX_SC_R_KPP, 1, false, 0 }, - { "lsio-fspi", IMX_SC_R_FSPI_0, 2, true, 0 }, - { "lsio-mu", IMX_SC_R_MU_0A, 14, true, 0 }, + { "pwm", IMX_SC_R_PWM_0, 8, true, 0 }, + { "gpio", IMX_SC_R_GPIO_0, 8, true, 0 }, + { "gpt", IMX_SC_R_GPT_0, 5, true, 0 }, + { "kpp", IMX_SC_R_KPP, 1, false, 0 }, + { "fspi", IMX_SC_R_FSPI_0, 2, true, 0 }, + { "mu", IMX_SC_R_MU_0A, 14, true, 0 }, /* CONN SS */ - { "con-usb", IMX_SC_R_USB_0, 2, true, 0 }, - { "con-usb0phy", IMX_SC_R_USB_0_PHY, 1, false, 0 }, - { "con-usb2", IMX_SC_R_USB_2, 1, false, 0 }, - { "con-usb2phy", IMX_SC_R_USB_2_PHY, 1, false, 0 }, - { "con-sdhc", IMX_SC_R_SDHC_0, 3, true, 0 }, - { "con-enet", IMX_SC_R_ENET_0, 2, true, 0 }, - { "con-nand", IMX_SC_R_NAND, 1, false, 0 }, - { "con-mlb", IMX_SC_R_MLB_0, 1, true, 0 }, - - /* Audio DMA SS */ - { "adma-audio-pll0", IMX_SC_R_AUDIO_PLL_0, 1, false, 0 }, - { "adma-audio-pll1", IMX_SC_R_AUDIO_PLL_1, 1, false, 0 }, - { "adma-audio-clk-0", IMX_SC_R_AUDIO_CLK_0, 1, false, 0 }, - { "adma-dma0-ch", IMX_SC_R_DMA_0_CH0, 16, true, 0 }, - { "adma-dma1-ch", IMX_SC_R_DMA_1_CH0, 16, true, 0 }, - { "adma-dma2-ch", IMX_SC_R_DMA_2_CH0, 5, true, 0 }, - { "adma-asrc0", IMX_SC_R_ASRC_0, 1, false, 0 }, - { "adma-asrc1", IMX_SC_R_ASRC_1, 1, false, 0 }, - { "adma-esai0", IMX_SC_R_ESAI_0, 1, false, 0 }, - { "adma-spdif0", IMX_SC_R_SPDIF_0, 1, false, 0 }, - { "adma-sai", IMX_SC_R_SAI_0, 3, true, 0 }, - { "adma-amix", IMX_SC_R_AMIX, 1, false, 0 }, - { "adma-mqs0", IMX_SC_R_MQS_0, 1, false, 0 }, - { "adma-dsp", IMX_SC_R_DSP, 1, false, 0 }, - { "adma-dsp-ram", IMX_SC_R_DSP_RAM, 1, false, 0 }, - { "adma-can", IMX_SC_R_CAN_0, 3, true, 0 }, - { "adma-ftm", IMX_SC_R_FTM_0, 2, true, 0 }, - { "adma-lpi2c", IMX_SC_R_I2C_0, 4, true, 0 }, - { "adma-adc", IMX_SC_R_ADC_0, 1, true, 0 }, - { "adma-lcd", IMX_SC_R_LCD_0, 1, true, 0 }, - { "adma-lcd0-pwm", IMX_SC_R_LCD_0_PWM_0, 1, true, 0 }, - { "adma-lpuart", IMX_SC_R_UART_0, 4, true, 0 }, - { "adma-lpspi", IMX_SC_R_SPI_0, 4, true, 0 }, - - /* VPU SS */ + { "usb", IMX_SC_R_USB_0, 2, true, 0 }, + { "usb0phy", IMX_SC_R_USB_0_PHY, 1, false, 0 }, + { "usb2", IMX_SC_R_USB_2, 1, false, 0 }, + { "usb2phy", IMX_SC_R_USB_2_PHY, 1, false, 0 }, + { "sdhc", IMX_SC_R_SDHC_0, 3, true, 0 }, + { "enet", IMX_SC_R_ENET_0, 2, true, 0 }, + { "nand", IMX_SC_R_NAND, 1, false, 0 }, + { "mlb", IMX_SC_R_MLB_0, 1, true, 0 }, + + /* AUDIO SS */ + { "audio-pll0", IMX_SC_R_AUDIO_PLL_0, 1, false, 0 }, + { "audio-pll1", IMX_SC_R_AUDIO_PLL_1, 1, false, 0 }, + { "audio-clk-0", IMX_SC_R_AUDIO_CLK_0, 1, false, 0 }, + { "dma0-ch", IMX_SC_R_DMA_0_CH0, 16, true, 0 }, + { "dma1-ch", IMX_SC_R_DMA_1_CH0, 16, true, 0 }, + { "dma2-ch", IMX_SC_R_DMA_2_CH0, 5, true, 0 }, + { "asrc0", IMX_SC_R_ASRC_0, 1, false, 0 }, + { "asrc1", IMX_SC_R_ASRC_1, 1, false, 0 }, + { "esai0", IMX_SC_R_ESAI_0, 1, false, 0 }, + { "spdif0", IMX_SC_R_SPDIF_0, 1, false, 0 }, + { "sai", IMX_SC_R_SAI_0, 3, true, 0 }, + { "amix", IMX_SC_R_AMIX, 1, false, 0 }, + { "mqs0", IMX_SC_R_MQS_0, 1, false, 0 }, + { "dsp", IMX_SC_R_DSP, 1, false, 0 }, + { "dsp-ram", IMX_SC_R_DSP_RAM, 1, false, 0 }, + + /* DMA SS */ + { "can", IMX_SC_R_CAN_0, 3, true, 0 }, + { "ftm", IMX_SC_R_FTM_0, 2, true, 0 }, + { "lpi2c", IMX_SC_R_I2C_0, 4, true, 0 }, + { "adc", IMX_SC_R_ADC_0, 1, true, 0 }, + { "lcd", IMX_SC_R_LCD_0, 1, true, 0 }, + { "lcd0-pwm", IMX_SC_R_LCD_0_PWM_0, 1, true, 0 }, + { "lpuart", IMX_SC_R_UART_0, 4, true, 0 }, + { "lpspi", IMX_SC_R_SPI_0, 4, true, 0 }, + + /* VPU SS */ { "vpu", IMX_SC_R_VPU, 1, false, 0 }, { "vpu-pid", IMX_SC_R_VPU_PID0, 8, true, 0 }, { "vpu-dec0", IMX_SC_R_VPU_DEC_0, 1, false, 0 }, @@ -139,14 +141,16 @@ static const struct imx_sc_pd_range imx8qxp_scu_pd_ranges[] = { { "gpu0-pid", IMX_SC_R_GPU_0_PID0, 4, true, 0 }, /* HSIO SS */ - { "hsio-pcie-b", IMX_SC_R_PCIE_B, 1, false, 0 }, - { "hsio-serdes-1", IMX_SC_R_SERDES_1, 1, false, 0 }, + { "pcie-b", IMX_SC_R_PCIE_B, 1, false, 0 }, + { "serdes-1", IMX_SC_R_SERDES_1, 1, false, 0 }, { "hsio-gpio", IMX_SC_R_HSIO_GPIO, 1, false, 0 }, - /* MIPI/LVDS SS */ + /* MIPI SS */ { "mipi0", IMX_SC_R_MIPI_0, 1, false, 0 }, { "mipi0-pwm0", IMX_SC_R_MIPI_0_PWM_0, 1, false, 0 }, { "mipi0-i2c", IMX_SC_R_MIPI_0_I2C_0, 2, true, 0 }, + + /* LVDS SS */ { "lvds0", IMX_SC_R_LVDS_0, 1, false, 0 }, /* DC SS */