From patchwork Wed Mar 22 01:54:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Zhong X-Patchwork-Id: 9637939 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 2A011602D6 for ; Wed, 22 Mar 2017 01:57:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1B07026CFF for ; Wed, 22 Mar 2017 01:57:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0F86C2830A; Wed, 22 Mar 2017 01:57:54 +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.4 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_SORBS_SPAM autolearn=no 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 9CDBF26CFF for ; Wed, 22 Mar 2017 01:57:53 +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=ROBQmceFl+L36wDfC1oiBbGiX2XDmC7DGxQnUNf+Hvs=; b=ZU5axIWp42RSJggCvCb7I0fJSv IOSkte+F4DCNgGT+VaVVGZ+uNthEifrqfcgBX3DuqYmOikhr9tE1vmXJCBvj3X6gfm0ghQFqy7prO 7Y/heya0/V9fMIepF0ZxGpytwQYgFbGRNa0hYb+c29I3B42gO6Akd8dxkolJw8xhxIR4md07i7orX cU56DC5mN+0GyzpkQakOt5QjlORLkUzBHqAyvajAQ4LbMI30NxX5tsQ2cwMksedcMtRp6zBzzAzjX AA5r4V7tnEYWdE0yF1n8fWV+Ml9Qv2k5os4jtW6dooYNuswHUJl79C9uUMXaomM7SomXiNLH5CgLV 4Qv14XjA==; 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 1cqVX7-0006Vv-4g; Wed, 22 Mar 2017 01:57:53 +0000 Received: from mail-pg0-f65.google.com ([74.125.83.65]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cqVWR-0005qn-G4; Wed, 22 Mar 2017 01:57:13 +0000 Received: by mail-pg0-f65.google.com with SMTP id 79so19222730pgf.0; Tue, 21 Mar 2017 18:56:56 -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=N0uDCBXc/DdBcdmhzIGd92fGOE3/gE0g/eDxV2kzx1k=; b=Xj9gxjfw9R3mhO3DTeoeyndLm/LB4c7NhkCJiaNZO46Glswu91DP3strd56CoAYXuk jjkdMpDUL/YVlbl3hgWONvcsGiVeEKP+MqGuYS8tSfAdGkO95h7Sz4o/2JIEn+MZBk1N kOh9ozJziaXpLbzx2cX9bdmED/42Ci1hlK5Qytluxyftm3cs5Pftw1z8NINHokpd9cg5 ZjCwIuomu+1CaKNWJ8PtofuV5hIoPBwKmsTnBjqdWJE8pFr4gCWAVqkhHF/0QMko+sX1 +s0RV2BTSJkG/DV88V3To+KWIoBa9ctxnTqp1xg+CqhYiXeHtKxRmhcjaJMSm1xEzN7t q2cw== X-Gm-Message-State: AFeK/H1JHUCZJtaAfgBPJkSjDJCgquPhf3s1su6mweAO9hW7RtPRWmACqnQjke13StZmaw== X-Received: by 10.99.184.18 with SMTP id p18mr41930962pge.20.1490147815851; Tue, 21 Mar 2017 18:56:55 -0700 (PDT) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id t6sm42197794pgo.42.2017.03.21.18.56.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 21 Mar 2017 18:56:55 -0700 (PDT) From: Chris Zhong To: linux-rockchip@lists.infradead.org Subject: [PATCH v4 4/4] drm/rockchip/dsi: correct the grf_switch_reg name Date: Wed, 22 Mar 2017 09:54:51 +0800 Message-Id: <1490147691-4489-5-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_185711_687217_54C24C7B X-CRM114-Status: UNSURE ( 9.46 ) 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: 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-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP For the RK3399, the grf_switch_reg name should be RK3399_GRF_SOC_CON20, not RK3399_GRF_SOC_CON19. Signed-off-by: Chris Zhong Reviewed-by: Brian Norris Reviewed-by: Sean Paul --- Changes in v4: None Changes in v3: None Changes in v2: None drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c index dc8fd22..3aedcba 100644 --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c @@ -34,7 +34,7 @@ #define RK3288_DSI0_SEL_VOP_LIT BIT(6) #define RK3288_DSI1_SEL_VOP_LIT BIT(9) -#define RK3399_GRF_SOC_CON19 0x6250 +#define RK3399_GRF_SOC_CON20 0x6250 #define RK3399_DSI0_SEL_VOP_LIT BIT(0) #define RK3399_DSI1_SEL_VOP_LIT BIT(4) @@ -1151,7 +1151,7 @@ static struct dw_mipi_dsi_plat_data rk3288_mipi_dsi_drv_data = { static struct dw_mipi_dsi_plat_data rk3399_mipi_dsi_drv_data = { .dsi0_en_bit = RK3399_DSI0_SEL_VOP_LIT, .dsi1_en_bit = RK3399_DSI1_SEL_VOP_LIT, - .grf_switch_reg = RK3399_GRF_SOC_CON19, + .grf_switch_reg = RK3399_GRF_SOC_CON20, .grf_dsi0_mode = RK3399_GRF_DSI_MODE, .grf_dsi0_mode_reg = RK3399_GRF_SOC_CON22, .flags = DW_MIPI_NEEDS_PHY_CFG_CLK | DW_MIPI_NEEDS_GRF_CLK,