From patchwork Sun May 9 14:47:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 12246419 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A0FB6C433B4 for ; Sun, 9 May 2021 14:49:21 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 132A2613C2 for ; Sun, 9 May 2021 14:49:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 132A2613C2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=th2d8Yh7ZoKIMV23410tzjR+zEULBF2I9BAzCSY5i0I=; b=TFxI6g7sH3X4VgbL/+YYHgdG2 Im+cfSkRRW5FyuAMCYPzW8CX7Eh5tzrEnWigzwABVfICPv1H/pWHsrNFg345yI6AvBoA0caYVb2Z6 vO8Cl1lHK8+1jCp9Dys6OaRfCTxmwMWBv7BRMXJNSzWl1vXlz0DQzESkK3U6uhSWL5Q+Cu6PEVIAo m+vFY+dk5ngi1hFp/x0a1F+13BgGkwkLtGPXhQob8JX4H1NGNTCEkASiCfVZV+wL34TmQmXAcnXwp 7Payo4UZp04Dk0T03PaAIvSl+fYG/4V4rxKEPV2QDkHlBJVhAloRYzOgdiaY3nItnTRTf2eZf7ONa 2O4il6q4g==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lfkik-00BlRa-1c; Sun, 09 May 2021 14:47:50 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lfkiJ-00BlNc-VG for linux-arm-kernel@desiato.infradead.org; Sun, 09 May 2021 14:47:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=tOmSoHd45k/En0UqK1OQagmHQENYt50xkIt6EPZ+HoE=; b=jH0LPhSxNSqTdvWVyxkA42AFgv 21kKh3BbDu83aXXAqm0SWQGqXq+uJMyB3Ac3xT2sT0eZ+taunKtRaSfzblPo6stix4qJySdHP4kj9 aaghxN+jnTTkh14/uqdwrnAywYxHk1GGpqrFLFmwCBWwApAyOOJZKhGjCkN9Ii5DY83WvaO5fWdsu L7ZwRmeIwmarX02XFH09qIF3OAx4p8TW3boIqaWUAXpOovUX/ibv72BKkYG7JmoV7MeUXU/6iRaU0 N5d+98tqUBFEX2gOKaG1i+V6Uy93Qjpavn9GPgQB/2M6QsVRN4qzMdh/pohvwfy8ihnppiY2jedG+ 5AnY7eYQ==; Received: from mail-il1-x12b.google.com ([2607:f8b0:4864:20::12b]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lfkiH-0080DT-2K for linux-arm-kernel@lists.infradead.org; Sun, 09 May 2021 14:47:22 +0000 Received: by mail-il1-x12b.google.com with SMTP id c3so11887056ils.5 for ; Sun, 09 May 2021 07:47:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tOmSoHd45k/En0UqK1OQagmHQENYt50xkIt6EPZ+HoE=; b=BOWv2YMjx6KnqG3FinsOCz3ZE9uxNbcuDPEDQVlnWwyrWIQZ3Boy5mnZwMuzvm3sXO iusTpMgJQXC0PgoXccZmPSN2gwoNi6t5eYiAam0EfiN45k35rppklWzNwfhdO6MzuLEr l++kvSEPQjR2WFSdZDokrvforNgyGduoZoz2rfCKITgZhnXp7XOk+m0XSNygV99wEw8+ s4xQ2CDfN+AiDdOIRsojc3i5UEXok3RDHxsps1XswDSibFYIu8r63HX7hDNfnLVNMVZh 5wNO1eq4AMDMFH9zepGu/2y96TPWGb5T0WW3mtvnDyF+bguBFopK2Xo3qmFocxm0pHWW Hg8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tOmSoHd45k/En0UqK1OQagmHQENYt50xkIt6EPZ+HoE=; b=FDv4V9WZsaVxhnZz2dX+1tQk7N7Vz2+fKngZzz09E7i/gnYdwbUAfIypWhYz0Iyk7H 7K13/+x4JXPr6hTGo8rXC5G8DgWe77SlcEX6r1/sqNLnvLy7vQhusH9O3t3aoeXbnI9S D3Bo5dB1EebV9TKkLB5z52YMOjlBGyf33CRTHUqU3etPSH7vuhOpfcYdSmeE3ZzkFHqe JaDJbR3hi5nB1NT5Fv8uoyfmjNif/Rb01gBaMQ2T4vNpbi2fu+9WfnvA0Yiv4A7sjsel FstleNhLG73HsKm0M+BAiQLRst+HX5rsiEsAlOCBZ3Q7oNSmJvLYMKHxysSaHNE1YljX mttA== X-Gm-Message-State: AOAM531l6GZDl+XWEaWPSKhu7Rya7IzZJ5VpiGPZoYAzVJm50Fp/5ZBL YptJ5G6dM86hFwr3wfFM0LRdkMnjZK4I6A== X-Google-Smtp-Source: ABdhPJxn/XWKuVsA+82U1+/CUElRr0Gc3WQ/8n91DgaIjUMvlPtDoRIyi2EyBelNsxxDj3HnuDgodA== X-Received: by 2002:a92:c884:: with SMTP id w4mr17678068ilo.186.1620571638987; Sun, 09 May 2021 07:47:18 -0700 (PDT) Received: from aford-IdeaCentre-A730.lan ([2601:448:8400:9e8:18a0:bffb:ecae:3d39]) by smtp.gmail.com with ESMTPSA id d4sm6281759ilg.65.2021.05.09.07.47.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 May 2021 07:47:18 -0700 (PDT) From: Adam Ford To: linux-arm-kernel@lists.infradead.org Cc: Adam Ford , Krzysztof Kozlowski Subject: [RFC 1/4] soc: imx: gpcv2: add support for i.MX8MN power domains Date: Sun, 9 May 2021 09:47:08 -0500 Message-Id: <20210509144711.2192991-2-aford173@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210509144711.2192991-1-aford173@gmail.com> References: <20210509144711.2192991-1-aford173@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210509_074721_130308_5F233B49 X-CRM114-Status: GOOD ( 16.12 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This adds support for the power domains founds on i.MX8MN. The Nano has fewer domains than the Mini, and the access to some of these domains is different than that of the Mini, the Mini power domains cannot be reused. Signed-off-by: Adam Ford Acked-by: Krzysztof Kozlowski diff --git a/drivers/soc/imx/gpcv2.c b/drivers/soc/imx/gpcv2.c index 35bbb1bc5159..3120718e1dd7 100644 --- a/drivers/soc/imx/gpcv2.c +++ b/drivers/soc/imx/gpcv2.c @@ -20,6 +20,7 @@ #include #include #include +#include #define GPC_LPCR_A_CORE_BSC 0x000 @@ -58,6 +59,12 @@ #define IMX8MM_PCIE_A53_DOMAIN BIT(3) #define IMX8MM_MIPI_A53_DOMAIN BIT(2) +#define IMX8MN_DISPMIX_A53_DOMAIN BIT(12) +#define IMX8MN_GPUMIX_A53_DOMAIN BIT(9) +#define IMX8MN_DDR1_A53_DOMAIN BIT(7) +#define IMX8MN_OTG1_A53_DOMAIN BIT(4) +#define IMX8MN_MIPI_A53_DOMAIN BIT(2) + #define GPC_PU_PGC_SW_PUP_REQ 0x0f8 #define GPC_PU_PGC_SW_PDN_REQ 0x104 @@ -94,6 +101,12 @@ #define IMX8MM_PCIE_SW_Pxx_REQ BIT(1) #define IMX8MM_MIPI_SW_Pxx_REQ BIT(0) +#define IMX8MN_DISPMIX_SW_Pxx_REQ BIT(10) +#define IMX8MN_GPUMIX_SW_Pxx_REQ BIT(7) +#define IMX8MN_DDR1_SW_Pxx_REQ BIT(5) +#define IMX8MN_OTG1_SW_Pxx_REQ BIT(2) +#define IMX8MN_MIPI_SW_Pxx_REQ BIT(0) + #define GPC_M4_PU_PDN_FLG 0x1bc #define GPC_PU_PWRHSK 0x1fc @@ -116,6 +129,14 @@ #define IMX8MM_VPUMIX_HSK_PWRDNREQN BIT(8) #define IMX8MM_DISPMIX_HSK_PWRDNREQN BIT(7) #define IMX8MM_HSIO_HSK_PWRDNREQN (BIT(5) | BIT(6)) + +#define IMX8MN_GPUMIX_HSK_PWRDNACKN (BIT(29) | BIT(27)) +#define IMX8MN_DISPMIX_HSK_PWRDNACKN BIT(25) +#define IMX8MN_HSIO_HSK_PWRDNACKN BIT(23) +#define IMX8MN_GPUMIX_HSK_PWRDNREQN (BIT(11) | BIT(9)) +#define IMX8MN_DISPMIX_HSK_PWRDNREQN BIT(7) +#define IMX8MN_HSIO_HSK_PWRDNREQN BIT(5) + /* * The PGC offset values in Reference Manual * (Rev. 1, 01/2018 and the older ones) GPC chapter's @@ -152,6 +173,12 @@ #define IMX8MM_PGC_VPUG2 28 #define IMX8MM_PGC_VPUH1 29 +#define IMX8MN_PGC_MIPI 16 +#define IMX8MN_PGC_OTG1 18 +#define IMX8MN_PGC_DDR1 21 +#define IMX8MN_PGC_GPUMIX 23 +#define IMX8MN_PGC_DISPMIX 26 + #define GPC_PGC_CTRL(n) (0x800 + (n) * 0x40) #define GPC_PGC_SR(n) (GPC_PGC_CTRL(n) + 0xc) @@ -764,6 +791,71 @@ static const struct imx_pgc_domain_data imx8mm_pgc_domain_data = { .reg_access_table = &imx8mm_access_table, }; +static const struct imx_pgc_domain imx8mn_pgc_domains[] = { + [IMX8MN_POWER_DOMAIN_HSIOMIX] = { + .genpd = { + .name = "hsiomix", + }, + .bits = { + .pxx = 0, /* no power sequence control */ + .map = 0, /* no power sequence control */ + .hskreq = IMX8MN_HSIO_HSK_PWRDNREQN, + .hskack = IMX8MN_HSIO_HSK_PWRDNACKN, + }, + }, + + [IMX8MN_POWER_DOMAIN_OTG1] = { + .genpd = { + .name = "usb-otg1", + }, + .bits = { + .pxx = IMX8MN_OTG1_SW_Pxx_REQ, + .map = IMX8MN_OTG1_A53_DOMAIN, + }, + .pgc = IMX8MN_PGC_OTG1, + }, + + [IMX8MN_POWER_DOMAIN_GPUMIX] = { + .genpd = { + .name = "gpumix", + }, + .bits = { + .pxx = IMX8MN_GPUMIX_SW_Pxx_REQ, + .map = IMX8MN_GPUMIX_A53_DOMAIN, + .hskreq = IMX8MN_GPUMIX_HSK_PWRDNREQN, + .hskack = IMX8MN_GPUMIX_HSK_PWRDNACKN, + }, + .pgc = IMX8MN_PGC_GPUMIX, + }, +}; + +static const struct regmap_range imx8mn_yes_ranges[] = { + regmap_reg_range(GPC_LPCR_A_CORE_BSC, + GPC_PU_PWRHSK), + regmap_reg_range(GPC_PGC_CTRL(IMX8MN_PGC_MIPI), + GPC_PGC_SR(IMX8MN_PGC_MIPI)), + regmap_reg_range(GPC_PGC_CTRL(IMX8MN_PGC_OTG1), + GPC_PGC_SR(IMX8MN_PGC_OTG1)), + regmap_reg_range(GPC_PGC_CTRL(IMX8MN_PGC_DDR1), + GPC_PGC_SR(IMX8MN_PGC_DDR1)), + regmap_reg_range(GPC_PGC_CTRL(IMX8MN_PGC_GPUMIX), + GPC_PGC_SR(IMX8MN_PGC_GPUMIX)), + regmap_reg_range(GPC_PGC_CTRL(IMX8MN_PGC_DISPMIX), + GPC_PGC_SR(IMX8MN_PGC_DISPMIX)), +}; + +static const struct regmap_access_table imx8mn_access_table = { + .yes_ranges = imx8mn_yes_ranges, + .n_yes_ranges = ARRAY_SIZE(imx8mn_yes_ranges), +}; + +static const struct imx_pgc_domain_data imx8mn_pgc_domain_data = { + .domains = imx8mn_pgc_domains, + .domains_num = ARRAY_SIZE(imx8mn_pgc_domains), + .reg_access_table = &imx8mn_access_table, +}; + + static int imx_pgc_domain_probe(struct platform_device *pdev) { struct imx_pgc_domain *domain = pdev->dev.platform_data; @@ -948,6 +1040,7 @@ static int imx_gpcv2_probe(struct platform_device *pdev) static const struct of_device_id imx_gpcv2_dt_ids[] = { { .compatible = "fsl,imx7d-gpc", .data = &imx7_pgc_domain_data, }, { .compatible = "fsl,imx8mm-gpc", .data = &imx8mm_pgc_domain_data, }, + { .compatible = "fsl,imx8mn-gpc", .data = &imx8mn_pgc_domain_data, }, { .compatible = "fsl,imx8mq-gpc", .data = &imx8m_pgc_domain_data, }, { } }; From patchwork Sun May 9 14:47:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 12246423 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B1014C43460 for ; Sun, 9 May 2021 14:49:22 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2EFC8613C2 for ; Sun, 9 May 2021 14:49:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2EFC8613C2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=fdG3gZjycAm3NSFJgPjEdZ0hXb1bzwYdUdSDPBXL/kw=; b=N2hkSknyVQra7SzuFH7RvO92+ aaKiVVD7cf9zb0TNNI0ok8K5bDb0C8n/0h3MjfCJIWx+swh8uoFYcGlffzTAgBhYm4S/1Ijx6YB/W o9YbAPh2gPwNJFs+P1Msk2qOn1Eg3pZIZ+DhLTBfERyqLNnfWtFwyqFddixKiM6rTZ5EKDGR09aRh OgS9HzixmleU9MLLIw7gusfU2QFNdLSffbEKMjvKF3xUFSCKd3+KxYH1rQptUZhQnckcaqIUnLVQD zA0X24cLVVzK7CqoB34rnTkJQ5bQLV7Prz6LMWjMjidIRIfNebYbC1D+MeCn25cPSB731BLcg2KeZ ICD9ODrgw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lfkia-00BlQi-F2; Sun, 09 May 2021 14:47:40 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lfkiK-00BlNf-JQ for linux-arm-kernel@desiato.infradead.org; Sun, 09 May 2021 14:47:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=Dm9w7LTwzf3cryqQtmGw4sXtE1JTs1J8nyoB4C0cVW4=; b=A6yjDAyYPp1mR6G/y2ZjRE3lWs HT+mPhUXM+EJF33RqYlLIdSHYUjNV2MRc8n+ibNbYT1Owul9Pv2+p073B5my7kmLWdM6Qe2VII3Lr fAlcwA9+b2OBZ6/YubTuqWDk43E4SXu9xSe1meuuqE9/3YzgqZ1o4O9YsKsAlCJmBlm72a5qlEjU7 VgSWch74IcGMloLNZOHqujnzFJknOg/WmdH4SbrwQ5iOCuyOkEc3vnweRC+wUDKnGXq95q22eIXRT HONe3+KZPldgLjS9BkJUm+SxPpIFAM0hq8Lzk8R5KCSdHMPoprsBI+DnHMx34LDfTJhp75d6SCaJa Ye0em9PA==; Received: from mail-io1-xd29.google.com ([2607:f8b0:4864:20::d29]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lfkiI-0080DU-3a for linux-arm-kernel@lists.infradead.org; Sun, 09 May 2021 14:47:23 +0000 Received: by mail-io1-xd29.google.com with SMTP id d24so2549443ios.2 for ; Sun, 09 May 2021 07:47:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Dm9w7LTwzf3cryqQtmGw4sXtE1JTs1J8nyoB4C0cVW4=; b=sY2tO/o4Sx5dcbnVaA5UYIWPZg26/H6n7/BPlkw0LhS6SMZ0cgLlQx6ROXzCuCnO0V R57D1xRElwrtWhyg+zrKrfOW4MWPK3yBl6Wr8jluTX1NFMMkNkLOuGi0QXcbOmXJVwGY IV0M902cpIBcpEpMti5/JN/UoFzgolypgNEdnExAHetimkmKogIsxlOln8vhjV0hRpow 06ltt9xXmFYcTMo8uVIP3PUnFrupmsl4IddbPRbfFwJdp/sKOyhk7YJyQsrb6YCG7f95 DO3V5el8PF+PHbC0VPyGEwJAFJpHWAvTHZIB1i8q+cqeF4fl0HVj2+RkUgUIGd4+TSqt 2FoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Dm9w7LTwzf3cryqQtmGw4sXtE1JTs1J8nyoB4C0cVW4=; b=b0zrntODxsxBH6UntnQ478Ca2LCHXHhub7AI1KBgH+c4nhOHpxdsDgbsfCT2a+MQQ8 nI/3pquUdySwOIHBTlpHOPCrzFLEz8fK++r1TW1nNHxbJ4yDkFNzq+VnFL2MlfT5DLpQ wbkr1vStZEaEK3MfwJMz0l2p0NkA7uayS7ukoGhjNkQz3/3fPgSaBHuXtGQTRAJEym0b grcre0f9dEO5b3H03heSvgF0RDCH03dl6uVCOGoBNffhQY/rzvFBqtRXyDohvmkeAOnB 1ndWArNUdx115UToVyDzQVuWNcBdD2PpbqZUy4dNMrcCWjjBNa3d0Xp/mD1LMfGJzfc5 /bIQ== X-Gm-Message-State: AOAM533GTVkEb/vUIkRJGkuPR32UUY4OYLD+Ww3HLbu0CdBHJRp4oaIT VeE6otWtEENZV8s8HELgHwI39cBx0CCgVQ== X-Google-Smtp-Source: ABdhPJxqY1jum8e8CvHDzXKYffLnRRku2/+EjKvPaabMaRHwSg7m9PxEfD96gqdtZH9DJ9Bhx4T6wQ== X-Received: by 2002:a02:bb0d:: with SMTP id y13mr17484811jan.124.1620571639923; Sun, 09 May 2021 07:47:19 -0700 (PDT) Received: from aford-IdeaCentre-A730.lan ([2601:448:8400:9e8:18a0:bffb:ecae:3d39]) by smtp.gmail.com with ESMTPSA id d4sm6281759ilg.65.2021.05.09.07.47.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 May 2021 07:47:19 -0700 (PDT) From: Adam Ford To: linux-arm-kernel@lists.infradead.org Cc: Adam Ford Subject: [RFC 2/4] Documentation: bindings: fsl,imx-blk-ctl: Support imx8mn Date: Sun, 9 May 2021 09:47:09 -0500 Message-Id: <20210509144711.2192991-3-aford173@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210509144711.2192991-1-aford173@gmail.com> References: <20210509144711.2192991-1-aford173@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210509_074722_166265_6A2968EA X-CRM114-Status: GOOD ( 12.26 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The imx8mn has a similar dispmix to that of the imx8mm, however there are some additionl power domains that will be needed for additional peripherals that were not present on the imx8mm, so it needs a unique blk-ctl. Signed-off-by: Adam Ford diff --git a/Documentation/devicetree/bindings/soc/imx/fsl,imx-blk-ctl.yaml b/Documentation/devicetree/bindings/soc/imx/fsl,imx-blk-ctl.yaml index a66f11acc6b4..da1951bf6d27 100644 --- a/Documentation/devicetree/bindings/soc/imx/fsl,imx-blk-ctl.yaml +++ b/Documentation/devicetree/bindings/soc/imx/fsl,imx-blk-ctl.yaml @@ -23,6 +23,7 @@ properties: - enum: - fsl,imx8mm-dispmix-blk-ctl - fsl,imx8mm-vpumix-blk-ctl + - fsl,imx8mn-dispmix-blk-ctl - const: syscon reg: diff --git a/include/dt-bindings/power/imx8mn-power.h b/include/dt-bindings/power/imx8mn-power.h new file mode 100644 index 000000000000..3817fcfcc565 --- /dev/null +++ b/include/dt-bindings/power/imx8mn-power.h @@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: (GPL-2.0 OR MIT) */ +/* + * Copyright (C) 2020 Compass Electronics Group, LLC + */ + +#ifndef __DT_BINDINGS_IMX8MN_POWER_H__ +#define __DT_BINDINGS_IMX8MN_POWER_H__ + +#define IMX8MN_POWER_DOMAIN_HSIOMIX 0 +#define IMX8MN_POWER_DOMAIN_OTG1 1 +#define IMX8MN_POWER_DOMAIN_GPUMIX 2 +#define IMX8MN_POWER_DOMAIN_DISPMIX 3 +#define IMX8MN_POWER_DOMAIN_MIPI 4 + +#define IMX8MN_BLK_CTL_DISPMIX_ISI 0 +#define IMX8MN_BLK_CTL_DISPMIX_LCDIF 1 +#define IMX8MN_BLK_CTL_DISPMIX_MIPI_DSI 2 +#define IMX8MN_BLK_CTL_DISPMIX_MIPI_CSI 3 +#define IMX8MN_BLK_CTL_DISPMIX_MAX_PD 4 + +#endif From patchwork Sun May 9 14:47:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 12246425 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.9 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8FB28C433ED for ; Sun, 9 May 2021 14:49:26 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 184B4613F0 for ; Sun, 9 May 2021 14:49:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 184B4613F0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=KYm2QTmsNZbukoPCpB/PPHmHnph3RPyKxnY32dEN6ZU=; b=bRV4oP9lWLQxE+Vho2+ooE8XQ Mf7ppTOyHFGh4mKXRafTuH9m3GB8OdG0KIqpJKPhU2AtqzLgJOxm5xBK27FOoUcHD6cQZPqvu3+Pq vjFefCD8FK/VMzRYJ3yTgDMertRyqQGF97y28QYM9+seREDi9GR7SZ9g2HZOjI+gZYOnbmi0XZh4r Zbd3EBuiEUY9c6xAEBZH7z3NXS75wjpwY5buwkL+IXC0XqQmGzdull+0OT3xFNAaTb5P1IQ60+Rfc uTA6RGXmgSOokUC/zCxqEOo/mIevMJ48f45VoIzbHNLjdkT1S7rlKVsZRQ1wP0Te9TDWOu7TgqPZC Zcvd1g3gA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lfkiu-00BlTK-TN; Sun, 09 May 2021 14:48:01 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lfkiL-00BlNh-7i for linux-arm-kernel@desiato.infradead.org; Sun, 09 May 2021 14:47:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=69268yasEbBqYqAo7K2xyZWQnzNr5TiTY7nHjD5vilA=; b=NMbZAr1keqkPNF+olDO68GMH2S rT3/ICgUK/mLlm98jx+ZegNKMphNKak2Unmhe6aAMQdr95Cj5ooYhUMsVMVSesBOrzqru/dTn1z+Q JrwTWq1W30E82sgib33IqxISJPbGAHU2R4Wk6++jcTOOrsGte2AQ7eVInUBEp6Wf+lUe6KLhskmZs vvIO66sBOMV7RZ1XiqziFARyegwHqzpujcGuGjAN2rX/LTSb+4sVYPCWC3XOXVuw43vhX5cefp7hb TKlEbKg4g9qtnqIjjOcSp+y5wrCGOpvjMPu0HINpRINygYKUoqO5fvtLLgGJeCvhFzvXh7Js4QskF K2nMPOGw==; Received: from mail-io1-xd30.google.com ([2607:f8b0:4864:20::d30]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lfkiI-0080Dw-HY for linux-arm-kernel@lists.infradead.org; Sun, 09 May 2021 14:47:24 +0000 Received: by mail-io1-xd30.google.com with SMTP id n10so12404262ion.8 for ; Sun, 09 May 2021 07:47:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=69268yasEbBqYqAo7K2xyZWQnzNr5TiTY7nHjD5vilA=; b=bU/Y6e4tkIF8ikf1ybYYrvxeGlMHo6icCKRhkmUAJGIG0zwuLzz4tyZ15hvg/KmryY 7HD/+eNJgpGCZVl6UqXh8ZDqBBnSTjKXR6LXBMmdXFh05hN+KDkD8b7rdsnE4Y4s2wxK /iLQBpHrkE3Ddc1eQJ5GF00G0kM/in95tbQ8e5GB/BTBh84rele+vwXY3SyYV5ud/4VU iRd4CHKl5NDSrIxab9ym/h0fjDxRzG4oiOrRNHmfUjtvsiQrQ9y7FdBSpxR9lcsGRFdq MbLTdJsW1RM21HVrLXMq7gmyK6uDEBp2lPdMJLytHpuZkrsPeXvghCReM8GkYlw9xvNg E+MQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=69268yasEbBqYqAo7K2xyZWQnzNr5TiTY7nHjD5vilA=; b=bk0F7h0Nqo6yK/ypth61XFto3wXJNNPuLG90UDrhcKKDv3YsiGYHQICsfg75ltdJc7 U4F1T30Z5i/rWmfwVLxFDbfcyU7QlO+lyIVZJspzaUWnbyyA3tUbq1RLkBpngRhIdqoW C0h2coSZWUV6f85tIf5pU3/9Az1unBPCtQWKyNsMX2yF6+cDEtE42KEtxtJgPuFyq+x0 KljRzbR9w6tDsCO31bXkggnSGicrZnnO9G95PrTKGAb0NpmnDhbdI2h7LZcRDc/4nvzX 6y0E6ZURwMYMUJ4jPHN6+DqLsevD6MDKPEZk7dwwRYUj4diiyRHBLgppH/s1dAWN7WhT yQnw== X-Gm-Message-State: AOAM53079Uhb6nXrvG49ElJcSRYIkUGqzroYte1wJxsC2tvAyb6NVdAi Ly4kyb12c4VWCMpdmlRK8FGXN3VDNfw1fg== X-Google-Smtp-Source: ABdhPJzSoOmsv0Nsu5gbmo2MhUaIBP4l/n/jsRb7r6JFOFNutZMq5MnhOvPDsGmRC+UI+OAiY8/w6w== X-Received: by 2002:a02:854a:: with SMTP id g68mr17313271jai.56.1620571641305; Sun, 09 May 2021 07:47:21 -0700 (PDT) Received: from aford-IdeaCentre-A730.lan ([2601:448:8400:9e8:18a0:bffb:ecae:3d39]) by smtp.gmail.com with ESMTPSA id d4sm6281759ilg.65.2021.05.09.07.47.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 May 2021 07:47:20 -0700 (PDT) From: Adam Ford To: linux-arm-kernel@lists.infradead.org Cc: Adam Ford Subject: [RFC 3/4] soc: imx: Add blk-ctl driver for i.MX8MN Date: Sun, 9 May 2021 09:47:10 -0500 Message-Id: <20210509144711.2192991-4-aford173@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210509144711.2192991-1-aford173@gmail.com> References: <20210509144711.2192991-1-aford173@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210509_074722_606446_50224D6F X-CRM114-Status: GOOD ( 17.72 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The i.MX8MN SoC has dispmix BLK-CTL. It's similar to the i.MX8MM, but there are subtle differences, so it needs its own. Signed-off-by: Adam Ford diff --git a/drivers/soc/imx/Makefile b/drivers/soc/imx/Makefile index c260b962f495..3bcd7d5fd7ed 100644 --- a/drivers/soc/imx/Makefile +++ b/drivers/soc/imx/Makefile @@ -4,4 +4,4 @@ obj-$(CONFIG_ARCH_MXC) += soc-imx.o endif obj-$(CONFIG_HAVE_IMX_GPC) += gpc.o obj-$(CONFIG_IMX_GPCV2_PM_DOMAINS) += gpcv2.o -obj-$(CONFIG_SOC_IMX8M) += soc-imx8m.o blk-ctl.o blk-ctl-imx8mm.o +obj-$(CONFIG_SOC_IMX8M) += soc-imx8m.o blk-ctl.o blk-ctl-imx8mm.o blk-ctl-imx8mn.o diff --git a/drivers/soc/imx/blk-ctl-imx8mn.c b/drivers/soc/imx/blk-ctl-imx8mn.c new file mode 100644 index 000000000000..eeb5c82bcf9a --- /dev/null +++ b/drivers/soc/imx/blk-ctl-imx8mn.c @@ -0,0 +1,118 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright 2021 NXP + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "blk-ctl.h" + +#define MEDIA_BLK_SFT_EN_BUS_CLK_RSTN BIT(8) +#define MEDIA_BLK_SFT_EN_ISI_CLK_RSTN GENMASK(7, 6) +#define MEDIA_BLK_SFT_EN_LCDIF_CLK_RSTN GENMASK(5, 4) +#define MEDIA_BLK_SFT_EN_MIPI_CSI_RSTN GENMASK(3, 2) +#define MEDIA_BLK_SFT_EN_DSI_RSTN GENMASK(1, 0) + +#define MEDIA_BLK_BUS_PD_MASK BIT(8) +#define MEDIA_BLK_ISI_PD_MASK GENMASK(7,6) +#define MEDIA_BLK_LCDIF_PD_MASK GENMASK(5, 4) +#define MEDIA_BLK_MIPI_CSI_PD_MASK GENMASK(3, 2) +#define MEDIA_BLK_MIPI_DSI_PD_MASK GENMASK(1, 0) + +static struct imx_blk_ctl_hw imx8mn_dispmix_blk_ctl_pds[] = { + IMX_BLK_CTL_PD("ISI", "dispmix", IMX8MN_BLK_CTL_DISPMIX_ISI, 0x4, + MEDIA_BLK_ISI_PD_MASK, 0, MEDIA_BLK_SFT_EN_ISI_CLK_RSTN, + IMX_BLK_CTL_PD_RESET), + IMX_BLK_CTL_PD("LCDIF", "dispmix", IMX8MN_BLK_CTL_DISPMIX_LCDIF, 0x4, + MEDIA_BLK_LCDIF_PD_MASK, 0, MEDIA_BLK_SFT_EN_LCDIF_CLK_RSTN, + IMX_BLK_CTL_PD_RESET), + IMX_BLK_CTL_PD("MIPI_DSI", "dispmix", IMX8MN_BLK_CTL_DISPMIX_MIPI_DSI, 0x4, + MEDIA_BLK_MIPI_DSI_PD_MASK, 0, MEDIA_BLK_SFT_EN_DSI_RSTN, + IMX_BLK_CTL_PD_RESET), + IMX_BLK_CTL_PD("MIPI_CSI", "ISI", IMX8MN_BLK_CTL_DISPMIX_MIPI_CSI, 0x4, + MEDIA_BLK_MIPI_CSI_PD_MASK, 0, MEDIA_BLK_SFT_EN_MIPI_CSI_RSTN, + IMX_BLK_CTL_PD_RESET), +}; + +static const struct regmap_config imx8mn_blk_ctl_regmap_config = { + .reg_bits = 32, + .reg_stride = 4, + .val_bits = 32, + .max_register = 0x30, + .fast_io = true, +}; + +static const struct imx_blk_ctl_dev_data imx8mn_dispmix_blk_ctl_dev_data = { + .pds = imx8mn_dispmix_blk_ctl_pds, + .pds_num = ARRAY_SIZE(imx8mn_dispmix_blk_ctl_pds), + .hw_hsk = IMX_BLK_CTL_PD(NULL, NULL, -1, 0x4, MEDIA_BLK_BUS_PD_MASK, 0, + MEDIA_BLK_SFT_EN_BUS_CLK_RSTN, + IMX_BLK_CTL_PD_HANDSHAKE | IMX_BLK_CTL_PD_RESET), + .config = imx8mn_blk_ctl_regmap_config, + .active_pd_names = (char*[]){"dispmix", "mipi"}, + .num_active_pd = 2, +}; + +static int imx8mn_blk_ctl_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + const struct imx_blk_ctl_dev_data *dev_data = of_device_get_match_data(dev); + struct regmap *regmap; + struct imx_blk_ctl *ctl; + void __iomem *base; + + ctl = devm_kzalloc(dev, sizeof(*ctl), GFP_KERNEL); + if (!ctl) + return -ENOMEM; + + base = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(base)) + return PTR_ERR(base); + + regmap = devm_regmap_init_mmio(dev, base, &dev_data->config); + if (IS_ERR(regmap)) + return PTR_ERR(regmap); + + ctl->regmap = regmap; + ctl->dev = dev; + ctl->power_count = 0; + mutex_init(&ctl->lock); + + ctl->num_clks = devm_clk_bulk_get_all(dev, &ctl->clks); + if (ctl->num_clks < 0) + return ctl->num_clks; + + dev_set_drvdata(dev, ctl); + ctl->dev_data = dev_data; + + return imx_blk_ctl_register(dev); +} + +static const struct of_device_id imx_blk_ctl_of_match[] = { + { .compatible = "fsl,imx8mn-dispmix-blk-ctl", .data = &imx8mn_dispmix_blk_ctl_dev_data }, + { /* Sentinel */ } +}; +MODULE_DEVICE_TABLE(of, imx_blk_ctl_of_match); + +static struct platform_driver imx_blk_ctl_driver = { + .probe = imx8mn_blk_ctl_probe, + .driver = { + .name = "imx8mn-blk-ctl", + .of_match_table = of_match_ptr(imx_blk_ctl_of_match), + .pm = &imx_blk_ctl_pm_ops, + }, +}; +module_platform_driver(imx_blk_ctl_driver); From patchwork Sun May 9 14:47:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 12246427 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B957AC433ED for ; Sun, 9 May 2021 14:49:40 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 40653613F0 for ; Sun, 9 May 2021 14:49:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 40653613F0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=iO6A0pKRFCn7NMV57nnzG0abveaU9Yz8hqtybMxE04M=; b=NOR7m88rsFh1d5C9hHgQpobqW w8j6XMlA8nltPx7vQBrEfRRubjIZ7e7fl47wvuYJg3TdVd9uMJISUSQGv47PVWXj+ubS3qvUNfObb QiIsb1dU95M48OAVSbQhSxtRFBepvNn22T9eIAdSRaKIeJsUapBmXjDoYeO7sfoB7erORHxVOj/9r GD9OPKf0sh5pYk5QHzwNsEofv2Mhv2GZTI53CfYK2va7GmqMDeYGbbV9NJy1+ldd4Pp86q5iL+32t 7z+wRXwS8POe1fRC5mQCs7h6A9Qvjm/ysp5JXw4/OOesHxrJwNKHre2zMcyV3qtpNzJzEy7FmN3oQ nZJ7KGzhA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lfkj6-00BlVT-P2; Sun, 09 May 2021 14:48:12 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lfkiL-00BlNn-Nu for linux-arm-kernel@desiato.infradead.org; Sun, 09 May 2021 14:47:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=VdwCJtLudApGIxPEI4F0XewnzY+mmYHmEipxWLUKzU8=; b=LZJpMhjsJXcUVbdmv1BGijwVZy i/Yw/3frMFQdwxJhv0kF65RCwOLqk1LcS1a+7CNO3xP6WdWV3JxdkcTc9U48SG9MYRCXZFyz8aLyo n9PKDAPKVpngV5r1PGedGmQ6+CBf/uFAki3G6akR9SQiF9ADqZHyOHDeFzsofJ+0L98WKc5jGvJpl gUGRiUDWxm/aOPwAAHjUMJdPBAYZLBpXFXStw7J0eHPYuPV204Z9AcA5cUhfoU3QU5okN8VmBocbu 1lYII72xKVtjPKzdqnRYrqynIfQ+u/1QuhNEgxKPM0O6fmmi3DNugIdCwdJ02U+IqxNKWfKVK+yWy uGJpNuLA==; Received: from mail-io1-xd30.google.com ([2607:f8b0:4864:20::d30]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lfkiJ-0080ET-61 for linux-arm-kernel@lists.infradead.org; Sun, 09 May 2021 14:47:24 +0000 Received: by mail-io1-xd30.google.com with SMTP id a11so12430002ioo.0 for ; Sun, 09 May 2021 07:47:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VdwCJtLudApGIxPEI4F0XewnzY+mmYHmEipxWLUKzU8=; b=XqWA7c+eQcX3ZW2relNihZiW9zq0/aUzeIHnxaLQO1vv53NJ+Gny+MiJsVwLS1tl1M 6603Urb9fM6r8CNY0VZTj2DpxEcZ1Zvw+Fx7etHW/9GN6v7H9WExxZD/JqaOPfqG9y1v yA7xDrNtUhbgQmDZDKYeguMYAi38TmKPvfLyR5X/m9pBlQjXNdSFDqM/fOGi4j8jM2HE KUHrCr/6vAyBK4r8XLQxf1VCBdf1DPAflJA7hd8PkrT5FLk2YIhHXF/r2fJC2LgiUbpk Um0w+au2lnTXwBsDKR7O7Rxx78KeNKMQqgWppMP9d0XqgG/wXkGxtWdqP1S+eeKfWkJ2 tsCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VdwCJtLudApGIxPEI4F0XewnzY+mmYHmEipxWLUKzU8=; b=Xcr7WNkqE1xT8y2gkM+XBL3Fxmv/RqQgS+GX7MFVLiWYaVyg8yBmP6e0riB3iztSk3 Pv1eLqqnvxWJL38OEyBbRrCYWT4w2+s4Ak22gTnk268VfLKAZGF7BB82tAtqu9z6j7cH hkAYG2ZhI+HeEXjFgcdDUlgTCPoVWZb+p36z6NHzYIdVwJBGsU3NJPrQgU69qKyvxfDZ +S5HIT641cXFZ6s397jv6nebaCWun+vr2o+dkPBIBVfBRe1ZsOr3VjcddnN0LwQmwKNo r1H9nzUb7IDaPJCJJNrUcUJUC8xb5c8qHJ6GbvbwSgiznCnoy7epf9Tjswf7DzFJ7Zv/ 0pOA== X-Gm-Message-State: AOAM533K/C1a9qziXZLVkaU8xZdQaZj+U0eL4A9owVvZR9g7gFgExKhF IRM7wBL9fp1/KnuHdk91TAjacqmUMt8a/Q== X-Google-Smtp-Source: ABdhPJzf3TJqmJu5nZNMMqhH9f/e9Nk/7bGMFGBUirjW8KZRxShGoKoumbPA2e7fSyViF4K7EMGUeQ== X-Received: by 2002:a02:764e:: with SMTP id z75mr17660230jab.113.1620571642210; Sun, 09 May 2021 07:47:22 -0700 (PDT) Received: from aford-IdeaCentre-A730.lan ([2601:448:8400:9e8:18a0:bffb:ecae:3d39]) by smtp.gmail.com with ESMTPSA id d4sm6281759ilg.65.2021.05.09.07.47.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 May 2021 07:47:21 -0700 (PDT) From: Adam Ford To: linux-arm-kernel@lists.infradead.org Cc: Adam Ford Subject: [RFC 4/4] arm64: dts: imx8mn: Enable blt-ctl power domains Date: Sun, 9 May 2021 09:47:11 -0500 Message-Id: <20210509144711.2192991-5-aford173@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210509144711.2192991-1-aford173@gmail.com> References: <20210509144711.2192991-1-aford173@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210509_074723_242185_59FF9DAE X-CRM114-Status: GOOD ( 10.73 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org There are a few blk-ctl power domains required for peripherals like ISI, CSI, DSI, and LCDIF. These new power domains require dispmix, and mipi from the gpcv2 controller in order to operate. Add them all. Signed-off-by: Adam Ford --- Note: This series is an RFC because the 8MN hangs when resuming from suspend, and I am looking for suggestions and feedback diff --git a/arch/arm64/boot/dts/freescale/imx8mn.dtsi b/arch/arm64/boot/dts/freescale/imx8mn.dtsi index 7f8e7e24dadf..d7d91fb9b7b6 100644 --- a/arch/arm64/boot/dts/freescale/imx8mn.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mn.dtsi @@ -646,6 +646,29 @@ pgc_gpumix: power-domain@2 { <&clk IMX8MN_CLK_GPU_AHB>; resets = <&src IMX8MQ_RESET_GPU_RESET>; }; + + pgc_dispmix: power-domain@3 { + #power-domain-cells = <0>; + reg = ; + clocks = <&clk IMX8MN_CLK_DISP_PIXEL_ROOT>, + <&clk IMX8MN_CLK_DISP_AXI_ROOT>, + <&clk IMX8MN_CLK_DISP_APB_ROOT>; + assigned-clocks = <&clk IMX8MN_CLK_DISP_PIXEL>, + <&clk IMX8MN_CLK_DISP_AXI>, + <&clk IMX8MN_CLK_DISP_APB>; + assigned-clock-parents = <&clk IMX8MN_VIDEO_PLL1_OUT>, + <&clk IMX8MN_SYS_PLL2_1000M>, + <&clk IMX8MN_SYS_PLL1_800M>; + assigned-clock-rate = <594000000>, + <500000000>, + <200000000>; + }; + + pgc_mipi: power-domain@4 { + #power-domain-cells = <0>; + reg = ; + power-domains = <&pgc_dispmix>; + }; }; }; }; @@ -990,6 +1013,18 @@ aips4: bus@32c00000 { #size-cells = <1>; ranges; + dispmix_blk_ctl: blk-ctl@32e28000 { + compatible = "fsl,imx8mn-dispmix-blk-ctl", "syscon"; + reg = <0x32e28000 0x100>; + #power-domain-cells = <1>; + power-domains = <&pgc_dispmix>, <&pgc_mipi>; + power-domain-names = "dispmix", "mipi"; + clocks = <&clk IMX8MN_CLK_DISP_PIXEL_ROOT>, + <&clk IMX8MN_CLK_DISP_AXI_ROOT>, + <&clk IMX8MN_CLK_DISP_APB_ROOT>; + clock-names = "disp", "axi", "apb"; + }; + usbotg1: usb@32e40000 { compatible = "fsl,imx8mn-usb", "fsl,imx7d-usb"; reg = <0x32e40000 0x200>;