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: 1039 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-io1-f69.google.com (mail-io1-f69.google.com [209.85.166.69]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 90F2B3F093 for ; Thu, 23 Jan 2020 15:12:44 +0100 (CET) Received: by mail-io1-f69.google.com with SMTP id e15sf2065753ioh.15 for ; Thu, 23 Jan 2020 06:12:44 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1579788763; cv=pass; d=google.com; s=arc-20160816; b=tsV+S+WuUr374mBrT+biqpzLeZsRUqP5Yl0zAUXik/1gARq3R3pUi0m9nyvmH1jXHX kidvJh+jvvLjgzv0bHcY5RUWlvp8HmevzhJR8Twom6qeMkCW/aMDxYhREjX2aDLtg4mI k/ugMVWwI9y6xbUr4X/mng3R2+y+hBLoIMXTfA5tM6LS09gQtTZzrW4qUhWpD+wlyql0 ey0BIAOCW2FQc/Lr3XiwA4cKvD/qbCY1KLgBBLaQklgslrUJThB+pYV1nS7brjtE8g4E 2kbs+ljRxa+TKee823mjKpLveT1O7xIrORpJ+M5Hh1uXcN7kjlpIkfy7smA82xcRKeR4 J8/w== 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:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=RX8Ct06Cn7Pz7dOyuJ4FBQ023Dl/NvFcDC2LgEzcjr4=; b=nkdC+gSyXkZbIVUBIbe1sGeoseZeqf8H53Tj4eZWxqvd3kNO3bpn00cQpi+dmxKuyp 1jo0i3PR42kP73wd8toGY95dW+2RO16SDnNda4NaHVCGYRnXxNswus5zU53THuA2F1ya VEVxi/tXReD2HtunAlbCgx+cVjNbkAzL9hxYGHk8TJAu/LIh+aTJqY95mR1WEdXKqEab KWoLTdQEKRhpxxfO/R3rZehu6+nw3NhKAFzA5xnpmnxOYVCKmcC/dz3YdC+wmc1o1y1O sYEZvX1kQq1q2ZY+TJcPSTHCIaW1hJfBekSJFKj3PudCCoCD3c/eBAsYI6QPaM2eGyEn F77A== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=LCFbtLwR; 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=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=RX8Ct06Cn7Pz7dOyuJ4FBQ023Dl/NvFcDC2LgEzcjr4=; b=oYbDHkxTT3k3LdZ/JHKTgQClEhbIDyhm8WBYKgu6gkC+GiLb+JDNPyUYn/qrnTEt5T gf3HBPLZIV7g5Pn1i/O/aY45ujz/tHKrM6wLe2tyOb3PoLXxkA6bsxYz5w7xyh0UkDeT vXzm3U4cXhGgmKlhhNCD53VIBspthI7AP8R7A= 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: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=RX8Ct06Cn7Pz7dOyuJ4FBQ023Dl/NvFcDC2LgEzcjr4=; b=L5fe4jkZJubT0f2hQUorxV3k7x45kL1L4sAT2FNyh18VYu76oJ6mgz+9p14P9QE1DH WC2pkSkTq3si8c354r2xZboyviysWKAXgM+8xvCMqd47+IVVRbGURDA03MQeyCOYdFAd +Nzt/h88enPWi42mROGoKieMloGIHtPi3NJEoQV8wi00wTvJtWCeSyf7UuF65yw8aPs+ y4YSl5oezXFW2zhSWvNI0sX/p1Vm8NyZNCp878ffm8TTIUOUSas9p4T2JYuRauXDeNln stNeeIBBRW4OuP/qBjc7Ar7UosDqRiNbnQ6Q4zQWE5VmtYKdF3HZnkX0PFgA7Hin3HXo fAcQ== X-Gm-Message-State: APjAAAUXrVspFt8Iz+YtgYr9oIGcGTbIGi2D4yj11c7XWEj6IdFuQU0t nubsdjq6Tp/n7sbNOX7TnYuD0Ckt X-Google-Smtp-Source: APXvYqwmKUXhQ2f7nJ06uEpCL45O0BCe9fmYfqrajw8emzgdQufoadH/TqtPWQBYeCES8BsQsny+jw== X-Received: by 2002:a02:94e9:: with SMTP id x96mr10892624jah.68.1579788762710; Thu, 23 Jan 2020 06:12:42 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a92:cb49:: with SMTP id f9ls7756780ilq.7.gmail; Thu, 23 Jan 2020 06:12:42 -0800 (PST) X-Received: by 2002:a92:d705:: with SMTP id m5mr2206152iln.76.1579788762164; Thu, 23 Jan 2020 06:12:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579788762; cv=none; d=google.com; s=arc-20160816; b=W5Jlpt3gqTi5y0eNUNSENn2z95l06xkiaCcvdoIrA1ABEUOfmPYxDe4gyGfNSZA5cz k0TiNyeAF5swUQhRyUoMlrAuZKsl5QsbkxkXYA/2ckjf51VM8ZeuHbr6mIh+TnZER06F UBbld19BZ5GGcA0hT2km4TDxf0spvxEUMn+KHM2Ze9a/5rx2qjkbURZpdrVoYV2wztCS F3p1JEZ36YW+TmKc61AybbfQg+GPCrfHFmlA6sWr8xGRhR2oEycorffXt8sJ5wDqTLRh obpj/RYA0xSMa8btf+VhCmWe0QV+OmZV2n0xBwAtVDscyyAfnOvDRjBq3wNwZ89nMciw EywQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=pX84TUtmw9tx4Os7n6FO68756VgiHD7gdbrKeWTJT2s=; b=rafM1D9zAePxo1QdQbDpd96VR4iG1h3gH2YjpHlIbYLZgsZ4S1dB9eGwb3t988/iQv 25gl9zhBP00eFEZextQSG3ikw1V+Fvgi82JvlWfO6bcETOMQXc2tUFEL7VVzeyCKXIK/ Hww+ptzd+8l1iJVep9LfhUggda0LWNNRocMNe0NeLbSHBicpny3CeGNwEIoHMjXDgZKP 6sJgjytVM00sbyJv/shj4m8A3cHJqeewee8CdMolu+5qBZ7+BxluRcCrVEIkUvoHOmUl eJ7OUAbYEjw5DigeHxKGSVPJha0/PUitpge6SKpmhV89V6QsT1QPfKs/HFycIE7aF5jR LqIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=LCFbtLwR; 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 20sor1758211iog.26.2020.01.23.06.12.42 for (Google Transport Security); Thu, 23 Jan 2020 06:12:42 -0800 (PST) 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: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 Cc: Michael Trimarchi , u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki 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-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=LCFbtLwR; 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: , 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 --- 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>; }; };