From patchwork Wed Mar 22 01:54:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Zhong X-Patchwork-Id: 9637937 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EBF19602D6 for ; Wed, 22 Mar 2017 01:57:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DD22B26CFF for ; Wed, 22 Mar 2017 01:57:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D1CEF2830A; Wed, 22 Mar 2017 01:57:39 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 363D2271CB for ; Wed, 22 Mar 2017 01:57:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=h9c/i9vm4vgqXp/tpM1mSXdOLDbQLrdn2qWLnO7oIFk=; b=nrH+fL7y+d5AltvzU0QQdhuaAm 6+d+4wzgDiHNuZWBnkRQJgCe/IgqPe3f+DfILmrWjRjQlPsS0xZ15EY9I+Ql7iJCCPs1anVoAPjsh RnMNzW4UBKG03IHpZrk7EKtn7eK5RS+UoMYlZ4l8HSdWyGsgXvxqo3UZ0/HwVq2pPeHDLzs9Avrcu JHleFVwAMoftBD27jnOUswzfARyjXVBxS46PpfVasaL/ih++H4XoOPRJncktfgBB7sZJYcZFxukEe 4wMOo1IY2fjJXkLxt7b5/49Gnneek1ebBPyb+JoUT5ayJ+egYm5MlY+eqhIsTMmdnT33wST+Ecoim TRVoZATg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cqVWn-0006C1-Q5; Wed, 22 Mar 2017 01:57:33 +0000 Received: from mail-pf0-f196.google.com ([209.85.192.196]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cqVWO-0005po-No; Wed, 22 Mar 2017 01:57:10 +0000 Received: by mail-pf0-f196.google.com with SMTP id r137so20655382pfr.3; Tue, 21 Mar 2017 18:56:48 -0700 (PDT) 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; bh=1hQ8GVb0nTyQ/4Y4I7iqYTJwguRTCjkcgYVTedQNBu4=; b=atjwZPGhTT93XGa4naYKGd0up8Gj1NjhkeTleAmUfScrDmI9i71BGbPQj7BPzFi3Z7 artzqApG7NQeWtkNTSvWgaZuTiMM0JMv4ljrb4nVUiVcC/4uSOMpqTK3BYVNy5Q6vhrB OZyvzDtag1hn8V4XtKouCFIIs9oei9jua2KKRlU5HtGpXit/FgbekxadP7RByt84sOko I9DG5lmZwR5nMDOBCY1nz9L6wHJ3Bdc8LAKsae1R/dOGk1wacNOIAoi2EA2046uYgZlC 84sjIO41li3Ne554wJVpac3kZ/gM6d0H+LhV4KzCStgQXC5hKfWfYrB7a4iqHK4pyrSo tGYg== X-Gm-Message-State: AFeK/H2uU24G1UQ5RiWz2NMHzwZ5FRayPsJodPWFMG1hMZBIUNktNA/FQ307KlI57Tqt4A== X-Received: by 10.84.193.129 with SMTP id f1mr21106485pld.63.1490147807809; Tue, 21 Mar 2017 18:56:47 -0700 (PDT) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id t6sm42197794pgo.42.2017.03.21.18.56.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 21 Mar 2017 18:56:47 -0700 (PDT) From: Chris Zhong To: linux-rockchip@lists.infradead.org Subject: [PATCH v4 1/4] drm/rockchip/dsi: check phy_cfg_clk only for RK3399 Date: Wed, 22 Mar 2017 09:54:48 +0800 Message-Id: <1490147691-4489-2-git-send-email-zyw@rock-chips.com> X-Mailer: git-send-email 2.6.3 In-Reply-To: <1490147691-4489-1-git-send-email-zyw@rock-chips.com> References: <1490147691-4489-1-git-send-email-zyw@rock-chips.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170321_185708_825782_85A18FE3 X-CRM114-Status: GOOD ( 13.19 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Heiko Stuebner , David Airlie , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Chris Zhong , linux-arm-kernel@lists.infradead.org, Mark Yao MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP For RK3399, the phy_cfg_clk is a required clock, if phy_cfg_clk is disabled, MIPI phy can not work. Let's return a error if there is no phy_cfg_clk in dts property, when the pdata match RK3399. Signed-off-by: Chris Zhong Reviewed-by: Sean Paul --- Changes in v4: None Changes in v3: - add a DW_MIPI_NEEDS_PHY_CFG_CLK for RK3399 Changes in v2: None drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c index f84f9ae..68f48b0 100644 --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c @@ -251,6 +251,8 @@ #define THS_PRE_PROGRAM_EN BIT(7) #define THS_ZERO_PROGRAM_EN BIT(6) +#define DW_MIPI_NEEDS_PHY_CFG_CLK BIT(0) + enum { BANDGAP_97_07, BANDGAP_98_05, @@ -279,6 +281,7 @@ struct dw_mipi_dsi_plat_data { u32 grf_switch_reg; u32 grf_dsi0_mode; u32 grf_dsi0_mode_reg; + unsigned int flags; unsigned int max_data_lanes; }; @@ -1136,6 +1139,7 @@ static struct dw_mipi_dsi_plat_data rk3399_mipi_dsi_drv_data = { .grf_switch_reg = RK3399_GRF_SOC_CON19, .grf_dsi0_mode = RK3399_GRF_DSI_MODE, .grf_dsi0_mode_reg = RK3399_GRF_SOC_CON22, + .flags = DW_MIPI_NEEDS_PHY_CFG_CLK, .max_data_lanes = 4, }; @@ -1227,15 +1231,13 @@ static int dw_mipi_dsi_bind(struct device *dev, struct device *master, clk_disable_unprepare(dsi->pclk); } - dsi->phy_cfg_clk = devm_clk_get(dev, "phy_cfg"); - if (IS_ERR(dsi->phy_cfg_clk)) { - ret = PTR_ERR(dsi->phy_cfg_clk); - if (ret != -ENOENT) { + if (pdata->flags & DW_MIPI_NEEDS_PHY_CFG_CLK) { + dsi->phy_cfg_clk = devm_clk_get(dev, "phy_cfg"); + if (IS_ERR(dsi->phy_cfg_clk)) { + ret = PTR_ERR(dsi->phy_cfg_clk); dev_err(dev, "Unable to get phy_cfg_clk: %d\n", ret); return ret; } - dsi->phy_cfg_clk = NULL; - dev_dbg(dev, "have not phy_cfg_clk\n"); } ret = clk_prepare_enable(dsi->pllref_clk);