From patchwork Fri Mar 10 04:32:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 9615055 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 0EBEF60415 for ; Fri, 10 Mar 2017 05:24:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 00986286E3 for ; Fri, 10 Mar 2017 05:24:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E9638286F3; Fri, 10 Mar 2017 05:24:57 +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=ham 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 77A01286E3 for ; Fri, 10 Mar 2017 05:24:57 +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=cSdiojWiIbGqckYN/yV0YwNwm6FKTphnk897vt5hPhQ=; b=FE2wfRIcBNFoNBfqEoGBIB/+0y 32e6D1GFH8z10KgNNhhuTZV7TdB1lmYnzCdpot95U6j1z8YZzV2wKW3fSt3cwEUwiAtkuEhOGZAaE Qb6yhxh5U5P2PcW0lKHrHvcaQx0gidpPAtbxCPNVesjn+RC/YBCeRx9TUZ6isk40ik+cirShRsc8w ofdsL7YrzwF3USjmr4sNGZc0VCBARSVJ55BUT6X3hBHHDC33lFJMRd1NKfuPNpNxbFbwYHGlvmRjQ vLfZlU+exn57zxKlmijdN9fOuAxtWgHeCgftzNh35+rpna0qbWKmzaez7PV4Kd/vBaCWyXGxGvXkc FHtKZEkg==; 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 1cmD2t-0007vG-SP; Fri, 10 Mar 2017 05:24:55 +0000 Received: from mail-qk0-x22d.google.com ([2607:f8b0:400d:c09::22d]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cmCM2-0003wq-Rh for linux-rockchip@lists.infradead.org; Fri, 10 Mar 2017 04:40:41 +0000 Received: by mail-qk0-x22d.google.com with SMTP id p64so152338617qke.1 for ; Thu, 09 Mar 2017 20:40:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1oX3yNWpMagT/nTerBDtO82qeVDoHNZzS4wM29lvEGA=; b=TGSzXl2V57NoznIrkD+nuaYzaD/hmugn1dL2YgRDYihLU+gTyvJkTheeWAIWRnp9Ue pk7Gzkf56+Njo0srfpRNUmrFoATkLyhI1nVDGTD0DhGSX87eHovp1wjsXf/gIGXZCLgJ MI5bUsVZFNnwZvMH+wG+N8zjj6oRLOuvOdbro= 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=1oX3yNWpMagT/nTerBDtO82qeVDoHNZzS4wM29lvEGA=; b=Lg+mABae413ZR2IJ2Zl5dHnj2o89xJbj8nAEzUDwn6MXndLKr8hEBiSLa8udWaekTP pHUEITKbpZQAh6cD8MTmceYHcmdkeEAzGfQJGtDriEe8Tw+80VPjeq3Zkk7LTjfnIMqq fgYSAVqrn0dBtTMMw5o0oviqZQ3CJQ65QyS2NXwIU0GFBRECdsFxW010OZqUBp5FqTpA aFpl/UqTKPkUbhqIWv6+YOVoTQRUq/RQjSRaO9lPCtGwePH2iZ1hSetCWotnnAYbcia+ vY7KoMJ6nK6KeMjjNUpa+8P/BNPA3+qC67GCiyAEFBlEDUwIiQmoS03aSPA4Um4lBds/ e/bA== X-Gm-Message-State: AMke39kGOwKIsLrGKjV/joYoWKOBdxwwZSRM9lafd76DDJsTrgjR4SLubN9k6kOYo4tsexHp X-Received: by 10.200.34.171 with SMTP id f40mr18314378qta.125.1489120821031; Thu, 09 Mar 2017 20:40:21 -0800 (PST) Received: from boxwood.roam.corp.google.com (cpe-75-189-128-87.nc.res.rr.com. [75.189.128.87]) by smtp.gmail.com with ESMTPSA id n19sm5697731qtn.35.2017.03.09.20.40.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Mar 2017 20:40:19 -0800 (PST) From: Sean Paul To: linux-rockchip@lists.infradead.org, dri-devel@lists.freedesktop.org Subject: [PATCH 28/41] drm/bridge: analogix_dp: Don't use ANALOGIX_DP_PLL_CTL to control pll Date: Thu, 9 Mar 2017 23:32:43 -0500 Message-Id: <20170310043305.17216-29-seanpaul@chromium.org> X-Mailer: git-send-email 2.12.0.246.ga2ecc84866-goog In-Reply-To: <20170310043305.17216-1-seanpaul@chromium.org> References: <20170310043305.17216-1-seanpaul@chromium.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170309_204038_981406_C25B7998 X-CRM114-Status: UNSURE ( 9.88 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Archit Taneja , zain wang , Lin Huang , Tomeu Vizoso , David Airlie , Douglas Anderson , Sean Paul , Yakir Yang MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: zain wang There is no register named ANALOGIX_DP_PLL_CTL in Rockchip edp phy reg list. We should use BIT_4 in ANALOGIX_DP_PD to control the pll power instead of ANALOGIX_DP_PLL_CTL. Cc: Douglas Anderson Signed-off-by: zain wang Signed-off-by: Sean Paul Reviewed-by: Andrzej Hajda --- drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c index 1cb57e528ec8..2cacd1e84b4d 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c @@ -230,16 +230,20 @@ enum pll_status analogix_dp_get_pll_lock_status(struct analogix_dp_device *dp) void analogix_dp_set_pll_power_down(struct analogix_dp_device *dp, bool enable) { u32 reg; + u32 mask = DP_PLL_PD; + u32 pd_addr = ANALOGIX_DP_PLL_CTL; - if (enable) { - reg = readl(dp->reg_base + ANALOGIX_DP_PLL_CTL); - reg |= DP_PLL_PD; - writel(reg, dp->reg_base + ANALOGIX_DP_PLL_CTL); - } else { - reg = readl(dp->reg_base + ANALOGIX_DP_PLL_CTL); - reg &= ~DP_PLL_PD; - writel(reg, dp->reg_base + ANALOGIX_DP_PLL_CTL); + if (dp->plat_data && is_rockchip(dp->plat_data->dev_type)) { + pd_addr = ANALOGIX_DP_PD; + mask = RK_PLL_PD; } + + reg = readl(dp->reg_base + pd_addr); + if (enable) + reg |= mask; + else + reg &= ~mask; + writel(reg, dp->reg_base + pd_addr); } void analogix_dp_set_analog_power_down(struct analogix_dp_device *dp,