From patchwork Thu Jan 23 14:12:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 11348219 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 BC1D3921 for ; Thu, 23 Jan 2020 14:12:48 +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 99E992051A for ; Thu, 23 Jan 2020 14:12:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="fY+GneAb"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="a79gqNaw" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 99E992051A 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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:In-Reply-To:References: List-Owner; bh=0misMhLbzQlbApqE3w80WcJbccwehNrhvniIHUVgz5Q=; b=fY+GneAbJkjajv bvzBl1ZWsAp3x79OjeZRfCsiyfdgkEPZwcDbmGcmNz48NpoyuUw1efRbJcu6Mmj7S9RxwK/TSUuBK hF5Fx3moD848TEn0VpaFte7/CFyu+clZTqiuHho0ADrPMXI+qb//Qvi84IwOMidAUEQoZn27sHQU9 apdF9MZ9Oa+YgDVIuS11viNRAAK0WyVOkdMN2hxd9H7rkthhca97Y0SQM4beS5ZKofMSfRdU52GGH /lo8tXIgg5pep5PLNeCwF5pPgkcqPhL7FQJCGH53DhgkvFP7n4/7+qN88/715LsuirEke4LsQkgTQ drK+FkE1b/UAC6QIvUug==; 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 1iudDv-0001tk-1z; Thu, 23 Jan 2020 14:12:43 +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 1iudDr-0001sz-7I for linux-rockchip@lists.infradead.org; Thu, 23 Jan 2020 14:12:40 +0000 Received: by mail-pf1-x442.google.com with SMTP id n9so1586100pff.13 for ; Thu, 23 Jan 2020 06:12:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=rDeb4IRpDr+jmE5DvZP+Erb2FHBE6aPgX/dlR6Q3DjE=; b=a79gqNawR9gPO+4e09eOr2TeLaKbKUDxYqseIi1tKgA282xbDu4FmfWG/LV5ejf7DY 0wzL8hEeq5n2Qi5xV2VNysopouA+Pmn/S35Qz7kiyVY5Ua4hhTueEZ0xZLoKZMQ0A6m1 2gpWNKHTElRaoZllcqQ+IoYs6X7OpmqQdDaKM= 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:mime-version :content-transfer-encoding; bh=rDeb4IRpDr+jmE5DvZP+Erb2FHBE6aPgX/dlR6Q3DjE=; b=C3j6y7DqlLskb8v0wPPJIjZdCRn81KVYTWRaw2tx9xY6kfzwG4vI8salLVfS3t4qmo nizLbNLAot9kr9px7yFvWe+Lxe3ZaSHxucPM5UwwGwt7P4WeQmHo/QfzZAa4FEqU3qhL FpUzWFpyZ+g7D3SDhtOVnMFV+w0E40kJm5/cdu3+zpJhRPu/htBtxzDX6otTAxQWImZY Dnp8ihIKeiNSlfj39Sx21I8KL9U1HHnz7rlr31plgC8lYJFzqv10ICsd6gy2nNedysju 6P8DBexuCiVtdSF/RXXYY0GEENY6kqggRWHgaqshXqJ8cUXI9FDFvMQoe+UEZJsXInw4 7b+A== X-Gm-Message-State: APjAAAXVBYzR/ytNjuHyms4RCbblfQwy/6g9t3XMjnxKhq3mOWwkOsqf v4G+KOEYVDx2vFJjlEURfDGrEQmNTQo= X-Google-Smtp-Source: APXvYqz2lRQwTrXQBNySlPyz+9dhRIKaPzPpU1xHaE/kL4xAoZ1J1mN4Y+eQKnfuXkvNPikVPHMT1w== X-Received: by 2002:a63:4b50:: with SMTP id k16mr4265766pgl.386.1579788758239; Thu, 23 Jan 2020 06:12:38 -0800 (PST) Received: from localhost.localdomain ([49.206.202.109]) by smtp.gmail.com with ESMTPSA id o6sm3136392pgg.37.2020.01.23.06.12.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jan 2020 06:12:37 -0800 (PST) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Subject: [PATCH 1/4] rockchip: rk3288: Enable pre console buffer Date: Thu, 23 Jan 2020 19:42:19 +0530 Message-Id: <20200123141222.486-1-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200123_061239_696167_F16334D2 X-CRM114-Status: UNSURE ( 9.27 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.3 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_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 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 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: u-boot@lists.denx.de, Michael Trimarchi , linux-amarula@amarulasolutions.com, Jagan Teki , linux-rockchip@lists.infradead.org Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org Enable pre console buffer for rk3288 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 RK3288 platform boards. Buffer address used for pre console is 0x0f000000 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 2f260a5c5f..ed7514ab75 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -102,6 +102,7 @@ config ROCKCHIP_RK3288 select SUPPORT_SPL select SPL select SUPPORT_TPL + imply PRE_CONSOLE_BUFFER imply ROCKCHIP_COMMON_BOARD imply SPL_ROCKCHIP_COMMON_BOARD imply TPL_CLK diff --git a/common/Kconfig b/common/Kconfig index a7c5ba278a..21d0244050 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -567,6 +567,7 @@ config PRE_CON_BUF_ADDR depends on PRE_CONSOLE_BUFFER default 0x2f000000 if ARCH_SUNXI && MACH_SUN9I default 0x4f000000 if ARCH_SUNXI && !MACH_SUN9I + default 0x0f000000 if ROCKCHIP_RK3288 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 Jan 23 14:12:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 11348221 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 03AF2139A for ; Thu, 23 Jan 2020 14:12:49 +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 D3ABB2051A for ; Thu, 23 Jan 2020 14:12:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="mhqk3Cqz"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="LCFbtLwR" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D3ABB2051A 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=VLPrUhlwZr4JiOk9HkTSwdmVppIq+r9lGy5mpPWmTeg=; b=mhqk3CqzqvrLmM vMGfrAJyQZwEHGUUysy9JMasmsLY2vn+3kN2oT1HsAUjOimBiME729QpcnYOGX65njAr3rUWMAmXQ A0DIQoowygQ78lSY80YVVAVcOvq2TXOClH2ujxDDhrD0/UqI4UOG2j6KGH8kgxHA0x0FpnufyW2D5 l4tviB04HQIS603vWr+bAgLIqD3Veho2NEFonpSaR/XP8QQouRHhQqT204NYbN6qLrbAj/M69Q3dN GGxuJS5t9K8h9ExlfCM9sTk3yhQerIcIqgI5WTuCdISs21tuqrfChjfekf8Q5WqMDsFuJhPLV1/eo 9e5mABrc6UvolrtYKDhA==; 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 1iudDx-0001ve-JP; Thu, 23 Jan 2020 14:12:45 +0000 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iudDu-0001tT-FC for linux-rockchip@lists.infradead.org; Thu, 23 Jan 2020 14:12:44 +0000 Received: by mail-pf1-x443.google.com with SMTP id n9so1586180pff.13 for ; Thu, 23 Jan 2020 06:12:42 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=pX84TUtmw9tx4Os7n6FO68756VgiHD7gdbrKeWTJT2s=; b=LCFbtLwRTWC75RAvZepulntOcvoSSkmx0HyO5S2HP11tCA4dGUYr7zPeTmZ9b3B0VB ifnkqaF6iLg0PqJJorHOq5URRTXdU8VGJr0wqBGL3zU/DTYpf79HQmCYGPz1jrQXXUJa zLqMHpGzYxyR0XklZy4ZtZlQ2V1sTeZ1qb73w= 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:mime-version:content-transfer-encoding; bh=pX84TUtmw9tx4Os7n6FO68756VgiHD7gdbrKeWTJT2s=; b=XW6FRJ18o3TLdEMqQoBBOVKTFT0XpnexZQL64aZssuD9IkuV0txZrR3s+3Fh2uOjme iCFr6uXFNaoqUhYNZ7g5H2Zobq32d3JXDZLRwl/LU3yp35oMmf2R5cb0rkf/AI278jRZ v4kTe2rT9eZyRiSy7MXRitVRbEE4iJrUzJJbJAfb+mIPP6OliFOGmm8tabEdYE76hDmH q3CvNhS9/DvEIg46PnMpo8kLi4spNjXPQGzjcViirIoTQ/pmrSuH0/EX9Pt59Jf7Gceq 9U9Tnu40XS0AhGlcb1oRblL8HczuB7xwe3bp6DzpdeJSePYQtKwLfe0mU1vbvZUiUJgh SVhg== X-Gm-Message-State: APjAAAVfnD9CqtTox4hO+dqfGyO0fLFXCzA4bt5jRr5ttYyf5J/lpGic YLriWHdKTN7LZHvUN1WMLD06Mw== X-Google-Smtp-Source: APXvYqxi+H96+GF1cfVmyDhZv9wCvcBChJoaOaTwwctDHijlQrAZRDEQCS+BteaX+yChqqam8wCZpA== X-Received: by 2002:a63:c508:: with SMTP id f8mr4014927pgd.17.1579788761720; Thu, 23 Jan 2020 06:12:41 -0800 (PST) Received: from localhost.localdomain ([49.206.202.109]) by smtp.gmail.com with ESMTPSA id o6sm3136392pgg.37.2020.01.23.06.12.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jan 2020 06:12:41 -0800 (PST) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Subject: [PATCH 2/4] ARM: dts: rockchip: Sync rk3288-vyasa dts from linux Date: Thu, 23 Jan 2020 19:42:20 +0530 Message-Id: <20200123141222.486-2-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20200123141222.486-1-jagan@amarulasolutions.com> References: <20200123141222.486-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200123_061242_505701_4764956C X-CRM114-Status: GOOD ( 18.62 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.3 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:443 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_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 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 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: u-boot@lists.denx.de, Michael Trimarchi , linux-amarula@amarulasolutions.com, Jagan Teki , linux-rockchip@lists.infradead.org Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org Sync rk3288-vyasa dts file from Linux. This sync has changes required to work HDMI output on Vyasa RK3288 board. This sync excludes the io_domains node since it is not available in rk3288.dtsi. Changes like vcc50_hdmi, vdd10_lcd and ddc-i2c-bus are not merged to Linux yet but wil resync later if any further updates on this. Signed-off-by: Jagan Teki Reviewed-by: Kever Yang --- arch/arm/dts/rk3288-vyasa.dts | 79 ++++++++++++++--------------------- 1 file changed, 32 insertions(+), 47 deletions(-) diff --git a/arch/arm/dts/rk3288-vyasa.dts b/arch/arm/dts/rk3288-vyasa.dts index 850aa25818..4193f7208c 100644 --- a/arch/arm/dts/rk3288-vyasa.dts +++ b/arch/arm/dts/rk3288-vyasa.dts @@ -1,43 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* * Copyright (C) 2017 Jagan Teki - * - * This file is dual-licensed: you can use it either under the terms - * of the GPL or the X11 license, at your option. Note that this dual - * licensing only applies to this file, and not this project as a - * whole. - * - * a) This file is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * Or, alternatively, - * - * b) Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. */ /dts-v1/; @@ -115,6 +78,17 @@ vin-supply = <&vcc_io>; }; + vcc50_hdmi: vcc50-hdmi { + compatible = "regulator-fixed"; + regulator-name = "vcc50_hdmi"; + enable-active-high; + gpio = <&gpio7 RK_PB4 GPIO_ACTIVE_HIGH>; /* HDMI_EN */ + pinctrl-names = "default"; + pinctrl-0 = <&vcc50_hdmi_en>; + regulator-always-on; + regulator-boot-on; + vin-supply = <&vsus_5v>; + }; vusb1_5v: vusb1-5v { compatible = "regulator-fixed"; regulator-name = "vusb1_5v"; @@ -158,7 +132,6 @@ &emmc { bus-width = <8>; cap-mmc-highspeed; - disable-wp; non-removable; pinctrl-names = "default"; pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_pwr &emmc_bus8>; @@ -188,7 +161,7 @@ }; &hdmi { - ddc-i2c-bus = <&i2c2>; + ddc-i2c-bus = <&i2c5>; status = "okay"; }; @@ -324,15 +297,15 @@ }; }; - vcc10_lcd: LDO_REG6 { - regulator-name = "vcc10_lcd"; + vdd10_lcd: LDO_REG6 { + regulator-name = "vdd10_lcd"; regulator-min-microvolt = <1000000>; regulator-max-microvolt = <1000000>; regulator-always-on; regulator-boot-on; regulator-state-mem { regulator-on-in-suspend; - regulator-suspend-microvolt = <1800000>; + regulator-suspend-microvolt = <1000000>; }; }; @@ -385,7 +358,7 @@ }; }; -&i2c2 { +&i2c5 { status = "okay"; }; @@ -402,6 +375,12 @@ status = "okay"; }; +&tsadc { + rockchip,hw-tshut-mode = <1>; /* tshut mode 0:CRU 1:GPIO */ + rockchip,hw-tshut-polarity = <1>; /* tshut polarity 0:LOW 1:HIGH */ + status = "okay"; +}; + &uart2 { status = "okay"; }; @@ -463,15 +442,21 @@ }; }; + hdmi { + vcc50_hdmi_en: vcc50-hdmi-en { + rockchip,pins = <7 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + pmic { pmic_int: pmic-int { - rockchip,pins = ; + rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>; }; }; usb_host { phy_pwr_en: phy-pwr-en { - rockchip,pins = ; + rockchip,pins = <2 RK_PB1 RK_FUNC_GPIO &pcfg_output_high>; }; usb2_pwr_en: usb2-pwr-en { @@ -481,7 +466,7 @@ usb_otg { otg_vbus_drv: otg-vbus-drv { - rockchip,pins = ; + rockchip,pins = <0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>; }; }; From patchwork Thu Jan 23 14:12: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: 11348223 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 CB7F9921 for ; Thu, 23 Jan 2020 14:12:51 +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 A91DB2051A for ; Thu, 23 Jan 2020 14:12:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="sGOFkuv1"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="O+z2EWfG" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A91DB2051A 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=0f2C5rGZF8YCuD60ycu+fcnWN5gfF0fZzCo8Y1rq/gs=; b=sGOFkuv1kB7sfq 8Uk39zyvdVwNRHpffem1RVyErM+5wy5VYX/C8sWT4ZRloq1IW4LaL8ooHkXPdBzWh8HMrA4o6SimL QDTeSVLczTTohUEVOv/LGHwCy/t0hnQyKJaTT4/WQ7pGGVaDya4GLuUG4OxvL0X79o2fKXKtNZbQC vpp6Ib1ttZ6L9KRaxNgSYPfKhfIJNSvp23+rbVXWPQNf8xNzx7QSKCmgL2Nbma2RNSqGGylxMH5Lt DJmtd50J1bJRMb5eDUUori2WfHq1sFY2ubrBFx0aL83z9uOhrLvghc3VrLTdC/Ssne54/bj0tFRSv KTwaPXxeTxqFJyoeeFjw==; 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 1iudE0-0001zM-UE; Thu, 23 Jan 2020 14:12:48 +0000 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iudDx-0001vg-Vz for linux-rockchip@lists.infradead.org; Thu, 23 Jan 2020 14:12:47 +0000 Received: by mail-pl1-x643.google.com with SMTP id y8so1390574pll.13 for ; Thu, 23 Jan 2020 06:12:45 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=zUWAnU1mR3ZKYR1jjZcWiKDm0bDXARn732TTOL/hENo=; b=O+z2EWfGM0CUV36pfILsgvDFkW2ttDYe6ED/RaS/MgmAI5kHq9wYX24HKFW5w39I9j LRQjtfcxIMt/l0PGMD/+MAR/TJEcSmnQTPsv/8FxqVHyjBVbiNnOds+mDCslYW+BIikF xIpEs3FLMfHelA4oczP0z87oqwWYZo+E/Rkdw= 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:mime-version:content-transfer-encoding; bh=zUWAnU1mR3ZKYR1jjZcWiKDm0bDXARn732TTOL/hENo=; b=iTnTEW1u29U6HI6vO3bDorKLB5t2Ix6gpblJF9rAIuQsRAfynPBO3mP2tQKrWGyTTa WOAzspfVkKGUggdE/+IhrbPlVn3zVXNks4YghVoKzmdNSfLZfIUuj+Dldd3YexLxTKiP xM6eKwt7OaOsNNlpSzIpoXP+p4FPKn3gURwGaqDS8ziEyNwU14ul3M/L7ScINSs+fCei Z2/CoTvs/rzMger5wqn75PnCibAVI3JEsTFMWNHMik5e7305VACiCEeGeLj+LunTRGv/ pdPNNKeisq87o73JUIus7iAaW8mysdyNWHeYFlP+U6zh1ZM2VhRdT03xyZO8XACtA+Tz ZKPQ== X-Gm-Message-State: APjAAAUCwCDtpqzUUN9JWRQYiiuX8JCC0aUR5xbbGnxiYJUP+h+rAC14 mj8cKMpr8T+af76LyNA4Zn0unA== X-Google-Smtp-Source: APXvYqzNgppfeLgbBMpvtjF7iArqRZTCI0YxYJAk47G+h6cO1VGuNjEL1oIZqJW/HWtsLlC5Sscreg== X-Received: by 2002:a17:90b:258:: with SMTP id fz24mr4594238pjb.6.1579788765295; Thu, 23 Jan 2020 06:12:45 -0800 (PST) Received: from localhost.localdomain ([49.206.202.109]) by smtp.gmail.com with ESMTPSA id o6sm3136392pgg.37.2020.01.23.06.12.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jan 2020 06:12:44 -0800 (PST) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Subject: [PATCH 3/4] rk3288: tinker: Enable HDMI output Date: Thu, 23 Jan 2020 19:42:21 +0530 Message-Id: <20200123141222.486-3-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20200123141222.486-1-jagan@amarulasolutions.com> References: <20200123141222.486-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200123_061246_058009_1345BD26 X-CRM114-Status: UNSURE ( 8.17 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.3 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:643 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_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 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 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: u-boot@lists.denx.de, Michael Trimarchi , linux-amarula@amarulasolutions.com, Jagan Teki , linux-rockchip@lists.infradead.org Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org Enable HDMI output for Tinker RK3288 board. Signed-off-by: Jagan Teki Reviewed-by: Kever Yang --- configs/tinker-rk3288_defconfig | 6 ++++++ include/configs/tinker_rk3288.h | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig index 894e7d1e12..ecade47e7a 100644 --- a/configs/tinker-rk3288_defconfig +++ b/configs/tinker-rk3288_defconfig @@ -83,3 +83,9 @@ CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_SMSC95XX=y CONFIG_CMD_DHRYSTONE=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/tinker_rk3288.h b/include/configs/tinker_rk3288.h index f8a55a2cec..f1095ccd0e 100644 --- a/include/configs/tinker_rk3288.h +++ b/include/configs/tinker_rk3288.h @@ -6,7 +6,11 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define ROCKCHIP_DEVICE_SETTINGS +#define ROCKCHIP_DEVICE_SETTINGS \ + "stdin=serial,cros-ec-keyb\0" \ + "stdout=serial,vidconsole\0" \ + "stderr=serial,vidconsole\0" + #include #undef BOOT_TARGET_DEVICES From patchwork Thu Jan 23 14:12: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: 11348225 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 E3DA5921 for ; Thu, 23 Jan 2020 14:12:54 +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 B2E482051A for ; Thu, 23 Jan 2020 14:12:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="G5ezBq83"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="Ch6/5a81" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B2E482051A 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=pSW0NQe3aMWOXXI79w68J/9pMHkBtWSi0+d4nfR7dKI=; b=G5ezBq83R3Voob z4BIArT6k/mVG9wHT/9IFo8hdti6aIh21XnsUcAAB/r/FqpoHPuYsgmOjIhhjwCCKFZE6aYwUhtbE qv+k9ZWGwiVXcKm7K7YYwwMxB8iczrXJ98ccn7O88yDP+FalsrT5zalMjyqar3iAP+b4zVsr/1gfm TBGSrZfVC9APVKdZZspI8C1IcJ4/OAfEqaLs+FdCGkHYCbJGxERe8SKyzA2GJbeZdvWj3hzGd5pok 36SqbotZ65ltQ5R3xVdYwfWBUwXEQti2hdkuoOQ7ZZkXvesC5MtTIxOPQMiEz7EuIvLHyimYfvUBf fGwFl2QtmGY2pwjClslQ==; 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 1iudE3-00022V-RN; Thu, 23 Jan 2020 14:12:51 +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 1iudE1-0001zk-FN for linux-rockchip@lists.infradead.org; Thu, 23 Jan 2020 14:12:50 +0000 Received: by mail-pj1-x1044.google.com with SMTP id bg7so1358212pjb.5 for ; Thu, 23 Jan 2020 06:12:49 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=0t9Yc8oCapK/pmXczwfOQfE1sOlvTfclcIrreLGQ2uU=; b=Ch6/5a81c2oTFai0yo5OkKBSmxnGiiinzWztEnvuM5HpaJd0vgjbjUml7edp/a9YTm hThBXDjhDXTmtZlo4LbCob3aJayxhCTXzOLByocQYeLwWZY+XUDcuCvf/bCbMRH+3JWE sjf4MyqDE7MFmYCTMkRPMG7qsiihIO9uMfFnM= 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:mime-version:content-transfer-encoding; bh=0t9Yc8oCapK/pmXczwfOQfE1sOlvTfclcIrreLGQ2uU=; b=o4rlD8RxFHGdn3hX3yABS6wmeyQqU8cA/E4ozEGKNguk80r77g0YG9i+YTK1DeMfj4 LV4KwM91rSnk2Dw7HiXOqfP4EH4FiaKApxhOATxk1qBD69Cp3h7aU5mwgeySx7lXloV4 /1eJ3CMM+VrPmQupTwSH7zxF9TPBLZY4wTDvQCkdJhruG1hz+SrPwNsZr5CjjPVSLNk+ uBXcMiuqdMnXMLz3Dr9V4OXwcYIObm6BNv/ryUrE8cGaOjG04LPtvxhCdYgtyziBfKQr BMUO0dLNYSgAK6dL6p0fXaB9g0vmMHd4Auvd/eAqTaRKioLhzORpR9c85rQu7TD6McWT d90A== X-Gm-Message-State: APjAAAVAqM7938HF685FAzPf3H3jJ05dTUG70GcOLAD7oYZZKCuvOrT6 S16snXR59AT4MbEHIKOkbnrX2w== X-Google-Smtp-Source: APXvYqyTOFVFCdtf/jmqxERjXwlSNBnGeAQvccMws3AtzLmxOziCMrvtSmbaP+wqNHYZ3GtPLwAmKQ== X-Received: by 2002:a17:902:708c:: with SMTP id z12mr15907896plk.15.1579788768767; Thu, 23 Jan 2020 06:12:48 -0800 (PST) Received: from localhost.localdomain ([49.206.202.109]) by smtp.gmail.com with ESMTPSA id o6sm3136392pgg.37.2020.01.23.06.12.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jan 2020 06:12:48 -0800 (PST) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Subject: [PATCH 4/4] rk3288: vyasa: Add console settings Date: Thu, 23 Jan 2020 19:42:22 +0530 Message-Id: <20200123141222.486-4-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20200123141222.486-1-jagan@amarulasolutions.com> References: <20200123141222.486-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200123_061249_534944_4B76D911 X-CRM114-Status: UNSURE ( 8.97 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -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_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 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 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: u-boot@lists.denx.de, Michael Trimarchi , linux-amarula@amarulasolutions.com, Jagan Teki , linux-rockchip@lists.infradead.org Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org Add console settings like stdin, stdout and stderr as cros-ec-keyb and vidconsole respectively for Vyasa Rk3288 board. This would certainly help to detect the attached video devices (like HDMI) and print the console message on display. Signed-off-by: Jagan Teki Reviewed-by: Kever Yang --- include/configs/vyasa-rk3288.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/configs/vyasa-rk3288.h b/include/configs/vyasa-rk3288.h index 3574a3b5a5..e31dc77720 100644 --- a/include/configs/vyasa-rk3288.h +++ b/include/configs/vyasa-rk3288.h @@ -8,7 +8,11 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define ROCKCHIP_DEVICE_SETTINGS +#define ROCKCHIP_DEVICE_SETTINGS \ + "stdin=serial,cros-ec-keyb\0" \ + "stdout=serial,vidconsole\0" \ + "stderr=serial,vidconsole\0" + #include #undef BOOT_TARGET_DEVICES