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 X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 E4F00C433F5 for ; Sun, 12 Sep 2021 14:40:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C5E0D61213 for ; Sun, 12 Sep 2021 14:40:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231925AbhILOmG (ORCPT ); Sun, 12 Sep 2021 10:42:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38398 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229653AbhILOmG (ORCPT ); Sun, 12 Sep 2021 10:42:06 -0400 Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5A22C061574 for ; Sun, 12 Sep 2021 07:40:51 -0700 (PDT) Received: by mail-ed1-x532.google.com with SMTP id g8so10202404edt.7 for ; Sun, 12 Sep 2021 07:40:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=M7XAduPSau7jNQ1Bw+pmFFUarTdMQmGShJ3P2Wf2mk0=; b=nPcDSOXwJfKBIwxe8NBTL4d8RsRbV9lf1sRbeE5xGrNJB8ShNcnhoyGkAl/f4A3ph/ r0s/XQthLKYzVH7MKlRO133IBagMeQqaKeMdmX/pqVzmj6iQcKG1A93PPK8knHuJuzge o4PfWkKtJPZXrvNK65eLT/opBJEtvtbaQZOo4jDfBF9bsUONsPGMWkKxblLLsDbCYihj 7IjC4MnkpGuw5b4rljxWX9c1I/jpoR3EDB9+TBTQGgRhs4OaB+9czqgyslHzFO7iiaef Uc3sNR5DGkqLx/xZ9/Ae3PIm3CvnF020hX24ZJWNlYf7oNJCE/778YwFFS0gsC/dl2hG Hciw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=M7XAduPSau7jNQ1Bw+pmFFUarTdMQmGShJ3P2Wf2mk0=; b=XxOY+QS5oJEcN2yV6uVeISkq2wzXoMkBRBwAXiIBNyyu8L91i9k8Z5xtWTD4znAFTW Zmf0mVgvbNx3Xh/Z1JfuTrx73Jd0byYAVQC5e5TH5PL+3S4AJEk/8IrGLUP8xcaV6hqi IuxftfQ7fy1cB9qplxIyJD8qLE/tzTtEppsGnElkRyb+x3MDvQsqhr3ZmmJiAoIeE3mP 7JgTIMdNFVbrG8jx2bnjbqhgW+3PnWssAvT09XLBa2JDLTHoBm88lXxfcwOupU3vsutH Qq7RxQH52aZlXMjEWVJNbu37YhmyeNsbDfxlsjjpFqMx9h3NxAsRN3gH+ztUXNtH4ctx 1prA== X-Gm-Message-State: AOAM533xyv/BXeB7LkqPOrlHDbBHxNWBmmk3potXG4ZN7/biShGBrnyG y6Xl5J8QgSkGAQA6T+wPgtTpOQfuYh46Qq2diFou5EaU3el+lw== X-Google-Smtp-Source: ABdhPJx6XCXRe3c6Fkp8vsAG28brDO7fcRgiQMj6a1y97qUOgoseDUl2JXCpf5sqdQ5pGv/Zm9IZJ9jJA82riFC/OlU= X-Received: by 2002:a50:9e02:: with SMTP id z2mr8117088ede.249.1631457650124; Sun, 12 Sep 2021 07:40:50 -0700 (PDT) MIME-Version: 1.0 References: <20210910202640.980366-1-l.stach@pengutronix.de> <20210910202640.980366-14-l.stach@pengutronix.de> In-Reply-To: <20210910202640.980366-14-l.stach@pengutronix.de> From: Adam Ford Date: Sun, 12 Sep 2021 09:40:39 -0500 Message-ID: Subject: Re: [PATCH v4 13/18] soc: imx: imx8m-blk-ctrl: add DISP blk-ctrl To: Lucas Stach Cc: Shawn Guo , Rob Herring , Fabio Estevam , NXP Linux Team , Frieder Schrempf , Marek Vasut , Tim Harvey , devicetree , arm-soc , Sascha Hauer , patchwork-lst@pengutronix.de Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On Fri, Sep 10, 2021 at 3:26 PM Lucas Stach wrote: > > This adds the description for the i.MX8MM disp blk-ctrl. > > Signed-off-by: Lucas Stach > Reviewed-by: Peng Fan > --- > drivers/soc/imx/imx8m-blk-ctrl.c | 70 ++++++++++++++++++++++++++++++++ > 1 file changed, 70 insertions(+) > > diff --git a/drivers/soc/imx/imx8m-blk-ctrl.c b/drivers/soc/imx/imx8m-blk-ctrl.c > index f2d74669d683..225c15f35dad 100644 > --- a/drivers/soc/imx/imx8m-blk-ctrl.c > +++ b/drivers/soc/imx/imx8m-blk-ctrl.c > @@ -431,11 +431,81 @@ static const struct imx8m_blk_ctrl_data imx8m_vpu_blk_ctl_dev_data = { > .num_domains = ARRAY_SIZE(imx8m_vpu_blk_ctl_domain_data), > }; > > +static int imx8mm_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(12)); > + regmap_set_bits(bc->regmap, BLK_SFT_RSTN, BIT(6)); > + > + /* > + * 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 imx8m_disp_blk_ctl_domain_data[] = { Since the 8MQ, 8MM, 8MN, and 8MP have different blk_ctl structures, shouldn't this be imx8mm_disp_blk_ctl_domain_data? > + [IMX8MM_DISPBLK_PD_CSI_BRIDGE] = { > + .name = "dispblk-csi-bridge", > + .clk_names = (const char *[]){ "csi-bridge-axi", "csi-bridge-apb", > + "csi-bridge-core", }, > + .num_clks = 3, > + .gpc_name = "csi-bridge", > + .rst_mask = BIT(0) | BIT(1) | BIT(2), > + .clk_mask = BIT(0) | BIT(1) | BIT(2) | BIT(3) | BIT(4) | BIT(5), > + }, > + [IMX8MM_DISPBLK_PD_LCDIF] = { > + .name = "dispblk-lcdif", > + .clk_names = (const char *[]){ "lcdif-axi", "lcdif-apb", "lcdif-pix", }, > + .num_clks = 3, > + .gpc_name = "lcdif", > + .clk_mask = BIT(6) | BIT(7), > + }, > + [IMX8MM_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(5), > + .clk_mask = BIT(8) | BIT(9), > + }, > + [IMX8MM_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(3) | BIT(4), > + .clk_mask = BIT(10) | BIT(11), > + }, > +}; > + > +static const struct imx8m_blk_ctrl_data imx8m_disp_blk_ctl_dev_data = { Same here. > + .max_reg = 0x2c, > + .power_notifier_fn = imx8mm_disp_power_notifier, > + .domains = imx8m_disp_blk_ctl_domain_data, > + .num_domains = ARRAY_SIZE(imx8m_disp_blk_ctl_domain_data), > +}; > + > static const struct of_device_id imx8m_blk_ctrl_of_match[] = { > { > .compatible = "fsl,imx8mm-vpu-blk-ctrl", > .data = &imx8m_vpu_blk_ctl_dev_data > }, { > + .compatible = "fsl,imx8mm-disp-blk-ctrl", > + .data = &imx8m_disp_blk_ctl_dev_data > + } ,{ > /* Sentinel */ > } > }; > -- > 2.30.2 > 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 X-Spam-Level: X-Spam-Status: No, score=-10.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 autolearn=unavailable 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 07D96C433EF for ; Sun, 12 Sep 2021 14:43:38 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id AC2A360F6C for ; Sun, 12 Sep 2021 14:43:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org AC2A360F6C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org 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:Cc:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=yFFR2J1N3p5sB1cXTgXFF/B45PN5UWoIyFzxlH14xDY=; b=pIzpcfay8rqYl4 172hwqbklj+SXsOTyOLOMrTyPjKm8MKevLgyhRCnrg/XhTc97iATDIKtsLEj3Uusy+i0LC/QusAyM UWT2dx3HFipTBvs1y+j24ASFKxaONt1arRPpmqnSNitGuzumSV6R3Lz7cxEkrG5YAO0AWeuePpk+m U1LMf7Xs4Ly7qM5XPw90btXRCj6gLQU/+ZgKSckXvLbp1lIXmZPRt2NV1ucI8uwlS97+VMoZX9mC3 yW6l9IPm+sbuqzT5XhEfSpe+Si761DR+ck7O1qtBSBgx6A8IqcM5PYHqL9gf2aUdWjrcV+BIOTGil EjDCjNnlZ3pGdTsAA8NQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mPQfH-00GZIW-BF; Sun, 12 Sep 2021 14:41:03 +0000 Received: from mail-ed1-x532.google.com ([2a00:1450:4864:20::532]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mPQfD-00GZHy-GR for linux-arm-kernel@lists.infradead.org; Sun, 12 Sep 2021 14:41:01 +0000 Received: by mail-ed1-x532.google.com with SMTP id t6so8774212edi.9 for ; Sun, 12 Sep 2021 07:40:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=M7XAduPSau7jNQ1Bw+pmFFUarTdMQmGShJ3P2Wf2mk0=; b=nPcDSOXwJfKBIwxe8NBTL4d8RsRbV9lf1sRbeE5xGrNJB8ShNcnhoyGkAl/f4A3ph/ r0s/XQthLKYzVH7MKlRO133IBagMeQqaKeMdmX/pqVzmj6iQcKG1A93PPK8knHuJuzge o4PfWkKtJPZXrvNK65eLT/opBJEtvtbaQZOo4jDfBF9bsUONsPGMWkKxblLLsDbCYihj 7IjC4MnkpGuw5b4rljxWX9c1I/jpoR3EDB9+TBTQGgRhs4OaB+9czqgyslHzFO7iiaef Uc3sNR5DGkqLx/xZ9/Ae3PIm3CvnF020hX24ZJWNlYf7oNJCE/778YwFFS0gsC/dl2hG Hciw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=M7XAduPSau7jNQ1Bw+pmFFUarTdMQmGShJ3P2Wf2mk0=; b=L7Hi+GyMYlj0UhjFISem4OUpp7goDibpJYenzWAoXhymYNFfcQPz5SjW9PyKavjWlI 7vDsDnOzLKA+QpF0UBoXNqufdYAmJqi69FlrIe8vBldB8jKpAx4qhEGp3mA7X4lJb42U ERQCwzSWXhiWDr5s8cJE49fzEaXfzcCEJoRD9I6koV2x2pmVKfdnQ/l2lkofMmaTkcVG 9x7GQLYnNyb3QvdUDGFLKtK0DJMlkW1PqrWA2Sz6YzWMtWOHYyx+YbJFPwYB4PQ06ME9 SNLPsOYKlYTWLxiZddLel+TqEVPF5s2ZjOC3daObwmCHHrrD0oX15qhU89LTzK/3FMN+ oLjA== X-Gm-Message-State: AOAM530u6+LscFHU7grQkxMlPTu1Z5dcGO7qHolt9oqETG3hGz+e3UBV kwcRxjxq8bbFEL4d41CkR2X5l1soCRDl81ONDwY= X-Google-Smtp-Source: ABdhPJx6XCXRe3c6Fkp8vsAG28brDO7fcRgiQMj6a1y97qUOgoseDUl2JXCpf5sqdQ5pGv/Zm9IZJ9jJA82riFC/OlU= X-Received: by 2002:a50:9e02:: with SMTP id z2mr8117088ede.249.1631457650124; Sun, 12 Sep 2021 07:40:50 -0700 (PDT) MIME-Version: 1.0 References: <20210910202640.980366-1-l.stach@pengutronix.de> <20210910202640.980366-14-l.stach@pengutronix.de> In-Reply-To: <20210910202640.980366-14-l.stach@pengutronix.de> From: Adam Ford Date: Sun, 12 Sep 2021 09:40:39 -0500 Message-ID: Subject: Re: [PATCH v4 13/18] soc: imx: imx8m-blk-ctrl: add DISP blk-ctrl To: Lucas Stach Cc: Shawn Guo , Rob Herring , Fabio Estevam , NXP Linux Team , Frieder Schrempf , Marek Vasut , Tim Harvey , devicetree , arm-soc , Sascha Hauer , patchwork-lst@pengutronix.de X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210912_074059_599349_488BC799 X-CRM114-Status: GOOD ( 25.00 ) 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 On Fri, Sep 10, 2021 at 3:26 PM Lucas Stach wrote: > > This adds the description for the i.MX8MM disp blk-ctrl. > > Signed-off-by: Lucas Stach > Reviewed-by: Peng Fan > --- > drivers/soc/imx/imx8m-blk-ctrl.c | 70 ++++++++++++++++++++++++++++++++ > 1 file changed, 70 insertions(+) > > diff --git a/drivers/soc/imx/imx8m-blk-ctrl.c b/drivers/soc/imx/imx8m-blk-ctrl.c > index f2d74669d683..225c15f35dad 100644 > --- a/drivers/soc/imx/imx8m-blk-ctrl.c > +++ b/drivers/soc/imx/imx8m-blk-ctrl.c > @@ -431,11 +431,81 @@ static const struct imx8m_blk_ctrl_data imx8m_vpu_blk_ctl_dev_data = { > .num_domains = ARRAY_SIZE(imx8m_vpu_blk_ctl_domain_data), > }; > > +static int imx8mm_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(12)); > + regmap_set_bits(bc->regmap, BLK_SFT_RSTN, BIT(6)); > + > + /* > + * 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 imx8m_disp_blk_ctl_domain_data[] = { Since the 8MQ, 8MM, 8MN, and 8MP have different blk_ctl structures, shouldn't this be imx8mm_disp_blk_ctl_domain_data? > + [IMX8MM_DISPBLK_PD_CSI_BRIDGE] = { > + .name = "dispblk-csi-bridge", > + .clk_names = (const char *[]){ "csi-bridge-axi", "csi-bridge-apb", > + "csi-bridge-core", }, > + .num_clks = 3, > + .gpc_name = "csi-bridge", > + .rst_mask = BIT(0) | BIT(1) | BIT(2), > + .clk_mask = BIT(0) | BIT(1) | BIT(2) | BIT(3) | BIT(4) | BIT(5), > + }, > + [IMX8MM_DISPBLK_PD_LCDIF] = { > + .name = "dispblk-lcdif", > + .clk_names = (const char *[]){ "lcdif-axi", "lcdif-apb", "lcdif-pix", }, > + .num_clks = 3, > + .gpc_name = "lcdif", > + .clk_mask = BIT(6) | BIT(7), > + }, > + [IMX8MM_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(5), > + .clk_mask = BIT(8) | BIT(9), > + }, > + [IMX8MM_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(3) | BIT(4), > + .clk_mask = BIT(10) | BIT(11), > + }, > +}; > + > +static const struct imx8m_blk_ctrl_data imx8m_disp_blk_ctl_dev_data = { Same here. > + .max_reg = 0x2c, > + .power_notifier_fn = imx8mm_disp_power_notifier, > + .domains = imx8m_disp_blk_ctl_domain_data, > + .num_domains = ARRAY_SIZE(imx8m_disp_blk_ctl_domain_data), > +}; > + > static const struct of_device_id imx8m_blk_ctrl_of_match[] = { > { > .compatible = "fsl,imx8mm-vpu-blk-ctrl", > .data = &imx8m_vpu_blk_ctl_dev_data > }, { > + .compatible = "fsl,imx8mm-disp-blk-ctrl", > + .data = &imx8m_disp_blk_ctl_dev_data > + } ,{ > /* Sentinel */ > } > }; > -- > 2.30.2 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel