From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E0218C433F5 for ; Sun, 28 Nov 2021 13:23:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; 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=1W0pTX4sPlAstOc2VXeyFJwTEymuYm/lqLcKmOSSc8g=; b=WEuzShIzLlByNe WkQPUmlL+Z3BayvPcp6jL0SQLd1XujoWeaPRfZzb4zVWX/tBZlm6UpH95xXQWDCwcCdcfk75YXvfH if2QvWqm30VjhUYYNsTfzBRa3R0kTOGS2EQIP9+swYI0cd6T5FBELQV9RS2oX2zC4TyycdpMI2iqp yI7mv9S9SiYspvBKTXnX2YT6+WmWsDCme5Yy5BkyQWZV/Hkd/v34S/hT3v2R2NOi18COpN2TexG07 Wa3YKXnYSfDXZLwcjQwTTYM8Ervp4TilLL92TDipHD7+Y+04PcEMJmPBQUTcTyNacrWk5TOaqVGE6 mFoCFrfU9TXyl9Pdq3/w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mrK6s-00FnPE-4m; Sun, 28 Nov 2021 13:20:50 +0000 Received: from mail-io1-xd2a.google.com ([2607:f8b0:4864:20::d2a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mrK5W-00FmvG-Em for linux-arm-kernel@lists.infradead.org; Sun, 28 Nov 2021 13:19:28 +0000 Received: by mail-io1-xd2a.google.com with SMTP id z26so17499251iod.10 for ; Sun, 28 Nov 2021 05:19:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qdAf9ZB6zSzEhceNqpvmTSzYWMmYY2ll5WtGsCcXMcg=; b=hzjfNrqxNOeq0v/oL0+39IH8f9zj+btuHf/SsI2cr+z879KYQFJTRA51i7ejyKfo4F GM6x9hfmbQ3k0eqgalAidlwQbAPSocTjYQY1m39+kM+WxZwALVPglnx/OgAMu8xNYOUm l6ijcGioF+ZhWMME/8bEkaAzm+Tdr7EujTC4bcNlS0wYTj5Ul/CC3CXpIVNq1OZiJqZp WzY/OFMOhfrJuRYOXcXoyQ3+Kti3HanWKvSbfaEBcyeaklk+ZbboECeBtpyDFMcmagru 9TofPWBPDsTo9cYzDdF6jLzk+35IXNOUyHuKMEf5eXWLE0bsrvifVQ0Y2069wyIfyM2q ur9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qdAf9ZB6zSzEhceNqpvmTSzYWMmYY2ll5WtGsCcXMcg=; b=OrxjcTEJUgEe7dhASlN7armAein2TrHIhvmOz6hEgGN8/3yHifPf3s6HjejUqvM6W2 U5AfK6APj5awIjmU1habq9RuZbZK3BUzVS6KeOCr1Q/Wo3CLeY9WHAqHNKUNIFioUvLa haIuZPu2g6GpDihnDRciU4OnfaoAsayI3WjuEWrhorZLT5GlJt7mmQMXbvSX1w/PEZ0Z xJCu1nVKC6iwwRcQ+hYF9Xkjs7eAlNGcdn5XFE1df7VuMG3AHZCg6VO/AgA5mWK2nup+ g4UCKxmwEesQZpY0501SNZgWETN4FBgRrcfaKzhkNZBQ6AAl+vEG9ETid/LZMXM2zEqr Rygg== X-Gm-Message-State: AOAM531zkiePuVDVMYg4Ox6o50y2cQqJTnlw7YHcUdzVY2zPNRlX12Y3 johXzpIKMmgQzxoqkDwxq4ausngYlHtuUw== X-Google-Smtp-Source: ABdhPJwR66IYRKxMA7e6L83tcP4mPWpEDky5lKphfCV6/DwHbdyPovddPMoWKa0W+3LjkwnBZybONw== X-Received: by 2002:a5e:840f:: with SMTP id h15mr51226709ioj.48.1638105565065; Sun, 28 Nov 2021 05:19:25 -0800 (PST) Received: from aford-IdeaCentre-A730.lan ([2601:448:8400:9e8:2a06:17d2:47df:6c8e]) by smtp.gmail.com with ESMTPSA id q12sm6990413ile.77.2021.11.28.05.19.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Nov 2021 05:19:24 -0800 (PST) From: Adam Ford To: linux-arm-kernel@lists.infradead.org Cc: aford@beaconembedded.com, tharvey@gateworks.com, Adam Ford , Rob Herring , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Lucas Stach , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH V4 5/9] soc: imx: imx8m-blk-ctrl: add i.MX8MN DISP blk-ctrl Date: Sun, 28 Nov 2021 07:18:48 -0600 Message-Id: <20211128131853.15125-6-aford173@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211128131853.15125-1-aford173@gmail.com> References: <20211128131853.15125-1-aford173@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211128_051926_556621_D38967C4 X-CRM114-Status: GOOD ( 18.50 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This adds the description for the i.MX8MN disp blk-ctrl. Signed-off-by: Adam Ford --- drivers/soc/imx/imx8m-blk-ctrl.c | 77 +++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-) diff --git a/drivers/soc/imx/imx8m-blk-ctrl.c b/drivers/soc/imx/imx8m-blk-ctrl.c index c2f076b56e24..511e74f0db8a 100644 --- a/drivers/soc/imx/imx8m-blk-ctrl.c +++ b/drivers/soc/imx/imx8m-blk-ctrl.c @@ -14,6 +14,7 @@ #include #include +#include #define BLK_SFT_RSTN 0x0 #define BLK_CLK_EN 0x4 @@ -517,6 +518,77 @@ static const struct imx8m_blk_ctrl_data imx8mm_disp_blk_ctl_dev_data = { .num_domains = ARRAY_SIZE(imx8mm_disp_blk_ctl_domain_data), }; + +static int imx8mn_disp_power_notifier(struct notifier_block *nb, + unsigned long action, void *data) +{ + struct imx8m_blk_ctrl *bc = container_of(nb, struct imx8m_blk_ctrl, + power_nb); + + if (action != GENPD_NOTIFY_ON && action != GENPD_NOTIFY_PRE_OFF) + return NOTIFY_OK; + + /* Enable bus clock and deassert bus reset */ + regmap_set_bits(bc->regmap, BLK_CLK_EN, BIT(8)); + regmap_set_bits(bc->regmap, BLK_SFT_RSTN, BIT(8)); + + /* + * On power up we have no software backchannel to the GPC to + * wait for the ADB handshake to happen, so we just delay for a + * bit. On power down the GPC driver waits for the handshake. + */ + if (action == GENPD_NOTIFY_ON) + udelay(5); + + + return NOTIFY_OK; +} + +static const struct imx8m_blk_ctrl_domain_data imx8mn_disp_blk_ctl_domain_data[] = { + [IMX8MN_DISPBLK_PD_MIPI_DSI] = { + .name = "dispblk-mipi-dsi", + .clk_names = (const char *[]){ "dsi-pclk", "dsi-ref", }, + .num_clks = 2, + .gpc_name = "mipi-dsi", + .rst_mask = BIT(0) | BIT(1), + .clk_mask = BIT(0) | BIT(1), + .mipi_phy_rst_mask = BIT(17), + }, + [IMX8MN_DISPBLK_PD_MIPI_CSI] = { + .name = "dispblk-mipi-csi", + .clk_names = (const char *[]){ "csi-aclk", "csi-pclk" }, + .num_clks = 2, + .gpc_name = "mipi-csi", + .rst_mask = BIT(2) | BIT(3), + .clk_mask = BIT(2) | BIT(3), + .mipi_phy_rst_mask = BIT(16), + }, + [IMX8MN_DISPBLK_PD_LCDIF] = { + .name = "dispblk-lcdif", + .clk_names = (const char *[]){ "lcdif-axi", "lcdif-apb", "lcdif-pix", }, + .num_clks = 3, + .gpc_name = "lcdif", + .rst_mask = BIT(4) | BIT(5), + .clk_mask = BIT(4) | BIT(5), + }, + [IMX8MN_DISPBLK_PD_ISI] = { + .name = "dispblk-isi", + .clk_names = (const char *[]){ "disp_axi", "disp_apb", "disp_axi_root", + "disp_apb_root"}, + .num_clks = 4, + .gpc_name = "isi", + .rst_mask = BIT(6) | BIT(7), + .clk_mask = BIT(6) | BIT(7), + }, +}; + +static const struct imx8m_blk_ctrl_data imx8mn_disp_blk_ctl_dev_data = { + .max_reg = 0x84, + .power_notifier_fn = imx8mn_disp_power_notifier, + .domains = imx8mn_disp_blk_ctl_domain_data, + .num_domains = ARRAY_SIZE(imx8mn_disp_blk_ctl_domain_data), +}; + static const struct of_device_id imx8m_blk_ctrl_of_match[] = { { .compatible = "fsl,imx8mm-vpu-blk-ctrl", @@ -524,7 +596,10 @@ static const struct of_device_id imx8m_blk_ctrl_of_match[] = { }, { .compatible = "fsl,imx8mm-disp-blk-ctrl", .data = &imx8mm_disp_blk_ctl_dev_data - } ,{ + }, { + .compatible = "fsl,imx8mn-disp-blk-ctrl", + .data = &imx8mn_disp_blk_ctl_dev_data + }, { /* Sentinel */ } }; -- 2.32.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel