From patchwork Thu Jul 1 00:40:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dennis Gilmore X-Patchwork-Id: 12352983 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 265B0C11F66 for ; Thu, 1 Jul 2021 00:42: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 E06FD613B1 for ; Thu, 1 Jul 2021 00:42:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E06FD613B1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :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=iz1L9bv2ybLlzo60i7TcF3m+L9Z6hcKz8OHKFLBhAiw=; b=Lm1ePsKGIiHD0h SG3ElJE9VBNwa5Y51gIhU5te6sK9Q6IRzVoHBybRSYDCzOjmnO442lnDx8g1OO2W42WP4rWkGp32O 6b9Nav1KjDSwZ+XyFAZfBnW/YEIzAQRo0jUDYlF3xdMMkG23/zsU+98Mn4PQEnkwWoQ9kygbqdggX 2KXB4AkxRmBuc+2vIeD745sdecHVr1tSzgCpNhhG2MqBrO+019uPZYc0DqaV0bw4I+ueN+pywpHcQ 3jbWnmy/8Z1MsCrH9kNxuED2ygvuQrgkEYPZ+6k9fWcFKPyM5TeLNkgu5z32w+weYl5Y4fbal8auG xwfbUVz00UoKwQ+i15iQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lykmy-00FiHd-KU; Thu, 01 Jul 2021 00:42:44 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lykmw-00FiHG-BR for linux-rockchip@lists.infradead.org; Thu, 01 Jul 2021 00:42:43 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1625100160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=+v6WPT/5taggbNgs2bz+98+dN0UiYk4moHB5213+Nl0=; b=IlcXCKga0uIjQUcfhygRK3LvzLGaMpgiSArJKcd+eDm2mPBT3/G5JNuh6xEIg8bz4MLJgk KZEJ2qe2Xja5O+QcKYVqrIApKztdNBopJbEynX3Vl6ssCG8rnanKYcgFopUZ0M2jH+4Lkx aktFL5cXA/naSicAiytP76obnY0FoQc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-133-KFxkK4w2MwyP4Kgvkz9bkA-1; Wed, 30 Jun 2021 20:40:53 -0400 X-MC-Unique: KFxkK4w2MwyP4Kgvkz9bkA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4C0135074C; Thu, 1 Jul 2021 00:40:51 +0000 (UTC) Received: from dreyauc.ausil.us (ovpn-113-50.rdu2.redhat.com [10.10.113.50]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CB3F0604CC; Thu, 1 Jul 2021 00:40:49 +0000 (UTC) From: Dennis Gilmore To: linux-rockchip@lists.infradead.org Cc: dgilmore@redhat.com, Rob Herring , Heiko Stuebner , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Rockchip SoC support), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 1/4] arm64: dts: rockchip: helios64: fixup USB setup Date: Wed, 30 Jun 2021 19:40:36 -0500 Message-Id: <20210701004043.18585-1-dgilmore@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210630_174242_651051_2A99BB2C X-CRM114-Status: GOOD ( 11.59 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Without the usbdrd_dwc3_1 node defined u-boot will throw an error and reset the system. All other rk3399 systems use this format Signed-off-by: Dennis Gilmore --- arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts index 738cfd21df3e..aeedf098f67c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts @@ -490,9 +490,9 @@ &uart2 { &usbdrd3_1 { status = "okay"; +}; - usb@fe900000 { - dr_mode = "host"; - status = "okay"; - }; +&usbdrd_dwc3_1 { + dr_mode = "host"; + status = "okay"; }; From patchwork Thu Jul 1 00:40:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dennis Gilmore X-Patchwork-Id: 12352985 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E80BEC11F66 for ; Thu, 1 Jul 2021 00:43:03 +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 A09CE613B1 for ; Thu, 1 Jul 2021 00:43:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A09CE613B1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=par8hUjd+mSMe/J84kbMiWguiGkpiHiN2w6b0QvTeNA=; b=DP8axzOQLX9y3Y iZyIObRbyf91ReG83O+RDik+ZDCrj2x1nC+44fELo8M65PBQFxTpyI3BvcdDtm4zGHNq2MeRt9+8L QJKifHU0vH0Mi1+nPnGTKRt7YszCAvwNqJmUI8dgvJv/sPWqx4/hhnhJCXnmg+6iLKYvSiDs9ReQP no0re/JcZh59yYJTK20A0FDSuhXxkm5cFxzfmg6VbYiLCwJUvLcHh99253+f+CZ1bI3v2xRCN1da2 37BpF7lIb7gEtaBI26ZOKzsoAOcuMkpfviiPEo53vl3IsPo9asU+J5RfRVuC7rFVb9mJjm5VP8XHn Hjyv23vMZ5zjJxHsQsKQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lyknD-00FiJb-6U; Thu, 01 Jul 2021 00:42:59 +0000 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lyknA-00FiIv-7U for linux-rockchip@lists.infradead.org; Thu, 01 Jul 2021 00:42:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1625100175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5HtOhtY9A3lJk+S03M4q/MteJLZvObE+vhVxSQf8wa8=; b=Pve22WpC2whmTk7MO8OIB7zu4ZQlCyuf4MAZlsyCQV01o28AWoOsuTO+9Zexwe6l/ESSkt uQEMucDk107ch9ayPeLPFBR75yC3NQNYvwqjMuxc9+HcVIRDygmR8qlFO2Z1NCMLkN238T 32b1XbV8PR88CsUb5BJYj9HbfZA6ZOE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-486-lksWBFYAM7-QN_dmwFYMUw-1; Wed, 30 Jun 2021 20:40:58 -0400 X-MC-Unique: lksWBFYAM7-QN_dmwFYMUw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 21AA3800D62; Thu, 1 Jul 2021 00:40:57 +0000 (UTC) Received: from dreyauc.ausil.us (ovpn-113-50.rdu2.redhat.com [10.10.113.50]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CBD6A604CC; Thu, 1 Jul 2021 00:40:55 +0000 (UTC) From: Dennis Gilmore To: linux-rockchip@lists.infradead.org Cc: dgilmore@redhat.com, Rob Herring , Heiko Stuebner , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Rockchip SoC support), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 2/4] arm64: dts: rockchip: helios64: set stdout-path Date: Wed, 30 Jun 2021 19:40:37 -0500 Message-Id: <20210701004043.18585-2-dgilmore@redhat.com> In-Reply-To: <20210701004043.18585-1-dgilmore@redhat.com> References: <20210701004043.18585-1-dgilmore@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210630_174256_570480_472EC00A X-CRM114-Status: GOOD ( 11.48 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org set the default output path to uart2 Signed-off-by: Dennis Gilmore --- arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts index aeedf098f67c..bdcf6472664c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts @@ -43,6 +43,10 @@ avdd_1v8_s0: avdd-1v8-s0 { vin-supply = <&vcc3v3_sys_s3>; }; + chosen { + stdout-path = "serial2:1500000n8"; + }; + clkin_gmac: external-gmac-clock { compatible = "fixed-clock"; clock-frequency = <125000000>; From patchwork Thu Jul 1 00:40:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dennis Gilmore X-Patchwork-Id: 12352987 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 68F29C11F66 for ; Thu, 1 Jul 2021 00:43:19 +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 3B04661107 for ; Thu, 1 Jul 2021 00:43:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3B04661107 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=xhV+8mkvHiDMNjhwjm0ADPAL6gUvlFiRL9dChzCKwno=; b=siu4CEf1Bz45Mc Alx0whwYlo9WnpLDSS4Dih7sUzQ5l4FTeIa8lPrczzlSXxI7WQn+0loO5oRK9hO24cQ8s+zlbktIp vYS2bZVxU91Zwhc2+c5Vr4BPIkf+7gGElhnKp4v7xFu+BivklFx0WwTC4j9XaHXbDegmc2crZcEWc O37srTSj/X+mp/GrD6VAzmHNFstLw4Je3GxQSPFktYHfso46reo1rvzQWAYpZjaY1N6oP74+YQkCp jvXDQfM1BE6SPT/LC2N4lX6D5YoZ4KK0fFar9hVdzJn5uy0UuOU7ZURpuy1tb3k5l5wldOeTIG4bQ 30MJZMKLBMQZsy7yoeDQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lyknR-00FiOD-My; Thu, 01 Jul 2021 00:43:13 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lyknP-00FiN9-4W for linux-rockchip@lists.infradead.org; Thu, 01 Jul 2021 00:43:12 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1625100190; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lwoHLx2eJfcqWlSuvHPH6Uv2QHfVsHItf+nTiFi6sqA=; b=AkWJ/67sDH2/D2AcQdB0i7SqzhAjxwGL61JDcn1w0Iyle7YNc/QIa57iHOtH8pjd9vsibG RFwfhwyATKClqp50WWJvpteLBE6/bPHLW5DsC4GGgkVKGznmkPJ7ulcTx7CI/LykoT5Nok o2teKrI1/CPZLTPyp2W1AKBUNyb2ksA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-402-CGqjlbC4P_Wl2cEPPwvDqA-1; Wed, 30 Jun 2021 20:41:06 -0400 X-MC-Unique: CGqjlbC4P_Wl2cEPPwvDqA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CA01B1005E53; Thu, 1 Jul 2021 00:41:04 +0000 (UTC) Received: from dreyauc.ausil.us (ovpn-113-50.rdu2.redhat.com [10.10.113.50]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B0359604CC; Thu, 1 Jul 2021 00:41:01 +0000 (UTC) From: Dennis Gilmore To: linux-rockchip@lists.infradead.org Cc: dgilmore@redhat.com, Rob Herring , Heiko Stuebner , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Rockchip SoC support), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 3/4] arm64: dts: rockchip: helios64: add SPI support Date: Wed, 30 Jun 2021 19:40:38 -0500 Message-Id: <20210701004043.18585-3-dgilmore@redhat.com> In-Reply-To: <20210701004043.18585-1-dgilmore@redhat.com> References: <20210701004043.18585-1-dgilmore@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210630_174311_415561_7DC5FFBB X-CRM114-Status: GOOD ( 12.50 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org add SPI support for the helios64, u-boot can live in spi1, spi2 is user accessible, spi5 is for the sata controller rom. https://wiki.kobol.io/helios64/spi/ Signed-off-by: Dennis Gilmore --- .../dts/rockchip/rk3399-kobol-helios64.dts | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts index bdcf6472664c..09c5a6fa11ff 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts @@ -21,6 +21,9 @@ / { aliases { mmc0 = &sdmmc; mmc1 = &sdhci; + spi1 = &spi1; + spi2 = &spi2; + spi5 = &spi5; }; avdd_0v9_s0: avdd-0v9-s0 { @@ -473,6 +476,27 @@ &sdmmc { status = "okay"; }; +&spi1 { + status = "okay"; + + spiflash: flash@0 { + compatible = "jedec,spi-nor"; + reg = <0x0>; + spi-max-frequency = <25000000>; + status = "okay"; + m25p,fast-read; + }; +}; + +/* UEXT connector */ +&spi2 { + status = "okay"; +}; + +&spi5 { + status = "okay"; +}; + &tcphy1 { /* phy for &usbdrd_dwc3_1 */ status = "okay"; From patchwork Thu Jul 1 00:40:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dennis Gilmore X-Patchwork-Id: 12352989 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9D0DFC11F66 for ; Thu, 1 Jul 2021 00:43:35 +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 6E42461107 for ; Thu, 1 Jul 2021 00:43:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6E42461107 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=nLqSVVxsyXE/csvET59xFEk6GUbtKH4u4l9OZhWg1ic=; b=wAfj43WHC2H8vv 5EpyGYrhcUMitKw/atgDeMKefSRCkNAmWgjToYcl7B4E0rdrebnV25IgJz4COg4pqPGIU208+odSG QmE/qMPOIyLHBfWuAa9LtzJVTTyVsfYbbsJL+1n5ERM+Emhnkb/Y/Bt0sfP5aZFKDSZZNl7daFPpy 03FPWQ+e2fShizUYAoicOpjibvC6sdUi9yFM7FesBlJ6hg0CgeYqseXA8NF3CUoGHqecigYvTwFax NMkmDnxnO1+QSOWZq+LTpz1hXHgXD7jiJplOI+lg4f6WbpiRk3Omk2cLjT1TTCkBjZWK6TM5/Ed+M GNdoDaBsn/dOO2obYUtw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lyknj-00FiUN-QN; Thu, 01 Jul 2021 00:43:31 +0000 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lyknX-00FiQF-Q0 for linux-rockchip@lists.infradead.org; Thu, 01 Jul 2021 00:43:21 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1625100198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aVBk4SHqyOlcbF1ifNVSq0kIYoC+2bJkL0n2RJO/CS0=; b=LX855xfWxyfwpqE9rwb2FE7ebIYWCpWwiNGwW0btIv+cpILftIW57h9flM24qwaPnNJGw3 BdS4DdbOJMCfazhNfJnqXe0dbCI57emAciMCR8EyCCXbbaoQRuMR6mztP+USNHfxPi861E bH27xsYrkurtM2GuiUEz4GlC/9mW1cE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-243-D-aFng4MPgu6eM9_N0gOLw-1; Wed, 30 Jun 2021 20:41:12 -0400 X-MC-Unique: D-aFng4MPgu6eM9_N0gOLw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 416B8800D62; Thu, 1 Jul 2021 00:41:10 +0000 (UTC) Received: from dreyauc.ausil.us (ovpn-113-50.rdu2.redhat.com [10.10.113.50]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 57EEA604CC; Thu, 1 Jul 2021 00:41:09 +0000 (UTC) From: Dennis Gilmore To: linux-rockchip@lists.infradead.org Cc: dgilmore@redhat.com, Rob Herring , Heiko Stuebner , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Rockchip SoC support), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 4/4] arm64: dts: rockchip: helios64: enable tsadc on helios64 Date: Wed, 30 Jun 2021 19:40:39 -0500 Message-Id: <20210701004043.18585-4-dgilmore@redhat.com> In-Reply-To: <20210701004043.18585-1-dgilmore@redhat.com> References: <20210701004043.18585-1-dgilmore@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210630_174320_135517_6C6E873E X-CRM114-Status: GOOD ( 11.38 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Enable the tsadc thermal controller on the helios64 Signed-off-by: Dennis Gilmore --- arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts index 09c5a6fa11ff..b44e54571c31 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts @@ -502,6 +502,14 @@ &tcphy1 { status = "okay"; }; +&tsadc { + /* tshut mode 0:CRU 1:GPIO */ + rockchip,hw-tshut-mode = <1>; + /* tshut polarity 0:LOW 1:HIGH */ + rockchip,hw-tshut-polarity = <1>; + status = "okay"; +}; + &u2phy1 { status = "okay";