From patchwork Thu Apr 2 11:41:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 11470515 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E42D01668 for ; Thu, 2 Apr 2020 11:41:47 +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 C2807206F8 for ; Thu, 2 Apr 2020 11:41:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="FRKop/ik"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="dG4jD98j" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C2807206F8 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org 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=As/hY5U6B7oo4CR/fNzTMOxOdTLKzPe56kCJ6AiJPoo=; b=FRKop/ikgzxbAG2kj74Z6Eyp7A njl7+1O01rck6jhjlAV4MQXeg1hoopSXhhiq22xLR7gtXvQLtDhCdPGqNL2/S1ldSazuN5GykhH3c pkT0l+8nY5qzW20zxMgTImROCZJUaU3mL1+E6V3z0WttWDwPYrJqnnOaX3C5lLs7Q88JN+zfGKnuP wt0+/N9Y8idzTbozdloGcdFYuE8Q4C/stJEXtdeAtEBq7ZfIbRMaU0xVwUimndz8kwg/TBhJoYg6y 0FOuF2CcxNwjnEWVup83qwkmZCAiudsvdVY/OuinZG8Xt3fKOzLZXF7JgFxloqfbTdFmwTah1er0J jaa7MuEA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jJyED-00024x-2d; Thu, 02 Apr 2020 11:41:45 +0000 Received: from mail-pj1-x1041.google.com ([2607:f8b0:4864:20::1041]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jJyE9-00022Y-VL for linux-rockchip@lists.infradead.org; Thu, 02 Apr 2020 11:41:43 +0000 Received: by mail-pj1-x1041.google.com with SMTP id v13so1441383pjb.0 for ; Thu, 02 Apr 2020 04:41:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gBSDPXyREXbKviEvPOPG9KCDKDt6DwOObFfEzEgv6fg=; b=dG4jD98jlHWodBXZdNfvzOVkaB9xhDrkN2ZqtBgcvfGFoAUMooLr5EFiEgy0XFtdsY pMz7WDey1VKGS4LS/EHLmBszeTACgJZ9rSt0Xnif8J+9s1bAIpvmImZJ2JHn8nsjl4hB sDBR5/ZUmm8WmHP41KaCDC885svcoI8yb/lP4= 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=gBSDPXyREXbKviEvPOPG9KCDKDt6DwOObFfEzEgv6fg=; b=PHZC7jU4rIGWXKNJVumJzS+NjHC0M12/wAdnjA93y2kkLjr5ewo0eWpl8CAnrc0cj/ LWTSKlSxouxO3otSC4587rDNBC9iHeW0o+WdYbClHLdl0/v7OWPHeCyx8owoqShAYmRB hmMNC6lJIPeeUYBnNXoHcrLfA2dHbWG4cc6XfG5O4divIirckv0gqBMxQDLB7h53OzTV GjZc9FuU8LXy7piLdh4aqOenjPUfX15DGV1+N+r/UnEMrXIoZhQAVSxCLP7wZ8HOGVbh Gsyy/R4GM61Y+VPvWKpHFd6xZsOOSryVRWRQfBqjaSQNGyg2JUu6+rsX2Kh5o78w+dQj F2og== X-Gm-Message-State: AGi0PuY4HNEsGmqjU6JUd/ikexchhGetVDTx4nSIT5iJbDcIVqXHRY2R 2Wt4xS8lpmEPdPKwezOrcLW4kg== X-Google-Smtp-Source: APiQypKa0FqBAsVxXiE4spWFQWrfNIQPShFiq6sM7iIDQhQup35cKTBsqZIh/Rc30taG291C51CYZQ== X-Received: by 2002:a17:902:8ec1:: with SMTP id x1mr2578196plo.325.1585827701334; Thu, 02 Apr 2020 04:41:41 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c809:c7d5:3532:519d:ba6d:25e1]) by smtp.gmail.com with ESMTPSA id i4sm3618107pjg.4.2020.04.02.04.41.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2020 04:41:40 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich , Anatolij Gustschin Subject: [PATCH v3 1/5] clk: rk3399: Set empty for vopl assigned-clocks Date: Thu, 2 Apr 2020 17:11:21 +0530 Message-Id: <20200402114125.2501-2-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200402114125.2501-1-jagan@amarulasolutions.com> References: <20200402114125.2501-1-jagan@amarulasolutions.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200402_044142_004435_F6026AA2 X-CRM114-Status: UNSURE ( 9.34 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:1041 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-rockchip@lists.infradead.org, u-boot@lists.denx.de, Jagan Teki , sunil@amarulasolutions.com, linux-amarula@amarulasolutions.com, Mark Kettenis MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org During vidconsole probe, the device probe will try to check whether the assigned clocks on that video console node is initialized or not? and return an error if not. But, unlike Linux U-Boot won't require to handle these vopl assigned-clocks since core clocks are enough to handle the video out to process. So, mark them as empty in set_rate to satisfy clk_set_defaults so-that probe happened properly. Signed-off-by: Jagan Teki Reviewed-by: Kever Yang --- Changes for v3: - new patch drivers/clk/rockchip/clk_rk3399.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c index 865b80cc0f..1f62376595 100644 --- a/drivers/clk/rockchip/clk_rk3399.c +++ b/drivers/clk/rockchip/clk_rk3399.c @@ -994,6 +994,13 @@ static ulong rk3399_clk_set_rate(struct clk *clk, ulong rate) case DCLK_VOP1: ret = rk3399_vop_set_clk(priv->cru, clk->id, rate); break; + case ACLK_VOP1: + case HCLK_VOP1: + /** + * assigned-clocks handling won't require for vopl, so + * return 0 to satisfy clk_set_defaults during device probe. + */ + return 0; case SCLK_DDRCLK: ret = rk3399_ddr_set_clk(priv->cru, rate); break; From patchwork Thu Apr 2 11:41:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 11470517 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EE25B92A for ; Thu, 2 Apr 2020 11:41:52 +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 CC282206F8 for ; Thu, 2 Apr 2020 11:41:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="cnAIsm6I"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="plupcqpX" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CC282206F8 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org 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=0ZoXXwu/aiQdJG7FcOOF+88kACZ59555z48q7kCJ5Vw=; b=cnAIsm6ITAYMTHyjTddKLNNAxh ECeq3w6CRFln6Okm9Goj+k5pPSe+pEy8TB9m9zARQtrG20Lqzda9IvXkvjqQAhUDr66Bwif2ORPki MBovEC7z7slEuEDuPoSKEeuDA9s+G6T2t8voQm020EuuX4oegtGz+BHCBJUg3rkCKw+PBUBHVnHk7 cYi6Eo8tgQnuRsKNPXxShb0FW9iAhEAs+if4d4g9hSSlVDe5En9lbR55RCKCasZ8MOTy95mrlDiT+ cgAr5lK6chIywEJohENegvc0xF5DOaCHtVdorglljxZvJa7k7eUWlQsRw5imd5EhiARcFj6d6SNxl Uy2hCxjA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jJyEG-00027V-JX; Thu, 02 Apr 2020 11:41:48 +0000 Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jJyEE-000269-8W for linux-rockchip@lists.infradead.org; Thu, 02 Apr 2020 11:41:47 +0000 Received: by mail-pl1-x644.google.com with SMTP id k18so1236826pll.6 for ; Thu, 02 Apr 2020 04:41:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MVMvuoELpzAHqyuA9ms6rbjYm6gv5pgxF3Z45snuCwc=; b=plupcqpXZ/LMlI7WI1axqnYLTejtyHYObEcspHtcRtDKcxWnr8Yx/lhKqSz0iPb/S1 9kBRXdilmoTeqVDXf76ryXQfZ2iQwmiwzNqVzWMbYqnYVycbyehgOBWAz4Al9/XZRsqd KYoVELJg1gnOfmskkzyYko3idSC4ZiYuuFBFw= 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=MVMvuoELpzAHqyuA9ms6rbjYm6gv5pgxF3Z45snuCwc=; b=uMM1g7J2pFXwAy7bnqHBlxErdso8/tnTRhE1xQA3KRILGt1xE5hRrk3h1EBNSMau6E x6of8qc37DjSVxok3ftKHwo3MJr2UdwMbB+Yeg7X4ZzTS/etfXcPyxEq+FPLJqj6x0La idWmpUVHVQz8XXIOT6GsnHPnstWBRPTQFtln9St2tc4izml26GQH6pqffQB0RR3qJJEw O6P7GxDVusFqyak0e+x6ZNNwYHoymrn6eh8yvbrJVmnSnsOya2Wovtj2XDUFsagiXHFx KX0eDAtfV/8x0t/Wcg19qTFwUgoREvxOKhIw8bCgqebIAfQtYWMvmcwX9YaR1PuZnu4p 86Vg== X-Gm-Message-State: AGi0PuaAzWImQKF24xZNSVdv2064j18v2ND/9qIaiZaTgElch1XWRUx2 KXZPZPhQkJm/iOBZ/SYZFTXJeA== X-Google-Smtp-Source: APiQypL9u6DHPR8iaK1r4mMn/jFk2E+QNEQzLt6DSjPUObvoF7cezecPlSH7OWhWXQvy0CmW33xcRg== X-Received: by 2002:a17:902:fe06:: with SMTP id g6mr2567630plj.263.1585827705609; Thu, 02 Apr 2020 04:41:45 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c809:c7d5:3532:519d:ba6d:25e1]) by smtp.gmail.com with ESMTPSA id i4sm3618107pjg.4.2020.04.02.04.41.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2020 04:41:45 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich , Anatolij Gustschin Subject: [PATCH v3 2/5] video: rockchip: Fix vop modes for rk3399 Date: Thu, 2 Apr 2020 17:11:22 +0530 Message-Id: <20200402114125.2501-3-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200402114125.2501-1-jagan@amarulasolutions.com> References: <20200402114125.2501-1-jagan@amarulasolutions.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200402_044146_299934_92F8D5AA X-CRM114-Status: GOOD ( 12.23 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:644 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-rockchip@lists.infradead.org, u-boot@lists.denx.de, Jagan Teki , sunil@amarulasolutions.com, linux-amarula@amarulasolutions.com, Mark Kettenis MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org VOP display endpoint pipeline configuration is differs between rk3288 vs rk3399. These VOP pipeline configuration depends on how the different display interfaces connected in sequence to IN and OUT ports like for, RK3288: vopb_out: port { #address-cells = <1>; #size-cells = <0>; vopb_out_edp: endpoint@0 { reg = <0>; remote-endpoint = <&edp_in_vopb>; }; vopb_out_hdmi: endpoint@1 { reg = <1>; remote-endpoint = <&hdmi_in_vopb>; }; vopb_out_lvds: endpoint@2 { reg = <2>; remote-endpoint = <&lvds_in_vopb>; }; vopb_out_mipi: endpoint@3 { reg = <3>; remote-endpoint = <&mipi_in_vopb>; }; }; RK3399: vopb_out: port { #address-cells = <1>; #size-cells = <0>; vopb_out_edp: endpoint@0 { reg = <0>; remote-endpoint = <&edp_in_vopb>; }; vopb_out_mipi: endpoint@1 { reg = <1>; remote-endpoint = <&mipi_in_vopb>; }; vopb_out_hdmi: endpoint@2 { reg = <2>; remote-endpoint = <&hdmi_in_vopb>; }; vopb_out_mipi1: endpoint@3 { reg = <3>; remote-endpoint = <&mipi1_in_vopb>; }; vopb_out_dp: endpoint@4 { reg = <4>; remote-endpoint = <&dp_in_vopb>; }; }; here, HDMI interface has endpoint 1 in rk3288 and 2 in rk3399. The rockchip vop driver often depends on this determined endpoint number and stored in vop_mode. So based on this vop_mode the bpp and pin polarity would configure on detected display interface. Since, the existing driver using rk3288 vop mode settings enabling the same will result wrong display interface configuration for rk3399. Add the patch for fixing these vop modes for rk3399. Signed-off-by: Jagan Teki Reviewed-by: Kever Yang --- arch/arm/include/asm/arch-rockchip/vop_rk3288.h | 11 +++++++++++ drivers/video/rockchip/rk3399_vop.c | 2 -- drivers/video/rockchip/rk_vop.c | 4 ++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/asm/arch-rockchip/vop_rk3288.h b/arch/arm/include/asm/arch-rockchip/vop_rk3288.h index 8398249509..872a158b71 100644 --- a/arch/arm/include/asm/arch-rockchip/vop_rk3288.h +++ b/arch/arm/include/asm/arch-rockchip/vop_rk3288.h @@ -85,6 +85,16 @@ enum { LB_RGB_1280X8 = 0x5 }; +#if defined(CONFIG_ROCKCHIP_RK3399) +enum vop_modes { + VOP_MODE_EDP = 0, + VOP_MODE_MIPI, + VOP_MODE_HDMI, + VOP_MODE_MIPI1, + VOP_MODE_DP, + VOP_MODE_NONE, +}; +#else enum vop_modes { VOP_MODE_EDP = 0, VOP_MODE_HDMI, @@ -94,6 +104,7 @@ enum vop_modes { VOP_MODE_AUTO_DETECT, VOP_MODE_UNKNOWN, }; +#endif /* VOP_VERSION_INFO */ #define M_FPGA_VERSION (0xffff << 16) diff --git a/drivers/video/rockchip/rk3399_vop.c b/drivers/video/rockchip/rk3399_vop.c index 81c122d7a9..1d5b3931a6 100644 --- a/drivers/video/rockchip/rk3399_vop.c +++ b/drivers/video/rockchip/rk3399_vop.c @@ -45,8 +45,6 @@ static void rk3399_set_pin_polarity(struct udevice *dev, V_RK3399_DSP_MIPI_POL(polarity)); break; - case VOP_MODE_LVDS: - /* The RK3399 has neither parallel RGB nor LVDS output. */ default: debug("%s: unsupported output mode %x\n", __func__, mode); } diff --git a/drivers/video/rockchip/rk_vop.c b/drivers/video/rockchip/rk_vop.c index e91d4dfa7f..e1bd656bee 100644 --- a/drivers/video/rockchip/rk_vop.c +++ b/drivers/video/rockchip/rk_vop.c @@ -118,10 +118,12 @@ static void rkvop_enable_output(struct udevice *dev, enum vop_modes mode) V_EDP_OUT_EN(1)); break; +#if defined(CONFIG_ROCKCHIP_RK3288) case VOP_MODE_LVDS: clrsetbits_le32(®s->sys_ctrl, M_ALL_OUT_EN, V_RGB_OUT_EN(1)); break; +#endif case VOP_MODE_MIPI: clrsetbits_le32(®s->sys_ctrl, M_ALL_OUT_EN, @@ -313,7 +315,9 @@ static int rk_display_init(struct udevice *dev, ulong fbbase, ofnode ep_node) /* Set bitwidth for vop display according to vop mode */ switch (vop_id) { case VOP_MODE_EDP: +#if defined(CONFIG_ROCKCHIP_RK3288) case VOP_MODE_LVDS: +#endif l2bpp = VIDEO_BPP16; break; case VOP_MODE_HDMI: From patchwork Thu Apr 2 11:41:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 11470519 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4640092A for ; Thu, 2 Apr 2020 11:41:56 +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 24688206F8 for ; Thu, 2 Apr 2020 11:41:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="JCOobchw"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="M/v//8fN" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 24688206F8 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org 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=jEhDa9GaRLO3p/qbXzzqMUs5MWztXaUaNvyfW9ITgS0=; b=JCOobchws87kwNeMzatzjFM+EW Hik8bkDTakLEe2i3oqZqn+CkLHbm4gC0nKx0c6yuS0tPcfm/rQ5AxS5dQlP6EqHnz6VjEGLa5OKG1 46h4qvfnz0nZyPbe/OMNMhU6wxE1f23PQO6vhWUHsWpjfHnTAQPytUEqHv8KFWLoXMdVf3vqp35PG UIsHMbTXtfyVxW513tDevTSkOqZllafaOGuBTrQBb6eBcfG8Y/kdl0vfFAWUAzajdJpeLwPkqBR78 MP/8b8E6G+EXRKXXmwYW1MF093wOevf4nEyHuwJDhJsUvSKL+wY9Nabu4pvBaulnCOII7T4gNPn6X lbiekgIg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jJyEL-0002Ad-8E; Thu, 02 Apr 2020 11:41:53 +0000 Received: from mail-pj1-x1044.google.com ([2607:f8b0:4864:20::1044]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jJyEI-00028q-2R for linux-rockchip@lists.infradead.org; Thu, 02 Apr 2020 11:41:51 +0000 Received: by mail-pj1-x1044.google.com with SMTP id ng8so1434500pjb.2 for ; Thu, 02 Apr 2020 04:41:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=U9shr/sIXGUpkWVegpw8emtHcoxnHuA88+inRf7p4IE=; b=M/v//8fNNBafv0qRs9IJVD0OeLGuOI2jcXoNcblXRRCkUfogm5UjOdecA7zAtOQh// 3NCviNSunTTK4lA5Y6H6cUjDyW082t/bzUbn53wE7r7KqrHZHQ0xHR8s35RyD/pnbyYF s8dL17KoFfOwRdw0spyZ/buyQEG6kJxOcE66E= 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=U9shr/sIXGUpkWVegpw8emtHcoxnHuA88+inRf7p4IE=; b=Yth7K3me6i6fati0ex2eStcRB460paBwB09ZTZxLgaaNvRgzXUn0mf8Fh4f75ou/8T L+Qfr9sI7fix//X+HHNe0Pp+2K1VXqYhp4/itzyyzaGWcopelLY2hQZdvN7HU9mZCfcD MQLXeuuq91a6sI0te1/h06WHuIz1/+VqKwVWJLTgDtOnDUCXRxKSnAoCER1IcSl9ludT k0cvwT1l2YzrwObKvCKxKvbi+DZghTKoFqh1vjLxAuwRXCk3Ks41nQHuaJn/yrk3NbkT HF2bEOklWS84/TbByPAgW2/eqtfPq6XAkATO/WgXDJS1QDeJhEWlNJlnA4RqPRlYwo23 iBvg== X-Gm-Message-State: AGi0Pubay7W5q+J0inF/4T9WArRgCpEOWTcgv14QCA78njQQIwo2Zgzd 7W+zs7mxT3+xHSTQnY9pTTyVZQ== X-Google-Smtp-Source: APiQypKuK+dRsLXJumxTCKxMR6eVsxq4/XyQl7YPxx7zIbt0E6zk74Vm3JGQZNB+Vd1yWXxJ4CAXIQ== X-Received: by 2002:a17:90a:ad8b:: with SMTP id s11mr3306616pjq.8.1585827709430; Thu, 02 Apr 2020 04:41:49 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c809:c7d5:3532:519d:ba6d:25e1]) by smtp.gmail.com with ESMTPSA id i4sm3618107pjg.4.2020.04.02.04.41.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2020 04:41:48 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich , Anatolij Gustschin Subject: [PATCH v3 3/5] rockchip: Enable pre console for rk3399 Date: Thu, 2 Apr 2020 17:11:23 +0530 Message-Id: <20200402114125.2501-4-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200402114125.2501-1-jagan@amarulasolutions.com> References: <20200402114125.2501-1-jagan@amarulasolutions.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200402_044150_109352_2B30921F X-CRM114-Status: GOOD ( 10.48 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:1044 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-rockchip@lists.infradead.org, u-boot@lists.denx.de, Jagan Teki , sunil@amarulasolutions.com, linux-amarula@amarulasolutions.com, Mark Kettenis MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org Enable pre console buffer for rk3399 platform. This would help to capture the console messages prior to the console being initialised. Enabling this would help to capture all the console messages on video output source like HDMI. So we can find the full console messages of U-Boot proper on HDMI display when enabled it for RK3399 platform boards. Buffer address used for pre console is 0x0f200000 which is ram base plus 240MiB. right now the Allwinner SoC is using similar computation. Signed-off-by: Jagan Teki Reviewed-by: Kever Yang --- arch/arm/mach-rockchip/Kconfig | 1 + common/Kconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index ed7514ab75..0cb1f23d0f 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -229,6 +229,7 @@ config ROCKCHIP_RK3399 select DM_PMIC select DM_REGULATOR_FIXED select BOARD_LATE_INIT + imply PRE_CONSOLE_BUFFER imply ROCKCHIP_COMMON_BOARD imply ROCKCHIP_SDRAM_COMMON imply SPL_ROCKCHIP_COMMON_BOARD diff --git a/common/Kconfig b/common/Kconfig index 46e4193fc8..bd35de3056 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -568,6 +568,7 @@ config PRE_CON_BUF_ADDR default 0x2f000000 if ARCH_SUNXI && MACH_SUN9I default 0x4f000000 if ARCH_SUNXI && !MACH_SUN9I default 0x0f000000 if ROCKCHIP_RK3288 + default 0x0f200000 if ROCKCHIP_RK3399 help This sets the start address of the pre-console buffer. This must be in available memory and is accessed before relocation and From patchwork Thu Apr 2 11:41:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 11470521 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 77E3B1668 for ; Thu, 2 Apr 2020 11:42:00 +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 55E0C206F8 for ; Thu, 2 Apr 2020 11:42:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="OkXBAd6o"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="bWrtgsQu" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 55E0C206F8 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org 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=NKKpJDLJ9N3m//dW0FZmEIO0AgKbDT6kqdFCKzxgrqc=; b=OkXBAd6oDfJmeJjH+m7dGiY4ch tWjC908Qx8XLhza9hCA9UG7WaGYY/HDz9jDtsfDSfD7z7u2iIjEyuHItXLRJzpQ+y31tQvdU0pmZY XSQEUUD4JX8nzKRIUuE9H3urFDOADk+wsh1qDrGWLksyOw9n1AaNw4bsnnu/+hG4NVGtLTgcK1o2l 4LECPg9fztts/ep1IjlAfa9usWNXWr10itj8O+CyP5ISiUYGP/DDoK8AWdsdrBhQrb+NjI+LnN/Di 2rm1uJIknV2v9xU9SWVY29BU3pqF49QcXxH6JjA4l4tURAjY5/1P+r1qAJ3ireCjHkc4FSzkMub0c EJC1uB9w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jJyEO-0002DE-S1; Thu, 02 Apr 2020 11:41:56 +0000 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jJyEM-0002Bs-GC for linux-rockchip@lists.infradead.org; Thu, 02 Apr 2020 11:41:55 +0000 Received: by mail-pf1-x442.google.com with SMTP id c21so1635693pfo.5 for ; Thu, 02 Apr 2020 04:41:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=WRZdNM0deIoSv283K07zAk/A6gBZnVda/XJNRb/2yT4=; b=bWrtgsQuFnnzBdXcsbFXT19wwAIx45o1LIYxVYZozD23BqMxr7nshRaZEeTUHr35h4 OeonsYgdIX6CgL/6r2oAR419iGOunml5NvesJWzZhQvklLnRwQUbW3AtGlO8pPavISZp EDBXYtjtTTX6Bg+/J65fVMWZphehffql46j4g= 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=WRZdNM0deIoSv283K07zAk/A6gBZnVda/XJNRb/2yT4=; b=fS8ELtWFJIVbDCJ0foLJMVhcZKdhp1JaTbUM/nuZlL+4pGuWmJWAaTD5ZanDVYbf2e qNg09zAmjtDNDGZ/NLEQUCSSdDHs+zZ5KZhZcpGE4lhhpHnMFn+w7hUT26fEo36dem8i pU4dep3QC3AjGmDxq5vwyuwvYTCQKe5m1nNi5/GoqA5+B2dOvLBRW4ItdkCHwiqn1sCK 1GNMGaXAUP8YF3yHlQcyHL0UPEoDUwuSUgbCnE+lWP3pUox6sg/j7gfqN0fkWzx+wJEy ZKurYU/ABp05n6eKbSQ1wzsk2fviodS4JhrFHtsWIE1mtnvk6iNin0OrQE+56/Q8ZcO1 qCEw== X-Gm-Message-State: AGi0PubjZXke0z0AkQEuCk0w/P8UEuqDPFRhMsmw8UirZLN3VWhnY765 SyWQ5S+XJ7RnBCm2cqTcMu3W/w== X-Google-Smtp-Source: APiQypLE+79egu39SX50fCIUVWWCiB1/pFRIWLW9FIQ7Gt26s2I5eQxihTorqEVWJN8f3hE1RT2jsA== X-Received: by 2002:a05:6a00:2cb:: with SMTP id b11mr2732492pft.42.1585827713856; Thu, 02 Apr 2020 04:41:53 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c809:c7d5:3532:519d:ba6d:25e1]) by smtp.gmail.com with ESMTPSA id i4sm3618107pjg.4.2020.04.02.04.41.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2020 04:41:53 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich , Anatolij Gustschin Subject: [PATCH v3 4/5] rockchip: Enable HDMI output on rk3399 board w/ HDMI Date: Thu, 2 Apr 2020 17:11:24 +0530 Message-Id: <20200402114125.2501-5-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200402114125.2501-1-jagan@amarulasolutions.com> References: <20200402114125.2501-1-jagan@amarulasolutions.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200402_044154_536035_2347C595 X-CRM114-Status: UNSURE ( 9.52 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:442 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-rockchip@lists.infradead.org, Manivannan Sadhasivam , u-boot@lists.denx.de, Jagan Teki , sunil@amarulasolutions.com, linux-amarula@amarulasolutions.com, Mark Kettenis MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org Enable config options and console setting to respective rk3399 board for HDMI output. Boards supported and tested on this patch are: - NanoPc T4 - NanoPi M4 - NanoPi Neo4 - ROC-RK3399-PC - Rock960 Cc: Manivannan Sadhasivam Signed-off-by: Jagan Teki Tested-by: Peter Robinson Reviewed-by: Kever Yang Acked-by: Manivannan Sadhasivam --- Changes for v3: - add rock960 hdmi out support configs/nanopc-t4-rk3399_defconfig | 7 +++++++ configs/nanopi-m4-rk3399_defconfig | 7 +++++++ configs/nanopi-neo4-rk3399_defconfig | 7 +++++++ configs/roc-pc-rk3399_defconfig | 6 ++++++ configs/rock960-rk3399_defconfig | 7 +++++++ include/configs/evb_rk3399.h | 5 +++++ include/configs/rock960_rk3399.h | 5 +++++ 7 files changed, 44 insertions(+) diff --git a/configs/nanopc-t4-rk3399_defconfig b/configs/nanopc-t4-rk3399_defconfig index 9ea9b11574..607a00dbf7 100644 --- a/configs/nanopc-t4-rk3399_defconfig +++ b/configs/nanopc-t4-rk3399_defconfig @@ -52,5 +52,12 @@ CONFIG_USB_ETHER_ASIX88179=y CONFIG_USB_ETHER_MCS7830=y CONFIG_USB_ETHER_RTL8152=y CONFIG_USB_ETHER_SMSC95XX=y +CONFIG_USB_KEYBOARD=y CONFIG_SPL_TINY_MEMSET=y CONFIG_ERRNO_STR=y +CONFIG_DM_VIDEO=y +CONFIG_VIDEO_BPP16=y +CONFIG_VIDEO_BPP32=y +CONFIG_DISPLAY=y +CONFIG_VIDEO_ROCKCHIP=y +CONFIG_DISPLAY_ROCKCHIP_HDMI=y diff --git a/configs/nanopi-m4-rk3399_defconfig b/configs/nanopi-m4-rk3399_defconfig index ad0e808bf6..3fcb7ac2d7 100644 --- a/configs/nanopi-m4-rk3399_defconfig +++ b/configs/nanopi-m4-rk3399_defconfig @@ -52,5 +52,12 @@ CONFIG_USB_ETHER_ASIX88179=y CONFIG_USB_ETHER_MCS7830=y CONFIG_USB_ETHER_RTL8152=y CONFIG_USB_ETHER_SMSC95XX=y +CONFIG_USB_KEYBOARD=y CONFIG_SPL_TINY_MEMSET=y CONFIG_ERRNO_STR=y +CONFIG_DM_VIDEO=y +CONFIG_VIDEO_BPP16=y +CONFIG_VIDEO_BPP32=y +CONFIG_DISPLAY=y +CONFIG_VIDEO_ROCKCHIP=y +CONFIG_DISPLAY_ROCKCHIP_HDMI=y diff --git a/configs/nanopi-neo4-rk3399_defconfig b/configs/nanopi-neo4-rk3399_defconfig index d038a8cab9..b9ea535e43 100644 --- a/configs/nanopi-neo4-rk3399_defconfig +++ b/configs/nanopi-neo4-rk3399_defconfig @@ -52,5 +52,12 @@ CONFIG_USB_ETHER_ASIX88179=y CONFIG_USB_ETHER_MCS7830=y CONFIG_USB_ETHER_RTL8152=y CONFIG_USB_ETHER_SMSC95XX=y +CONFIG_USB_KEYBOARD=y CONFIG_SPL_TINY_MEMSET=y CONFIG_ERRNO_STR=y +CONFIG_DM_VIDEO=y +CONFIG_VIDEO_BPP16=y +CONFIG_VIDEO_BPP32=y +CONFIG_DISPLAY=y +CONFIG_VIDEO_ROCKCHIP=y +CONFIG_DISPLAY_ROCKCHIP_HDMI=y diff --git a/configs/roc-pc-rk3399_defconfig b/configs/roc-pc-rk3399_defconfig index d540a17aeb..be76524cef 100644 --- a/configs/roc-pc-rk3399_defconfig +++ b/configs/roc-pc-rk3399_defconfig @@ -59,3 +59,9 @@ CONFIG_USB_ETHER_SMSC95XX=y CONFIG_USB_KEYBOARD=y CONFIG_SPL_TINY_MEMSET=y CONFIG_ERRNO_STR=y +CONFIG_DM_VIDEO=y +CONFIG_VIDEO_BPP16=y +CONFIG_VIDEO_BPP32=y +CONFIG_DISPLAY=y +CONFIG_VIDEO_ROCKCHIP=y +CONFIG_DISPLAY_ROCKCHIP_HDMI=y diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig index ba4226e173..c4e954731a 100644 --- a/configs/rock960-rk3399_defconfig +++ b/configs/rock960-rk3399_defconfig @@ -58,5 +58,12 @@ CONFIG_USB_ETHER_ASIX88179=y CONFIG_USB_ETHER_MCS7830=y CONFIG_USB_ETHER_RTL8152=y CONFIG_USB_ETHER_SMSC95XX=y +CONFIG_USB_KEYBOARD=y CONFIG_SPL_TINY_MEMSET=y CONFIG_ERRNO_STR=y +CONFIG_DM_VIDEO=y +CONFIG_VIDEO_BPP16=y +CONFIG_VIDEO_BPP32=y +CONFIG_DISPLAY=y +CONFIG_VIDEO_ROCKCHIP=y +CONFIG_DISPLAY_ROCKCHIP_HDMI=y diff --git a/include/configs/evb_rk3399.h b/include/configs/evb_rk3399.h index c0b0358893..2d3db22877 100644 --- a/include/configs/evb_rk3399.h +++ b/include/configs/evb_rk3399.h @@ -6,6 +6,11 @@ #ifndef __EVB_RK3399_H #define __EVB_RK3399_H +#define ROCKCHIP_DEVICE_SETTINGS \ + "stdin=serial,usbkbd\0" \ + "stdout=serial,vidconsole\0" \ + "stderr=serial,vidconsole\0" + #include #if defined(CONFIG_ENV_IS_IN_MMC) diff --git a/include/configs/rock960_rk3399.h b/include/configs/rock960_rk3399.h index 746d24cbff..304ad2b7aa 100644 --- a/include/configs/rock960_rk3399.h +++ b/include/configs/rock960_rk3399.h @@ -6,6 +6,11 @@ #ifndef __ROCK960_RK3399_H #define __ROCK960_RK3399_H +#define ROCKCHIP_DEVICE_SETTINGS \ + "stdin=serial,usbkbd\0" \ + "stdout=serial,vidconsole\0" \ + "stderr=serial,vidconsole\0" + #include #define CONFIG_SYS_MMC_ENV_DEV 1 From patchwork Thu Apr 2 11:41:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 11470523 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 972E992C for ; Thu, 2 Apr 2020 11:42:05 +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 74EC6206F8 for ; Thu, 2 Apr 2020 11:42:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="gp4C67J2"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="nB6TM8G5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 74EC6206F8 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org 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=790hAhyE5vW8cf88wBCbqzLS1O7zErEEKfby0ywe35g=; b=gp4C67J2lO+d1Fi3QrSC319STd oeH2IDq+95b+2dCh7HzCxCJSFu2S41kk21ela5P95jizJW+cOCHgqPfnH6ES9sWfieCFSmm7BtrOK 8X1QoE37G1XoifltXdVSnM7rJOOPE8bfgGM6pPQA28Peogv2hOC7dcNsk1z0BJfR8KUMOWN8LQ8bv lQyWpSOFCe88nTYGw2uqvrZt+jn1oMAtVlcWyQDW0HYGSLHLHBZUgiVjCq1QRHyLI4SXD0WN2/kCS Cu1cnL+k4OiDgKKRP61NaTn3Imv6Q7Kgzdj9wLlFPHNMAgwbYDzvbMjl/A+0F+h36AMN8tzKrG+HN prXbEL5Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jJyEU-0002Gn-O4; Thu, 02 Apr 2020 11:42:02 +0000 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jJyER-0002Ed-Re for linux-rockchip@lists.infradead.org; Thu, 02 Apr 2020 11:42:01 +0000 Received: by mail-pg1-x541.google.com with SMTP id x7so1723145pgh.5 for ; Thu, 02 Apr 2020 04:41:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=oIKi2o05B3Z9cSU1NF9xH472HBvt4fwkMM8ABMXFROs=; b=nB6TM8G57eVlmSYGAe4tHnLtxk114pG866EhkcmchUPHFt0LlR8Z3UCmnlEdyb/Pe4 i9vqqaH6ZQgmRTWj172Argghtwlimf6hMmgcXhfbNRMSji+0z+9YWZs3aK9lq+XQmDvI Z6+16/b47s9EpcKhFbjeUnPJceiKgcViERFUo= 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=oIKi2o05B3Z9cSU1NF9xH472HBvt4fwkMM8ABMXFROs=; b=jDCC0tc16lcXU3WvWJ4hPv67tPpDxPcFMkBL1EmQ+VLJ5vLuXnRqrvUK/pJlBh65XX aH9nzN7xaNOb+eu8211yK1R6wNERWzpafsCJPagLZBcjZAlluNhGIzjTl1cb5bcAXU/F EssihMicNQnOPPTjVaPuyXiYff0QZzw2KmZTgglgf8BIF+jqTZPhFSVJPgCyp/IAlT9Q 7HMQNEGqKBH+VIPbW7iK9wX3RsqWtveC/aQ4sTolM+di57XeHLFQNA4mDOx0mzrae0hP G7hY49mFCxHcdmCSdUqQm96knkIsHPVDjznLvuKm6PKOt0yqad9FtnsUKZwbp+4l7ZL+ sXNA== X-Gm-Message-State: AGi0PubBFx2H8vLz4MAB2qA/ru7UcJ+jBqwbO2Px2g13LrXHCCc7qL7U arnL7ycjTW6i4pjnOqWPUbN4AQ== X-Google-Smtp-Source: APiQypKQPfM5v59ATdHn2zW07b69ZQAkS+2/ZZ0phbD/cwJ/5eVENIfLMZw84D65BWljN5lS0n55FQ== X-Received: by 2002:a63:cb4a:: with SMTP id m10mr3060711pgi.101.1585827717799; Thu, 02 Apr 2020 04:41:57 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c809:c7d5:3532:519d:ba6d:25e1]) by smtp.gmail.com with ESMTPSA id i4sm3618107pjg.4.2020.04.02.04.41.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2020 04:41:57 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich , Anatolij Gustschin Subject: [PATCH v3 5/5] video: rockchip: Support 4K resolution for rk3399, HDMI Date: Thu, 2 Apr 2020 17:11:25 +0530 Message-Id: <20200402114125.2501-6-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200402114125.2501-1-jagan@amarulasolutions.com> References: <20200402114125.2501-1-jagan@amarulasolutions.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200402_044159_888694_E2DC38B4 X-CRM114-Status: GOOD ( 10.04 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:541 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-rockchip@lists.infradead.org, u-boot@lists.denx.de, Jagan Teki , sunil@amarulasolutions.com, linux-amarula@amarulasolutions.com, Mark Kettenis MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org The default resolution for rockchip display is 1920x1080 which failed to work on 4K HDMI out displays on rk3399. So, mark the default resolution as 3480x2160 for rk3399 HDMI out. This would work all the hdmi display resolutions till 4K. Signed-off-by: Jagan Teki Reviewed-by: Kever Yang --- Changes for v3: - new patch drivers/video/rockchip/Kconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/video/rockchip/Kconfig b/drivers/video/rockchip/Kconfig index 10182d0b66..cfd774ead6 100644 --- a/drivers/video/rockchip/Kconfig +++ b/drivers/video/rockchip/Kconfig @@ -22,6 +22,7 @@ menuconfig VIDEO_ROCKCHIP config VIDEO_ROCKCHIP_MAX_XRES int "Maximum horizontal resolution (for memory allocation purposes)" depends on VIDEO_ROCKCHIP + default 3480 if ROCKCHIP_RK3399 && DISPLAY_ROCKCHIP_HDMI default 1920 help The maximum horizontal resolution to support for the framebuffer. @@ -31,6 +32,7 @@ config VIDEO_ROCKCHIP_MAX_XRES config VIDEO_ROCKCHIP_MAX_YRES int "Maximum vertical resolution (for memory allocation purposes)" depends on VIDEO_ROCKCHIP + default 2160 if ROCKCHIP_RK3399 && DISPLAY_ROCKCHIP_HDMI default 1080 help The maximum vertical resolution to support for the framebuffer.