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: 1061 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id DDAF73F0D3 for ; Thu, 2 Apr 2020 13:41:44 +0200 (CEST) Received: by mail-pg1-f198.google.com with SMTP id v29sf2763941pgo.12 for ; Thu, 02 Apr 2020 04:41:44 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1585827703; cv=pass; d=google.com; s=arc-20160816; b=pBkK+PX7D9TrHPF44ROWupvbs1+s48urc+76nBjv+MOeN8kS0EdrCEmIdUMXc5+FUB 0TSzgICSQzrIJSJixx0q0pVWaaXnRiASLCSz8zvOOsI6PGO08ZuiktUyDXashQdHyai4 owVcNwKNGZxAbZv9NL7E11wpikZ1NclZtB65HocowcfcT8OFBvBhabIeIJjtARkmw7O1 ORQLBcnORwgAVcqzJiyjgZ6hQXzFzQVd3C37ValEwRv/HGqUrZYe4k+hJenxiN8PBpCn w7svIveEY7gufUg5Zy+7Gpmp48p4xWpYJ70aYxWsxPQFA+ZjhZsVheeLMjB03ZeORJ0D c/NA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:references:in-reply-to:message-id:date :subject:cc:to:from:mime-version:dkim-signature; bh=4hZrnkf5OIjsdavTUIztLJL031UIz+QWLsaauWIesYo=; b=01jp5eUh81TPwiJqVBVSzeHldhGvwMh/0TB59K1d83M7qaqMujGOOw1mrKOjC9HuAb uYj4GRFKLAMvETlQIJxmxe7sLVPqbekZBRKg7LlnajUvPVH/mvYKSWrBU0TOQ8cfvTaJ u26gsIlgH6thUShPZCMMZPqr+BhExH9pCyN4hWo4Zjt0kf3JBpjsazF+b+YyUhgxHjt3 tIiLSu6+EJdnG5RhaXSgs92Phk3jcbF5NULekJGGcjPlMIfmRMKnp6KnTkMFkf050kt5 p4+Du4xeq+eMlAU+BYEkhpiteXKV9Gp8V72wbbOLfMCB0TxWnarmO2GzhwwkrPTfp8SR 8lcA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=dG4jD98j; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=4hZrnkf5OIjsdavTUIztLJL031UIz+QWLsaauWIesYo=; b=S19nBNqZNfN9PiE4xGPGbgUrHtPyTJ0VybFJSZwKMggfH/1OyrqJIe6D4Bp2N0DiUY 3yQocfZ69RBXXIIxzGKJCAdhdw4ljHNa20m1BKBOsNJsB7OmW7PYg3A9UnsizjrToeqt 0Rwls3nNmWC+Ys6RuaMhc908XiSyk1mNhyKZo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:to:cc:subject:date:message-id :in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=4hZrnkf5OIjsdavTUIztLJL031UIz+QWLsaauWIesYo=; b=RrISvDR0ts1bwKn2uaVaKs7/i2HAymo55X4WD1yWjrP26v9H0GkmralOy3MwQUBkMg LC6AsQF6e3gpYSFCjk+DBbMvengdliw1gbWbvZpgFsYP3km4QPnhxKvvLwI7cHVWRLfe Qt3SHHjSoAxtZXWC0JNZmtmOYGMra0L7ik8Tccu/2J7VSYmzExmsjhqryeNUMHOCknLD gsiPg96kXaTih2ino8VgstxT/Uzp6+9yHNRwMgsEdmNTIjDkGnQy6/9usiXKJl//ijfI rvg2vYeH6CBbXofL/5TVD8SGJB2T4jAj7zwXov+0JjH+/vI/y0beZ3Kbh3KZTpAWR5Vz nJvA== X-Gm-Message-State: AGi0PuYfxt22edbkvLAUdcKZnKz9TuwI/pBRGaOmVU0rBxICcQ8xpWxp OvNHu11D7dAcdPVoQpeMZZPF5Sr4 X-Google-Smtp-Source: APiQypLMGjnyVw6+pNYT5N97wfaN+M6AvgmwtDS+FAJbrSEjWrahGm8jkqoFdd00dHt2u92owEL24g== X-Received: by 2002:a17:902:74c4:: with SMTP id f4mr2615896plt.39.1585827703073; Thu, 02 Apr 2020 04:41:43 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:90b:245:: with SMTP id fz5ls2940997pjb.3.canary-gmail; Thu, 02 Apr 2020 04:41:42 -0700 (PDT) X-Received: by 2002:a17:902:169:: with SMTP id 96mr2533657plb.140.1585827702514; Thu, 02 Apr 2020 04:41:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585827702; cv=none; d=google.com; s=arc-20160816; b=EKD4MYwLuFXJQ/FdBQF4u+/zi49r/D8DSpF49RzafhIRoHRPqW5+Jl+TJhT8OAqpuH 3ZwqP0iA+tEhYz2oIn1JDBXIkJbpSlpYVp+Q7dJzkMF0C1KEHjS/P+yoGsdS0lE7RUSs CxsYm0F9I7vZ6F3vOc6hczsJcETyflBG1Vwr9DBaWZT/lh55R/YfDUFd+yO3U8FBzNCC hNhnCsyj/L7YRis4yta9Sm4AqfrLe4AmxdffMZuyHIgOEveTLp9wWosCrf33/61v6/fG qr2X7VpucW8XtSAyPmNdo1M5stHGSdDKj+HlE7iRfVOcizjfJ2HcGQ1HLFQBnE/A4mdd BdLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=gBSDPXyREXbKviEvPOPG9KCDKDt6DwOObFfEzEgv6fg=; b=btBiETEpUlhiOdR4OZ/JUTlc1ImQG1Ki3HPpynsYgzmFWEZdbCOZDQhIdViC26j4cx DW1MTNULnTzWQUWJ/0GeA0NUvWrXng6HSCmEXzKxlBqbNXTC54EKiljfJQhtyzzPVJqa o46XQDwXTXqXLmZj6hptpq6lX08TohvI6ZoQ5N8mpFjGby5hT3NIA4V9lEUHLmBlkwI0 UmFbOwcfnPrrJiuZ2WEarGJjRyTB25t4JsX14jliILPjWFAGp5JyYnLJwPXN5uUMcLTH qdq159IEAG6ihg2g+iGcFIxMav9RASGcBcqWZaz9h4N/m+4+vftqNrE6ENKIpE1J00Cz lf+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=dG4jD98j; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id j4sor6602517pld.51.2020.04.02.04.41.41 for (Google Transport Security); Thu, 02 Apr 2020 04:41:41 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; 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 Cc: Mark Kettenis , sunil@amarulasolutions.com, u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki 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-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=dG4jD98j; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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: 1062 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 9D1533F0D3 for ; Thu, 2 Apr 2020 13:41:47 +0200 (CEST) Received: by mail-pj1-f69.google.com with SMTP id nk12sf2991098pjb.0 for ; Thu, 02 Apr 2020 04:41:47 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1585827706; cv=pass; d=google.com; s=arc-20160816; b=dB0KW6D9GOWkDXis7A+1W7cR4WgsfGcrT9Wo4TDLmz1PyYYDUiJi7M5oZGYQHONPGS 4aqH60PU0biR9SkZakrjAcmNykEBaY5bNSszCPIlx6xdf5i/5RrBM240yfmDE/sKzqTS /xxqKCWUVs4XfyR0eNIPgz6cgRgdYGwoNRf5bYEudmSiFuDR10etg6kJQJn+MkxjQK6W ZNe4FQqdBy0y5hB/X5mOrUoNH7GUxetIa4PxATAn/5WY4C78IrYDGm252LrV7ePjNNXl toupHDI/79RcxPMsrZmzgK/MFFWwx7yuw/4LAN336JcDcTjhuapWgAsrYjJGkNWHakU4 Q/tw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:references:in-reply-to:message-id:date :subject:cc:to:from:mime-version:dkim-signature; bh=jBiUvsWi6VGf1az1hXYbXf6W6ZGpK46EI2H3QRqJvk0=; b=0hJ2dznQ/AxX4N4dLj2cPXkOEv7PysNFii38s9wqAwEmkQdVgKP71j5VI2xIBhQ0KD 9B9vKoQoGQNgZCM1cJyhokpifttovZVUnXCgJ/AIkBb1ZsL1WmV+gZY17kE8TON1lUUI lOJfYjbJw/YVS+LhsXaNL1Iw6V8euecYhT/hE/JFEC/TUgZU2J4kHf3I731ZhSxACEYl EicTa0+K2/QfkZTlE8rB19oEP/xSbCySu9biUXVjIddmzIceqO0Vj0YsPmvNBCcJF2RC ID2/iyY3KHaxjuYwAPzlMMCxjUDGW+VbwZbeQd0Osd1dR/Tv4h2gzykRVzce7EHV81EP +6Yw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=plupcqpX; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=jBiUvsWi6VGf1az1hXYbXf6W6ZGpK46EI2H3QRqJvk0=; b=McXrImX6VFKvDUQhr/kBOdXSINQDRts2gStPLlGIA6TvzWXJyks0D9YLMzQiTvEaZo G39+OIGTFWv+2NyGcDTo+5oqJpIko5DTYOtdnnM9fuVgeuPDFBzJ6arha96Vybi3LlTa 1QWn4mBVxVhFygnRq5aNXQn8pUnNl8MiPGO4k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:to:cc:subject:date:message-id :in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=jBiUvsWi6VGf1az1hXYbXf6W6ZGpK46EI2H3QRqJvk0=; b=SFKuJ3dJaVAZ3meXu6CWanHYK2ika8xMB1gj+1dN//5FkP2quUAurJk0dLpk/ONX4D Zx33+tgr+3dkKqLU+8ax9Tf+Au/JGjVvaK1v92954m6bWUCtdYfVWqhZsj360bLmuIhP xJFbFKavGZCmergCLiv20k1N+v8B27SZWchhV65Pw2EUypQkX9PrhX9kkAZ6zJt8/JDr y/wiO7F7p8iHPm9REaONTxsNPT3X21svZamJaZhwBpdsLYWqJ3TYbT0Prz1MQHmaquik kZLiJWPFQEXAf125WwBRzXnG/0OVZdmLmqiFI0c1XGoBJL9IcTTQYF4U342Ma0t2/fWz gXsg== X-Gm-Message-State: AGi0PuZBbpX9H7Dn4gM9jBa/ooCv7usZ81o3PkTJEsdSY87VlWuPHe6r QeDHwNdk9maDZnqWz4HFChW9Cv5z X-Google-Smtp-Source: APiQypKPpmIDXCmv+oFTMFqJDwct/Llro31TSlqfNF9snrFKyhsnIhgAN7Pc9t15Sv72l9HEUQOauQ== X-Received: by 2002:a17:90a:a014:: with SMTP id q20mr3440557pjp.91.1585827706480; Thu, 02 Apr 2020 04:41:46 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:90a:e7c4:: with SMTP id kb4ls2947522pjb.0.gmail; Thu, 02 Apr 2020 04:41:46 -0700 (PDT) X-Received: by 2002:a17:90a:2307:: with SMTP id f7mr3349540pje.152.1585827705953; Thu, 02 Apr 2020 04:41:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585827705; cv=none; d=google.com; s=arc-20160816; b=qtS2dVk9THstS7Bpd/7dXxWNDB6fbiqWub2OqGw6egkyjrI3zF6uWgngqEAoyc6B4F wAaDDr3TlveYWmWIDvAff7SYNHyiySWFfqpEr4wH8xNXwu/+um4QCybzGpV1quThB6i9 Dr5kcIXA0vy7EK6GDq1Ufz36JpZGfLMuc8g6y4+0EhD1pgAiXJnu/AR2FfMx41cZfqGd w85Mq1R8j7waXZZWxvwVN4Dm4/QL6R13cDTnMfQE8FUAsy63qpm7ILqlsYHdwd0EktDT uoYHjHx2hx4sO1KPBbYLefCOxEPQmN5UCp5t1qyn8d7197myi1bx9HWSRSdPbC0J8wGz Wl7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=MVMvuoELpzAHqyuA9ms6rbjYm6gv5pgxF3Z45snuCwc=; b=n8bf1/XwXeniJQ1M1pUZJeXSmkNsepX0M1aVOSpmpNTdxgC2xU46UvoZMV+N1kc71A u//ErtXYGG+5mOmezYCGU44K2aXDrbgYAg/kzfa+7JuMxoVej4P++WNsrhVGIHFyBqgU R/4N7grRngO9b+P8of4ht1HyvedXmEUhIK2vp4lwIStEPLGD7yiBDLrtOkdNEVmfsayj BnnYhAf93MjQGu69986rblmdp4F+sJXj567eakfHxw82jXQaNFIlmCE2RQKk5KCJDJe9 JMosQvG+qrcU3+ngEmFiW2Me+8B8b+Qs0uqeZUpLxqLSY8401vQEJnki+vpN3HInQAwG rkyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=plupcqpX; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id 97sor6637450pld.6.2020.04.02.04.41.45 for (Google Transport Security); Thu, 02 Apr 2020 04:41:45 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; 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 Cc: Mark Kettenis , sunil@amarulasolutions.com, u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki 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-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=plupcqpX; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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: 1063 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id A92E63F0D3 for ; Thu, 2 Apr 2020 13:41:51 +0200 (CEST) Received: by mail-pj1-f71.google.com with SMTP id l12sf2977112pjh.3 for ; Thu, 02 Apr 2020 04:41:51 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1585827710; cv=pass; d=google.com; s=arc-20160816; b=hlBo+DxePopEj13y/3jO7DtfGpChHmGx948VEyemGrRTkk9Mgw0XApQZxin/r/Jbkz oHwQ3kLJgNasF5LMb/cC6i9jlylcB0/TDxk9B17uFpnybIFqXFecvnPFP7WMv0gwOsrg gZpWRbfxUP5OeAN3HweBIt+TpTYJ9SU/d1ItaP3x2SVD7UqKzFb5pQhGoL4Nc0Bgvr5K uoahSm0mXCDeZ6c/CbP6V3aVAXhb8d9uuRkm4GscKi8luL3tD7/UXhX3fGWYPpIQ7kV6 IpmKf8rQqXD2q6FxLlvFcLC97AyhwmI7ycaaT42+ovDpVuvYuh43NtXhbZB0k4IvU5Xm LgWw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:references:in-reply-to:message-id:date :subject:cc:to:from:mime-version:dkim-signature; bh=Hvu/9b5PxjqubF6svFjb6M4uhF/QYzSRCN9D1oCx044=; b=xtoMXp9lO2adgZXT919zxB72XG47t86ko6c2u7R4qbuoHUc1iEV2C7sN/F2+aup9OB bO55xISZbe53bwx4CW0HSYEyMxzdGdHw+BlCebmJ4VwhwUWHmP6/Z61i2sWRlsks/DiR t2IIMyHPqi1gvwHbvSMKm3jUQEYHR1a2ivcUFSqYQzxMhG1eTr+ANvcdjMsPaYpotbuS LzjRrKmpID/x3Jr1dSJ9keRArdN8Eo/Sur9JMYqitDANxJKq1a3sGHt1CFSClFa87ndK SRjWIGfrLKbkG9MBl+3k71dLZRjYbQDUkqrhPD55FBZhRrHrkvKy9r1EeSr8V9Wzt9V7 CKEg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="M/v//8fN"; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=Hvu/9b5PxjqubF6svFjb6M4uhF/QYzSRCN9D1oCx044=; b=lte/4Rai3j5/QxOiOyU5xOrDc5XOWdRlMnRqMen3KWBDvxK+hVu0+p4wSQZeQT2KCp dDchbDikrgIEipkWl7wvF3F6RDjzbNHhYwu1Y+fzl05BAaLIztkuLq9I7ny9loPZFoRd txK8rv9SbSLndYGLXDPaeC1+Yw9Gj20k7MWpQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:to:cc:subject:date:message-id :in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=Hvu/9b5PxjqubF6svFjb6M4uhF/QYzSRCN9D1oCx044=; b=lR3JN18EwUN0xviEhllihssIezwZH50/AH9ahNT1vWR8ClkZRb2GUAVBzTRhbRmVTT yRRBVfGb8+Tf40w/00mRDTxBPNaClSmZD3Ah2aM8OtMmuKVP0PCfKNCsehwWslchHY2w s8/FTc83xa7hzoWgW9eVNwhnzOnpVJWVeBjifxtc2wSSkauFJQnwEaGwuwQ9pK5XMmF+ Vcmp1WxH4YMrz/+MNu70hiLdjRMA1az0NbO80HhIrUy1h57LW6up0xJ6Vr3C6u4gUcBK EPto72XKlURZFJ16XnANrglncWDu5tgfVXFn1+dOwl58KajnJs4Jvc0QqXdO6ORoi9fd 8HXA== X-Gm-Message-State: AGi0PubcV4Ka8jMTzJ6qMN3v1iP3UHXQ1p/KgwgKTW8mII7NGSXYurQG FHthCXGa/8CsuRI3+JuXSIDGaGUg X-Google-Smtp-Source: APiQypJskm8ZA0jcnkKyUJvAeWv0S70KZKDAYmmP6eX/WL6DW23QfZJoC3vkLYwGxsl7t2FupOQaGg== X-Received: by 2002:aa7:9844:: with SMTP id n4mr2639203pfq.98.1585827710302; Thu, 02 Apr 2020 04:41:50 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a63:7d6:: with SMTP id 205ls2310293pgh.7.gmail; Thu, 02 Apr 2020 04:41:50 -0700 (PDT) X-Received: by 2002:a63:1c1:: with SMTP id 184mr3072534pgb.203.1585827709751; Thu, 02 Apr 2020 04:41:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585827709; cv=none; d=google.com; s=arc-20160816; b=om5vU+McB584jYfTd1Wkc/tv0u54KOC7mkOOemoATcsaGqCraFT0jMCy7lcE4/toru ZdduzEQ+JuRAQtkWOLAjzlUTH8CQzIctAqRWdBEbjGAtFPnSUSIBSXJyRnB+mrqTfyR0 e5vVTudZH9m1gs939ASsHCNsWn6FVsFHELyHCE4f6GdeayC3mXY3eBO+hnd+cA1pPJlW fowxEh1bd0WXiOcTHuwipB9HpbDkJ5KktXqu9IXc97kgEuKRv0bPVqqi9pSz04OtJXIV uEtBNXV0d7xkWyVzQ/FcnRH7y5RKyiZHEVc9CY7Lqsje2npiqxOOUKZF+k9Yo30DwZjX 3ioA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=U9shr/sIXGUpkWVegpw8emtHcoxnHuA88+inRf7p4IE=; b=W92EVwJZ9j2X1FihNA5vbaPxASG9BX68N2U/DgJ//2GOPRSDT+8HTW49DEJlezHgWv jYdnL3ZFGELdPhiVlBmu0atuGIEH1mqCBOlk7lhbXIqHkamsFk5PBLzh9UG6WJ47v1cA PUnqbZRAaf8GqPFW9O8fpolqk8SMslGIPnsOiQ3fcb9Yys0WTd71cpdT9lIB0bsQ01sX XXRvXoOQ6STpgoXrPPR0fK271iGyMObpAkquWQ2Xden3otqnEffUkgqv0fXQxCUSq9kp kWEGFK/9CkS+1zxGqtj8+nBWtaipdpKC2X/Shh2oTog4rxfxaGZDzZFYZdEZyuZp4SIk V4ZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="M/v//8fN"; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id g94sor6730926pje.1.2020.04.02.04.41.49 for (Google Transport Security); Thu, 02 Apr 2020 04:41:49 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; 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 Cc: Mark Kettenis , sunil@amarulasolutions.com, u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki 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-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="M/v//8fN"; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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: 1064 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id ED8D23F0D3 for ; Thu, 2 Apr 2020 13:41:55 +0200 (CEST) Received: by mail-pf1-f198.google.com with SMTP id v18sf123965pfg.9 for ; Thu, 02 Apr 2020 04:41:55 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1585827714; cv=pass; d=google.com; s=arc-20160816; b=0kKrJP5AymDvC4uC1XmIB53+gnCbSmC2IS87wt56zCJi29e3gY0ZH5IMsIxFMh7s3H WUbr/MZfCRwgslo+Ji1ntCSSFdxpQhb2a5Hr5mzyIkTl6H7Tb02Qs6MD0bpD2WJgNp7n 0mgyGm1KwcGGg/kHlL3tP5chClxgapXBFFpG0iuTe9tQPZte2aOP2HhJllojHb2nMUNu e6bQv9aFLwfUht65mmed51Uk49nKZBajkDTZnJV8fgntTeaMup1UDA1tRwcsBc0avR6r P9TlGlvktOERHs++hSKGszG8OdB+EG0ECKRwrDGBvm0fhuV5uG6eQI4Pwv2IRo7lYA5/ gyGw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:references:in-reply-to:message-id:date :subject:cc:to:from:mime-version:dkim-signature; bh=elliqK3lrH4+6Mdqt0wibSdb6Pg3OgW3oCGmEUpGLNQ=; b=DJCEq66gavKkKOd8l/g4XEb6gfqhZJiJ5mhMuOUb1gCSIi1mtO9YCMhpkh6swPLhRw avrWGYkX2tYJHd/A3Vgmbet2gkJifAAu9lIYOSc5CuTUqumyPUrjjYSHDU9b+2FpsJVC Bt5K8tj82zlBI4gJa4btol8IrNrz3Dp2IepaeqJb3aslCwZM1GGnI8FMTTur8e7hhSsJ vqy7jbyuSfz8kmovWN5E6HWel/kwEGVHQVk9v6Ax5oObGEJBOVJb+MhiqenVNqF8oXoT i+jJJoZByuRFFbW2y+pX+nmyGaS4R0S/zx4eFow9ljCaf702NaZ6HyZdom0j/6mCUOxC FQvg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=bWrtgsQu; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=elliqK3lrH4+6Mdqt0wibSdb6Pg3OgW3oCGmEUpGLNQ=; b=TiWSA09hvj7h93Z2Tv85mbbAiDVf2IO6MO8Vy7bhOW30fySO49+iKDhNK6uFlO1747 aJW3W7lwqCAahKN6f9FuZtr+r6vssDQHT9g2O000Rx+D3Dvsr+VP19wgr78UvHAmE8aL TGygoczvZgu9NJxQRpFFA4F+7JSo6YSntSfnU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:to:cc:subject:date:message-id :in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=elliqK3lrH4+6Mdqt0wibSdb6Pg3OgW3oCGmEUpGLNQ=; b=A1XSp49qFRDg6twg98ppDLKlI50n/i27KGe/ypWCpuUbqd2PZUmBgOhz/ASJxAkrZQ CMYUCESgDpyWoXHm0jtFc0HQsIKIs+BdylOSinWl1kS8m//157vwA8xANURdD5+q2V20 BnFCB8+krpJWA4KMSL6q7vdyjIVIa0SrCW87f7tXGhCFpxvAYTl5J7zE6/kCshlJePyX /mm//6YfK2Gi6YIAeoWRJvS5IJdhSbu5px5L+QuRLIQBIrtWqmOGmv5DXeGrdwwwZRKC 4Qc4LincCsCB6/RAJF6PA0ybWCaFJrg6bh+LYUX+pXMOfJCD8vgy6B5sH/H/+U8saTNR pOug== X-Gm-Message-State: AGi0PubYXSeR8Dtxs2sfIVhQG20NbWhLzzbeQQWRvWsnJcmnYVuLpHsN RQsoNM0oqikhVGS+0tXn5jDAwN/w X-Google-Smtp-Source: APiQypJWEdlzjcfJjjh0aK6eVETJus+h5GuwGGmzygoCOh971oI0qclFBgN1EOxMRpzSZGjRAyMc7w== X-Received: by 2002:a63:e544:: with SMTP id z4mr2950776pgj.174.1585827714710; Thu, 02 Apr 2020 04:41:54 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:902:8488:: with SMTP id c8ls2578953plo.8.gmail; Thu, 02 Apr 2020 04:41:54 -0700 (PDT) X-Received: by 2002:a17:902:8ec1:: with SMTP id x1mr2578818plo.325.1585827714182; Thu, 02 Apr 2020 04:41:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585827714; cv=none; d=google.com; s=arc-20160816; b=fI3LBvFdVpRVplGzDLDjZDiEPUPud/GI7xBp6hHHLOQkIkzKYkCq3I4gglHnucTTv3 8uy0Q2a/TEQZ/iOFAV+ahWKrYvxnVWKVo1PuJJrjE7NbNmYS1elZMz4/xoUg4Q90lKLD IU3Essa8j2TjGUk0vI8Wy+eniqq9nQNXfrILMvHu/pQCdgQRQ7TQOuYiVOI83RWh1/oH RcsE11Ks58KouehzFYar9tS+fOBGpvut0WILzZFr/jw7UGx6Gjt6keomqnnFP4ZRL2hm fDiLG/qQQkz0uTNYlfs8Fp5dSdv9rECKYMCvWhX1aEdOxS88LpmvtIj471SyTaJte3WT Opsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=WRZdNM0deIoSv283K07zAk/A6gBZnVda/XJNRb/2yT4=; b=h4mE1pCsElrodbir+rpgKDF7u47WjOl+RL/qSqjL0M8ixW8Fz8ZAHM1qiB5sE9E9/N tgiNxjgdKOFIThvszx8clOnsS+P57dizMOtcKHCvkLaVd6pvqkaRwQQq4qMA3lb/LaMW vn0vIblWxYd9WMoWJsj4gl9WwofgXoQ7Biv53Xk7xO1pAc7ZQuid6h3MIifRmonEHO7e wFLwzMuhiEAYMHrjbkW3lu5qPI8dIEjtOSOQ4FA1CjOo+DxnYuy95j9QZ2o5OM9Mo3Mg LENv8woVO6D+Bl5Ouz32GQRYytYV8Vb1GryA0CBdSU/VtLwIlR8MIsV5vY5kp7DbGijc Jz3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=bWrtgsQu; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id 81sor6264704pfb.4.2020.04.02.04.41.54 for (Google Transport Security); Thu, 02 Apr 2020 04:41:54 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; 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 Cc: Mark Kettenis , sunil@amarulasolutions.com, u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki , Manivannan Sadhasivam 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-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=bWrtgsQu; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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: 1065 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id EFCB63F0D3 for ; Thu, 2 Apr 2020 13:41:59 +0200 (CEST) Received: by mail-pj1-f71.google.com with SMTP id d2sf5565218pje.1 for ; Thu, 02 Apr 2020 04:41:59 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1585827718; cv=pass; d=google.com; s=arc-20160816; b=gG72pEBFghnMS0b9bowgioQBd2n72Wz05VMD2w+p1/1D3kFrtY1bmIkps8SDFYft+m 7d+9AdfLZGkYDTfkVju71qrezvpIiUd/ceJV/Lk0WWw8QEn5Ht4PJgkOv8nJ3kkVetzv 4zqCl0R8GXfu00nooE9JvuY79jeRlquFAdRJNjImub90myMc1Eebf09ANCvVwVtUvJCf +ZyvslGo/+at9uotzoMunt2R/zn4kbFnNX8QGPkYYFjYcBcdTVBnn4MVk/14qzvYNun2 NYFKxW4GIv2Iejzr00w+gkelN7vsiboLNW0Or+3jXFAaLndHHVFY6T28ivW0FTA9LJii vgUA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:references:in-reply-to:message-id:date :subject:cc:to:from:mime-version:dkim-signature; bh=sY2Uwap6VoaGtzb/RJ06Y7SiovfBagvtaU/oA7dfMfQ=; b=cfRPurEH163XFlZ27iu/0zGWgfRn/Te36xehXU00V6cjkkISQDxW/BtQJs3Juq/FnJ ShtdDRgu145DM8DcqBlTYBoRz5mtNMv8m2+J8/Dw29ThnhH7bJRL3s2dIVHagOo7caX5 Bg0Ge7abjmBb1iVMYx/qDrWEHk7rVPOPb9TCRDLdGPLCThKC8KqYPJHXsvDQfUHJMLH3 ZybKRqxY9+1F4EHMcmJkZHmC2k0UPfA9ukI/Hj0Xq6KzTdiUrwTQopKuau3LiAsu/zbS TXk6pK6xjoSYgt6v9/xOInFcKiQvIpcX+IgHOFm8Md9Oi8qAkGqAUsES5EyHzxT98bp4 Qffw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=nB6TM8G5; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=sY2Uwap6VoaGtzb/RJ06Y7SiovfBagvtaU/oA7dfMfQ=; b=UZ49EaHjAGjHHZJ3iIS/Yq5G9vfFpvKb5OampmNLrkT+sFZe5Lti6ojtQnxTUoLWmS DskpfnTS6JKjlIkVnPT/XTKMTRUF4/R8FwctCgTsGWg8B8Z7ZavKKo/ZrL8zbfZuP/S3 2RCfchZDWhNZ/BA/W9faVGxn7Pmp9ihgWvXp0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:to:cc:subject:date:message-id :in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=sY2Uwap6VoaGtzb/RJ06Y7SiovfBagvtaU/oA7dfMfQ=; b=agEbc4IC2Ws4bxZDtHgWQMUQu/KpW2fYG/3iclIaAOcLKsD0TqTYjVe3E8orw53VAt W37HUeDfRLoDNdcW0XSICQZVYGpRGj6pVW9vHVew+NWGfxtK21sXgvyAWvLY0rkRZS5O o5i+1wiX87HZgbL8cj+mllvdXW1ra4Yq7F1hehknnpmeT6vf9t/g+wUlApns/Sc5WGhr di0xb/IESMMMRjZnL5y7Y/Tl8YDG5FbhWMRpte4aeeWASBsnpUJsPWmj8I52YVECdj3H 6g6Qq7DPpAjvezpZhoeeiWUBTtg8Fd3YqyN7LEf3D5+qYazUqi87QHK+kN1iiyN5uSZy Nxcg== X-Gm-Message-State: AGi0PubL2jppRHk1GOR4VvXLrpVfK4SYJ6fZJG7tjD0P2ihj0XYhNPaG gnfxHK7gVpIsa9jSe0XJQE2mwDXG X-Google-Smtp-Source: APiQypIn4+lTUQ3nZKnf2Kz/GWH6im/rAyFMLKYPid8RpbJPdLxHXiQtxPYsFmOJjIy7lOVf0fmM0Q== X-Received: by 2002:a63:2057:: with SMTP id r23mr3024751pgm.232.1585827718752; Thu, 02 Apr 2020 04:41:58 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a63:fb01:: with SMTP id o1ls2321679pgh.3.gmail; Thu, 02 Apr 2020 04:41:58 -0700 (PDT) X-Received: by 2002:a63:1c1:: with SMTP id 184mr3072872pgb.203.1585827718147; Thu, 02 Apr 2020 04:41:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585827718; cv=none; d=google.com; s=arc-20160816; b=t9OoJZxiX6RxBYs6qYOt89cx7UVqQ1mCFeOa36v1LWZ931zUBNLVtR6SNIccq4HUld R2nOE3qNuTK4lLULK/IHG1uDCRBoqNN6SE6YPEthsIqIRJJNN7qEBEFzm2UHjfEubQ0k k3/lY+WfeRZGbseT9tx3atO5wrsTJleS7FMthUsuO3OijoOwfEx+pFxk3hoNIx0Q5EDb kCbRJZjvL1akGRkAywjK1gVSMGW1YW96upeWQfiphXiZbvvBVSQM/Mbm3slbkZh92qih 1zu/4NHy9I7pkbXH3Id65heQ+r9pU+Kb2Uwr+nToHw9maaZaCH4sTiZ+djCz3PuJc6jn 6Hqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=oIKi2o05B3Z9cSU1NF9xH472HBvt4fwkMM8ABMXFROs=; b=geGH6+5HGrD5ZD9ZBbZOHY7vDtlmfuyqaijj7Ik4+tj5b3qLagz9q92n1TlAkQIZfn Px1RJk3/iDTEEW/fZ6lFP1y8X/ECUL9tOXPIJ8qNeqWoomnaHyAqYfhlkB4qbHAqB+3O o4UIqUAdid7ulQ8Y5G4Gydn+bqnnDkNDXg1lij+6kbxRt9VQEoFeTqgpLQ5/cYUKl/9i 6kJUmC6pwCBuR4iYZUhl1AEEJABAn4mynyJ49iMnvB+KDSJjVt2ga6P1ucm9WIB9/MzH prqhZ7Mfx/1uXTkiQLjlB+vBHagSwcTomGFeMEfcf2c+MMaGBdiLGan2nrk9d1meG5Q/ UE4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=nB6TM8G5; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id g21sor6213905pfb.52.2020.04.02.04.41.58 for (Google Transport Security); Thu, 02 Apr 2020 04:41:58 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; 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 Cc: Mark Kettenis , sunil@amarulasolutions.com, u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki 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-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=nB6TM8G5; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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.