From patchwork Wed Jun 9 11:44:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 12309903 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=-17.0 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,USER_AGENT_GIT 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 9E3A0C48BCD for ; Wed, 9 Jun 2021 11:51:30 +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 62C4A61249 for ; Wed, 9 Jun 2021 11:51:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 62C4A61249 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=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=pRpkAF6wns4p9i8sCA76qvQK8URU65lyt1KZNiaKiTA=; b=SzPcHaHv/pdtFg DqfwIihgabGeGtFxZfGhkHKvrP37sYf1TyrdcabyzG/mGNFA47QGGVkrPPcLVTurYgndtpdDsuncS d0fp9pPCrw28xifSIv8NGYX22bLG7pZuyxWhG6nFwW1aOF8j3QkNLTKf37N8Q+SdFoeF171/VvqPg uY6USCljS8ioFDSlT/TdrEnyjFY6iP3F5EntlCk3FcUIhHL/gk/dSlRQb0nVBXWAf25+Gp986qVLL 7M1oB4jJYDlLoY8KOe48+MknM+eKfzecr2puc+ENIcT4LMcDKfPjR+4azxzCMWFd0+fmtIG9BzuZs gtCKX6vsHn/F/uRSvmBA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqwi8-00DRZp-6A; Wed, 09 Jun 2021 11:49:29 +0000 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqweD-00DPqi-TJ for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 11:45:29 +0000 Received: by mail-wr1-x42d.google.com with SMTP id i94so20087088wri.4 for ; Wed, 09 Jun 2021 04:45:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FTo7fY3KRCemJPkgL+lr6NZwHmmJ9ybZ3qdejBmcTTc=; b=HM8pgh7/bh6NKk9Y9TrR2GU+2d0omcsm8erFDG5vG6TkrCxyhvuMj17bnXKeHxEb9X OGzqFOcLnr9Ljzd53I+UsVpzJKoNkaf0cNxZMTzhQs5+1kvaxyesGNQRdhAQcDXYow3n lf5dTC530Q7RwMY0TTa8xkXsNSrcO6LW15B3NM4Jz74D++JKih7Pd1dKs+v2tolRV0ak FLaFUg2ysw902ywyjcK3t98pm8aYoZEjVrffZR7dNZJqLiY4k+X1ulsUxS4VKK58/P1p T2mN/ewlBpi5oPhl8tr4LGr1w5JKkCw+fddgEjK+1Jw8J2+N4HGWZFvRzi5SX4d97R35 JN+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=FTo7fY3KRCemJPkgL+lr6NZwHmmJ9ybZ3qdejBmcTTc=; b=fOR10h8kWXI0xpZ4Xl6wRDK/7hr2JSZdJ+MK6SXMDqqPByDC5u7MIHk9U2Tp4WgBSP rNhjMLsbbTFOoo19YJYZsD/hfcfvN71eTQN4fUBJS3jG1hm7j4HptYSyo7I+tZTding4 atHbn6FAZWIXy1YpJL6KfO73Gfsv9jKJh7ckE1X8fv22WHB69KY5JcsyDWQSNbpNYamH UEtHw3ufQWAfhadlI+yNAsgCxim0MIeFl2SiEjy30WwlAEeWivetL3OHWA+Mx64AFi60 1hqUKlRN6lplslc1VW1fi0uXDeN3wJgOngYoLOC/drJk4DCfsp39YNm3B8FaP4yH+QbL 8Dig== X-Gm-Message-State: AOAM533OElMOfTstd0lb2Z5p/l4dvEB80GKmC5L5ZLg05kFQpDvvAD/1 tOUc1RU2fJB14S7zhci3IGtCCw== X-Google-Smtp-Source: ABdhPJxBZmKp+0falKzmfm9ydBDnIRX2z4EtWUOTKh7WVXlG3Uk3CvKjUsRc1MM2+cubnFvTfeduQQ== X-Received: by 2002:a5d:40ca:: with SMTP id b10mr27939968wrq.240.1623239122618; Wed, 09 Jun 2021 04:45:22 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::45a]) by smtp.gmail.com with ESMTPSA id y189sm21738918wmy.25.2021.06.09.04.45.21 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Jun 2021 04:45:22 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu, michal.simek@xilinx.com, git@xilinx.com, Viresh Kumar Cc: Krzysztof Kozlowski , Laurent Pinchart , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 01/31] arm64: zynqmp: Disable CCI by default Date: Wed, 9 Jun 2021 13:44:37 +0200 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_044526_848075_DB73D672 X-CRM114-Status: GOOD ( 10.58 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org There is no reason to have CCI no enabled by default. Enable it when your system configuration requires it. In Xilinx configuration flow this is work for Device Tree Generator which reads information from HW Design configuration. Signed-off-by: Michal Simek --- arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi index 28dccb891a53..302ca0196c34 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi @@ -245,6 +245,7 @@ can1: can@ff070000 { cci: cci@fd6e0000 { compatible = "arm,cci-400"; + status = "disabled"; reg = <0x0 0xfd6e0000 0x0 0x9000>; ranges = <0x0 0x0 0xfd6e0000 0x10000>; #address-cells = <1>; From patchwork Wed Jun 9 11:44:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 12309901 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=-17.0 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,USER_AGENT_GIT 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 B6599C48BCD for ; Wed, 9 Jun 2021 11:50:02 +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 7D78B61249 for ; Wed, 9 Jun 2021 11:50:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7D78B61249 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=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=aMYZu0cHy2rjdVGm02MJ3LXqBv18l/eyzCRSY9W0sZQ=; b=XpquyjjFoNTpmH iFdjDm3GypNhIuGUYYG80p45nTRhGFMZfrfPYIwgcgswN+WcSCZwHql7GJDkxeSbubhg/2LD9llPx sX5hHXgC8S0AZ+f8gjxhRDQFwdHCnDBellT/A5ex/ZQxxKTFRjaiWiDTwiyjB9ubORSAvF1T2+gyr JQXJ4fEcuwxX9sjpRk7+wz4d+4oBDoP2OOdK6rrVpQI/GPzJU2w9uPOLQQG0eiUF4bxxg035lFv71 a2tn4ko96IW4fEpTwk/Hd4AnIslC5hriLQOyBSFD/GYGekal+ZSJ9tYllnRD/DE+JEaRvCvhuG2R4 j8dTmvQ41LxPmsFdfL4A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqwgh-00DQsm-Q4; Wed, 09 Jun 2021 11:48:02 +0000 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqweE-00DPr5-6c for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 11:45:29 +0000 Received: by mail-wm1-x331.google.com with SMTP id v206-20020a1cded70000b02901a586d3fa23so3983688wmg.4 for ; Wed, 09 Jun 2021 04:45:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kEDmcXw1Vb0a19AjvwRij7MjXqXCoObE8zeLieziyHk=; b=kKGqttYupE3iAnWWcj2Z/5S/M9a++Vowp7tLhYCysZ5ycoUMSJhJ5pj5brD1sUEmyi Ozr4OFfsbSV8EqJz/U/YRe5NVT/WvePyC4/4vVIdtjh0O0XhRi6Ny3gvWNsKCmGrkd5Q kMIlbz3cPWF6QcpHq5Rj1Q+azERtcIi9E0hzTxD4vavVlgjj2M9vxQ8dCcuNJR0ZBu4s JbvNh8qyZVq5M6VknyuYHsUwuRH4ep2ylfheCD1On3cHp6hJ7enWSYLbneWMYvIXYVYv aGZv64qRAhI2oavIwckktxBwo/ZW4ruXDHpHlEKx8gKLRTf38fMGy0MU5S67+I+Uy40G K/tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=kEDmcXw1Vb0a19AjvwRij7MjXqXCoObE8zeLieziyHk=; b=bsdBQVqbikUWGz74yU6nlCb90cSP19AncREftycTeLqawsC89rCcTa/g4FzZt10yCg brl0w5JXeNV0FsK0b4jEglCm9JbOe9y4R0au4OVdsk2nIbJtixQxxmAzQxMp/WbSl9Vm Q8+k5fSKWKJUmCQYUT6dxbiXpr7Fo/4haQiQ7AViqMgYfcDl1WzivpNo6ho7XlWF9o0M Jz4QopnFNi6nmZMmoeJfP5I8kq4PbtlYXXhCZ/I2ky/u+TaL9c9ii0WHtIayeMbRIUPt PORLjPXLj2HhjixnXJpn95GBkfOwlkv6qYxAr3PdjTWcn+rHpcjuH+sMNqPsgvB2edxz HKMQ== X-Gm-Message-State: AOAM532YeWW+2KTbjZRXEkckfPcll3lRmmCWWL0mB3IJ3wXTb1mRzLUz w5r+t+Qd+5AfEXLxQGk6k7mO1w== X-Google-Smtp-Source: ABdhPJx/gF/i/+f3rHQ5uRMfSpqn975b21+2ucb/F8nsogWOh6nBJ3ghohhqCBek0mAcbMtAQQqwrg== X-Received: by 2002:a1c:2015:: with SMTP id g21mr9400708wmg.87.1623239124315; Wed, 09 Jun 2021 04:45:24 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::45a]) by smtp.gmail.com with ESMTPSA id o18sm13601475wrx.59.2021.06.09.04.45.23 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Jun 2021 04:45:24 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu, michal.simek@xilinx.com, git@xilinx.com, Viresh Kumar Cc: Amit Kumar Mahapatra , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 02/31] arm64: zynqmp: Do not duplicate flash partition label property Date: Wed, 9 Jun 2021 13:44:38 +0200 Message-Id: <6c4b9b9232b93d9e316a63c086540fd5bf6b8687.1623239033.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_044526_848966_8DAE0CA5 X-CRM114-Status: GOOD ( 13.99 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Amit Kumar Mahapatra In kernel 5.4, support has been added for reading MTD devices via the nvmem API. For this the mtd devices are registered as read-only NVMEM providers under sysfs with the same name as the flash partition label property. So if flash partition label property of multiple flash devices are identical then the second mtd device fails to get registered as a NVMEM provider. This patch fixes the issue by having different label property for different flashes. Signed-off-by: Amit Kumar Mahapatra Signed-off-by: Michal Simek --- arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts index 4a86efa32d68..f7124e15f0ff 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts @@ -131,7 +131,7 @@ spi0_flash0: flash@0 { reg = <0>; partition@0 { - label = "data"; + label = "spi0-data"; reg = <0x0 0x100000>; }; }; @@ -149,7 +149,7 @@ spi1_flash0: flash@0 { reg = <0>; partition@0 { - label = "data"; + label = "spi1-data"; reg = <0x0 0x84000>; }; }; From patchwork Wed Jun 9 11:44:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 12309909 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=-17.0 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,USER_AGENT_GIT 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 EB5F3C48BCF for ; Wed, 9 Jun 2021 11:53:26 +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 B67916100B for ; Wed, 9 Jun 2021 11:53:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B67916100B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=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=fZ/m1YMJPs5PiBpZwP0z45AO9ccpgtjofIgIr0j9nVY=; b=d4eUb8dDewzgdP idUIqK4MsGML81C4g/kGo64gxh4XFCc4T9SyioF1Gc2+DYXFty/njIDULFQdZMlWkX7+zPlw9N4w3 FV+T1wBaQM4oTx77hUR7OQaNeCGUl1SDlZo9pW7zzQosLEQ40r2sTyQD6O4+gmC0GPpjAdO4H7NZn M0Faeww9epK4ClBR9NohQ2/+i2Su8XxUVLFxhcDyM3PYjA9WbjEmcevaWO8ouQTq2SO5GbqFKA5UQ scVZwxa3FrkiMSAER2mD7jpdabRUegKIF7C3gAZ7vLAeoHj3/gAYo4giMyJrtxgyd3La/WAJqaUgE Ktc5+M8Qjffm01g6uxhg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqwjr-00DSMs-Oi; Wed, 09 Jun 2021 11:51:16 +0000 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqweF-00DPrR-Sq for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 11:45:31 +0000 Received: by mail-wr1-x42b.google.com with SMTP id a20so25191337wrc.0 for ; Wed, 09 Jun 2021 04:45:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YYuLc1LqPr72hqNJJCXhm/SbKZfu9G6M9dH7AziyJJw=; b=UyMMRjDC6VShzzWvIHSx7+UqtXqhNcJz3bercrMmRU9+n4hkqIHrNgAu7py1aOyACO teT5BWAlmV/lIf2SOqKSyVQqBG02wQARco9V6K94mAvmbYUbnJzMwDrmOia4K8iGOLBP Ddu65qYKKguvQmqp+wPbPM/lGh7JLZGK4QFaxNwgw/uQVbsz4VrcEIsNIsH1Zd2cpXLN ApwwVRW26PCFAj94y2jGVEb8T3qMZbTFNnrhmeTkO5q94irEs8KXfo9ydEHWofjnFcsd vRtvFavKU1JYguyN5/RYjOatnWyJGIoolTIkWHW79U+R2NAmtFgVtxemafWQjO0Oj2BO SVdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=YYuLc1LqPr72hqNJJCXhm/SbKZfu9G6M9dH7AziyJJw=; b=X7aiBTQdYau09A81clscIihcVcWQdzxEZPcaoJyN+1p0JlytJbvu3sI0evlw4zGk50 1iHd+JjEZTWYHey38dJi+7LQygBmCEn8Tf7WlEEiZjv/U5KgkoNvrPRt16SDAdOlSQK/ ip0eYPqZ/zkUTXFJG1mxi6O8J439Ww0DRW0xhNpLa4BJ3ai6TCOuT0lbHG7jO4w+1PBq sXQRERDyDfa4iNupD4Jrv6xyh6liT68RGbcLiISeG2OrfuOg5ksdYptA2J4i024h32us AYfu6yqYHktpwYQoBI7yQ3QYfnmHC/HSCAhrNH/dEeoiaBEcsNwRn3t8x7aQjES1FsqH V0dQ== X-Gm-Message-State: AOAM530uh5ZCM3xjrRi+87K0tI2zxUde0dvTnQjIIJzz3X8Tdv87eQWU S2CEn7Nj8YjL8i5vwg2xddrW2w== X-Google-Smtp-Source: ABdhPJyU6yQuHiCitOyJeixBKTWQW2Y9gsA2mP2i0gBJ8JDz1WitfCJcrgBeVWoOqeEb344fRg6aOA== X-Received: by 2002:adf:a45a:: with SMTP id e26mr23012035wra.222.1623239126066; Wed, 09 Jun 2021 04:45:26 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::45a]) by smtp.gmail.com with ESMTPSA id r4sm23760075wre.84.2021.06.09.04.45.25 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Jun 2021 04:45:25 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu, michal.simek@xilinx.com, git@xilinx.com, Viresh Kumar Cc: Laurent Pinchart , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 03/31] arm64: zynqmp: Enable fpd_dma for zcu104 platforms Date: Wed, 9 Jun 2021 13:44:39 +0200 Message-Id: <76d330bf2b2414efa2e98965a3ca7f7c43e3645f.1623239033.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_044527_964120_54D99511 X-CRM114-Status: UNSURE ( 9.65 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Enable fpd_dma for this board. Signed-off-by: Michal Simek --- .../boot/dts/xilinx/zynqmp-zcu104-revA.dts | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts index 5637e1c17fdf..99896db6b8ca 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts @@ -65,6 +65,38 @@ &dcc { status = "okay"; }; +&fpd_dma_chan1 { + status = "okay"; +}; + +&fpd_dma_chan2 { + status = "okay"; +}; + +&fpd_dma_chan3 { + status = "okay"; +}; + +&fpd_dma_chan4 { + status = "okay"; +}; + +&fpd_dma_chan5 { + status = "okay"; +}; + +&fpd_dma_chan6 { + status = "okay"; +}; + +&fpd_dma_chan7 { + status = "okay"; +}; + +&fpd_dma_chan8 { + status = "okay"; +}; + &gem3 { status = "okay"; phy-handle = <&phy0>; From patchwork Wed Jun 9 11:44:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 12309987 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=-17.0 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,USER_AGENT_GIT autolearn=unavailable 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 54147C48BCD for ; Wed, 9 Jun 2021 12:19:43 +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 1B31761287 for ; Wed, 9 Jun 2021 12:19:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1B31761287 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=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=JJwo8DHINXEfldTGvI9nNm/fkHRo/IBnhaf39VAL+GY=; b=JmZIuSyGmw77WB oHjCEPaVJjnDCup6ARSdIYUaSjJGSBYfsEIGgXIPdcQ0j1GipA6rl9KU1uAcVTetY5eCdDSNbovy+ FXzD4qs9N/TXrxfL81WnRSr7GFGzGbM2EPM+wbGV5P8anLK5mK+G7FZBrvcBAt24X8aJpZyBupe0J jStQQltgwN9vaOqFBZWrWMSv+X5nMccWX3/5wjDP9bahDZmIu5/u12I2jeJv/ryWAFUM8PGV841R/ yN7hajlzJ6jv4kTn/skrFxnnJtT192W6ZTIYlH96nqnQs40yeFH7Nsn9TixfxMoLcHNYuyiW5BzDn Ro8VNgMjL4DSR89qX4yg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqx95-00DcK3-NT; Wed, 09 Jun 2021 12:17:22 +0000 Received: from mail-wm1-f43.google.com ([209.85.128.43]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqwfF-00DQJ7-NU for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 11:46:31 +0000 Received: by mail-wm1-f43.google.com with SMTP id h22-20020a05600c3516b02901a826f84095so3976492wmq.5 for ; Wed, 09 Jun 2021 04:46:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=R/3HZeObvFzaodz0f51dPqwRxwzWlJkXtgOWwyFJYTE=; b=Jh1ZfgwevTKVlcRoffLLON05ol0p1wNKWclXF76B9EE9LwKMs+A8lNSPwR6E50vbxV WDUb/gM6c8Gg42Nv65TKHBYr0bTV7UrLSQhw7n76itx+9nfRrTVt67mNTlct3e/8vwKt 2OqxtICfk7R6+Hno/mSuTLyFQqKtmhBou+0JS+YSvx7CLEUlRXdcJm14vxe3IY0Xy9n7 g49oZOhBhjh8gtZzIG3E8OT+uFDmehmYmS88m8N2Ju0dYkuA3kuVSEC5i5TIK9BvxNOK 0dyGqIh8PSo8OGh2xlJaceFfNKVYwUXQiNICCS8dW+RXwbs9h361duUsOliDlwyn2hWx SwIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=R/3HZeObvFzaodz0f51dPqwRxwzWlJkXtgOWwyFJYTE=; b=N4dtqrS0h1Sch7xalAeQ4wkI0y/BUrhcM0phVK6/a1ACyGPbf8A/T1ptUvkPhPbld3 zuiAqKLu8xiLS9n5hfJg1Ke5awxc3reynDH6NWb1jlbct07Cc0UCojzP4GvbJKNnwWx1 9XC3Z/hKHunE6itAgfDAuSGLmqRAhKQHoHv8S6ZG/WAOzZs6FPVEB7Iz+3J9fWmpONN/ I2s5R4p/BhP7hxwwjgETRufTUngymabeKUv4TKLd5PhAHXSJHoOAiCArO8qWbPoghh/u NjViVek7Pr0/HK2JuE0w0cJePz43WAfRreV0HrfOWKWukEp3xthqg2rlZTKpwv8sSPJA mNbA== X-Gm-Message-State: AOAM533FQY6ZKb8O6qRRrcLdGojwhVu2HQMPIAg7cnBAsDFbZ9el6yNx lH5ILDFTrnMHHbqf7R7/9UaZ8w== X-Google-Smtp-Source: ABdhPJwobdDEXRoGGhM2Kp9aITq138OtfIvhQ2lRd36EZs79rSc6YTuaKJVMRqf9WRWUPFQAjrVbKA== X-Received: by 2002:a1c:7c13:: with SMTP id x19mr9399617wmc.96.1623239127802; Wed, 09 Jun 2021 04:45:27 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::45a]) by smtp.gmail.com with ESMTPSA id o22sm5810994wmc.17.2021.06.09.04.45.27 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Jun 2021 04:45:27 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu, michal.simek@xilinx.com, git@xilinx.com, Viresh Kumar Cc: Laurent Pinchart , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 04/31] arm64: zynqmp: Fix irps5401 device nodes Date: Wed, 9 Jun 2021 13:44:40 +0200 Message-Id: <10bf5f9e7a18579626fb1850e3a8a7476ba6f2ed.1623239033.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_044629_829842_369DFF28 X-CRM114-Status: GOOD ( 11.95 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org - Add compatible string for irps5401 chip. - Do not use irps54012 as device node which is not correct. - Fix addresses of irps5401/u180 on zcu104 revisions. Signed-off-by: Michal Simek --- arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts | 10 ++++++---- arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 9 ++++++--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts index 99896db6b8ca..5c35edd736aa 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts @@ -157,11 +157,13 @@ i2c@2 { #address-cells = <1>; #size-cells = <0>; reg = <2>; - irps5401_43: irps54012@43 { /* IRPS5401 - u175 */ - reg = <0x43>; + irps5401_43: irps5401@43 { /* IRPS5401 - u175 */ + compatible = "infineon,irps5401"; + reg = <0x43>; /* pmbus / i2c 0x13 */ }; - irps5401_4d: irps54012@4d { /* IRPS5401 - u180 */ - reg = <0x4d>; + irps5401_44: irps5401@44 { /* IRPS5401 - u180 */ + compatible = "infineon,irps5401"; + reg = <0x44>; /* pmbus / i2c 0x14 */ }; }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts index d4b68f0d0098..68b758e40f80 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts @@ -326,13 +326,16 @@ i2c@2 { #address-cells = <1>; #size-cells = <0>; reg = <2>; - irps5401_43: irps54012@43 { /* IRPS5401 - u53 check these */ + irps5401_43: irps5401@43 { /* IRPS5401 - u53 check these */ + compatible = "infineon,irps5401"; reg = <0x43>; }; - irps5401_44: irps54012@44 { /* IRPS5401 - u55 */ + irps5401_44: irps5401@44 { /* IRPS5401 - u55 */ + compatible = "infineon,irps5401"; reg = <0x44>; }; - irps5401_45: irps54012@45 { /* IRPS5401 - u57 */ + irps5401_45: irps5401@45 { /* IRPS5401 - u57 */ + compatible = "infineon,irps5401"; reg = <0x45>; }; /* u68 IR38064 +0 */ From patchwork Wed Jun 9 11:44:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 12309923 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=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 2C88FC48BCF for ; Wed, 9 Jun 2021 12:00:13 +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 E8607613B1 for ; Wed, 9 Jun 2021 12:00:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E8607613B1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=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=yoMqjVg1asBlrFF0UXnCQd6hStKwTswm7OFTNYo4aTI=; b=F+2P4M5JG1o97d 7ufpz33USZdfbcLNl8ZmxWZMb7cpn5yEWzuQWmGLn2Dh+2su2klQ3ZpH37rBjmP91JAh/WBW3bGXK DxYUrzKn8d+gqtmFgSF0wvyOhlJ90KDgW/gjpyqtjen1SQaqhcKLPNLgQIoBE6nkdwadJbOcVzr35 P9Zgk9OkWNisOOoTBVrj1CTwhNGEpIFUh1it5GEjGs7ABZFY9iMp20ftKDMmw4uqGlyKUiS/+B2cc l7LqEY+7LPc00rKqniA28cCw6RRoAQo0axKta3/ZNm01JRgtarawRF/fJP2uGHvpI5lyea+VLIsak FOYP/Ib7eB03H6wdH3Fg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqwq9-00DUp7-56; Wed, 09 Jun 2021 11:57:46 +0000 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqweJ-00DPtY-VZ for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 11:45:42 +0000 Received: by mail-wr1-x432.google.com with SMTP id r9so8428435wrz.10 for ; Wed, 09 Jun 2021 04:45:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yHw3VX8TTHJ6udZssheVY8bOzNWzdr0I0KKTIhWjCXQ=; b=vmpMiJUMHwtoi4kfgr7qr6gSg9TEq53k7AzGBUBbQMuJLo9PcCmeObHqa2kt6XW98b azAamXUHf6xq107fvUOqxR8/1dp5OuCVBmpXa6W+T1FpkJVSVnC5lpEotwpReL4n4QCI A4xQgb1RQhIHL4zLK7vBzn7HEYiEC5ZLYf4lQiNwKLiaL4LUtebVwLOKIc79y3OJZlp0 DHQGzQKH98Du51fn03mORJt1R35F+JQYv2yJrNJ9kDroUGLTzfaU8onJrysxUOXip+ga B8DgENmseNo+H+SszdTV/AUxrx6zPQwwGVy0onBQBPTUAM/gr402xRj18ISSbirT5M+5 W2EA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=yHw3VX8TTHJ6udZssheVY8bOzNWzdr0I0KKTIhWjCXQ=; b=GCL3cwUdRlEW1JRtDMk8/dvgq5C4ZltN55MCCU0eOtCgm92jbquDyj5n4GHolwUFGc VSmO235mID5rS7iVWhkHwcKL73pfOr7kyk1Xeo0Q1myfkjhA2syiMUlJ/7lb00btzmCP BL2LVJVKpoxxg2LEqRc3OUfym43nVKsRoF5rcRB/LqrcXajMaVU2JTRA22PgG8pIsVIc Sy7rFCM9INNEKvMwjBNVvlyFj41eS39wBEwSq6xb7zZ/QbPWgTSX8bvVQ9O0a7JZeeEG dNBXrvcXNR1p8BsAdwCl9IVkgAUN8fd1NFI0Qnns9vxL2CEdsB4xD+0svg5jlt1de8kw VctQ== X-Gm-Message-State: AOAM531CyoFS54bI1CEY2ZKZLqSfcx6YD5c5zvlWpzEZLlEbVCNFcvIO 09S8J4P+QCchd0NHg0a7eTvsMw== X-Google-Smtp-Source: ABdhPJzb9Jc/nGcUVIxh6+Ftp+ZpQF7Uz7KHNAwpuX9OKEmFQKLLyk3+xLDXhPb5OIpDDIeJRDl/WA== X-Received: by 2002:adf:ec02:: with SMTP id x2mr24026234wrn.156.1623239129739; Wed, 09 Jun 2021 04:45:29 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::45a]) by smtp.gmail.com with ESMTPSA id b15sm22161066wru.64.2021.06.09.04.45.29 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Jun 2021 04:45:29 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu, michal.simek@xilinx.com, git@xilinx.com, Viresh Kumar Cc: Amit Kumar Mahapatra , Krzysztof Kozlowski , Laurent Pinchart , Quanyang Wang , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 05/31] arm64: zynqmp: Add pinctrl description for all boards Date: Wed, 9 Jun 2021 13:44:41 +0200 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_044532_314383_B28B44B5 X-CRM114-Status: GOOD ( 14.84 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The commit 1dccb5ec0123 ("dt-bindings: pinctrl: Add binding for ZynqMP pinctrl driver") and commit 8b242ca700f8 ("pinctrl: Add Xilinx ZynqMP pinctrl driver support") add support for Xilinx ZynqMP pinctrl driver that's why describe pins configuration for current boards. Signed-off-by: Michal Simek --- .../dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 230 +++++++++++- .../dts/xilinx/zynqmp-zc1751-xm016-dc2.dts | 303 +++++++++++++++- .../dts/xilinx/zynqmp-zc1751-xm019-dc5.dts | 329 +++++++++++++++++- .../boot/dts/xilinx/zynqmp-zcu100-revC.dts | 241 ++++++++++++- .../boot/dts/xilinx/zynqmp-zcu102-revA.dts | 290 ++++++++++++++- .../boot/dts/xilinx/zynqmp-zcu104-revA.dts | 218 +++++++++++- .../boot/dts/xilinx/zynqmp-zcu104-revC.dts | 218 +++++++++++- .../boot/dts/xilinx/zynqmp-zcu106-revA.dts | 290 ++++++++++++++- .../boot/dts/xilinx/zynqmp-zcu111-revA.dts | 227 +++++++++++- arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 5 + 10 files changed, 2340 insertions(+), 11 deletions(-) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts index 69f6e4610739..5b258129c7ef 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts @@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP zc1751-xm015-dc1 * - * (C) Copyright 2015 - 2019, Xilinx, Inc. + * (C) Copyright 2015 - 2021, Xilinx, Inc. * * Michal Simek */ @@ -12,6 +12,7 @@ #include "zynqmp.dtsi" #include "zynqmp-clk-ccf.dtsi" #include +#include / { model = "ZynqMP zc1751-xm015-dc1 RevA"; @@ -73,6 +74,8 @@ &gem3 { status = "okay"; phy-handle = <&phy0>; phy-mode = "rgmii-id"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gem3_default>; phy0: ethernet-phy@0 { reg = <0>; }; @@ -80,12 +83,19 @@ phy0: ethernet-phy@0 { &gpio { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpio_default>; }; &i2c1 { status = "okay"; clock-frequency = <400000>; + pinctrl-names = "default", "gpio"; + pinctrl-0 = <&pinctrl_i2c1_default>; + pinctrl-1 = <&pinctrl_i2c1_gpio>; + scl-gpios = <&gpio 36 GPIO_ACTIVE_HIGH>; + sda-gpios = <&gpio 37 GPIO_ACTIVE_HIGH>; eeprom: eeprom@55 { compatible = "atmel,24c64"; /* 24AA64 */ @@ -93,6 +103,216 @@ eeprom: eeprom@55 { }; }; +&pinctrl0 { + status = "okay"; + pinctrl_i2c1_default: i2c1-default { + mux { + groups = "i2c1_9_grp"; + function = "i2c1"; + }; + + conf { + groups = "i2c1_9_grp"; + bias-pull-up; + slew-rate = ; + power-source = ; + }; + }; + + pinctrl_i2c1_gpio: i2c1-gpio { + mux { + groups = "gpio0_36_grp", "gpio0_37_grp"; + function = "gpio0"; + }; + + conf { + groups = "gpio0_36_grp", "gpio0_37_grp"; + slew-rate = ; + power-source = ; + }; + }; + + pinctrl_uart0_default: uart0-default { + mux { + groups = "uart0_8_grp"; + function = "uart0"; + }; + + conf { + groups = "uart0_8_grp"; + slew-rate = ; + power-source = ; + }; + + conf-rx { + pins = "MIO34"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO35"; + bias-disable; + }; + }; + + pinctrl_usb0_default: usb0-default { + mux { + groups = "usb0_0_grp"; + function = "usb0"; + }; + + conf { + groups = "usb0_0_grp"; + slew-rate = ; + power-source = ; + }; + + conf-rx { + pins = "MIO52", "MIO53", "MIO55"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO54", "MIO56", "MIO57", "MIO58", "MIO59", + "MIO60", "MIO61", "MIO62", "MIO63"; + bias-disable; + }; + }; + + pinctrl_gem3_default: gem3-default { + mux { + function = "ethernet3"; + groups = "ethernet3_0_grp"; + }; + + conf { + groups = "ethernet3_0_grp"; + slew-rate = ; + power-source = ; + }; + + conf-rx { + pins = "MIO70", "MIO71", "MIO72", "MIO73", "MIO74", + "MIO75"; + bias-high-impedance; + low-power-disable; + }; + + conf-tx { + pins = "MIO64", "MIO65", "MIO66", "MIO67", "MIO68", + "MIO69"; + bias-disable; + low-power-enable; + }; + + mux-mdio { + function = "mdio3"; + groups = "mdio3_0_grp"; + }; + + conf-mdio { + groups = "mdio3_0_grp"; + slew-rate = ; + power-source = ; + bias-disable; + }; + }; + + pinctrl_sdhci0_default: sdhci0-default { + mux { + groups = "sdio0_0_grp"; + function = "sdio0"; + }; + + conf { + groups = "sdio0_0_grp"; + slew-rate = ; + power-source = ; + bias-disable; + }; + + mux-cd { + groups = "sdio0_cd_0_grp"; + function = "sdio0_cd"; + }; + + conf-cd { + groups = "sdio0_cd_0_grp"; + bias-high-impedance; + bias-pull-up; + slew-rate = ; + power-source = ; + }; + + mux-wp { + groups = "sdio0_wp_0_grp"; + function = "sdio0_wp"; + }; + + conf-wp { + groups = "sdio0_wp_0_grp"; + bias-high-impedance; + bias-pull-up; + slew-rate = ; + power-source = ; + }; + }; + + pinctrl_sdhci1_default: sdhci1-default { + mux { + groups = "sdio1_0_grp"; + function = "sdio1"; + }; + + conf { + groups = "sdio1_0_grp"; + slew-rate = ; + power-source = ; + bias-disable; + }; + + mux-cd { + groups = "sdio1_cd_0_grp"; + function = "sdio1_cd"; + }; + + conf-cd { + groups = "sdio1_cd_0_grp"; + bias-high-impedance; + bias-pull-up; + slew-rate = ; + power-source = ; + }; + + mux-wp { + groups = "sdio1_wp_0_grp"; + function = "sdio1_wp"; + }; + + conf-wp { + groups = "sdio1_wp_0_grp"; + bias-high-impedance; + bias-pull-up; + slew-rate = ; + power-source = ; + }; + }; + + pinctrl_gpio_default: gpio-default { + mux { + function = "gpio0"; + groups = "gpio0_38_grp"; + }; + + conf { + groups = "gpio0_38_grp"; + bias-disable; + slew-rate = ; + power-source = ; + }; + }; +}; + &rtc { status = "okay"; }; @@ -113,20 +333,28 @@ &sata { /* eMMC */ &sdhci0 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sdhci0_default>; bus-width = <8>; }; /* SD1 with level shifter */ &sdhci1 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sdhci1_default>; }; &uart0 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart0_default>; }; /* ULPI SMSC USB3320 */ &usb0 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb0_default>; dr_mode = "host"; }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts index f7124e15f0ff..1ac105a82e1b 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts @@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP zc1751-xm016-dc2 * - * (C) Copyright 2015 - 2019, Xilinx, Inc. + * (C) Copyright 2015 - 2021, Xilinx, Inc. * * Michal Simek */ @@ -12,6 +12,7 @@ #include "zynqmp.dtsi" #include "zynqmp-clk-ccf.dtsi" #include +#include / { model = "ZynqMP zc1751-xm016-dc2 RevA"; @@ -42,10 +43,14 @@ memory@0 { &can0 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_can0_default>; }; &can1 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_can1_default>; }; &fpd_dma_chan1 { @@ -84,6 +89,8 @@ &gem2 { status = "okay"; phy-handle = <&phy0>; phy-mode = "rgmii-id"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gem2_default>; phy0: ethernet-phy@5 { reg = <5>; ti,rx-internal-delay = <0x8>; @@ -100,6 +107,11 @@ &gpio { &i2c0 { status = "okay"; clock-frequency = <400000>; + pinctrl-names = "default", "gpio"; + pinctrl-0 = <&pinctrl_i2c0_default>; + pinctrl-1 = <&pinctrl_i2c0_gpio>; + scl-gpios = <&gpio 6 GPIO_ACTIVE_HIGH>; + sda-gpios = <&gpio 7 GPIO_ACTIVE_HIGH>; tca6416_u26: gpio@20 { compatible = "ti,tca6416"; @@ -115,6 +127,285 @@ rtc@68 { }; }; +&pinctrl0 { + status = "okay"; + pinctrl_can0_default: can0-default { + mux { + function = "can0"; + groups = "can0_9_grp"; + }; + + conf { + groups = "can0_9_grp"; + slew-rate = ; + power-source = ; + }; + + conf-rx { + pins = "MIO38"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO39"; + bias-disable; + }; + }; + + pinctrl_can1_default: can1-default { + mux { + function = "can1"; + groups = "can1_8_grp"; + }; + + conf { + groups = "can1_8_grp"; + slew-rate = ; + power-source = ; + }; + + conf-rx { + pins = "MIO33"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO32"; + bias-disable; + }; + }; + + pinctrl_i2c0_default: i2c0-default { + mux { + groups = "i2c0_1_grp"; + function = "i2c0"; + }; + + conf { + groups = "i2c0_1_grp"; + bias-pull-up; + slew-rate = ; + power-source = ; + }; + }; + + pinctrl_i2c0_gpio: i2c0-gpio { + mux { + groups = "gpio0_6_grp", "gpio0_7_grp"; + function = "gpio0"; + }; + + conf { + groups = "gpio0_6_grp", "gpio0_7_grp"; + slew-rate = ; + power-source = ; + }; + }; + + pinctrl_uart0_default: uart0-default { + mux { + groups = "uart0_10_grp"; + function = "uart0"; + }; + + conf { + groups = "uart0_10_grp"; + slew-rate = ; + power-source = ; + }; + + conf-rx { + pins = "MIO42"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO43"; + bias-disable; + }; + }; + + pinctrl_uart1_default: uart1-default { + mux { + groups = "uart1_10_grp"; + function = "uart1"; + }; + + conf { + groups = "uart1_10_grp"; + slew-rate = ; + power-source = ; + }; + + conf-rx { + pins = "MIO41"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO40"; + bias-disable; + }; + }; + + pinctrl_usb1_default: usb1-default { + mux { + groups = "usb1_0_grp"; + function = "usb1"; + }; + + conf { + groups = "usb1_0_grp"; + slew-rate = ; + power-source = ; + }; + + conf-rx { + pins = "MIO64", "MIO65", "MIO67"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO66", "MIO68", "MIO69", "MIO70", "MIO71", + "MIO72", "MIO73", "MIO74", "MIO75"; + bias-disable; + }; + }; + + pinctrl_gem2_default: gem2-default { + mux { + function = "ethernet2"; + groups = "ethernet2_0_grp"; + }; + + conf { + groups = "ethernet2_0_grp"; + slew-rate = ; + power-source = ; + }; + + conf-rx { + pins = "MIO58", "MIO59", "MIO60", "MIO61", "MIO62", + "MIO63"; + bias-high-impedance; + low-power-disable; + }; + + conf-tx { + pins = "MIO52", "MIO53", "MIO54", "MIO55", "MIO56", + "MIO57"; + bias-disable; + low-power-enable; + }; + + mux-mdio { + function = "mdio2"; + groups = "mdio2_0_grp"; + }; + + conf-mdio { + groups = "mdio2_0_grp"; + slew-rate = ; + power-source = ; + bias-disable; + }; + }; + + pinctrl_nand0_default: nand0-default { + mux { + groups = "nand0_0_grp"; + function = "nand0"; + }; + + conf { + groups = "nand0_0_grp"; + bias-pull-up; + }; + + mux-ce { + groups = "nand0_ce_0_grp"; + function = "nand0_ce"; + }; + + conf-ce { + groups = "nand0_ce_0_grp"; + bias-pull-up; + }; + + mux-rb { + groups = "nand0_rb_0_grp"; + function = "nand0_rb"; + }; + + conf-rb { + groups = "nand0_rb_0_grp"; + bias-pull-up; + }; + + mux-dqs { + groups = "nand0_dqs_0_grp"; + function = "nand0_dqs"; + }; + + conf-dqs { + groups = "nand0_dqs_0_grp"; + bias-pull-up; + }; + }; + + pinctrl_spi0_default: spi0-default { + mux { + groups = "spi0_0_grp"; + function = "spi0"; + }; + + conf { + groups = "spi0_0_grp"; + bias-disable; + slew-rate = ; + power-source = ; + }; + + mux-cs { + groups = "spi0_ss_0_grp", "spi0_ss_1_grp", + "spi0_ss_2_grp"; + function = "spi0_ss"; + }; + + conf-cs { + groups = "spi0_ss_0_grp", "spi0_ss_1_grp", + "spi0_ss_2_grp"; + bias-disable; + }; + }; + + pinctrl_spi1_default: spi1-default { + mux { + groups = "spi1_3_grp"; + function = "spi1"; + }; + + conf { + groups = "spi1_3_grp"; + bias-disable; + slew-rate = ; + power-source = ; + }; + + mux-cs { + groups = "spi1_ss_9_grp", "spi1_ss_10_grp", + "spi1_ss_11_grp"; + function = "spi1_ss"; + }; + + conf-cs { + groups = "spi1_ss_9_grp", "spi1_ss_10_grp", + "spi1_ss_11_grp"; + bias-disable; + }; + }; +}; + &rtc { status = "okay"; }; @@ -122,6 +413,8 @@ &rtc { &spi0 { status = "okay"; num-cs = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi0_default>; spi0_flash0: flash@0 { #address-cells = <1>; @@ -140,6 +433,8 @@ partition@0 { &spi1 { status = "okay"; num-cs = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi1_default>; spi1_flash0: flash@0 { #address-cells = <1>; @@ -158,13 +453,19 @@ partition@0 { /* ULPI SMSC USB3320 */ &usb1 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb1_default>; dr_mode = "host"; }; &uart0 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart0_default>; }; &uart1 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart1_default>; }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm019-dc5.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm019-dc5.dts index 41934e3525c6..6c9460a0707c 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm019-dc5.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm019-dc5.dts @@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP zc1751-xm019-dc5 * - * (C) Copyright 2015 - 2019, Xilinx, Inc. + * (C) Copyright 2015 - 2021, Xilinx, Inc. * * Siva Durga Prasad * Michal Simek @@ -13,6 +13,7 @@ #include "zynqmp.dtsi" #include "zynqmp-clk-ccf.dtsi" #include +#include / { model = "ZynqMP zc1751-xm019-dc5 RevA"; @@ -74,6 +75,8 @@ &gem1 { status = "okay"; phy-handle = <&phy0>; phy-mode = "rgmii-id"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gem1_default>; phy0: ethernet-phy@0 { reg = <0>; }; @@ -85,41 +88,365 @@ &gpio { &i2c0 { status = "okay"; + pinctrl-names = "default", "gpio"; + pinctrl-0 = <&pinctrl_i2c0_default>; + pinctrl-1 = <&pinctrl_i2c0_gpio>; + scl-gpios = <&gpio 74 GPIO_ACTIVE_HIGH>; + sda-gpios = <&gpio 75 GPIO_ACTIVE_HIGH>; }; &i2c1 { status = "okay"; + pinctrl-names = "default", "gpio"; + pinctrl-0 = <&pinctrl_i2c1_default>; + pinctrl-1 = <&pinctrl_i2c1_gpio>; + scl-gpios = <&gpio 76 GPIO_ACTIVE_HIGH>; + sda-gpios = <&gpio 77 GPIO_ACTIVE_HIGH>; + +}; + +&pinctrl0 { + status = "okay"; + pinctrl_i2c0_default: i2c0-default { + mux { + groups = "i2c0_18_grp"; + function = "i2c0"; + }; + + conf { + groups = "i2c0_18_grp"; + bias-pull-up; + slew-rate = ; + power-source = ; + }; + }; + + pinctrl_i2c0_gpio: i2c0-gpio { + mux { + groups = "gpio0_74_grp", "gpio0_75_grp"; + function = "gpio0"; + }; + + conf { + groups = "gpio0_74_grp", "gpio0_75_grp"; + slew-rate = ; + power-source = ; + }; + }; + + pinctrl_i2c1_default: i2c1-default { + mux { + groups = "i2c1_19_grp"; + function = "i2c1"; + }; + + conf { + groups = "i2c1_19_grp"; + bias-pull-up; + slew-rate = ; + power-source = ; + }; + }; + + pinctrl_i2c1_gpio: i2c1-gpio { + mux { + groups = "gpio0_76_grp", "gpio0_77_grp"; + function = "gpio0"; + }; + + conf { + groups = "gpio0_76_grp", "gpio0_77_grp"; + slew-rate = ; + power-source = ; + }; + }; + + pinctrl_uart0_default: uart0-default { + mux { + groups = "uart0_17_grp"; + function = "uart0"; + }; + + conf { + groups = "uart0_17_grp"; + slew-rate = ; + power-source = ; + }; + + conf-rx { + pins = "MIO70"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO71"; + bias-disable; + }; + }; + + pinctrl_uart1_default: uart1-default { + mux { + groups = "uart1_18_grp"; + function = "uart1"; + }; + + conf { + groups = "uart1_18_grp"; + slew-rate = ; + power-source = ; + }; + + conf-rx { + pins = "MIO73"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO72"; + bias-disable; + }; + }; + + pinctrl_gem1_default: gem1-default { + mux { + function = "ethernet1"; + groups = "ethernet1_0_grp"; + }; + + conf { + groups = "ethernet1_0_grp"; + slew-rate = ; + power-source = ; + }; + + conf-rx { + pins = "MIO44", "MIO45", "MIO46", "MIO47", "MIO48", + "MIO49"; + bias-high-impedance; + low-power-disable; + }; + + conf-tx { + pins = "MIO38", "MIO39", "MIO40", "MIO41", "MIO42", + "MIO43"; + bias-disable; + low-power-enable; + }; + + mux-mdio { + function = "mdio1"; + groups = "mdio1_0_grp"; + }; + + conf-mdio { + groups = "mdio1_0_grp"; + slew-rate = ; + power-source = ; + bias-disable; + }; + }; + + pinctrl_sdhci0_default: sdhci0-default { + mux { + groups = "sdio0_0_grp"; + function = "sdio0"; + }; + + conf { + groups = "sdio0_0_grp"; + slew-rate = ; + power-source = ; + bias-disable; + }; + + mux-cd { + groups = "sdio0_cd_0_grp"; + function = "sdio0_cd"; + }; + + conf-cd { + groups = "sdio0_cd_0_grp"; + bias-high-impedance; + bias-pull-up; + slew-rate = ; + power-source = ; + }; + + mux-wp { + groups = "sdio0_wp_0_grp"; + function = "sdio0_wp"; + }; + + conf-wp { + groups = "sdio0_wp_0_grp"; + bias-high-impedance; + bias-pull-up; + slew-rate = ; + power-source = ; + }; + }; + + pinctrl_watchdog0_default: watchdog0-default { + mux-clk { + groups = "swdt0_clk_1_grp"; + function = "swdt0_clk"; + }; + + conf-clk { + groups = "swdt0_clk_1_grp"; + bias-pull-up; + }; + + mux-rst { + groups = "swdt0_rst_1_grp"; + function = "swdt0_rst"; + }; + + conf-rst { + groups = "swdt0_rst_1_grp"; + bias-disable; + slew-rate = ; + }; + }; + + pinctrl_ttc0_default: ttc0-default { + mux-clk { + groups = "ttc0_clk_0_grp"; + function = "ttc0_clk"; + }; + + conf-clk { + groups = "ttc0_clk_0_grp"; + bias-pull-up; + }; + + mux-wav { + groups = "ttc0_wav_0_grp"; + function = "ttc0_wav"; + }; + + conf-wav { + groups = "ttc0_wav_0_grp"; + bias-disable; + slew-rate = ; + }; + }; + + pinctrl_ttc1_default: ttc1-default { + mux-clk { + groups = "ttc1_clk_0_grp"; + function = "ttc1_clk"; + }; + + conf-clk { + groups = "ttc1_clk_0_grp"; + bias-pull-up; + }; + + mux-wav { + groups = "ttc1_wav_0_grp"; + function = "ttc1_wav"; + }; + + conf-wav { + groups = "ttc1_wav_0_grp"; + bias-disable; + slew-rate = ; + }; + }; + + pinctrl_ttc2_default: ttc2-default { + mux-clk { + groups = "ttc2_clk_0_grp"; + function = "ttc2_clk"; + }; + + conf-clk { + groups = "ttc2_clk_0_grp"; + bias-pull-up; + }; + + mux-wav { + groups = "ttc2_wav_0_grp"; + function = "ttc2_wav"; + }; + + conf-wav { + groups = "ttc2_wav_0_grp"; + bias-disable; + slew-rate = ; + }; + }; + + pinctrl_ttc3_default: ttc3-default { + mux-clk { + groups = "ttc3_clk_0_grp"; + function = "ttc3_clk"; + }; + + conf-clk { + groups = "ttc3_clk_0_grp"; + bias-pull-up; + }; + + mux-wav { + groups = "ttc3_wav_0_grp"; + function = "ttc3_wav"; + }; + + conf-wav { + groups = "ttc3_wav_0_grp"; + bias-disable; + slew-rate = ; + }; + }; }; &sdhci0 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sdhci0_default>; no-1-8-v; }; &ttc0 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ttc0_default>; }; &ttc1 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ttc1_default>; }; &ttc2 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ttc2_default>; }; &ttc3 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ttc3_default>; }; &uart0 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart0_default>; }; &uart1 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart1_default>; }; &watchdog0 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_watchdog0_default>; }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts index a53598c3624b..9c40c6552c32 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts @@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP ZCU100 revC * - * (C) Copyright 2016 - 2019, Xilinx, Inc. + * (C) Copyright 2016 - 2021, Xilinx, Inc. * * Michal Simek * Nathalie Chan King Choy @@ -15,6 +15,7 @@ #include #include #include +#include #include / { @@ -160,6 +161,11 @@ &gpio { &i2c1 { status = "okay"; + pinctrl-names = "default", "gpio"; + pinctrl-0 = <&pinctrl_i2c1_default>; + pinctrl-1 = <&pinctrl_i2c1_gpio>; + scl-gpios = <&gpio 4 GPIO_ACTIVE_HIGH>; + sda-gpios = <&gpio 5 GPIO_ACTIVE_HIGH>; clock-frequency = <100000>; i2c-mux@75 { /* u11 */ compatible = "nxp,pca9548"; @@ -237,8 +243,222 @@ i2csw_7: i2c@7 { }; }; -&psgtr { +&pinctrl0 { status = "okay"; + pinctrl_i2c1_default: i2c1-default { + mux { + groups = "i2c1_1_grp"; + function = "i2c1"; + }; + + conf { + groups = "i2c1_1_grp"; + bias-pull-up; + slew-rate = ; + power-source = ; + }; + }; + + pinctrl_i2c1_gpio: i2c1-gpio { + mux { + groups = "gpio0_4_grp", "gpio0_5_grp"; + function = "gpio0"; + }; + + conf { + groups = "gpio0_4_grp", "gpio0_5_grp"; + slew-rate = ; + power-source = ; + }; + }; + + pinctrl_sdhci0_default: sdhci0-default { + mux { + groups = "sdio0_3_grp"; + function = "sdio0"; + }; + + conf { + groups = "sdio0_3_grp"; + slew-rate = ; + power-source = ; + bias-disable; + }; + + mux-cd { + groups = "sdio0_cd_0_grp"; + function = "sdio0_cd"; + }; + + conf-cd { + groups = "sdio0_cd_0_grp"; + bias-high-impedance; + bias-pull-up; + slew-rate = ; + power-source = ; + }; + }; + + pinctrl_sdhci1_default: sdhci1-default { + mux { + groups = "sdio1_2_grp"; + function = "sdio1"; + }; + + conf { + groups = "sdio1_2_grp"; + slew-rate = ; + power-source = ; + bias-disable; + }; + }; + + pinctrl_spi0_default: spi0-default { + mux { + groups = "spi0_3_grp"; + function = "spi0"; + }; + + conf { + groups = "spi0_3_grp"; + bias-disable; + slew-rate = ; + power-source = ; + }; + + mux-cs { + groups = "spi0_ss_9_grp"; + function = "spi0_ss"; + }; + + conf-cs { + groups = "spi0_ss_9_grp"; + bias-disable; + }; + + }; + + pinctrl_spi1_default: spi1-default { + mux { + groups = "spi1_0_grp"; + function = "spi1"; + }; + + conf { + groups = "spi1_0_grp"; + bias-disable; + slew-rate = ; + power-source = ; + }; + + mux-cs { + groups = "spi1_ss_0_grp"; + function = "spi1_ss"; + }; + + conf-cs { + groups = "spi1_ss_0_grp"; + bias-disable; + }; + + }; + + pinctrl_uart0_default: uart0-default { + mux { + groups = "uart0_0_grp"; + function = "uart0"; + }; + + conf { + groups = "uart0_0_grp"; + slew-rate = ; + power-source = ; + }; + + conf-rx { + pins = "MIO3"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO2"; + bias-disable; + }; + }; + + pinctrl_uart1_default: uart1-default { + mux { + groups = "uart1_0_grp"; + function = "uart1"; + }; + + conf { + groups = "uart1_0_grp"; + slew-rate = ; + power-source = ; + }; + + conf-rx { + pins = "MIO1"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO0"; + bias-disable; + }; + }; + + pinctrl_usb0_default: usb0-default { + mux { + groups = "usb0_0_grp"; + function = "usb0"; + }; + + conf { + groups = "usb0_0_grp"; + slew-rate = ; + power-source = ; + }; + + conf-rx { + pins = "MIO52", "MIO53", "MIO55"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO54", "MIO56", "MIO57", "MIO58", "MIO59", + "MIO60", "MIO61", "MIO62", "MIO63"; + bias-disable; + }; + }; + + pinctrl_usb1_default: usb1-default { + mux { + groups = "usb1_0_grp"; + function = "usb1"; + }; + + conf { + groups = "usb1_0_grp"; + slew-rate = ; + power-source = ; + }; + + conf-rx { + pins = "MIO64", "MIO65", "MIO67"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO66", "MIO68", "MIO69", "MIO70", "MIO71", + "MIO72", "MIO73", "MIO74", "MIO75"; + bias-disable; + }; + }; +}; + +&psgtr { /* usb3, dps */ clocks = <&si5335a_0>, <&si5335a_1>; clock-names = "ref0", "ref1"; @@ -253,12 +473,16 @@ &sdhci0 { status = "okay"; no-1-8-v; disable-wp; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sdhci0_default>; xlnx,mio-bank = <0>; }; &sdhci1 { status = "okay"; bus-width = <0x4>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sdhci1_default>; xlnx,mio-bank = <0>; non-removable; disable-wp; @@ -279,16 +503,22 @@ &spi0 { /* Low Speed connector */ status = "okay"; label = "LS-SPI0"; num-cs = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi0_default>; }; &spi1 { /* High Speed connector */ status = "okay"; label = "HS-SPI1"; num-cs = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi1_default>; }; &uart0 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart0_default>; bluetooth { compatible = "ti,wl1831-st"; enable-gpios = <&gpio 8 GPIO_ACTIVE_HIGH>; @@ -297,18 +527,23 @@ bluetooth { &uart1 { status = "okay"; - + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart1_default>; }; /* ULPI SMSC USB3320 */ &usb0 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb0_default>; dr_mode = "peripheral"; }; /* ULPI SMSC USB3320 */ &usb1 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb1_default>; dr_mode = "host"; }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts index eca6c2de84a7..b37aee2d85b9 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts @@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP ZCU102 RevA * - * (C) Copyright 2015 - 2019, Xilinx, Inc. + * (C) Copyright 2015 - 2021, Xilinx, Inc. * * Michal Simek */ @@ -13,6 +13,7 @@ #include "zynqmp-clk-ccf.dtsi" #include #include +#include #include / { @@ -150,6 +151,8 @@ refhdmi: refhdmi { &can1 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_can1_default>; }; &dcc { @@ -192,6 +195,8 @@ &gem3 { status = "okay"; phy-handle = <&phy0>; phy-mode = "rgmii-id"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gem3_default>; phy0: ethernet-phy@21 { reg = <21>; ti,rx-internal-delay = <0x8>; @@ -203,11 +208,18 @@ phy0: ethernet-phy@21 { &gpio { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpio_default>; }; &i2c0 { status = "okay"; clock-frequency = <400000>; + pinctrl-names = "default", "gpio"; + pinctrl-0 = <&pinctrl_i2c0_default>; + pinctrl-1 = <&pinctrl_i2c0_gpio>; + scl-gpios = <&gpio 14 GPIO_ACTIVE_HIGH>; + sda-gpios = <&gpio 15 GPIO_ACTIVE_HIGH>; tca6416_u97: gpio@20 { compatible = "ti,tca6416"; @@ -468,6 +480,11 @@ max20751@73 { /* u96 */ &i2c1 { status = "okay"; clock-frequency = <400000>; + pinctrl-names = "default", "gpio"; + pinctrl-0 = <&pinctrl_i2c1_default>; + pinctrl-1 = <&pinctrl_i2c1_gpio>; + scl-gpios = <&gpio 16 GPIO_ACTIVE_HIGH>; + sda-gpios = <&gpio 17 GPIO_ACTIVE_HIGH>; /* PL i2c via PCA9306 - u45 */ i2c-mux@74 { /* u34 */ @@ -642,6 +659,269 @@ i2c@7 { }; }; +&pinctrl0 { + status = "okay"; + pinctrl_i2c0_default: i2c0-default { + mux { + groups = "i2c0_3_grp"; + function = "i2c0"; + }; + + conf { + groups = "i2c0_3_grp"; + bias-pull-up; + slew-rate = ; + power-source = ; + }; + }; + + pinctrl_i2c0_gpio: i2c0-gpio { + mux { + groups = "gpio0_14_grp", "gpio0_15_grp"; + function = "gpio0"; + }; + + conf { + groups = "gpio0_14_grp", "gpio0_15_grp"; + slew-rate = ; + power-source = ; + }; + }; + + pinctrl_i2c1_default: i2c1-default { + mux { + groups = "i2c1_4_grp"; + function = "i2c1"; + }; + + conf { + groups = "i2c1_4_grp"; + bias-pull-up; + slew-rate = ; + power-source = ; + }; + }; + + pinctrl_i2c1_gpio: i2c1-gpio { + mux { + groups = "gpio0_16_grp", "gpio0_17_grp"; + function = "gpio0"; + }; + + conf { + groups = "gpio0_16_grp", "gpio0_17_grp"; + slew-rate = ; + power-source = ; + }; + }; + + pinctrl_uart0_default: uart0-default { + mux { + groups = "uart0_4_grp"; + function = "uart0"; + }; + + conf { + groups = "uart0_4_grp"; + slew-rate = ; + power-source = ; + }; + + conf-rx { + pins = "MIO18"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO19"; + bias-disable; + }; + }; + + pinctrl_uart1_default: uart1-default { + mux { + groups = "uart1_5_grp"; + function = "uart1"; + }; + + conf { + groups = "uart1_5_grp"; + slew-rate = ; + power-source = ; + }; + + conf-rx { + pins = "MIO21"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO20"; + bias-disable; + }; + }; + + pinctrl_usb0_default: usb0-default { + mux { + groups = "usb0_0_grp"; + function = "usb0"; + }; + + conf { + groups = "usb0_0_grp"; + slew-rate = ; + power-source = ; + }; + + conf-rx { + pins = "MIO52", "MIO53", "MIO55"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO54", "MIO56", "MIO57", "MIO58", "MIO59", + "MIO60", "MIO61", "MIO62", "MIO63"; + bias-disable; + }; + }; + + pinctrl_gem3_default: gem3-default { + mux { + function = "ethernet3"; + groups = "ethernet3_0_grp"; + }; + + conf { + groups = "ethernet3_0_grp"; + slew-rate = ; + power-source = ; + }; + + conf-rx { + pins = "MIO70", "MIO71", "MIO72", "MIO73", "MIO74", + "MIO75"; + bias-high-impedance; + low-power-disable; + }; + + conf-tx { + pins = "MIO64", "MIO65", "MIO66", "MIO67", "MIO68", + "MIO69"; + bias-disable; + low-power-enable; + }; + + mux-mdio { + function = "mdio3"; + groups = "mdio3_0_grp"; + }; + + conf-mdio { + groups = "mdio3_0_grp"; + slew-rate = ; + power-source = ; + bias-disable; + }; + }; + + pinctrl_can1_default: can1-default { + mux { + function = "can1"; + groups = "can1_6_grp"; + }; + + conf { + groups = "can1_6_grp"; + slew-rate = ; + power-source = ; + }; + + conf-rx { + pins = "MIO25"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO24"; + bias-disable; + }; + }; + + pinctrl_sdhci1_default: sdhci1-default { + mux { + groups = "sdio1_0_grp"; + function = "sdio1"; + }; + + conf { + groups = "sdio1_0_grp"; + slew-rate = ; + power-source = ; + bias-disable; + }; + + mux-cd { + groups = "sdio1_cd_0_grp"; + function = "sdio1_cd"; + }; + + conf-cd { + groups = "sdio1_cd_0_grp"; + bias-high-impedance; + bias-pull-up; + slew-rate = ; + power-source = ; + }; + + mux-wp { + groups = "sdio1_wp_0_grp"; + function = "sdio1_wp"; + }; + + conf-wp { + groups = "sdio1_wp_0_grp"; + bias-high-impedance; + bias-pull-up; + slew-rate = ; + power-source = ; + }; + }; + + pinctrl_gpio_default: gpio-default { + mux-sw { + function = "gpio0"; + groups = "gpio0_22_grp", "gpio0_23_grp"; + }; + + conf-sw { + groups = "gpio0_22_grp", "gpio0_23_grp"; + slew-rate = ; + power-source = ; + }; + + mux-msp { + function = "gpio0"; + groups = "gpio0_13_grp", "gpio0_38_grp"; + }; + + conf-msp { + groups = "gpio0_13_grp", "gpio0_38_grp"; + slew-rate = ; + power-source = ; + }; + + conf-pull-up { + pins = "MIO22", "MIO23"; + bias-pull-up; + }; + + conf-pull-none { + pins = "MIO13", "MIO38"; + bias-disable; + }; + }; +}; + &pcie { status = "okay"; }; @@ -676,20 +956,28 @@ &sata { &sdhci1 { status = "okay"; no-1-8-v; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sdhci1_default>; xlnx,mio-bank = <1>; }; &uart0 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart0_default>; }; &uart1 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart1_default>; }; /* ULPI SMSC USB3320 */ &usb0 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb0_default>; dr_mode = "host"; }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts index 5c35edd736aa..7e1b024f71e1 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts @@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP ZCU104 * - * (C) Copyright 2017 - 2019, Xilinx, Inc. + * (C) Copyright 2017 - 2021, Xilinx, Inc. * * Michal Simek */ @@ -12,6 +12,7 @@ #include "zynqmp.dtsi" #include "zynqmp-clk-ccf.dtsi" #include +#include #include / { @@ -59,6 +60,8 @@ clock_8t49n287_3: clk27 { &can1 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_can1_default>; }; &dcc { @@ -101,6 +104,8 @@ &gem3 { status = "okay"; phy-handle = <&phy0>; phy-mode = "rgmii-id"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gem3_default>; phy0: ethernet-phy@c { reg = <0xc>; ti,rx-internal-delay = <0x8>; @@ -117,6 +122,11 @@ &gpio { &i2c1 { status = "okay"; clock-frequency = <400000>; + pinctrl-names = "default", "gpio"; + pinctrl-0 = <&pinctrl_i2c1_default>; + pinctrl-1 = <&pinctrl_i2c1_gpio>; + scl-gpios = <&gpio 16 GPIO_ACTIVE_HIGH>; + sda-gpios = <&gpio 17 GPIO_ACTIVE_HIGH>; /* Another connection to this bus via PL i2c via PCA9306 - u45 */ i2c-mux@74 { /* u34 */ @@ -207,6 +217,204 @@ i2c@7 { }; }; +&pinctrl0 { + status = "okay"; + + pinctrl_can1_default: can1-default { + mux { + function = "can1"; + groups = "can1_6_grp"; + }; + + conf { + groups = "can1_6_grp"; + slew-rate = ; + power-source = ; + drive-strength = <12>; + }; + + conf-rx { + pins = "MIO25"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO24"; + bias-disable; + }; + }; + + pinctrl_i2c1_default: i2c1-default { + mux { + groups = "i2c1_4_grp"; + function = "i2c1"; + }; + + conf { + groups = "i2c1_4_grp"; + bias-pull-up; + slew-rate = ; + power-source = ; + drive-strength = <12>; + }; + }; + + pinctrl_i2c1_gpio: i2c1-gpio { + mux { + groups = "gpio0_16_grp", "gpio0_17_grp"; + function = "gpio0"; + }; + + conf { + groups = "gpio0_16_grp", "gpio0_17_grp"; + slew-rate = ; + power-source = ; + drive-strength = <12>; + }; + }; + + pinctrl_gem3_default: gem3-default { + mux { + function = "ethernet3"; + groups = "ethernet3_0_grp"; + }; + + conf { + groups = "ethernet3_0_grp"; + slew-rate = ; + power-source = ; + drive-strength = <12>; + }; + + conf-rx { + pins = "MIO70", "MIO71", "MIO72", "MIO73", "MIO74", + "MIO75"; + bias-high-impedance; + low-power-disable; + }; + + conf-tx { + pins = "MIO64", "MIO65", "MIO66", "MIO67", "MIO68", + "MIO69"; + bias-disable; + low-power-enable; + }; + + mux-mdio { + function = "mdio3"; + groups = "mdio3_0_grp"; + }; + + conf-mdio { + groups = "mdio3_0_grp"; + slew-rate = ; + power-source = ; + bias-disable; + }; + }; + + pinctrl_sdhci1_default: sdhci1-default { + mux { + groups = "sdio1_0_grp"; + function = "sdio1"; + }; + + conf { + groups = "sdio1_0_grp"; + slew-rate = ; + power-source = ; + bias-disable; + drive-strength = <12>; + }; + + mux-cd { + groups = "sdio1_cd_0_grp"; + function = "sdio1_cd"; + }; + + conf-cd { + groups = "sdio1_cd_0_grp"; + bias-high-impedance; + bias-pull-up; + slew-rate = ; + power-source = ; + }; + }; + + pinctrl_uart0_default: uart0-default { + mux { + groups = "uart0_4_grp"; + function = "uart0"; + }; + + conf { + groups = "uart0_4_grp"; + slew-rate = ; + power-source = ; + drive-strength = <12>; + }; + + conf-rx { + pins = "MIO18"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO19"; + bias-disable; + }; + }; + + pinctrl_uart1_default: uart1-default { + mux { + groups = "uart1_5_grp"; + function = "uart1"; + }; + + conf { + groups = "uart1_5_grp"; + slew-rate = ; + power-source = ; + drive-strength = <12>; + }; + + conf-rx { + pins = "MIO21"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO20"; + bias-disable; + }; + }; + + pinctrl_usb0_default: usb0-default { + mux { + groups = "usb0_0_grp"; + function = "usb0"; + }; + + conf { + groups = "usb0_0_grp"; + slew-rate = ; + power-source = ; + drive-strength = <12>; + }; + + conf-rx { + pins = "MIO52", "MIO53", "MIO55"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO54", "MIO56", "MIO57", "MIO58", "MIO59", + "MIO60", "MIO61", "MIO62", "MIO63"; + bias-disable; + }; + }; +}; + &rtc { status = "okay"; }; @@ -237,21 +445,29 @@ &sata { &sdhci1 { status = "okay"; no-1-8-v; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sdhci1_default>; xlnx,mio-bank = <1>; disable-wp; }; &uart0 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart0_default>; }; &uart1 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart1_default>; }; /* ULPI SMSC USB3320 */ &usb0 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb0_default>; dr_mode = "host"; }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts index 7f2e32831b05..b140fd2c86aa 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts @@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP ZCU104 * - * (C) Copyright 2017 - 2020, Xilinx, Inc. + * (C) Copyright 2017 - 2021, Xilinx, Inc. * * Michal Simek */ @@ -12,6 +12,7 @@ #include "zynqmp.dtsi" #include "zynqmp-clk-ccf.dtsi" #include +#include #include / { @@ -64,6 +65,8 @@ clock_8t49n287_3: clk27 { &can1 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_can1_default>; }; &dcc { @@ -106,6 +109,8 @@ &gem3 { status = "okay"; phy-handle = <&phy0>; phy-mode = "rgmii-id"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gem3_default>; phy0: ethernet-phy@c { reg = <0xc>; ti,rx-internal-delay = <0x8>; @@ -122,6 +127,11 @@ &gpio { &i2c1 { status = "okay"; clock-frequency = <400000>; + pinctrl-names = "default", "gpio"; + pinctrl-0 = <&pinctrl_i2c1_default>; + pinctrl-1 = <&pinctrl_i2c1_gpio>; + scl-gpios = <&gpio 16 GPIO_ACTIVE_HIGH>; + sda-gpios = <&gpio 17 GPIO_ACTIVE_HIGH>; tca6416_u97: gpio@20 { compatible = "ti,tca6416"; @@ -219,6 +229,204 @@ i2c@7 { }; }; +&pinctrl0 { + status = "okay"; + + pinctrl_can1_default: can1-default { + mux { + function = "can1"; + groups = "can1_6_grp"; + }; + + conf { + groups = "can1_6_grp"; + slew-rate = ; + power-source = ; + drive-strength = <12>; + }; + + conf-rx { + pins = "MIO25"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO24"; + bias-disable; + }; + }; + + pinctrl_i2c1_default: i2c1-default { + mux { + groups = "i2c1_4_grp"; + function = "i2c1"; + }; + + conf { + groups = "i2c1_4_grp"; + bias-pull-up; + slew-rate = ; + power-source = ; + drive-strength = <12>; + }; + }; + + pinctrl_i2c1_gpio: i2c1-gpio { + mux { + groups = "gpio0_16_grp", "gpio0_17_grp"; + function = "gpio0"; + }; + + conf { + groups = "gpio0_16_grp", "gpio0_17_grp"; + slew-rate = ; + power-source = ; + drive-strength = <12>; + }; + }; + + pinctrl_gem3_default: gem3-default { + mux { + function = "ethernet3"; + groups = "ethernet3_0_grp"; + }; + + conf { + groups = "ethernet3_0_grp"; + slew-rate = ; + power-source = ; + drive-strength = <12>; + }; + + conf-rx { + pins = "MIO70", "MIO71", "MIO72", "MIO73", "MIO74", + "MIO75"; + bias-high-impedance; + low-power-disable; + }; + + conf-tx { + pins = "MIO64", "MIO65", "MIO66", "MIO67", "MIO68", + "MIO69"; + bias-disable; + low-power-enable; + }; + + mux-mdio { + function = "mdio3"; + groups = "mdio3_0_grp"; + }; + + conf-mdio { + groups = "mdio3_0_grp"; + slew-rate = ; + power-source = ; + bias-disable; + }; + }; + + pinctrl_sdhci1_default: sdhci1-default { + mux { + groups = "sdio1_0_grp"; + function = "sdio1"; + }; + + conf { + groups = "sdio1_0_grp"; + slew-rate = ; + power-source = ; + bias-disable; + drive-strength = <12>; + }; + + mux-cd { + groups = "sdio1_cd_0_grp"; + function = "sdio1_cd"; + }; + + conf-cd { + groups = "sdio1_cd_0_grp"; + bias-high-impedance; + bias-pull-up; + slew-rate = ; + power-source = ; + }; + }; + + pinctrl_uart0_default: uart0-default { + mux { + groups = "uart0_4_grp"; + function = "uart0"; + }; + + conf { + groups = "uart0_4_grp"; + slew-rate = ; + power-source = ; + drive-strength = <12>; + }; + + conf-rx { + pins = "MIO18"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO19"; + bias-disable; + }; + }; + + pinctrl_uart1_default: uart1-default { + mux { + groups = "uart1_5_grp"; + function = "uart1"; + }; + + conf { + groups = "uart1_5_grp"; + slew-rate = ; + power-source = ; + drive-strength = <12>; + }; + + conf-rx { + pins = "MIO21"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO20"; + bias-disable; + }; + }; + + pinctrl_usb0_default: usb0-default { + mux { + groups = "usb0_0_grp"; + function = "usb0"; + }; + + conf { + groups = "usb0_0_grp"; + slew-rate = ; + power-source = ; + drive-strength = <12>; + }; + + conf-rx { + pins = "MIO52", "MIO53", "MIO55"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO54", "MIO56", "MIO57", "MIO58", "MIO59", + "MIO60", "MIO61", "MIO62", "MIO63"; + bias-disable; + }; + }; +}; + &qspi { status = "okay"; flash@0 { @@ -259,21 +467,29 @@ &sata { &sdhci1 { status = "okay"; no-1-8-v; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sdhci1_default>; xlnx,mio-bank = <1>; disable-wp; }; &uart0 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart0_default>; }; &uart1 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart1_default>; }; /* ULPI SMSC USB3320 */ &usb0 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb0_default>; dr_mode = "host"; }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts index eff7c6447087..4919cdec835b 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts @@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP ZCU106 * - * (C) Copyright 2016 - 2019, Xilinx, Inc. + * (C) Copyright 2016 - 2021, Xilinx, Inc. * * Michal Simek */ @@ -13,6 +13,7 @@ #include "zynqmp-clk-ccf.dtsi" #include #include +#include #include / { @@ -150,6 +151,8 @@ refhdmi: refhdmi { &can1 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_can1_default>; }; &dcc { @@ -204,6 +207,8 @@ &gem3 { status = "okay"; phy-handle = <&phy0>; phy-mode = "rgmii-id"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gem3_default>; phy0: ethernet-phy@c { reg = <0xc>; ti,rx-internal-delay = <0x8>; @@ -215,11 +220,18 @@ phy0: ethernet-phy@c { &gpio { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpio_default>; }; &i2c0 { status = "okay"; clock-frequency = <400000>; + pinctrl-names = "default", "gpio"; + pinctrl-0 = <&pinctrl_i2c0_default>; + pinctrl-1 = <&pinctrl_i2c0_gpio>; + scl-gpios = <&gpio 14 GPIO_ACTIVE_HIGH>; + sda-gpios = <&gpio 15 GPIO_ACTIVE_HIGH>; tca6416_u97: gpio@20 { compatible = "ti,tca6416"; @@ -478,6 +490,11 @@ max20751@73 { /* u96 */ &i2c1 { status = "okay"; clock-frequency = <400000>; + pinctrl-names = "default", "gpio"; + pinctrl-0 = <&pinctrl_i2c1_default>; + pinctrl-1 = <&pinctrl_i2c1_gpio>; + scl-gpios = <&gpio 16 GPIO_ACTIVE_HIGH>; + sda-gpios = <&gpio 17 GPIO_ACTIVE_HIGH>; /* PL i2c via PCA9306 - u45 */ i2c-mux@74 { /* u34 */ @@ -652,6 +669,269 @@ i2c@7 { }; }; +&pinctrl0 { + status = "okay"; + pinctrl_i2c0_default: i2c0-default { + mux { + groups = "i2c0_3_grp"; + function = "i2c0"; + }; + + conf { + groups = "i2c0_3_grp"; + bias-pull-up; + slew-rate = ; + power-source = ; + }; + }; + + pinctrl_i2c0_gpio: i2c0-gpio { + mux { + groups = "gpio0_14_grp", "gpio0_15_grp"; + function = "gpio0"; + }; + + conf { + groups = "gpio0_14_grp", "gpio0_15_grp"; + slew-rate = ; + power-source = ; + }; + }; + + pinctrl_i2c1_default: i2c1-default { + mux { + groups = "i2c1_4_grp"; + function = "i2c1"; + }; + + conf { + groups = "i2c1_4_grp"; + bias-pull-up; + slew-rate = ; + power-source = ; + }; + }; + + pinctrl_i2c1_gpio: i2c1-gpio { + mux { + groups = "gpio0_16_grp", "gpio0_17_grp"; + function = "gpio0"; + }; + + conf { + groups = "gpio0_16_grp", "gpio0_17_grp"; + slew-rate = ; + power-source = ; + }; + }; + + pinctrl_uart0_default: uart0-default { + mux { + groups = "uart0_4_grp"; + function = "uart0"; + }; + + conf { + groups = "uart0_4_grp"; + slew-rate = ; + power-source = ; + }; + + conf-rx { + pins = "MIO18"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO19"; + bias-disable; + }; + }; + + pinctrl_uart1_default: uart1-default { + mux { + groups = "uart1_5_grp"; + function = "uart1"; + }; + + conf { + groups = "uart1_5_grp"; + slew-rate = ; + power-source = ; + }; + + conf-rx { + pins = "MIO21"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO20"; + bias-disable; + }; + }; + + pinctrl_usb0_default: usb0-default { + mux { + groups = "usb0_0_grp"; + function = "usb0"; + }; + + conf { + groups = "usb0_0_grp"; + slew-rate = ; + power-source = ; + }; + + conf-rx { + pins = "MIO52", "MIO53", "MIO55"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO54", "MIO56", "MIO57", "MIO58", "MIO59", + "MIO60", "MIO61", "MIO62", "MIO63"; + bias-disable; + }; + }; + + pinctrl_gem3_default: gem3-default { + mux { + function = "ethernet3"; + groups = "ethernet3_0_grp"; + }; + + conf { + groups = "ethernet3_0_grp"; + slew-rate = ; + power-source = ; + }; + + conf-rx { + pins = "MIO70", "MIO71", "MIO72", "MIO73", "MIO74", + "MIO75"; + bias-high-impedance; + low-power-disable; + }; + + conf-tx { + pins = "MIO64", "MIO65", "MIO66", "MIO67", "MIO68", + "MIO69"; + bias-disable; + low-power-enable; + }; + + mux-mdio { + function = "mdio3"; + groups = "mdio3_0_grp"; + }; + + conf-mdio { + groups = "mdio3_0_grp"; + slew-rate = ; + power-source = ; + bias-disable; + }; + }; + + pinctrl_can1_default: can1-default { + mux { + function = "can1"; + groups = "can1_6_grp"; + }; + + conf { + groups = "can1_6_grp"; + slew-rate = ; + power-source = ; + }; + + conf-rx { + pins = "MIO25"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO24"; + bias-disable; + }; + }; + + pinctrl_sdhci1_default: sdhci1-default { + mux { + groups = "sdio1_0_grp"; + function = "sdio1"; + }; + + conf { + groups = "sdio1_0_grp"; + slew-rate = ; + power-source = ; + bias-disable; + }; + + mux-cd { + groups = "sdio1_cd_0_grp"; + function = "sdio1_cd"; + }; + + conf-cd { + groups = "sdio1_cd_0_grp"; + bias-high-impedance; + bias-pull-up; + slew-rate = ; + power-source = ; + }; + + mux-wp { + groups = "sdio1_wp_0_grp"; + function = "sdio1_wp"; + }; + + conf-wp { + groups = "sdio1_wp_0_grp"; + bias-high-impedance; + bias-pull-up; + slew-rate = ; + power-source = ; + }; + }; + + pinctrl_gpio_default: gpio-default { + mux { + function = "gpio0"; + groups = "gpio0_22_grp", "gpio0_23_grp"; + }; + + conf { + groups = "gpio0_22_grp", "gpio0_23_grp"; + slew-rate = ; + power-source = ; + }; + + mux-msp { + function = "gpio0"; + groups = "gpio0_13_grp", "gpio0_38_grp"; + }; + + conf-msp { + groups = "gpio0_13_grp", "gpio0_38_grp"; + slew-rate = ; + power-source = ; + }; + + conf-pull-up { + pins = "MIO22"; + bias-pull-up; + }; + + conf-pull-none { + pins = "MIO13", "MIO23", "MIO38"; + bias-disable; + }; + }; +}; + &psgtr { status = "okay"; /* nc, sata, usb3, dp */ @@ -682,20 +962,28 @@ &sata { &sdhci1 { status = "okay"; no-1-8-v; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sdhci1_default>; xlnx,mio-bank = <1>; }; &uart0 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart0_default>; }; &uart1 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart1_default>; }; /* ULPI SMSC USB3320 */ &usb0 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb0_default>; dr_mode = "host"; }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts index 68b758e40f80..2e9fe675a718 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts @@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP ZCU111 * - * (C) Copyright 2017 - 2019, Xilinx, Inc. + * (C) Copyright 2017 - 2021, Xilinx, Inc. * * Michal Simek */ @@ -13,6 +13,7 @@ #include "zynqmp-clk-ccf.dtsi" #include #include +#include #include / { @@ -166,6 +167,8 @@ &gem3 { status = "okay"; phy-handle = <&phy0>; phy-mode = "rgmii-id"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gem3_default>; phy0: ethernet-phy@c { reg = <0xc>; ti,rx-internal-delay = <0x8>; @@ -177,11 +180,18 @@ phy0: ethernet-phy@c { &gpio { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpio_default>; }; &i2c0 { status = "okay"; clock-frequency = <400000>; + pinctrl-names = "default", "gpio"; + pinctrl-0 = <&pinctrl_i2c0_default>; + pinctrl-1 = <&pinctrl_i2c0_gpio>; + scl-gpios = <&gpio 14 GPIO_ACTIVE_HIGH>; + sda-gpios = <&gpio 15 GPIO_ACTIVE_HIGH>; tca6416_u22: gpio@20 { compatible = "ti,tca6416"; @@ -357,6 +367,11 @@ i2c@3 { &i2c1 { status = "okay"; clock-frequency = <400000>; + pinctrl-names = "default", "gpio"; + pinctrl-0 = <&pinctrl_i2c1_default>; + pinctrl-1 = <&pinctrl_i2c1_gpio>; + scl-gpios = <&gpio 16 GPIO_ACTIVE_HIGH>; + sda-gpios = <&gpio 17 GPIO_ACTIVE_HIGH>; i2c-mux@74 { /* u26 */ compatible = "nxp,pca9548"; @@ -545,6 +560,210 @@ i2c@7 { }; }; +&pinctrl0 { + status = "okay"; + pinctrl_i2c0_default: i2c0-default { + mux { + groups = "i2c0_3_grp"; + function = "i2c0"; + }; + + conf { + groups = "i2c0_3_grp"; + bias-pull-up; + slew-rate = ; + power-source = ; + }; + }; + + pinctrl_i2c0_gpio: i2c0-gpio { + mux { + groups = "gpio0_14_grp", "gpio0_15_grp"; + function = "gpio0"; + }; + + conf { + groups = "gpio0_14_grp", "gpio0_15_grp"; + slew-rate = ; + power-source = ; + }; + }; + + pinctrl_i2c1_default: i2c1-default { + mux { + groups = "i2c1_4_grp"; + function = "i2c1"; + }; + + conf { + groups = "i2c1_4_grp"; + bias-pull-up; + slew-rate = ; + power-source = ; + }; + }; + + pinctrl_i2c1_gpio: i2c1-gpio { + mux { + groups = "gpio0_16_grp", "gpio0_17_grp"; + function = "gpio0"; + }; + + conf { + groups = "gpio0_16_grp", "gpio0_17_grp"; + slew-rate = ; + power-source = ; + }; + }; + + pinctrl_uart0_default: uart0-default { + mux { + groups = "uart0_4_grp"; + function = "uart0"; + }; + + conf { + groups = "uart0_4_grp"; + slew-rate = ; + power-source = ; + }; + + conf-rx { + pins = "MIO18"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO19"; + bias-disable; + }; + }; + + pinctrl_usb0_default: usb0-default { + mux { + groups = "usb0_0_grp"; + function = "usb0"; + }; + + conf { + groups = "usb0_0_grp"; + slew-rate = ; + power-source = ; + }; + + conf-rx { + pins = "MIO52", "MIO53", "MIO55"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO54", "MIO56", "MIO57", "MIO58", "MIO59", + "MIO60", "MIO61", "MIO62", "MIO63"; + bias-disable; + }; + }; + + pinctrl_gem3_default: gem3-default { + mux { + function = "ethernet3"; + groups = "ethernet3_0_grp"; + }; + + conf { + groups = "ethernet3_0_grp"; + slew-rate = ; + power-source = ; + }; + + conf-rx { + pins = "MIO70", "MIO71", "MIO72", "MIO73", "MIO74", + "MIO75"; + bias-high-impedance; + low-power-disable; + }; + + conf-tx { + pins = "MIO64", "MIO65", "MIO66", "MIO67", "MIO68", + "MIO69"; + bias-disable; + low-power-enable; + }; + + mux-mdio { + function = "mdio3"; + groups = "mdio3_0_grp"; + }; + + conf-mdio { + groups = "mdio3_0_grp"; + slew-rate = ; + power-source = ; + bias-disable; + }; + }; + + pinctrl_sdhci1_default: sdhci1-default { + mux { + groups = "sdio1_0_grp"; + function = "sdio1"; + }; + + conf { + groups = "sdio1_0_grp"; + slew-rate = ; + power-source = ; + bias-disable; + }; + + mux-cd { + groups = "sdio1_cd_0_grp"; + function = "sdio1_cd"; + }; + + conf-cd { + groups = "sdio1_cd_0_grp"; + bias-high-impedance; + bias-pull-up; + slew-rate = ; + power-source = ; + }; + }; + + pinctrl_gpio_default: gpio-default { + mux { + function = "gpio0"; + groups = "gpio0_22_grp", "gpio0_23_grp"; + }; + + conf { + groups = "gpio0_22_grp", "gpio0_23_grp"; + slew-rate = ; + power-source = ; + }; + + mux-msp { + function = "gpio0"; + groups = "gpio0_13_grp", "gpio0_38_grp"; + }; + + conf-msp { + groups = "gpio0_13_grp", "gpio0_38_grp"; + slew-rate = ; + power-source = ; + }; + + conf-pull-up { + pins = "MIO22"; + bias-pull-up; + }; + + conf-pull-none { + pins = "MIO13", "MIO23", "MIO38"; + bias-disable; + }; + }; +}; + &psgtr { status = "okay"; /* nc, sata, usb3, dp */ @@ -574,17 +793,23 @@ &sata { /* SD1 with level shifter */ &sdhci1 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sdhci1_default>; no-1-8-v; xlnx,mio-bank = <1>; }; &uart0 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart0_default>; }; /* ULPI SMSC USB3320 */ &usb0 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb0_default>; dr_mode = "host"; }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi index 302ca0196c34..f860e90ea2a6 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi @@ -193,6 +193,11 @@ zynqmp_reset: reset-controller { compatible = "xlnx,zynqmp-reset"; #reset-cells = <1>; }; + + pinctrl0: pinctrl { + compatible = "xlnx,zynqmp-pinctrl"; + status = "disabled"; + }; }; }; From patchwork Wed Jun 9 11:44:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 12309913 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=-17.0 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,USER_AGENT_GIT 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 B30D9C48BCF for ; Wed, 9 Jun 2021 11:56:17 +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 82F56613B6 for ; Wed, 9 Jun 2021 11:56:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 82F56613B6 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=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=6TPytvPqpQWEyJTu7W8Ff01Zl3ic5a4QPIb4MhX76bo=; b=GDk7n4uqJv/pIA 7IxafjV7IWmqS08KfDLHvcWR+PyZV7174Rykrw5c5SGtvDK/TKLBLApScZfZe6sGR9rPghk+bl7f4 EYl8HZVAPnYsHOlzrVOA3I2VYjp5cX5/vOhKoo/40DeAoE/q2ztRTV2ZSfr0N9oEHzNQHRFscsh4o rJJa2tjsjX7s1lQpVoMl85ZWUWSKWGWTVy+OKyvsflu/5/nZlMG/EvWfMOS7k470Sphu2MjIlwPZ9 7PVOHc8UpTluxo7b18796VWBZEfYTraS+lbo2016QpY9fcF05QEOT8hK/d75ETLGJJi5sl9boztuO 48uXKX/WQAvOFxwaP24A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqwmz-00DTdx-QG; Wed, 09 Jun 2021 11:54:30 +0000 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqweM-00DPuE-6y for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 11:45:36 +0000 Received: by mail-wr1-x42c.google.com with SMTP id o3so6752530wri.8 for ; Wed, 09 Jun 2021 04:45:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=se+dBkzLkPDZB3gvYNmJcBXaJIMDNQ2dYe77WcU2tYs=; b=J+tFMxfwWj1xdMm0Ycxr5wHDigG7e+8Qj5uh4NM9jjVXozGXjCVAwcH7CfHQjkyOtJ /3Rbyn3z1CenPd+LzIIbQmmT3Ysn7oDU3h545DHlEgGQjOcVWYw9Hmfbd+YeC3D/TIMj mmTrY2ERpil2ClCTkwDv5SanJGQOhzxhIApkaOrCneZ33MPOAsMrrqIQFYnVz4byK9+1 5u7EDl7Aa74BFqojFDxRnbSVHiUp2K643CPmYIDvmwPXn9U/SJd42FaJBhSWyr457sk/ Fgzg8vt16MZlZ2audXLMeRBTkFwYkVcjoGMjTzbPOLyfRkUhVFCMHOfEKvn1POdqlVNG Vw0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=se+dBkzLkPDZB3gvYNmJcBXaJIMDNQ2dYe77WcU2tYs=; b=bKpoycJdQHj+HTuxfvnLJwD0wjrzij7zn3e51qDEUlV/2vVXm/JAkohNMiRHTOtzxN /IMx+nfRQqi1A1shg2CgUJVId5tB4PycRQ4AkyLGPhINBohJ6kc7Y2Dt/sUVLHQK0ytB 945tTGPm59ty3ZS7aAhyT6iWurJ58UXdpVWrcj8/495UruvhYIpr0OYrtlg6e8c5MlUz RauA+c4PHhqIMIF3CaWD7YsApCyR/ofwx95adH4zFtrut5O+TM1G5ci+7GWJIXBJw4HB 9gJH7iPzdSq8HZrzbs7SlyOs2rApSKQfKbUyM8Nwmjk7Sjj/CKNp+2jBFSduVuMQwFlR p7gA== X-Gm-Message-State: AOAM532agir6iBqoA+X43qqRCoc36v/NZs/VKLA60oC5Z3uiKW6uNx6p VByRGIx5vkaaUQD5cBeCqYMSUg== X-Google-Smtp-Source: ABdhPJwF7fBpGFpM/ENgi2PM22Vk64GidPt03UrxhwC99oMdcbMimGbBN3fkRlA1+QGeMKDOcWrdcA== X-Received: by 2002:adf:ea49:: with SMTP id j9mr25107860wrn.366.1623239131390; Wed, 09 Jun 2021 04:45:31 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::45a]) by smtp.gmail.com with ESMTPSA id w18sm22603601wrt.55.2021.06.09.04.45.30 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Jun 2021 04:45:31 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu, michal.simek@xilinx.com, git@xilinx.com, Viresh Kumar Cc: Laurent Pinchart , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 06/31] arm64: zynqmp: Correct zcu111 psgtr description Date: Wed, 9 Jun 2021 13:44:42 +0200 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_044534_299571_3AE2299B X-CRM114-Status: GOOD ( 10.91 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DP and SATA psgtrs are swapped. Signed-off-by: Michal Simek --- arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts index 2e9fe675a718..b0c2eae1b4b3 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts @@ -766,8 +766,8 @@ conf-pull-none { &psgtr { status = "okay"; - /* nc, sata, usb3, dp */ - clocks = <&si5341 0 3>, <&si5341 0 2>, <&si5341 0 0>; + /* nc, dp, usb3, sata */ + clocks = <&si5341 0 0>, <&si5341 0 2>, <&si5341 0 3>; clock-names = "ref1", "ref2", "ref3"; }; @@ -787,7 +787,7 @@ &sata { ceva,p1-burst-params = /bits/ 8 <0x13 0x08 0x4A 0x06>; ceva,p1-retry-params = /bits/ 16 <0x96A4 0x3FFC>; phy-names = "sata-phy"; - phys = <&psgtr 3 PHY_TYPE_SATA 1 1>; + phys = <&psgtr 3 PHY_TYPE_SATA 1 3>; }; /* SD1 with level shifter */ From patchwork Wed Jun 9 11:44:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 12309993 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=-17.0 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,USER_AGENT_GIT 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 67D0AC48BCD for ; Wed, 9 Jun 2021 12:21:16 +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 379D460E0C for ; Wed, 9 Jun 2021 12:21:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 379D460E0C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=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=45fuLIeCL8v+FdQvacbrfl1s2jq1qQ2eAib940+2GqM=; b=5BcsSiR5YQzYo0 RF45sqi7aqDMjcPNl14kxENReFhsqKPPlfsvJdN9RyPpT8ZO91fd4aoVpR8RMIZGNfy1aUkW0MWJI OYMXMaNo8vEdM+69XNrJEM5QFLOBNKPC4B1gy+PniGLivybMESJjiilsaHvb68eNgcYWTGWMiCzbG +jcwBA5eqtmUldruiYCeiOp/wfH+LItR+whSeu45I2dgKA8c8QpFGdvUb/SOZ5LxcR6NMriwMfktF iSdfUKlmMIogikfjLtQ2gMqpU8xo7Lrh2wvkQIvISqKBA/akLzpkXbULQN1ld1RbK/p6ouhkuQDKQ wKYL7xOMa5DR+czv+VTA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqxAP-00Dcmp-QZ; Wed, 09 Jun 2021 12:18:42 +0000 Received: from mail-wm1-f48.google.com ([209.85.128.48]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqwfK-00DQKk-NJ for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 11:46:38 +0000 Received: by mail-wm1-f48.google.com with SMTP id m41-20020a05600c3b29b02901b9e5d74f02so884969wms.3 for ; Wed, 09 Jun 2021 04:46:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Fz6PtoBNrXggGvHCv/ERGGBDM9Ib0qTjZiZAcbm2N6Q=; b=TRpqXxR32bEJkTNwU6AOJ2rVb69udkIyrqqK5qj+CUnlZzcyW77zBc90L6cLc+JCKp ipe5Tiwctjsf2IBozXvHQ2m/ZvZR/QrcaQJCMyYZdxOSIO1VT9PZ2szi+HpGlUhfQZ+I 0t67PVEnNf9gAtPgFlaehUofawfToYmk2Tbp63WwtJgqRPdYlhIMJU0iHM9jyKT16bhP Y4vL6fFi4M0xdPqNic5BiNY17QvEdWZpGip7BNHYL7XSCMJF1uBHJOuWxfhKBKaAmfxO hn/I5SnJoXLBokQho0hKfK0YHWCg4cSfb61MEt70P5an1bQhs4hLGiq9qKSynB4R4o6B 0H6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Fz6PtoBNrXggGvHCv/ERGGBDM9Ib0qTjZiZAcbm2N6Q=; b=n6Pz3QiEhUH55GRacwI8eu8Ek3GAeUv4Drv/4WUPgTP4by17RtpNUJfYdIvdtc52vJ R6wdWcNJcGLjXAh5Zb+pH8ZUFzutl1J8+S7zZaFeWMAAVroeu565oSBuLjnxkcKDGyiD Kuz1iGqp8hYRoMuOrfUsN8wC3gMUb0l3vQVr0HkHngr7Fsb21elxnoF1CKmdkjgMbe6r yL0ZRkc3p8zj90h6MfAv8QEqCEJrdh3lFjmurXtd7zx/z/P/LN7IRT8xo1J78jcfw3gu CjKOq3MmO2d2CfSZqkcLl4nXeqyZ8O5KMPgGwH1tGQ9g3+PwpJAZ9F2pb+qVtXpBG4Rl hzrQ== X-Gm-Message-State: AOAM5317ZXlVo+kPNlBCOsbAuK4XLbS8iyX5OWmjTLqgRUKtCpg3rC0s KaNYoCPd6bCqxF2TKslyS5Qccw== X-Google-Smtp-Source: ABdhPJziy6biO08+CwH8Iuxinnm2yLnRF21q5hf9BgUMrEGrS9g/z3Pb/wClgPiioTo1etfJUC7sYQ== X-Received: by 2002:a7b:cbd2:: with SMTP id n18mr3391962wmi.112.1623239133007; Wed, 09 Jun 2021 04:45:33 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::45a]) by smtp.gmail.com with ESMTPSA id r4sm23760486wre.84.2021.06.09.04.45.32 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Jun 2021 04:45:32 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu, michal.simek@xilinx.com, git@xilinx.com, Viresh Kumar Cc: Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 07/31] arm64: zynqmp: Wire psgtr for zc1751-xm015 Date: Wed, 9 Jun 2021 13:44:43 +0200 Message-Id: <3fb11fdb9ade828fa174379515e45ba02bc17247.1623239033.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_044634_835972_FD5689EF X-CRM114-Status: GOOD ( 11.34 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add psgtr description for SATA and USB. Display Port could be also added but it wasn't tested yet. Signed-off-by: Michal Simek --- .../dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts index 5b258129c7ef..f57cb5356cef 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts @@ -11,6 +11,7 @@ #include "zynqmp.dtsi" #include "zynqmp-clk-ccf.dtsi" +#include #include #include @@ -36,6 +37,31 @@ memory@0 { device_type = "memory"; reg = <0x0 0x0 0x0 0x80000000>, <0x8 0x00000000 0x0 0x80000000>; }; + + clock_si5338_0: clk27 { /* u55 SI5338-GM */ + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <27000000>; + }; + + clock_si5338_2: clk26 { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <26000000>; + }; + + clock_si5338_3: clk150 { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <150000000>; + }; +}; + +&psgtr { + status = "okay"; + /* dp, usb3, sata */ + clocks = <&clock_si5338_0>, <&clock_si5338_2>, <&clock_si5338_3>; + clock-names = "ref1", "ref2", "ref3"; }; &fpd_dma_chan1 { @@ -328,6 +354,8 @@ &sata { ceva,p1-comwake-params = /bits/ 8 <0x06 0x19 0x08 0x0E>; ceva,p1-burst-params = /bits/ 8 <0x13 0x08 0x4A 0x06>; ceva,p1-retry-params = /bits/ 16 <0x96A4 0x3FFC>; + phy-names = "sata-phy"; + phys = <&psgtr 3 PHY_TYPE_SATA 1 3>; }; /* eMMC */ @@ -357,4 +385,7 @@ &usb0 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0_default>; dr_mode = "host"; + phy-names = "usb3-phy"; + phys = <&psgtr 2 PHY_TYPE_USB3 0 2>; + maximum-speed = "super-speed"; }; From patchwork Wed Jun 9 11:44:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 12309911 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=-17.0 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,USER_AGENT_GIT 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 74902C48BCD for ; Wed, 9 Jun 2021 11:54:58 +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 3F2106100B for ; Wed, 9 Jun 2021 11:54:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3F2106100B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=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=5oNgE5Ntni0sFnPqMTxBhamWRwDETB0gJ90lT4MiKEw=; b=TkYU9++gq1SGoX ApqcojHaEJaa3TzKcyC8bYYemHe7CfQv7PuoKmWr1TfOc0ED15mNB026KAM5IqOuQMNd4oGy4vE09 sSDOvgsYJ/ACJyhLmc6PzA5Ih1M1OpefUZpGc+i5P3HGBx+x3YU4nX5RHrrfG3w5Xpu9xxVmOoMic gC4xqIX/sEcyxcCc6hPjw23OEVYfoOj/TPpIr5FwTSGcf9Fd1pUO7CwzlPM+/SqtKJB1rby+bxrjy pV94JtmnB87asaJQhP+VMQRQRME8sYoosyOaXFrjDf9lm/IbJMqkWOgcz0Pk3SPLnq5I2EdzfMSjN ViUJWfr7Ne87sArp9bPA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqwlb-00DT3v-DF; Wed, 09 Jun 2021 11:53:05 +0000 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqweO-00DPvH-GR for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 11:45:38 +0000 Received: by mail-wr1-x432.google.com with SMTP id m18so25147583wrv.2 for ; Wed, 09 Jun 2021 04:45:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0qKaD7pcb5H9dx5KCUiqNVK5FGDD0UzlMgn+aThmPRQ=; b=LwLmDRa7HlVj5TeRIpJRW31k1q2q0LlumVmgD3rCRkL/qSlQOVL+r4huHkECdp2mbF HdBA57KgpDnUjbp2HP7pKTAXOr+h+qpBcIcDdcjoFIvsyK7Ln6GzYLuB6akf75Y0GA5J kS29z5bcGJT7RmfeSZVOyHi0HAR/EL6D0/v+fQmN+GCPThEbtduA4E9F4w40Tz1r17Q/ Nzq76MpTE+uI70pDb2xJsAoWvTMAJrQ4OHk1qY1wBTbPqVcI9BMBk0MohsRMVs/nNu1q WXwSWYzGkIPejvUlQWWWNEGiqy6lvJwMXshXvw6sLfML9fEOKDvtDUqRQI2OZHtP6QU5 ofug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=0qKaD7pcb5H9dx5KCUiqNVK5FGDD0UzlMgn+aThmPRQ=; b=cRm57mHk/QNdZLFo1HgTfPX52W8A9QAo4RwVpJLJ4TQuUVbJBzizZQAufq1FrVHzOm oyotp6GFJIuSE9VsezgEyBm5HOhqYf/jC6N8je1ZelbZajcTo6VkKEBQtTz/ecZVQ+zA Im+yaU5ZRdzxM8XUAoUJhKU3MVK5g33tuT09FMRmXKs5hycMwIN3dy9q1+aIG1XCksb8 s+uArZC2dr34bNl//+3g9SznC3M/IudHRxIexNPUr+dx8rt7aWwqDNRCyo6MMfbmLYs7 11wjPn+i/2szWcvINe2QHlnlLTh/dK+sRM33uzQoN59j8fRKeHaOaRxjz1dCsjTjV7N5 VpOQ== X-Gm-Message-State: AOAM532MNRttfbVgc4kr2TL/kIETODmghodv63LUwHp6+Ff3x0oYo7B8 vcaGk6/dTvt7VnPoRJ6FSSNsRA== X-Google-Smtp-Source: ABdhPJzYholqo05PJOkGyVewkjTdKbLoCbFtuO511CPRSN8GIDXNlAS3YvCL76RCDzWo0v7BLIhDEA== X-Received: by 2002:adf:f211:: with SMTP id p17mr27593378wro.173.1623239135005; Wed, 09 Jun 2021 04:45:35 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::45a]) by smtp.gmail.com with ESMTPSA id v15sm1836422wrw.24.2021.06.09.04.45.34 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Jun 2021 04:45:34 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu, michal.simek@xilinx.com, git@xilinx.com, Viresh Kumar Cc: Krzysztof Kozlowski , Laurent Pinchart , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 08/31] arm64: zynqmp: Correct psgtr description for zcu100-revC Date: Wed, 9 Jun 2021 13:44:44 +0200 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_044536_694194_10BDF07E X-CRM114-Status: GOOD ( 11.61 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Enable psgtr node and also fix clock names to be aligned with other zynqmp boards. Signed-off-by: Michal Simek --- arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts index 9c40c6552c32..4622e173d262 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts @@ -111,13 +111,13 @@ ina226 { io-channels = <&u35 0>, <&u35 1>, <&u35 2>, <&u35 3>; }; - si5335a_0: clk26 { + si5335_0: si5335_0 { /* clk0_usb - u23 */ compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <26000000>; }; - si5335a_1: clk27 { + si5335_1: si5335_1 { /* clk1_dp - u23 */ compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <27000000>; @@ -459,8 +459,9 @@ conf-tx { }; &psgtr { - /* usb3, dps */ - clocks = <&si5335a_0>, <&si5335a_1>; + status = "okay"; + /* usb3, dp */ + clocks = <&si5335_0>, <&si5335_1>; clock-names = "ref0", "ref1"; }; From patchwork Wed Jun 9 11:44:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 12309921 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=-17.0 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,USER_AGENT_GIT autolearn=unavailable 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 12AC0C48BCF for ; Wed, 9 Jun 2021 11:58:30 +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 D21366023B for ; Wed, 9 Jun 2021 11:58:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D21366023B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=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=pZul5962lnfe0v4zOn9ae3YBzCT38M0onNZdtUDpFTY=; b=k+NIyVTYjGNG6Z OUljXYbREYL1at2t4JQw6PD/zfdvyKeT0RCnQTNp4bJYVE3eBrw2TveF826GGrG6HMBHdnKzgLqDi Qeq6cZFOtQuqMa0Uq7YE3NBpLo+DVrqBH4T1tGQyUi9IvG7w5YtiDS6F4qqlVW/jMlgG22zFPVjgf xM/ZfI4e6WP8vqsHBBhai85DpTYF2PZyNBUfDc6sDoi6djHhuO7CRwRFpSExNFbrJXOQv3RpYeNqZ boLMOAEARfigDr6PzJbhK8RxDIAJ/oAG++yWF7DRjAUV9HcViW1Flg+9ak+WzxF6Lc15z8HSnhWma /iGTRJOq/QzsOCkxYKLw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqwow-00DUPw-I0; Wed, 09 Jun 2021 11:56:31 +0000 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqweQ-00DPvb-Gg for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 11:45:40 +0000 Received: by mail-wr1-x434.google.com with SMTP id m18so25147668wrv.2 for ; Wed, 09 Jun 2021 04:45:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+ztWISkfbHLRcrutYYOCwKbEn/sj5GOKylRbehxkcT8=; b=awyLTVcmnOLAAf+R6/GMoRbVqRSlP/YS6JgB+6D1F1gvM9MMSc4cD/WdXulgTM7//1 G/e75TR9l4inBFCFcSrKeuOl4iETp2u4elTB4L7k8+7c0+W80zbwbhPDzwbeHpUrSYQ+ 6D8AZE45lTf8GHZTTIubBa5dArAh+hCyqhan3GPvEcwzZ2LiObWDz21m5CCE2q3YKPgL lky/z26B/fLzY2TPB1dOpXhoziQKAe7sxx0OKaODFJ8/z5M+XUv3CH+AQJotEFiVBByx mOTHqYHeY31T1pTwsNiBKUUe2Wxr7j+cNNd5f4trFAEbi00TVhjy8hywvVWA+x9RzFQQ HhIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=+ztWISkfbHLRcrutYYOCwKbEn/sj5GOKylRbehxkcT8=; b=q9hiQn+rncwQJGq4tlCqCQVcrUqXLHq/I/4nIM+wZLu7DtnvLVASX49cg3PjRbpKcU WpO9W4EHWgynJukiHxoR7A822z1d65Cwa7amezdmfVMg3DrTNCIVoQHSrVMzTGDkRhsZ LYOiXsmCP8mU/VsMLK4fxin9JLP/9hqVEhWTOQwaiox1Ds/X3fywIGIb5CaeLR7X20aZ vXLKTSunV5hyqdVSqQF1kk/FcMMTfr7qU/UD3B7QMu6r9nRVzQxkf5P2ZaVnNXjeA8jN x9naLMOvipj6e3vSpGJqVTHWUNPbYLFIKhjCaRuzGphsGzw9NZtX3zklFL1O0HYUfqgs ZZMA== X-Gm-Message-State: AOAM530GmoVYqkCdN7Znzhc47tp2tofNyWb39+0cOKFwMrQG9tjPWnmy A1LKBvzBhnc5uBmhYNctFuk9fQ== X-Google-Smtp-Source: ABdhPJzSC6EPdrOgWUgBxVgTNII5hR2mUzGO+0Gi9Q+F6XFTR4y9ZdgY1EbvuMzXNVdFwqj4XzD6/A== X-Received: by 2002:adf:9c93:: with SMTP id d19mr27643593wre.17.1623239136750; Wed, 09 Jun 2021 04:45:36 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::45a]) by smtp.gmail.com with ESMTPSA id u20sm15670188wmq.24.2021.06.09.04.45.36 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Jun 2021 04:45:36 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu, michal.simek@xilinx.com, git@xilinx.com, Viresh Kumar Cc: Krzysztof Kozlowski , Laurent Pinchart , Quanyang Wang , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 09/31] arm64: zynqmp: Add phy description for usb3.0 Date: Wed, 9 Jun 2021 13:44:45 +0200 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_044538_616890_6D1E149E X-CRM114-Status: GOOD ( 10.46 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org usb3.0 requires serdes setting that's why also wire it up. Signed-off-by: Michal Simek --- arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts | 6 ++++++ arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 3 +++ arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts | 3 +++ arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts | 3 +++ arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts | 3 +++ arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 3 +++ 6 files changed, 21 insertions(+) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts index 4622e173d262..80415e202814 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts @@ -538,6 +538,9 @@ &usb0 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0_default>; dr_mode = "peripheral"; + phy-names = "usb3-phy"; + phys = <&psgtr 2 PHY_TYPE_USB3 0 0>; + maximum-speed = "super-speed"; }; /* ULPI SMSC USB3320 */ @@ -546,6 +549,9 @@ &usb1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb1_default>; dr_mode = "host"; + phy-names = "usb3-phy"; + phys = <&psgtr 3 PHY_TYPE_USB3 1 0>; + maximum-speed = "super-speed"; }; &watchdog0 { diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts index b37aee2d85b9..719a9e5e1b01 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts @@ -979,6 +979,9 @@ &usb0 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0_default>; dr_mode = "host"; + phy-names = "usb3-phy"; + phys = <&psgtr 2 PHY_TYPE_USB3 0 2>; + maximum-speed = "super-speed"; }; &watchdog0 { diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts index 7e1b024f71e1..d7ecfcadd08b 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts @@ -469,6 +469,9 @@ &usb0 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0_default>; dr_mode = "host"; + phy-names = "usb3-phy"; + phys = <&psgtr 2 PHY_TYPE_USB3 0 2>; + maximum-speed = "super-speed"; }; &watchdog0 { diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts index b140fd2c86aa..403a8ea6a36f 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts @@ -491,6 +491,9 @@ &usb0 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0_default>; dr_mode = "host"; + phy-names = "usb3-phy"; + phys = <&psgtr 2 PHY_TYPE_USB3 0 2>; + maximum-speed = "super-speed"; }; &watchdog0 { diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts index 4919cdec835b..186d2e00d4a0 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts @@ -985,6 +985,9 @@ &usb0 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0_default>; dr_mode = "host"; + phy-names = "usb3-phy"; + phys = <&psgtr 2 PHY_TYPE_USB3 0 2>; + maximum-speed = "super-speed"; }; &watchdog0 { diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts index b0c2eae1b4b3..0bf29ff9c714 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts @@ -811,6 +811,9 @@ &usb0 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0_default>; dr_mode = "host"; + phy-names = "usb3-phy"; + phys = <&psgtr 2 PHY_TYPE_USB3 0 2>; + maximum-speed = "super-speed"; }; &zynqmp_dpdma { From patchwork Wed Jun 9 11:44:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 12309919 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=-17.0 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,USER_AGENT_GIT 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 8D094C48BCF for ; Wed, 9 Jun 2021 11:57: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 4936161263 for ; Wed, 9 Jun 2021 11:57:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4936161263 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=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=+5qbIzK4e4fSqw4Pz5z6niGIazqgKsEkcZ26rVCbilo=; b=ArWJqU8qY3KvH1 cwRUG7xEmVc1ToIUeR7UYtziHSFZs2DuYn9jYsBFQy13xBIiC/vdGYdJOBiGsI77h4xfVYamwXGdY JeacrT6Lsc+ilmUMj+CSmHSiYsGgOLvgs1FUEcQt2LyBXzChRqFjO1/eN0efDcZs8mLn94FgtOq2t JoUXjmJs+pAyqwOCGcPoyT0mne5hsimiyq0fU6LhvBKBgMntPMae8HejulDgAcLBfisNfYq0hJcZv KVtt4uDoG1crnbkiU26lAYhGj27VeA0Nd4RRqYPDItlY9WudFS5hA/gXDl/s3h7lB0hGD5qU0S+IJ YuhIUs1/FMeLc0bZGk0w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqwo0-00DU3m-8V; Wed, 09 Jun 2021 11:55:32 +0000 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqweS-00DPw7-7e for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 11:45:41 +0000 Received: by mail-wm1-x330.google.com with SMTP id v206-20020a1cded70000b02901a586d3fa23so3984209wmg.4 for ; Wed, 09 Jun 2021 04:45:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IyfmD8DZDuvMGX8TMgLHBLVuXjpa67aulA9PCio4mUQ=; b=GQUZrQk2siL3MYsb3zbntAIwvSNm4XXGm3WUDGOuR8XR1JrQSF7+W2WYm7wMNj3b4N w0t4vk8jdCKVZHfwqvallHEnhNW3PmVUVsGK/XnqOOr2xZP5/xpaaGQEg8hKQnP//hx/ YAi2GU2LKtQVmJ42fRZ8IuxljKlOKreT4yL2iyFmYfXunWats9CIAZnbkDrBrSIa879W vKH2g+pxd7Tyawqnuf37P+rnbv8kdzRLAhzbWmYnz9J2wnHB7hgVv5EWGlCeRcpw+X1R 2gTsab24LQrPhTXE+GvKFlY+BR7za7EaJyq3oVa/UYdbKft7xZjgyJdfSiYVnW4IHkEl GshQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=IyfmD8DZDuvMGX8TMgLHBLVuXjpa67aulA9PCio4mUQ=; b=QGm1qTrpthT+DyCwtGO5wckY3lKAIXEO1BHnHqw+CeG4rZwdOyZhL9XpCBQSvgftzK vy7I5P01JoK3Wm6QkbGCbEfxcMu9+64do8vrTNvwz48C1S68M0lFAyx4aBNUuF1pjRWn jSnfqap7JuzgDVOBGlC5mb7HsQA4LqmN9ttDQb3nA4alcEoniohqSLcrxQC5nmNv8Paj stZEn9M7i66Ap2qLSPF1qU6Iz+sW4LLQkXixm8LYpsCH8IBjTjUwy223mNw0bu+i9N2G ISpuDtucfBCXtd600mD62Bj72x8IJk2txIXvt5/otG7EDcdnLGMCR4YRHX8asDh27UuD oGjw== X-Gm-Message-State: AOAM533bAUj9lvA4DcvOd1rJM51drI3BIm5If4d1a3sxP1ZkcTPdyrwl AP85fDbLPVs8ll+DUKixC57r9MPEQzODp2lP X-Google-Smtp-Source: ABdhPJzYQshAC9lzL2og3uBVwNPXkYkx8vduU1+Nsvitalj3WqDePCR14cefVuls41RnV+uEnUInOw== X-Received: by 2002:a1c:a382:: with SMTP id m124mr26635972wme.40.1623239138380; Wed, 09 Jun 2021 04:45:38 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::45a]) by smtp.gmail.com with ESMTPSA id z5sm15172660wrv.67.2021.06.09.04.45.37 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Jun 2021 04:45:38 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu, michal.simek@xilinx.com, git@xilinx.com, Viresh Kumar Cc: Laurent Pinchart , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 10/31] arm64: zynqmp: Disable WP on zcu111 Date: Wed, 9 Jun 2021 13:44:46 +0200 Message-Id: <88e41d4f5c6a7353762bd5ad38b92ce352c3a123.1623239033.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_044540_305451_0B7059EB X-CRM114-Status: UNSURE ( 9.90 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On this board there is SD slot without WP connected. Signed-off-by: Michal Simek --- arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts index 0bf29ff9c714..e646246a3b14 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts @@ -796,6 +796,7 @@ &sdhci1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_sdhci1_default>; no-1-8-v; + disable-wp; xlnx,mio-bank = <1>; }; From patchwork Wed Jun 9 11:44:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 12309999 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=-17.0 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,USER_AGENT_GIT 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 77863C48BCD for ; Wed, 9 Jun 2021 12:22:17 +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 39D8A61285 for ; Wed, 9 Jun 2021 12:22:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 39D8A61285 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=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=C/9HF6vwJZmNQc1N4CEYcK0h2dUB52JwI4s/A8TLHNY=; b=bd6zPkDa80Si7x dHkXebD4gemXU5kvNkLRDHD4via1RoX8S3pXLLev0j6T7MeRD28JrCqIhA3KyyOsPRbRFLRLJ4h9h AysyhpFHiW6mjfnxMWrgZQ2TIxDke5O38ICsAHz+4+PFg5SAXsJFCZgp5UCe0/ilDoSivbhiSAyB6 ENzFPqV2YFHxhLfHcDwCxyrqZRfsQVlHwtG0YaK0Q76QkULmb6utqmuvehL04VbDm4ZKm39TDPn65 q/dK7MdodtBk+OlnYOw/s6H6Lu5wxC+Ms8ydwnWu27eX0pdw+LLE3/vOMZY3V0mUcJ4T25QM79AXB bctcNikou+mez1s6z5fQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqxBZ-00DdE0-3Z; Wed, 09 Jun 2021 12:19:54 +0000 Received: from mail-wm1-f50.google.com ([209.85.128.50]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqwfS-00DQOM-2U for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 11:46:43 +0000 Received: by mail-wm1-f50.google.com with SMTP id g204so3804946wmf.5 for ; Wed, 09 Jun 2021 04:46:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4s1/Jg1HhDEEncoJTBVDB2qVrW8UQryvJsGgvpUV+xI=; b=cVHjuAELhDwvpdbPi2qd5bIp3w/aLKgyo3fzT8qkdXVnvQQ9c8osdS2ZptqnfyzQLb ja7lj2Z9hcR6RkIWwxJB4M2thYwbYX1nSFvxpi3wEIgDH5qZC63pSMpJQaf3qL4Q9ifX ZYGwC4TPV7wddlyzunvp0AtkaXJphg2K+5mmlRIbjQHmD+uJj5/tQanL9j2d4wfWYi39 WW7j+KgxvjUZQI8tI12/cdk6sCOox3VBChmz45ZoSMi0uqRNGZPjNxTc0I9CyeAZh1hU +PU5+RosEoMTJTHCbWMYSejtaMK0aYhJOOGWxwtc7AXVEYo6ulQWQy3L0HvmSS8T3eRA WBIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=4s1/Jg1HhDEEncoJTBVDB2qVrW8UQryvJsGgvpUV+xI=; b=oDvZg8heBupEHvt08Lvw06lrdlr7oZCjqew3UGglH7rHRgfhypCIZIUHQcPhJDsng1 hekOtHaZWe+NSvi5eoHrBATiuD6/VBVGPASRE5bDY3ve+mqxjCsQoYZCdjd23WsqdMNn fSC8HinA9an6UpBuRfvpubRphDuPihKK1cqPvf9dcBze4rqAXSKjWm4ePb8ojKsf/wws OFcUi79A0WuQwFSkBAPoLT25ByV1mcIHgw3TRNVjwQZVbJpGHv+AwzwKsZAFqGPgqDXl njczoJf4xOY+yPCrcZjmXznyLYCjkupGvTMYdTJZv03qcjz0kBqk0up5oE081yYqhqIc Vnyw== X-Gm-Message-State: AOAM533gJa9wnSTizTGYQAfmhiVM9NhiKGsQ+u5xRm0SDXM83r1m7cMJ ugCb+6xoxcgAsjq/4TTNr6mQyw== X-Google-Smtp-Source: ABdhPJwsLUcaMGCZInb11RHfN50h5UthTEpVaT91Z3buvkGcKGqzZpr/tpg52cOuZbU625ExxQhD1w== X-Received: by 2002:a05:600c:35c1:: with SMTP id r1mr9213935wmq.181.1623239140298; Wed, 09 Jun 2021 04:45:40 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::45a]) by smtp.gmail.com with ESMTPSA id m23sm21541508wmc.29.2021.06.09.04.45.39 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Jun 2021 04:45:39 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu, michal.simek@xilinx.com, git@xilinx.com, Viresh Kumar Cc: Stefano Stabellini , Krzysztof Kozlowski , Laurent Pinchart , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 11/31] arm64: zynqmp: Add missing SMID for pcie to zynqmp.dtsi Date: Wed, 9 Jun 2021 13:44:47 +0200 Message-Id: <43f21f5033f7806fba049474bced6131c8cb98ba.1623239033.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_044642_169836_C45572F0 X-CRM114-Status: GOOD ( 12.66 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Stefano Stabellini The SMMU is disabled in device tree so this change has no impact. The benefit is that this way it is in sync with xen.dtsi. Xen enables the SMMU and makes use of it. Signed-off-by: Stefano Stabellini Signed-off-by: Michal Simek --- arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi index f860e90ea2a6..3fa0517cfd98 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi @@ -636,6 +636,8 @@ pcie: pcie@fd0e0000 { <0x0 0x0 0x0 0x2 &pcie_intc 0x2>, <0x0 0x0 0x0 0x3 &pcie_intc 0x3>, <0x0 0x0 0x0 0x4 &pcie_intc 0x4>; + #stream-id-cells = <1>; + iommus = <&smmu 0x4d0>; power-domains = <&zynqmp_firmware PD_PCIE>; pcie_intc: legacy-interrupt-controller { interrupt-controller; From patchwork Wed Jun 9 11:44:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 12309925 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=-17.0 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,USER_AGENT_GIT 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 664B3C48BDF for ; Wed, 9 Jun 2021 12:00:55 +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 3556C61364 for ; Wed, 9 Jun 2021 12:00:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3556C61364 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=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=P/X+RHfxfMZf4h4JeyCLT3Usn8FO67nMlIzW4cMIfDg=; b=qeWCN8dUSoyg7L jCArGFrKx/+Nh7krNHOEHI3oltpLQHw549b+tjivKrZS4aD2hr+e6YhMXR7BGqFHNNtduaGQyzqRt LmKdqGyMXmSQyN6bF4j4J51hpI63Sjc+snKLZu4UiLiSbGW6qOxwRTx0oDuwmnLA4bmRoT8IKUAi7 1dOsrObzsA6pxpOngtiLqvmq0LqeknaY1UcRlNZMUcKWB6BzDBXbxrRvk2UZHHAgAMlUYab90W94E OttqDZGt+bNrVOdBvNghBnIEcF9rMNvEOy2g4BrQ0o6BzRTlBfGD0Ck5FyOunNEFMECYqSOV1056I SxMjrHK3rWnNn5Kqooxw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqwrJ-00DVHG-Pw; Wed, 09 Jun 2021 11:58:59 +0000 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqweV-00DPxS-Sb for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 11:45:45 +0000 Received: by mail-wm1-x32e.google.com with SMTP id l9so3828362wms.1 for ; Wed, 09 Jun 2021 04:45:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dv5TZU6Wfb8j+K9/W/AYEnaVxLhCu1/evPURiwPUiMo=; b=Z85OLRbx3GH2ei/4xqhwY+3XR6I9n1h1s5VwXt9lvOq6dJ5i0Y7PQv9gzw83iNl3Rx xICN/iysMo7NlB1cSOlJROS3V2UXyBmkb1o6ntlPBTqSQ2KO/WCgGbyII+8hQPjR/2t7 tcFuo6jBdp0JL9hlS5ckKfFUONWfpdkrNuUqdTjxtbspt2eptlxCyl+QHZKK8egaJKXT DsBFklGnyK7GIOHV/peFDp/MccwgOaIBEoUHTJZWR6CD7ipFEcvYE+RDrpOGcL4/18aI A9JNiV1CXsy1As6bxNgoRy41njUKJ82Fe4ExZNzRrayN0P08Ao52aIdYyzp9/sgj9ai2 W/AQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=dv5TZU6Wfb8j+K9/W/AYEnaVxLhCu1/evPURiwPUiMo=; b=htVlsKRsJ9iZqAv5FFXiYug6xpFC+6BKWxYHOWEN+/uySWDb+9twHHqr7pY7fcMSvG xkHiWynnSSw/ZPR0BKZ9CbApUp8O9p1uomJOGQ8Q+KIOme37koY2px+2oA5CiXpk0w+3 yQwnVHvssRxYShYRbcovjsyoUmyKYhrlOHUG/tGxbcwcOpIjdS6L5OrrsBirvurY0fhj /v4/skJfAXLbqzHZcQAyD+yB4EiF9Ixb5JCiGEJ4E7brqYGeb0TB6gCrr5EFM5ZJgVGa 4ExQ/tqw7jR1/Snb0HeRXFRa4f9NndLmroQcmuf41WwymD78wH3mI+MmR4B0u25m+Dw0 SghQ== X-Gm-Message-State: AOAM533TLvkIpjHaegNUiswmqQp22EgNfWw9jJ1b5zNik8JhXT2Hrd8o GfxZlnBTTBbVlAq3FF6wUnHOxQ== X-Google-Smtp-Source: ABdhPJxZ4rF6XjqTvg0g48EKxnPE4/hfAi3vObLFC5G1cq2/FzO1UwWMM1SbT6R2lwIc1kdlcfr/pg== X-Received: by 2002:a7b:c20b:: with SMTP id x11mr9596495wmi.9.1623239142053; Wed, 09 Jun 2021 04:45:42 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::45a]) by smtp.gmail.com with ESMTPSA id n8sm20171026wmi.16.2021.06.09.04.45.41 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Jun 2021 04:45:41 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu, michal.simek@xilinx.com, git@xilinx.com, Viresh Kumar Cc: Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 12/31] arm64: zynqmp: Add missing mio-bank properties to dc1 and dc5 Date: Wed, 9 Jun 2021 13:44:48 +0200 Message-Id: <2b2ab31639c706651dfd319f5b6bc59e68f111b6.1623239033.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_044543_964354_0C68373D X-CRM114-Status: GOOD ( 11.08 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add missing mio-bank properties to zc1751 dc1 and dc5 boards. The same change was done by commit 63481699d6e3 ("arm64: dts: zynqmp: Add missing mio-bank properties to sdhcis"). Signed-off-by: Michal Simek --- arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 2 ++ arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm019-dc5.dts | 1 + 2 files changed, 3 insertions(+) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts index f57cb5356cef..dd129347174a 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts @@ -364,6 +364,7 @@ &sdhci0 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_sdhci0_default>; bus-width = <8>; + xlnx,mio-bank = <0>; }; /* SD1 with level shifter */ @@ -371,6 +372,7 @@ &sdhci1 { status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_sdhci1_default>; + xlnx,mio-bank = <1>; }; &uart0 { diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm019-dc5.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm019-dc5.dts index 6c9460a0707c..ae2d03d98322 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm019-dc5.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm019-dc5.dts @@ -407,6 +407,7 @@ &sdhci0 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_sdhci0_default>; no-1-8-v; + xlnx,mio-bank = <0>; }; &ttc0 { From patchwork Wed Jun 9 11:44:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 12309931 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=-17.0 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,USER_AGENT_GIT 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 F18D9C48BCF for ; Wed, 9 Jun 2021 12:03:13 +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 B9F5960FF4 for ; Wed, 9 Jun 2021 12:03:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B9F5960FF4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=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=FSMZRk6Bf4kjedi34rpJSy38w2x/qNFtsp2xFEFnprI=; b=adX1QdH+tbg4nQ QbCcY8k6vrqyEHTQlwDngQZcMk3VIBab+2J79osMpEyfKGq8Uo5CrQwVsCa51zZjC6W+wO059RseA V/Ukud3cuwI6gbDn2JIjQJxMWp53xDqe7ccEsLqKnGJ4E13JSvjLtEjZbvnNoZvJTaVmLcpND0FEy vmaDhGRn5Q53RhOK8/AOom41NdF/EKCUkCv168kA8aEzzcVZYzcbZTQQDNgE6f4m/kVgfUeXfioZZ N/cu7cJCztSkWhuhy8VHDzonELo+9E/FKgwX84h6orIEtfpW+XL3acgHg9mKMkcpz2SqhcZqonFyz Ej4uDJ6MY/SXjXbe4UXg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqwsZ-00DVpM-W7; Wed, 09 Jun 2021 12:00:17 +0000 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqweX-00DPyG-I5 for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 11:45:46 +0000 Received: by mail-wm1-x332.google.com with SMTP id l9so3828412wms.1 for ; Wed, 09 Jun 2021 04:45:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=styvWJvIXEs6U8gd1fv+TlnpGj3ZJZxwZ7wSHylJeKo=; b=RX57wVm41b1Crmr0H5Ujqr2EdlVFoAvjZPCD3KEnYcEJ/+OlmIpyDb3LAwbiNkkmfy 3sCQtbd+iMGAH9vOLRm0Sl6lSZvzPzEnvLOAGXVTkuyxfnLJl5L/LyL+JowLQcfk2iK2 UrnZJGJVs7kAfsFN3XEZmn8GuayG++PC2jNArabOhXEOF5amlq7MZ/L41pq+yjzOCVhI hJhs9uyIAWe10deEo0k4sF5oDxCb0bktFYOSpWKv/KLb9DxxSc2yA4/oXHPaY6rb2cGV 3iefErMI38OO270UEO6r9WTzfsIv8Q0QAKQ8pbEXpNBtlWP5nH6jctwpvBYjtZFs3bQk CZvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=styvWJvIXEs6U8gd1fv+TlnpGj3ZJZxwZ7wSHylJeKo=; b=H+amj/GJ06x9nKEdyLCM50IuHFPWSd9B3PC3UKrFGawzkKHxo7z4RM1uMSNquGBowb PkfPREtig3uRvW5saXnI5XfgLRZBFiNfG3JW8ydqmTPy+UPRfJXBfmwyCoXqa2ODsOnC 2gQBVIbMuFO/cHYBJFkFXqz8TvaK1hXJvZ307z65Nl5aTSdqx/Y54uShkcOmmpK47tnU 9qQlpt6IPUTAWz1BqrFKR8jaEF+ZrZciFElQDF67WLWs6MirxdcO7QTNMylfOX7GNhB2 6ZNy/cGG20wLeahUZmczK0poqJ2a5KrgEQ//OA2JhPqfAeT9KgwYTiHL79a/yhJP7WXE NugA== X-Gm-Message-State: AOAM532s1lugT36iEwq6XfwR15NjqHJj84d6eZp2uGSytR0vdhF+baSm 4WVruj3UGY+1xvU/nlZTNZugpg== X-Google-Smtp-Source: ABdhPJztWMwskty+Zgx1ZKoAqoj/y4UU3LXJ2H2Rx0dZP8C55OIkUiMpdWyKFSzwbcPk9wEvTF/JXg== X-Received: by 2002:a7b:c3da:: with SMTP id t26mr26717316wmj.63.1623239143605; Wed, 09 Jun 2021 04:45:43 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::45a]) by smtp.gmail.com with ESMTPSA id n7sm5429414wmq.37.2021.06.09.04.45.43 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Jun 2021 04:45:43 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu, michal.simek@xilinx.com, git@xilinx.com, Viresh Kumar Cc: Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 13/31] arm64: zynqmp: Wire DP and DPDMA for dc1/dc4 Date: Wed, 9 Jun 2021 13:44:49 +0200 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_044545_637456_9987C11A X-CRM114-Status: GOOD ( 11.19 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Enable Display Port and Display Port DMA for zc1751 dc1 and dc4. Signed-off-by: Michal Simek --- arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 8 ++++++++ arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts | 10 +++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts index dd129347174a..460aba6e7990 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts @@ -391,3 +391,11 @@ &usb0 { phys = <&psgtr 2 PHY_TYPE_USB3 0 2>; maximum-speed = "super-speed"; }; + +&zynqmp_dpdma { + status = "okay"; +}; + +&zynqmp_dpsub { + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts index 2366cd9f091a..8046f0df0f35 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts @@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP zc1751-xm018-dc4 * - * (C) Copyright 2015 - 2019, Xilinx, Inc. + * (C) Copyright 2015 - 2021, Xilinx, Inc. * * Michal Simek */ @@ -176,3 +176,11 @@ &uart1 { &watchdog0 { status = "okay"; }; + +&zynqmp_dpdma { + status = "okay"; +}; + +&zynqmp_dpsub { + status = "okay"; +}; From patchwork Wed Jun 9 11:44:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 12309933 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=-17.0 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,USER_AGENT_GIT 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 6FBA0C48BD1 for ; Wed, 9 Jun 2021 12:04:12 +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 3C74D613BA for ; Wed, 9 Jun 2021 12:04:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3C74D613BA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=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=WAFyQmpGgYqTQjKrrda1L59DpIzNU5DIg4cNtUiv1Ks=; b=vO3ErgJtFU02M5 34j24QgIsR06Jc7n9JUvyIN9KqxGzdtudV3gLlBd+05pljXKzFM0b/NkEDjXR+ucmLgXj3ix8tj1+ V1V7q80N0ibQp62zZTPwrtgAc7nnslBk8/2AlplpVxVPjng8+XcaznAkHNen4X0yhALZaBes76jBH S/8Oa5XgwxJpiKHrtr0zj5x41o2HDGpJjOYlmzT+W02sFORSgfqVV5SVn5RWe5fLSCwqS7c4hMnUQ cWu1w+sWNAXE/Ztpg0XbekPlODYjoa5KHnOERP+wkzCCfAEW7Bdl78Usen2BY8NJExNH8xOxxtIj8 wmgO4gjYOJsu8E9zCwsA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqwtu-00DWNB-9J; Wed, 09 Jun 2021 12:01:39 +0000 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqweZ-00DPzC-1v for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 11:45:48 +0000 Received: by mail-wr1-x42f.google.com with SMTP id c5so25087930wrq.9 for ; Wed, 09 Jun 2021 04:45:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TgZ5B4J502ii7Dy6GCLNVKtli/unOViiMaRQaClYuVI=; b=rSYkJPLEqoeYbB3sXP+5MCnQ0t70j4u5kRk1ljAgJyOul11NvFJwZynxEWANTep7v+ 1sdzv3ypm3QWK9y3kig3skcYg++N0UZlcG4STMM+zsMJwO/+A3f+OUaFEhWJdNbGwg6p rlfforaloP0ks6bVk5dbiHjgr8u68Hfzpd8Y4u9R4Ir3f2bd5E6JXeWBtYqWBQ7ChTqy UTXzgQT6JQOyN4qrpuhdbgINq0049UFQr8MbDv30zQXimKISyH3JxhYtPBnr0MSW+6G5 zGbrpTHVmunlB2bOj8NAtLCTmnoFuV2o0wuVxUGsqFQPNzHBQ0fD8sH+Oc5ThsQPVlrj ZcgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=TgZ5B4J502ii7Dy6GCLNVKtli/unOViiMaRQaClYuVI=; b=gzXv2HIrGEaHnoH66unk2orMu2/QmCIgV5GnbpAxYZrd4EbZ6kueLTWX4FKV4saUNZ lo5iS2WpXq0Kz59oxe4GOllC3vVZgGtoqQwZR2XDVVFdLXuF0y0UjptJbOIbNqkXn2vt 5ay6nO7dzGRvPjxBsDQqxo29QBawa7ivOA/WKawfbb/Nq3/sNFM+lJ2IOp+1QS45VSiP WrXsRbBsZusaufC2JKKdngW9Uid0niwmM10cxb4foxwDTNvKHyHhLcEk9MWSDd6yT+gs YuXkZwR/VLwx8j7VG/d9pIRUvh4L37Hlik0IiLLVAbPL86+VxtCc5FbsWrRW0pxBNQkc 7/aA== X-Gm-Message-State: AOAM532FVeSw4k/IrwhCBbXreofxsm0X9ECs9X709ZC85SVRdc7K8TyP 9uP8ruHXrOla4e+M1LSw5yKwdQ== X-Google-Smtp-Source: ABdhPJx+JfhhubBypEm5y+nRpda2i6WKRLjb8dclWxrl36b65HCEpQGNaUCkimjH85vz8bNMEeTyow== X-Received: by 2002:adf:e5c7:: with SMTP id a7mr27471448wrn.117.1623239145245; Wed, 09 Jun 2021 04:45:45 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::45a]) by smtp.gmail.com with ESMTPSA id k11sm5911750wmj.1.2021.06.09.04.45.44 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Jun 2021 04:45:44 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu, michal.simek@xilinx.com, git@xilinx.com, Viresh Kumar Cc: Amit Kumar Mahapatra , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 14/31] arm64: zynqmp: Enable nand driver for dc2 and dc3 Date: Wed, 9 Jun 2021 13:44:50 +0200 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_044547_170590_A6A4AE8D X-CRM114-Status: GOOD ( 12.10 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add description for nand devices on zc1751 dc2 and dc3 boards. Signed-off-by: Michal Simek --- .../dts/xilinx/zynqmp-zc1751-xm016-dc2.dts | 26 +++++++++++++++++++ .../dts/xilinx/zynqmp-zc1751-xm017-dc3.dts | 9 ++++++- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts index 1ac105a82e1b..4b4c19034fe1 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts @@ -127,6 +127,32 @@ rtc@68 { }; }; +&nand0 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_nand0_default>; + arasan,has-mdma; + + nand@0 { + reg = <0x0>; + #address-cells = <0x2>; + #size-cells = <0x1>; + nand-ecc-mode = "soft"; + nand-ecc-algo = "bch"; + nand-rb = <0>; + label = "main-storage-0"; + }; + nand@1 { + reg = <0x1>; + #address-cells = <0x2>; + #size-cells = <0x1>; + nand-ecc-mode = "soft"; + nand-ecc-algo = "bch"; + nand-rb = <0>; + label = "main-storage-1"; + }; +}; + &pinctrl0 { status = "okay"; pinctrl_can0_default: can0-default { diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm017-dc3.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm017-dc3.dts index 4ea6ef5a7f2b..ba7f1f21c579 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm017-dc3.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm017-dc3.dts @@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP zc1751-xm017-dc3 * - * (C) Copyright 2016 - 2019, Xilinx, Inc. + * (C) Copyright 2016 - 2021, Xilinx, Inc. * * Michal Simek */ @@ -107,6 +107,13 @@ &i2c1 { clock-frequency = <400000>; }; +/* MT29F64G08AECDBJ4-6 */ +&nand0 { + status = "okay"; + arasan,has-mdma; + num-cs = <2>; +}; + &rtc { status = "okay"; }; From patchwork Wed Jun 9 11:44:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 12310001 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=-17.0 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,USER_AGENT_GIT 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 4671EC48BCD for ; Wed, 9 Jun 2021 12:23:37 +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 100E561351 for ; Wed, 9 Jun 2021 12:23:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 100E561351 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=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=jaqc2M4O9B/R2dHNHeslB2FRjzgTZGTOVhmlwojDAdM=; b=L70RDbaSCGsIQQ uTk54t4gGfCa7nFleJeVSzjfSCpZMTt8CUe9LK/aWVPXAoQ2vlgH3AyLGAGvR7zNCmYlUJK6CVAK9 VF72Qdjn6KNcAN147pQfR5CJUQcbwckrkcj9taN+oKqk0swhi3T+b6obl6bF7TW6Nd2wt++y6fPDe T71HgmfWPYf8TTcZtSret7MdFcnMdugG2wgUNJJQBAewEcvOTYfZt5JnpitxK/uyE2vX5pzwFDU80 hiekIhnsro5WgoACPm7d0cqtddxRmqImTH58mgKvR3NmIGbHDkzvDVx0qSSIKjrc4tSRTT0lYqBat atHnRzW6QKRp++eyCv7Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqxCw-00DdrC-43; Wed, 09 Jun 2021 12:21:18 +0000 Received: from mail-wm1-f50.google.com ([209.85.128.50]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqwfY-00DQRl-0q for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 11:46:49 +0000 Received: by mail-wm1-f50.google.com with SMTP id u5-20020a7bc0450000b02901480e40338bso3047886wmc.1 for ; Wed, 09 Jun 2021 04:46:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=958Czn2DLB+o/NZtXonc7bnisFWGNfDVO9VxvQ+P81g=; b=JPp+4hs+e1lRRVOlXTYSKUNgES7Yspkb4tBX4RSwbXg5kWE2KIkq3HGXzAR6gCVQ0s Ww3Vx3zwXajcMMpM1odY5aa27oIs0Wv3RBM3boxOh+zKOGS3Tv7BPH9IrPZMUHSlzsL0 ousS0VsdfKsg9DCX9SO9EweV85gTIBSybH1CZq/z2LU77FGkhYHBFP0qK9qCzjwtEyIK BCo2DJuM4PwWKgBxs3auHmYcW3miz21ac1RTIuwqrU/r4s06+cSOmtDRIxp1nX7VBukY TOz+x5yRq9e0SBzcogdny1zahZ9j/1cvCBV1bxUU5hQyMjMdfCMZy340Rb1fFY08tunN vwcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=958Czn2DLB+o/NZtXonc7bnisFWGNfDVO9VxvQ+P81g=; b=W2XHamFQvSooAU+LV1Oy22XLkYColCUgj7LRAHpkQA7S11NNP3mnvivvFsSb2VIBJO bMT5szWBOYA+2l1PQ32Rv/wxVy7oz1fHelgVPLl17IHoSpvPR1fiIKUW6ROrUfQAwRGO iH4+dHiUgzpjSeN4EPvRAKC1dtKgWibXR7fSIn1aklMovJUjkngL2AexOsxlimVClZlc TrRardi5qT5NI8hIcVnfTlMpUAvyC+psxlnDi3mHeejWIaxJbqsznBCR1qcfak+jhfKc mGo1wWdvrxn65GG+XtcGT3XLqH86bHySvAv4LUVI46mv/Cwhh5B4jRtL6ueXDmY8cK+u UW6w== X-Gm-Message-State: AOAM530syt/9vmyqUKR/8jYtdEhTap4xQi6xQ8CmFq6uo5dJDkL9jtkf N7dUAI+vFGHzd070uP1s1YQERg== X-Google-Smtp-Source: ABdhPJxWWYa3eVsbzmR8sPamyReW3RB7KhmZEZSUIEmZ+yyq4NYQyOeC4FZSkJ5ONT0Z5UCxzr4UVg== X-Received: by 2002:a05:600c:4f4e:: with SMTP id m14mr9333276wmq.157.1623239146885; Wed, 09 Jun 2021 04:45:46 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::45a]) by smtp.gmail.com with ESMTPSA id j7sm21467822wrm.93.2021.06.09.04.45.46 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Jun 2021 04:45:46 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu, michal.simek@xilinx.com, git@xilinx.com, Viresh Kumar Cc: Krzysztof Kozlowski , Laurent Pinchart , Quanyang Wang , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 15/31] arm64: zynqmp: Remove additional newline Date: Wed, 9 Jun 2021 13:44:51 +0200 Message-Id: <16f6f41c8d748d3c7cd4f49b2839e63a5b41c944.1623239033.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_044648_114224_8D41E595 X-CRM114-Status: GOOD ( 11.11 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This is sync between Linux and U-Boot. Trivial change. Signed-off-by: Michal Simek --- arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts index 719a9e5e1b01..1a45e4946dd4 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts @@ -463,7 +463,6 @@ max15303@20 { /* u8 */ status = "disabled"; /* unreachable */ reg = <0x20>; }; - max20751@72 { /* u95 */ compatible = "maxim,max20751"; reg = <0x72>; From patchwork Wed Jun 9 11:44:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 12309935 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=-17.0 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,USER_AGENT_GIT autolearn=unavailable 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 A57C1C48BCF for ; Wed, 9 Jun 2021 12:05: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 6DB256124C for ; Wed, 9 Jun 2021 12:05:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6DB256124C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=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=XbAwotx1BQkNcAoy8FhlMHnVvGR69jqHErZ33VCk51g=; b=rneUVQUh6+/57B 0sAMYkd0R5v4a6nSseo87AlWWIsNyQ6bOAg7ylbLDZ8A3/LELywkAn054j4n7yl8iQztoV/nCTKkN mtu/gejjLHWLSb+5JRzySwvvcjF9zxTKQnXMccFvx2TiU1//lA8bXzab6X3UvQSsrC7KAlrfFEi9a cGCPtidqhu5KnHCMX34uzZbmCMJZLPX+vMkfiGtpK03iMvqLIl5ZrBPUbAxyDeZKZDkS9r1ECueBQ nrS3oN26UjB9kAPqTK03mAAQl/pIrjKhHUGCJdfM5WhI06UJ6NvfIx4oRMXR79jWV7ZPPexU823jO G269TERFN+ooiV47l+kw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqwun-00DWjP-RI; Wed, 09 Jun 2021 12:02:35 +0000 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqwec-00DQ0r-M7 for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 11:45:52 +0000 Received: by mail-wr1-x429.google.com with SMTP id f2so25088050wri.11 for ; Wed, 09 Jun 2021 04:45:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OFkJ4b+Pv9hA9fg/hHFAqZWjcxiSUunEmPfat4jQdC4=; b=Ts8TbXPH/MqSFzh9qeCjFmMNJ7DArCCG2XWTDXEtuPLRtl+xkadG1WFuu39jDDUi4+ OO8e4MOv7ihZdTaJzg8M/4NSKkz3ESZduJ/4QdjJWlzP0xDHzQ0+SrhNptIp5iDlRhgg 0g/xrpytLVFKOGxadnv5Cnp9xGISUFO6q2Wz+p8xhR+sEkQW3oV/XFsKEf8VAUM+xEzy 14uvEx8qE470D8gTNWjlF760fnB1rFj/8wWetPOPZTYuCLGu1Wgw9V2qMQwc6tecubPs MI8Jsnli5nAbGI5iwfJ/GERKxvG/UR0SDVLQQcr7vcdhtuhEDCdsaxaTF9Vmbzg0PjGq Kz/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=OFkJ4b+Pv9hA9fg/hHFAqZWjcxiSUunEmPfat4jQdC4=; b=q2h6KeKDuRcSXSrpmsxOjONv7dKxV6enhVsTYfZwVKzXkBHLja9c63N5UTEQX11Eoh ma/1kZm+kQ9QdSVo0UZIN0kVj3out9R9ph4VqBAjw3kedeCv/fxID/tB+/Ins3t90E2F zMab2udxIzeN7zzSm7p2Dknn3EXxDnMzRJPshZpRK2eF9ihFUNZRK2KuSG2hLtTwHn0O iRQl2510mMh7rsrTLSpi9IHCk6HRdSlR6Ta6aJNNf47/4ubf7BOL/05R8Nw7oMfvp6mr 1lcF/ZXUSPmBdXdNJEyLqenPYSgjzy3hk93o/gTwwTA0ZYqbX+g032U+npbsqKq5fsI6 fVDQ== X-Gm-Message-State: AOAM530iPuB5My98iX0/2hVQGBz45s1D+vwJKVMtZKrVmjG3f7wPc+T4 erJQg4GUo8Ur3r0+G3kdW6ml0A== X-Google-Smtp-Source: ABdhPJyURMieWSx/lNg4b2fyHhX9FhDq86PbmK1VZeJCx8xeecvlukgiGTspB96uKuiLVljoOa9klg== X-Received: by 2002:a5d:47ce:: with SMTP id o14mr27341558wrc.273.1623239148723; Wed, 09 Jun 2021 04:45:48 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::45a]) by smtp.gmail.com with ESMTPSA id t9sm16840930wmq.14.2021.06.09.04.45.48 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Jun 2021 04:45:48 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu, michal.simek@xilinx.com, git@xilinx.com, Viresh Kumar Cc: Krzysztof Kozlowski , Laurent Pinchart , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 16/31] arm64: zynqmp: Move clock node to zynqmp-clk-ccf.dtsi Date: Wed, 9 Jun 2021 13:44:52 +0200 Message-Id: <48bfd8cf0de4d10b9c4d745218595f28954f70d5.1623239033.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_044550_773772_14B36B6E X-CRM114-Status: GOOD ( 13.03 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Using clock firmware driver is not the only one option how to configure clock. In past fixed clocks were also used and that configuration is still valid that's why move clock firmware node to the same file where zynqmp_clk references are used. Signed-off-by: Michal Simek --- arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 13 ++++++++++++- arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 15 --------------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi index cf5295224750..1e0b1bca7c94 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi +++ b/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi @@ -2,7 +2,7 @@ /* * Clock specification for Xilinx ZynqMP * - * (C) Copyright 2017 - 2019, Xilinx, Inc. + * (C) Copyright 2017 - 2021, Xilinx, Inc. * * Michal Simek */ @@ -40,6 +40,17 @@ aux_ref_clk: aux_ref_clk { }; }; +&zynqmp_firmware { + zynqmp_clk: clock-controller { + #clock-cells = <1>; + compatible = "xlnx,zynqmp-clk"; + clocks = <&pss_ref_clk>, <&video_clk>, <&pss_alt_ref_clk>, + <&aux_ref_clk>, <>_crx_ref_clk>; + clock-names = "pss_ref_clk", "video_clk", "pss_alt_ref_clk", + "aux_ref_clk", "gt_crx_ref_clk"; + }; +}; + &can0 { clocks = <&zynqmp_clk CAN0_REF>, <&zynqmp_clk LPD_LSBUS>; }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi index 3fa0517cfd98..bd3f0d456ca4 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi @@ -156,21 +156,6 @@ zynqmp_power: zynqmp-power { mbox-names = "tx", "rx"; }; - zynqmp_clk: clock-controller { - #clock-cells = <1>; - compatible = "xlnx,zynqmp-clk"; - clocks = <&pss_ref_clk>, - <&video_clk>, - <&pss_alt_ref_clk>, - <&aux_ref_clk>, - <>_crx_ref_clk>; - clock-names = "pss_ref_clk", - "video_clk", - "pss_alt_ref_clk", - "aux_ref_clk", - "gt_crx_ref_clk"; - }; - nvmem_firmware { compatible = "xlnx,zynqmp-nvmem-fw"; #address-cells = <1>; From patchwork Wed Jun 9 11:44:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 12309941 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=-17.0 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,USER_AGENT_GIT autolearn=unavailable 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 6D945C48BCF for ; Wed, 9 Jun 2021 12:07:52 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3609161285 for ; Wed, 9 Jun 2021 12:07:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3609161285 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=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=40uLT6cZeU557ARCeKcZ3l+gWL/WPB372VWfC1Wq/wc=; b=KXRfBSRpBAv9Zg L2Pc9qzp2Nnzy69pb8FUe2C70q3ILC0IOrBu7jDdeq7p40D4MBjyl9j81zuFL21+FKnpjjHuuRbQn ou8sZ6gIjc2Lb98pwO/j7phWGklgDC4ti0CF/93/IjFcprc2Dg6rz95+vyNQTgeJZVkdIl6kwItPE VE60C0tunf9LleMMJxU9Ctl8JBYX+cfdz1PhC+9F9sqhiekBAGL0uOFehqazgRgDNW4zcWhSJEjSw mQhIS+me4n3ynkq5JcFlvLc6/pvYOEbjQhCN/2LSJQIU0M8ceXlzCe9aPqMauyKvWwPsAGvccWzrK aM5qzOVZVh6LIZbkTY2g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqwxX-00DXsK-Od; Wed, 09 Jun 2021 12:05:25 +0000 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqwef-00DQ2O-V2 for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 11:45:55 +0000 Received: by mail-wr1-x435.google.com with SMTP id z8so25087995wrp.12 for ; Wed, 09 Jun 2021 04:45:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2oJBCb/IEp6HCT0Khc41E+ZKW3BEVh2wQ7Q+Btm9aLE=; b=u33UTezcqWw3EwAL8es1PrN9BNk7b9P6aXfTUXOzGWKzRU6LGDhufMDBOfMYaBaYT4 j+iPZkh2PBwNtEMxwiJpskl5YbN7timv2lOCyKcRx77nrM176NuN5g+yB7ccIjUe71wo /ml5VXI12qXCAVDRpt3XDYylJsVS9SWUGGnBT9Zka4lUB2zTJ7cERD4MYes/g9WcBGLT YSuPRi1FN0kRIEAtMFSuMVB33yYz3IdtyNe30kSAuuzOGiiSFT63DL4msLO0oW9hPNN4 UjltDjinK7zo/jy+pfcl1DTHlLUfEeuQt9BpWdPeWHuOJv0pOsbe8ukg1eibPAy8BLnf tx7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=2oJBCb/IEp6HCT0Khc41E+ZKW3BEVh2wQ7Q+Btm9aLE=; b=SkNU/c49ZqmkKFGW81yzO88S3beaZal6LqI4Vkk4lsKIJe/d5VFvdr8HeaYef1kenM C9gBUUpMD7QEUvorS9EBWqQEtOVIK1x9c95V1WpSyQMGwaualnQptMMxXwCndT74TYBN 7fVT5gF1oEDu0kOpVmvEujaaWYL+YN2ElQejSuRFsMEGTTAcBZZUNM/au8VdfmY4Vp6l PV4DdOqzecD5IINS8YUsDgTLBAnxDgPlqNSz3Wm8gK78U8howcZC+b0nabXFDeanNhik KlkVhHRT4nNtG2VA4YQxxQ4nGTO2H/17TGOiozrumgjyanuQlhq55d5DRuJ8lUAl4+hc XBrg== X-Gm-Message-State: AOAM533oVPfcmWg/Kd0KXXnrQ5BgbI8ZUJtWRMPSwJ9oZwskrjzNsh96 wivsVYZNA0FH3IQLJd+pYke09A== X-Google-Smtp-Source: ABdhPJwu3dPsiYPGloJtXLHsOdDjrEjSlsgc0e2EjWGqoM/VtNdqkJ4OceOVsDvXUIFHi1wPvQEQHA== X-Received: by 2002:a5d:6a41:: with SMTP id t1mr21296407wrw.113.1623239150445; Wed, 09 Jun 2021 04:45:50 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::45a]) by smtp.gmail.com with ESMTPSA id l2sm23037103wrp.21.2021.06.09.04.45.49 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Jun 2021 04:45:50 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu, michal.simek@xilinx.com, git@xilinx.com, Viresh Kumar Cc: Krzysztof Kozlowski , Laurent Pinchart , Quanyang Wang , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 17/31] arm64: zynqmp: Add nvmem alises for eeproms Date: Wed, 9 Jun 2021 13:44:53 +0200 Message-Id: <9b860b47ec3ca64340b4d29317e92b667236d7d1.1623239033.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_044554_067907_E35A7B47 X-CRM114-Status: GOOD ( 13.52 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Use nvmem alias to point to eeprom memory which contains information about board. The change is done based on discussion in the link below. Link: https://lore.kernel.org/r/CAL_JsqLMDqpkyg-Q7mUfw-XH67-v068Q6e9wTq2UOoN=0-_coQ@mail.gmail.com Signed-off-by: Michal Simek --- arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 1 + arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts | 3 ++- arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts | 1 + arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts | 1 + arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 1 + 5 files changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts index 1a45e4946dd4..339a12b255c1 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts @@ -25,6 +25,7 @@ aliases { i2c0 = &i2c0; i2c1 = &i2c1; mmc0 = &sdhci1; + nvmem0 = &eeprom; rtc0 = &rtc; serial0 = &uart0; serial1 = &uart1; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts index d7ecfcadd08b..4c328569c3ac 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts @@ -23,6 +23,7 @@ aliases { ethernet0 = &gem3; i2c0 = &i2c1; mmc0 = &sdhci1; + nvmem0 = &eeprom; rtc0 = &rtc; serial0 = &uart0; serial1 = &uart1; @@ -146,7 +147,7 @@ i2c@0 { * 512B - 768B address 0x56 * 768B - 1024B address 0x57 */ - eeprom@54 { /* u23 */ + eeprom: eeprom@54 { /* u23 */ compatible = "atmel,24c08"; reg = <0x54>; #address-cells = <1>; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts index 403a8ea6a36f..99d172867f6a 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts @@ -23,6 +23,7 @@ aliases { ethernet0 = &gem3; i2c0 = &i2c1; mmc0 = &sdhci1; + nvmem0 = &eeprom; rtc0 = &rtc; serial0 = &uart0; serial1 = &uart1; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts index 186d2e00d4a0..dbb8bfbb5c7f 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts @@ -25,6 +25,7 @@ aliases { i2c0 = &i2c0; i2c1 = &i2c1; mmc0 = &sdhci1; + nvmem0 = &eeprom; rtc0 = &rtc; serial0 = &uart0; serial1 = &uart1; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts index e646246a3b14..85e9d0e2f9bd 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts @@ -25,6 +25,7 @@ aliases { i2c0 = &i2c0; i2c1 = &i2c1; mmc0 = &sdhci1; + nvmem0 = &eeprom; rtc0 = &rtc; serial0 = &uart0; serial1 = &dcc; From patchwork Wed Jun 9 11:44:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 12309937 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=-17.0 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,USER_AGENT_GIT 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 238D6C48BCD for ; Wed, 9 Jun 2021 12:06:28 +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 D164E60FF4 for ; Wed, 9 Jun 2021 12:06:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D164E60FF4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=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=oNjP8Mcn4Qp/pxWYv65dosfteJ2HdhC+fiPSChRl4K4=; b=X40TY+xod/gLMs JSsUMmgESGlCEjlXUOyv3qDLEXlqeTMa7r1ckxptZEzyyEHLgaDlYRh7gRWjI13eekrVC7uCTDIcj /fpmTmcmWKgpHmA2VoymnE24AuI7Gmw8ebcJN8hfTWnWSyWc1v8wyZsfPYj2iC3shdeJQDRT8RiGJ cmNCAHYJJyiOgygaRAJUMZDksnibl3VVBKxah+DPIROsEt44rqNHd0FQYZ6Q9TYvefjynpH2r6eY4 sgT05gH4+J8HMSLgDUqj3owYmvkOZwLzqtAweO6Sqw4FmBWNuKOoIkD68TMwe2g7w+iobLZ8k0cEF hHUOpEDxhm0gXtae0OKA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqww3-00DXFG-42; Wed, 09 Jun 2021 12:03:53 +0000 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqweg-00DQ2L-0V for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 11:45:55 +0000 Received: by mail-wm1-x32f.google.com with SMTP id l7-20020a05600c1d07b02901b0e2ebd6deso3990803wms.1 for ; Wed, 09 Jun 2021 04:45:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GbQSiZBzEuGIVwuEiIag9TzTdqugGYvIJEoxnMrSSJY=; b=SS2cbDoIzdIU96DkZoAQxyIUC1aFdY9kqx4Q8uf/kxO4b4viV6WVw3+KrLMRZfgo3I u6KDYfbfnf8rMX7OCg+K3SiqcROUCrB3qnJsF0cXL7yjuXSo+jytL+zPHz0uzAHmbteB cY+ORis0OXizeOjQe/SskVVlHDYeiF8jg5QNj13MIb1OpQ15jDw0GiYmA/HxGR1lBlXN IIpbS/QLWqytR4hONpz+BfBh/u0qI221NL0LCXt3jaam8xJl+uc5k0QImmpL3yDztdEZ Qb/9agXFRkwbA0Bu00Z+ivR8i7i75hHy4XlTVD+Q2R6Npz4nx2TbxEdgqNnMXmALYQsa x5uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=GbQSiZBzEuGIVwuEiIag9TzTdqugGYvIJEoxnMrSSJY=; b=FXAve2+gAG3lW/ThZXImJyEWHSHPqurzAa2XHJpXVCZP1VN5TNB33Yt9JKLFkPCPrO M2pmGU71HKUahc1Q7jucQE2U2TMUoLCKt3zHrB2rkSob8Ooh1EnaEVBRy8/wP8Md+H8V Eg1YSw17x5jq6wfd7yuOaj6FEm15YRyTfKyLmCKu38ylF9/v381sDHiDusosq+mLpKGu gUXkeJxNbW/SrZxWSCGA8NWRv1me0RvqKju8hBwqDH42J+kan/jYdxA0heW4DDEXlBNe gpLnByi/1cC4amy4uc0lvORfV7oehnk7wMNhb24Dea9ENgoe9HYnPxxFygfNPqsScWB4 Tnog== X-Gm-Message-State: AOAM531NqiOccM1RQj/fhnVjaAtab4WkSOEkloSLKMgdWCkFPmc9yGWY 6DPpF50cDGJjXzk2Ir4BM6ZZOw== X-Google-Smtp-Source: ABdhPJxMn0oxXJfBeEUS9bZ7ufRZPIikEZ+zhGDeKdgYxT4BmbfG8pxY764UIHuPlJ+II2TscdM03g== X-Received: by 2002:a05:600c:1546:: with SMTP id f6mr9668034wmg.47.1623239152133; Wed, 09 Jun 2021 04:45:52 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::45a]) by smtp.gmail.com with ESMTPSA id b188sm7961793wmh.18.2021.06.09.04.45.51 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Jun 2021 04:45:51 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu, michal.simek@xilinx.com, git@xilinx.com, Viresh Kumar Cc: Krzysztof Kozlowski , Laurent Pinchart , Quanyang Wang , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 18/31] arm64: zynqmp: List reset property for ethernet phy Date: Wed, 9 Jun 2021 13:44:54 +0200 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_044554_092120_7BC4497C X-CRM114-Status: GOOD ( 12.34 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add information about reset gpio for ethernet phy in case someone wants to use it. Signed-off-by: Michal Simek --- arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 1 + arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revB.dts | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts index 339a12b255c1..5ddcfdf48626 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts @@ -204,6 +204,7 @@ phy0: ethernet-phy@21 { ti,tx-internal-delay = <0xa>; ti,fifo-depth = <0x1>; ti,dp83867-rxctrl-strap-quirk; + /* reset-gpios = <&tca6416_u97 6 GPIO_ACTIVE_LOW>; */ }; }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revB.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revB.dts index d9ad8a4b20d3..f7d718ff116b 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revB.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revB.dts @@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP ZCU102 RevB * - * (C) Copyright 2016 - 2018, Xilinx, Inc. + * (C) Copyright 2016 - 2021, Xilinx, Inc. * * Michal Simek */ @@ -22,6 +22,7 @@ phyc: ethernet-phy@c { ti,tx-internal-delay = <0xa>; ti,fifo-depth = <0x1>; ti,dp83867-rxctrl-strap-quirk; + /* reset-gpios = <&tca6416_u97 6 GPIO_ACTIVE_LOW>; */ }; /* Cleanup from RevA */ /delete-node/ ethernet-phy@21; From patchwork Wed Jun 9 11:44:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 12310003 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=-17.0 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,USER_AGENT_GIT 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 00F5EC48BCD for ; Wed, 9 Jun 2021 12:24:05 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C33F761364 for ; Wed, 9 Jun 2021 12:24:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C33F761364 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=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=0HEhubBOfQM+CmaPaXckqWB19kV9cxMLoFpdDn3nopk=; b=UTsQnhJuPJ7PHE eY85IXEBGykfEaPCUbaUILn8uDfWQweiR3kUGYmJdasJ747UGYQHjZQOEi0YoNKMSoqr/jxcVBnfp 9oD2xDwId9NPxKiE9FqbCknqzeeGaEgU6wcl3ADlyACRhQfTcsdHc7M2eZF8Zh1JWrHaI7/ZCPbZX TkqFPiMBAO5mCxmzliRwq9lnIwr+ikZCsFfvZzwg8jTjiFQopIEaHzi30Qfn0elSUqYBVG7QBk3s+ pxFkELRptmYUTI7lc9mf7YF9u3uth6KLoeTlfmbHV7BTlEep2b9ThajbkqvkryTMDefgnd+3qL1fz MqdZ/Y68QDax3TvWQiyQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqxDe-00De7W-Eb; Wed, 09 Jun 2021 12:22:03 +0000 Received: from mail-wm1-f44.google.com ([209.85.128.44]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqwff-00DQVL-UZ for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 11:46:57 +0000 Received: by mail-wm1-f44.google.com with SMTP id d184so3851718wmd.0 for ; Wed, 09 Jun 2021 04:46:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ws5KFSDcy0/GzNRUs6Wg3uxHuwHpItMQoMPWkBxL9Uc=; b=Oy7U7Zvp7YmAmR4vLC9d/ys3RwZvv/RGbSF7AJ/n+fU+tHr1rccDo0NggpbFnk82S3 fzd8od6yNFwyTOnRi6jqi6zT1GfoT/3n566Urmlx6vC8QZWwbdTcBDsLHHyd9qKzL8YQ /XkvkChf3gFJiTojhqYvyRr3lxSqMUf8r+wrqxs9I33f/cFb+CZwo2gwxP0U1XTI4tCi AXe03oUieAPB00K/N8i3Vx7Am8OURJYPPfX2BscuF7F/sV1JMXLwgFVqtDmTXSs0peDF 9qPuTJs/xPOD1NG+VqgpOgUooC/oNaBgweGbVyUcIy1X6QPRKnf6q3bQJWElOOVyeotn n7Qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Ws5KFSDcy0/GzNRUs6Wg3uxHuwHpItMQoMPWkBxL9Uc=; b=JGFFmtz+RyAWpKIM14XSlq9rBZN9iwrNYyBn8VzO/cjP3x/5GwFS9XezkCQfKmyy/h rs5QHquKkvyGMlA58RX5CcAxBpE8+VYPbqiYX2qTMX3Wt8xdCzTndmGqKe9Q4Bgk3SBI 9xfzcOCfLB0HX2peIDtqMwoAA+2j0hiU0A3m1SfzN0AdVYU+/18aVwSuXvBt+jjV7/dI yxeKwbEgNIYnbM3Kbi2qOhizkKH3W40lGqNDyyljgkMSvQN6RMJU/NQaMuOFsAB5XAUw uJXl/MbuUvgwcD812F+eHaidCxlrjd4Qfxd8eGdxW5vzf616TB/ctT9fekwDvWlt5grf V3Fg== X-Gm-Message-State: AOAM530NlHVJNs5GiTC2nJ8akwGFimcUyJZJ5dp1uvJgt82PjhJ6LwN/ hofaO/lx62Q2Si1YSKa0tSAC6w== X-Google-Smtp-Source: ABdhPJwPkVRd86Kf3QXTQ/Dm+lvBT829pSO/dYETHf6tfBEI/MgZlRu78M/MbhBQvFS3yhJpIAnJAQ== X-Received: by 2002:a05:600c:4ec8:: with SMTP id g8mr9257644wmq.62.1623239153922; Wed, 09 Jun 2021 04:45:53 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::45a]) by smtp.gmail.com with ESMTPSA id p16sm24172961wrs.52.2021.06.09.04.45.53 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Jun 2021 04:45:53 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu, michal.simek@xilinx.com, git@xilinx.com, Viresh Kumar Cc: Mounika Grace Akula , Krzysztof Kozlowski , Laurent Pinchart , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 19/31] arm64: zynqmp: Add reset-on-timeout to all boards and modify default timeout value Date: Wed, 9 Jun 2021 13:44:55 +0200 Message-Id: <5848a81447921240fddfe2f5749ae0746fcbbdbd.1623239033.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_044656_052065_CFF5887D X-CRM114-Status: GOOD ( 15.44 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Mounika Grace Akula This patch adds reset-on-timeout to FPD WDT which will trigger an interrupt to PMU when watchdog expiry happens and PMU takes the necessary action. If this property is not enabled, reason will not be known when watchdog expiry happens. This patch also modifies the default timeout to 60 seconds. Reason is that if u-boot enables WDT, it will set the timeout to 10 seconds and this is not enough to boot till Linux and start the WDT application in Linux. 60 seconds is the maximum safest value to boot till Linux and start the WDT application. Users need to change this timeout value to fit their needs. Signed-off-by: Mounika Grace Akula Signed-off-by: Michal Simek --- arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi index bd3f0d456ca4..80332e3b4d6a 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi @@ -830,7 +830,8 @@ watchdog0: watchdog@fd4d0000 { interrupt-parent = <&gic>; interrupts = <0 113 1>; reg = <0x0 0xfd4d0000 0x0 0x1000>; - timeout-sec = <10>; + timeout-sec = <60>; + reset-on-timeout; }; lpd_watchdog: watchdog@ff150000 { From patchwork Wed Jun 9 11:44:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 12309943 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=-17.0 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,USER_AGENT_GIT 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 418ABC48BCF for ; Wed, 9 Jun 2021 12:08:46 +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 13FA26124C for ; Wed, 9 Jun 2021 12:08:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 13FA26124C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=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=3RKoEDpRvJgz0DXpQTsIN5psUdjYdmD+WiZsvG9lILA=; b=AgZno1v25k+6yZ beedpvYj9g0QV6ywRvWvWAe8AZ1WMD2mAYSH7xXGLhKn5N+KLhl2yja/+huylEtNZK50TDNW4mC8D GCmBiJW0r9aeau8o45WP/vAdQhj924VFnZkg81jaUnKajNCVW/8+RlvwtcJsJ2HrlXRmBGlBRFedZ A5V/NsCmxU4bHWqe/D08/IzKBCT0A9zQEuadBWn2cotgWKn101zImgFB3RdjWaalso2S+Wa3CaQmO pWHxggd2wumdVE27VgUc7CWCQNYpIsQTWCqowP6O0f5C455psIV8RL4BiPKOOQRfFoo8JUyvPZP9c jzeaikwUOKKGC6cRSuzw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqwyn-00DYLd-MS; Wed, 09 Jun 2021 12:06:41 +0000 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqwei-00DQ4F-Qq for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 11:45:58 +0000 Received: by mail-wr1-x429.google.com with SMTP id l2so25156148wrw.6 for ; Wed, 09 Jun 2021 04:45:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JCtkr0FGIEXKuw/IKBQwL2IYtCBmYOG1gCclNZ1TnYU=; b=y/mvR0subgYPyYXBYPaJexgznZC0QLJjB3kL6lFfxVkhCZfjFHK8LLO40xa3Gbxd+y /u7jn/7ay9PnzimGWsJpuEGms488GU7Ol0o2xsqtoXCXYVQG6HkQmP1QgSZOJRRKhY7R q1easU4gl4Uy/KAO9vANmO5w8rK2/XbYz21LvzTXYY6NZ/3EL84KsVd3VsaP3uLh+E6h LIWKt2gp332pQnvclx1UoEaUXeX9+M+/8Kb4WMte7Fe1uBHM5VRv9W3jyEu/o+FRZ9NR DQ/fLTAy2UNgdQeb9+1n7ffChGIgFzjkCNFJQ7lTQvuk4n9fIif8jHDa9U4msORNctCM xkFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=JCtkr0FGIEXKuw/IKBQwL2IYtCBmYOG1gCclNZ1TnYU=; b=C9wn7/yBy9Qc132DaRBY0WxGztfE0x22A0yfq+4/gN5J4PYzAeFxfvC1LPbxpIuhIs wd+v1ChAh9M9uD50Yx54D4KL6ZkPcmblNMvu6ZleSs+upiqKc0AjOEuMwUCyW3ecyZo0 hrU5mI69+c+n9JaH0kVpDKYSZuhKYRrLfwaqYMV1FVPMYN/I5zIbQg/MAyH5uqTwF1Fs YgcAMvxhobFRApaYn4wNjflkgJYmPPiYuvqSFSSKq5d2HWwlY4pYTphmE9MulF6AHvuy D5Lgq/JCXLW365aqBIYhdR0EzYQriWQswfJhhP5qZcIbgex1kElnq7aNwQiC14kxufX7 ctFg== X-Gm-Message-State: AOAM532xpSPcX73nTTk9LlLAyw4gJF9azbuhzyQB7wDH2qqTE1SA29cs yO4OkdYLh2wPrN7l6lRM+eOgkQ== X-Google-Smtp-Source: ABdhPJzH/elHnu+qP+OUwArp737SBD9wh0zDvmqjdX04gYArHrXqKSpb+WnzgxrytDf54IQjAZ3BNA== X-Received: by 2002:a5d:46c4:: with SMTP id g4mr28852302wrs.308.1623239155524; Wed, 09 Jun 2021 04:45:55 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::45a]) by smtp.gmail.com with ESMTPSA id 6sm21231031wmg.17.2021.06.09.04.45.55 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Jun 2021 04:45:55 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu, michal.simek@xilinx.com, git@xilinx.com, Viresh Kumar Cc: Amit Kumar Mahapatra , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 20/31] arm64: zynqmp: Remove can aliases from zc1751 Date: Wed, 9 Jun 2021 13:44:56 +0200 Message-Id: <475a60fc4d01ba9c61579801fb84620b6905dcad.1623239033.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_044556_945105_0BE09E44 X-CRM114-Status: GOOD ( 10.65 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Networking subsystem is not using aliases that's why remove them for can devices. There is also no any other Xilinx ZynqMP DT file with them. Signed-off-by: Michal Simek --- arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts index 4b4c19034fe1..cd61550c52e5 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts @@ -19,8 +19,6 @@ / { compatible = "xlnx,zynqmp-zc1751", "xlnx,zynqmp"; aliases { - can0 = &can0; - can1 = &can1; ethernet0 = &gem2; i2c0 = &i2c0; rtc0 = &rtc; From patchwork Wed Jun 9 11:44:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 12309945 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=-17.0 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,USER_AGENT_GIT 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 74A0CC48BCD for ; Wed, 9 Jun 2021 12:09: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 43DBB61285 for ; Wed, 9 Jun 2021 12:09:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 43DBB61285 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=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=YI+VghMT7VOvTT/V55heCQdJ78npgadRnVKNYynElkI=; b=DumxUEOJtvRw3v FD34W5E+Mqsv85R4kKciyTyfDCtsggho7wZKBISKhBSwACJAdqzo1MMSmBNNgep22G15ZU4P6cZH3 I7eM7aZWVTyEE9f+qg/SPzQRZHprgSumzPV8FcQEQoa9JN0C2LfuF6ZVKHJCeM8x01GzM0P8c849n +qCn3Ol25Cnb2mxk+f3RJasLa5t20ZNDHIGHMXE3XlbS0VOFC1dr63JucxgUClTy26U1T1abfFIyQ 0L/V+dOGk8mYhvRBT7QPOWb6MXy2lHQZxTpFCl2OxTEZVq5r2UT/TLhETuUr+/4Bx6bkwGAzFIGqw FF11DaFtYtUoEofiuCAw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqwzy-00DYqF-6Y; Wed, 09 Jun 2021 12:07:55 +0000 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqwek-00DQ5P-Fp for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 11:45:59 +0000 Received: by mail-wr1-x42d.google.com with SMTP id o3so6753818wri.8 for ; Wed, 09 Jun 2021 04:45:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=z0cFsHWQuOk9G5jkREqSCN4u8xY+Z74kdKMqaqt4F9c=; b=GvmwQD/kVLwJG8MdRtkEKzfGwg4M/mxylb+khtTOyeA3+SLGx2OUbQFFTTt9wyBwkD Mi7bmH/2zVcvBMNBHjfMtoKpayYcLp+HU920cKoCMxygc2eatLFmyHEPd7Lhl4y95qMT eiSIqRE2H+CH4nGNFNJqZiJ9t2XCm/H4EJhGu9/shfFYYvwoM2gHLPXJa1baZmcqqbw+ cMb66j98hZklxUcZftjivNEJxwfZLt5iSDH6GpXW+F8/N8WxGEvA4FUaqMo6VOWQy7UY pyA88f4dqOg08wA4ewBLliDAuWlnA1rg/PZ7WMlxLcMZqM2IHTwrMn/Z3Jy/MDfxlrbE ovNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=z0cFsHWQuOk9G5jkREqSCN4u8xY+Z74kdKMqaqt4F9c=; b=J8+UvwXAKsqhlw+Cjk4tcQdtgdBPtpoqo3TLt1Z0b0m6cYo0xqiWWk1yC4TkWheEjq PN7KArUqVHPSVWYdcp2u+evMGzrLVM27w46e3BzGdcN4sUqyToiJ3nqDOfFPzzgmJMS1 whQs12ObJ4pZVfW4AVxUMTp2P/3KuymjAYUHjzr47853KU9f9kr8yk1ZVDNq81R/4W5s q3me0lf6zHcxjc3Rn6iN087iYmsyz4lpQjMaFRDbVNxoAnS+HgB1kc31pcQrsXJzaMCQ ETbT/6Io5Bga5NQwh/day8e729panOBvYLkEwDR1u/PmjQYhHqgNYctCZVnfKcEqyPDO rXWA== X-Gm-Message-State: AOAM530qVopVRyiZ8g+jqYqn1gghLk4EwwG6sw4W57TyReONJ3IvMEAk CqJxyqgCBJGv61xCVubYTRXh5g== X-Google-Smtp-Source: ABdhPJzamxlVbLxHizavnn9Xv6irhxfglkP3D6Bxq6qyeu1A2aPWPNdor17d4qPb3u0HWsmS+HU1BA== X-Received: by 2002:a05:6000:18f:: with SMTP id p15mr22537019wrx.102.1623239157104; Wed, 09 Jun 2021 04:45:57 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::45a]) by smtp.gmail.com with ESMTPSA id k36sm11937395wms.30.2021.06.09.04.45.56 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Jun 2021 04:45:56 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu, michal.simek@xilinx.com, git@xilinx.com, Viresh Kumar Cc: Laurent Pinchart , Quanyang Wang , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 21/31] arm64: zynqmp: Move DP nodes to the end of file on zcu106 Date: Wed, 9 Jun 2021 13:44:57 +0200 Message-Id: <4d1c79f6f184367687f61608bb8e0f18d9121802.1623239033.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_044558_644866_38AA1BBF X-CRM114-Status: GOOD ( 12.15 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This location is used by others DTs files that's why this move. Signed-off-by: Michal Simek Reviewed-by: Laurent Pinchart --- .../boot/dts/xilinx/zynqmp-zcu106-revA.dts | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts index dbb8bfbb5c7f..4a0f3370bf7f 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts @@ -160,17 +160,6 @@ &dcc { status = "okay"; }; -&zynqmp_dpdma { - status = "okay"; -}; - -&zynqmp_dpsub { - status = "okay"; - phy-names = "dp-phy0", "dp-phy1"; - phys = <&psgtr 1 PHY_TYPE_DP 0 3>, - <&psgtr 0 PHY_TYPE_DP 1 3>; -}; - /* fpd_dma clk 667MHz, lpd_dma 500MHz */ &fpd_dma_chan1 { status = "okay"; @@ -994,3 +983,14 @@ &usb0 { &watchdog0 { status = "okay"; }; + +&zynqmp_dpdma { + status = "okay"; +}; + +&zynqmp_dpsub { + status = "okay"; + phy-names = "dp-phy0", "dp-phy1"; + phys = <&psgtr 1 PHY_TYPE_DP 0 3>, + <&psgtr 0 PHY_TYPE_DP 1 3>; +}; From patchwork Wed Jun 9 11:44:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 12309947 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=-17.0 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,USER_AGENT_GIT autolearn=unavailable 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 8B266C48BCF for ; Wed, 9 Jun 2021 12:11:29 +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 5FB6D61285 for ; Wed, 9 Jun 2021 12:11:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5FB6D61285 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=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=q0t6lB9jl5B06IJ0g6FImbJkoSJc0hAe7xZ+VUd5g9Q=; b=MsDexK0Ghpou2x koHYtWVSL1dK5hr93ODnlvZhfT1A/oSDMjA+8XuR5xui/P7uB0gEi3GBziFa6RLTXqgkBw0Wa3tZ7 OR5APH/xtUQ+A7/hEMfgT6cHxreqeEmXG9U7j5xRtOOwlQghyWDloCECJ8rbg3JfDNbJcMyWDndEA csXILywHOOaDjfNFMmrFNAR1JDS/XrukXsE0gvgnmKJJjlCGzYZvifknuzfMACwOvhYXjKVNd6/SB jXheFDhumcaItwz3d0dWGlRbD8HZ9dxE0JBiDObRjSlG9Wwf0O9WDQcioMN72DY8UgEoNM7ytS4jR RN0QvvGicU5zDoioQdbA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqx1B-00DZLa-A4; Wed, 09 Jun 2021 12:09:10 +0000 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqwem-00DQ6W-3L for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 11:46:01 +0000 Received: by mail-wm1-x32f.google.com with SMTP id m41-20020a05600c3b29b02901b9e5d74f02so885809wms.3 for ; Wed, 09 Jun 2021 04:45:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nrZElwT9y3W18Lbft5uOXhWR0ueAWy9kjrpr8/SaaVM=; b=MGJwUTU3ouxTrRBx54L0Y6kIMPTVVjeIZYE3AWfYF0mIToRFlUq+j2r4xInXqkSulV 0RypE2euRdG6Z5W+Q7q+gtQNZaKgW9bLj+aUuWzGZQTNUjH5ePKxxepJ6OssY/y+JHyF cP7QULlnNfvQNYhCcf6OYTS11mXKblu8QwbKKHHTdJlnNs8NjdG2vu5tleRoHt3WfUxd YhwQW5egSiEly3y8h2gObFaJsK7G7oL/ko96qLqsTYgy3hNWfWowIM+Xrc4W95HaLSeY cLGhxNcMLOPJYpltFnfr4CdbHmJIs3CRYnAks8qIOo56KUEybGG+ggbrkC2BDyArUL7n bAxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=nrZElwT9y3W18Lbft5uOXhWR0ueAWy9kjrpr8/SaaVM=; b=mGtmqxAa2nUvY1Q53RxcKM6Su+/c3TO9WgogDixS5wpGO4OFqL1tQCyhw301P5UFZC emJgC6KZvnkZ7upYre4B2NQ0uVq63B5YvHZJ6qqtuOgt7cxvmT23Xno9Y67mWFWXNywl TCorC/42Hg/9GPGD3yAceJDAhIJM+diQ4OhqRVPcJbUNiZvOZuVvUDQykCLfOlUh0np3 702NsniesesUYXeH/JtI92oCTkJpYjNd2npvANdtGxleGBlaeUEaMF5wjK4DqMmuxftz 53exI/DoTLAgKUC4tP7mrBlyQNg8WhsYvsSpRhz7J7/MQjMNlCw3Ru1FaUJNub8eKMlo VQKw== X-Gm-Message-State: AOAM530zv7U0OxV1MWPcM+0EKYxz69YyOUft0DXwFKrI6wi0aKcF6t6W Jg8ST3V/otIzfgscylXSuqJUPg== X-Google-Smtp-Source: ABdhPJz/Klyqy8Y+luI/yuy0IgYB1SCvJlkMPYkQe0DhLcM9V6pZ1BGe43mytDAP3OWX+IGqnqrpMQ== X-Received: by 2002:a1c:bad6:: with SMTP id k205mr9594035wmf.171.1623239158850; Wed, 09 Jun 2021 04:45:58 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::45a]) by smtp.gmail.com with ESMTPSA id l31sm6047615wms.16.2021.06.09.04.45.58 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Jun 2021 04:45:58 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu, michal.simek@xilinx.com, git@xilinx.com, Viresh Kumar Cc: Krzysztof Kozlowski , Laurent Pinchart , Quanyang Wang , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 22/31] arm64: zynqmp: Add note about UHS mode on some boards Date: Wed, 9 Jun 2021 13:44:58 +0200 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_044600_204503_913D6F5C X-CRM114-Status: GOOD ( 13.86 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add note about UHS mode and add no-1-8-v property to zc1751-dc1 board. Signed-off-by: Michal Simek --- arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 4 ++++ arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 4 ++++ arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts | 3 +++ arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 5 ++++- 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts index 460aba6e7990..cd406947ec34 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts @@ -370,6 +370,10 @@ &sdhci0 { /* SD1 with level shifter */ &sdhci1 { status = "okay"; + /* + * This property should be removed for supporting UHS mode + */ + no-1-8-v; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_sdhci1_default>; xlnx,mio-bank = <1>; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts index 5ddcfdf48626..3cbc51b4587d 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts @@ -956,6 +956,10 @@ &sata { /* SD1 with level shifter */ &sdhci1 { status = "okay"; + /* + * 1.0 revision has level shifter and this property should be + * removed for supporting UHS mode + */ no-1-8-v; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_sdhci1_default>; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts index 4a0f3370bf7f..2c1c4d96fb21 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts @@ -951,6 +951,9 @@ &sata { /* SD1 with level shifter */ &sdhci1 { status = "okay"; + /* + * This property should be removed for supporting UHS mode + */ no-1-8-v; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_sdhci1_default>; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts index 85e9d0e2f9bd..c9d41d16c3f0 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts @@ -796,8 +796,11 @@ &sdhci1 { status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_sdhci1_default>; - no-1-8-v; disable-wp; + /* + * This property should be removed for supporting UHS mode + */ + no-1-8-v; xlnx,mio-bank = <1>; }; From patchwork Wed Jun 9 11:44:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 12310005 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=-17.0 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,USER_AGENT_GIT 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 5995AC48BCD for ; Wed, 9 Jun 2021 12:25:17 +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 2220161351 for ; Wed, 9 Jun 2021 12:25:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2220161351 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=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=txEhKwkMatQv0KHehuaThzblt3+0rcnnQTh4yxjDkNc=; b=4aehOMEKEOjt3n 9m+3fttWrm0eriQPkL7hqI1QdN1EBtygUX7XjnJxGmT7iIWEsekC1QgrNyC3JnEe4LRmfimpmWw6+ xZ9bRXaK7iKzpvp9j6Rhnxdxck0DSJBtMfy3ZHVzdeAiwbArualPysrqOOHcezBSCAfoA8+Dm3wr2 /KsLYSsNTz4kE+t1pYZGoUA1RfSc3CKb6nE9RB4KiMt/qyjKfkYsV4f1hOUiQXUrJD3QGsM3DWiZq O8mcPYAev69YPdCS7j65mnG+HVsKkmFO8lBmYhsK5OX844/FYUtXzqypsdkPm8Ti3//oODOx0u3bI SLmF0cG+J0OHSssHQsag==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqxEf-00DeUb-KP; Wed, 09 Jun 2021 12:23:06 +0000 Received: from mail-wm1-f42.google.com ([209.85.128.42]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqwfm-00DQXz-Cm for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 11:47:03 +0000 Received: by mail-wm1-f42.google.com with SMTP id h22-20020a05600c3516b02901a826f84095so3977720wmq.5 for ; Wed, 09 Jun 2021 04:47:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ygLx5mqyQd2h1hI8hvNSPIoVDk3VcyF8wNEveFu8IIc=; b=X4SxR6sTMrh3dDCmjjhSuDAVAmHQMNNkEcOwEkrs6RMVywtWJN9mwPJPH2M610k0xW PME8zUtPDBQ+0qdpDBd5VivS6+eNu2+moDzbYH16aajVnoHbFEOiywed0b5re+kuU9lX 56JSnqMN/AZWFK+aCPsc1Lzm5c4AqnfNEH2oxRw4ybwezNxcmU0RBmSLc5nCoz2nYz7a l7ij4U20VQQSMNYH5rLEdRvJwlnW9jhwGiADBEzkYomksdsU835o5dfI/GeC4uimFzsy NlnVPWwMXCFIV3aYLFcEknoHvsFar15WXnqUpejhjY7H3mRkuxatKa/de3Lmpw9aUDkD oetw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ygLx5mqyQd2h1hI8hvNSPIoVDk3VcyF8wNEveFu8IIc=; b=ApOH4KcWrbWVublcdd+Hu6LIfs1VDCLOEeCQMYv79dn6kWTn+pqCqz/A0iYgt2Fral uSOFWJ4DDGAMeTP0xuwLL5ngJBSp4MsgMRr27mYX2hh2hoKV6qT5ogV2jFU8iFeD2gfd XJWm5YVokRyco8mhOeMlMOxv5f21ahYUzQB7cs2cBhZjVaZngv1A/kUOaYTQZDfyP4N6 pOc90qpJ96K6vLP6V3FeoZuPpCRqaeB599COBkC8d3YYR3KjtUJAV1yu4soHfenFw1EF 7nZzLBZdd1e6CuVrMbPGApRQtwbxEgWm8YxAGIZhzKpNJafGcQFckD/mXSSIfO1tMead U8OQ== X-Gm-Message-State: AOAM531CNtF877ja5FwaZRqUj2p+rsOEMfcBjgk6WDTtDeH8hQBBLV+Z fsMk7usbTbU8KSSI9kNQRFek1A== X-Google-Smtp-Source: ABdhPJz7Q5mq9N+0Smnm0si/xySA3RKY9uF/7ud5QpTTpMnRh4RQgeMW/FpScpBMeR9SnN8y+2p9QA== X-Received: by 2002:a7b:c5cd:: with SMTP id n13mr27401786wmk.97.1623239160459; Wed, 09 Jun 2021 04:46:00 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::45a]) by smtp.gmail.com with ESMTPSA id e17sm26458205wre.79.2021.06.09.04.46.00 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Jun 2021 04:46:00 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu, michal.simek@xilinx.com, git@xilinx.com, Viresh Kumar Cc: Srinivas Neeli , Krzysztof Kozlowski , Laurent Pinchart , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 23/31] arm64: zynqmp: Update rtc calibration value Date: Wed, 9 Jun 2021 13:44:59 +0200 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_044702_500696_C02DF580 X-CRM114-Status: GOOD ( 12.66 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Srinivas Neeli As per the design specification "The 16-bit Seconds Calibration Value represents the number of Oscillator Ticks that are required to measure the largest time period that is less than or equal to 1 second. For an oscillator that is 32.768 KHz, this value will be 0x7FFF." Signed-off-by: Srinivas Neeli Signed-off-by: Michal Simek --- arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi index 80332e3b4d6a..da54a2d35552 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi @@ -663,7 +663,7 @@ rtc: rtc@ffa60000 { interrupt-parent = <&gic>; interrupts = <0 26 4>, <0 27 4>; interrupt-names = "alarm", "sec"; - calibration = <0x8000>; + calibration = <0x7FFF>; }; sata: ahci@fd0c0000 { From patchwork Wed Jun 9 11:45:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 12309963 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=-17.0 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,USER_AGENT_GIT 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 88A79C48BCF for ; Wed, 9 Jun 2021 12:13:14 +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 53AA760FEB for ; Wed, 9 Jun 2021 12:13:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 53AA760FEB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=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=o75ZAcAHcdnat83E7LEOC3lBjhHDAC+pNzkA6XtSGz4=; b=bELo8NkkNGX5So zahKt1kLriICd2Yaqt2PiFJ79m7Wiqhnn0WQnbEtmXUALGAp4zuoLWLbIn3PtuWl4sQVesY69SB+0 9c6hyn9ikiPozTpLN/AjrJm1RxW2YE6DkmTXKy9SbuuIDLJM64aT8PlH13NMuBwcyieTyaJYKRS4p 6mXfCmiTWA3eH2de/evZ3Kyh4VAwViyEbLR+TLcMqhnVaZl9spOt4ytmO1WvBFrEtoY7T++1f81tA pqv9e8pHN3W3cLouu/rkvvPUT2jQoamPpKZhjnHYjDnu8oC2EN2y61/FqEWppHdE/CPb9CegK0+pB 0N1Iolj2nta1Lvdp+O0g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqx2Z-00DZsc-03; Wed, 09 Jun 2021 12:10:36 +0000 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqwep-00DQ7n-NE for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 11:46:04 +0000 Received: by mail-wr1-x42b.google.com with SMTP id a20so25193429wrc.0 for ; Wed, 09 Jun 2021 04:46:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Zyj2qD3igNfbE2o554S+1NewmK7isTe8spptV2VStGM=; b=uATJj90MLOX6sVf2yy13LcASfZ80U4iSafWWZuDLCAUi7cFu2IW9o2HPaYRuAmkyos KOkHo9/Zfq7Fz8v7F9h510M+IIC5wRIUXmWIhxg7zE9OVlZgAPOp+d3qd5CjWrlRMRsN qHtCmIpeagsqZq1/nAjY1nh0KuPVVORivHxLa6Gn0zRR/E8jv7J5Wmvq3n7DpLIYffj9 cCRHXOTlP1iG6JTR3i8NC5Ve2LJDXDxkgM6BQPEpnZcMS2kdQLkvKlIYDR+PMayPxJ7c ld+4frsVhhY7Vu8YXojCbKSCzdh/bmZEPxzD1KpHlGLdOc4cyVF4kEtZSBo+nW+LwDC7 dJmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Zyj2qD3igNfbE2o554S+1NewmK7isTe8spptV2VStGM=; b=lqK/uuPR2OoQ2hiBAOUf8uWzpssTpH4pornHm9lGefzth3pvfY5PKc6q6ferb9eosy 2n+ZkgMpKEkoFRpdjF8i9ASfKYZdRZFYA2oAAi12GN+VyZSjHM5SLKWtb0XZhFd3dn5u Wkr4AlLgtyqyOxKcgRmN5QOznP6D9YMvp775MFATwl1SzvoEZvBAdP6attrk34ePnO8y RerkBuVRtbUguF7Z7Yqr3ah6aZ29FQICIJvy88/tIB3dSAi+sDR0pLby5ue94aaNljPT h8AMd3NkPaMm2vyfGznVdcgRhIyfpqPR5m91bWTc+/yz64FsDfEpcmbnzRX4USErXamr um1g== X-Gm-Message-State: AOAM532mpemZcoLUFNp1fG6BhsGFvEGu91VF06qOKLPtiWG9V3skKS30 PYYr3bQltxxev1owSxFnLD3heg== X-Google-Smtp-Source: ABdhPJwkMIqiQ0Rv0FZopdOGc2NgCynivFN/KI1KGd8g72kcm01u8oTjXImZKv43HgnWsasGZGC8GQ== X-Received: by 2002:a05:6000:1889:: with SMTP id a9mr15767835wri.288.1623239162477; Wed, 09 Jun 2021 04:46:02 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::45a]) by smtp.gmail.com with ESMTPSA id b15sm10337551wrr.27.2021.06.09.04.46.01 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Jun 2021 04:46:01 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu, michal.simek@xilinx.com, git@xilinx.com, Viresh Kumar Cc: Laurent Pinchart , Quanyang Wang , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 24/31] arm64: zynqmp: Remove information about dma clock on zcu106 Date: Wed, 9 Jun 2021 13:45:00 +0200 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_044603_844867_B8E2C304 X-CRM114-Status: GOOD ( 11.06 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Clock setting is not static anymore that's why it depends on firmware setup that's why remove this comment. Signed-off-by: Michal Simek --- arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts index 2c1c4d96fb21..464a76a13c24 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts @@ -160,7 +160,6 @@ &dcc { status = "okay"; }; -/* fpd_dma clk 667MHz, lpd_dma 500MHz */ &fpd_dma_chan1 { status = "okay"; }; From patchwork Wed Jun 9 11:45:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 12309965 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=-17.0 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,USER_AGENT_GIT autolearn=unavailable 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 3E2C6C48BCD for ; Wed, 9 Jun 2021 12:16: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 0B81361078 for ; Wed, 9 Jun 2021 12:16:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0B81361078 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=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=UnENgdoQ0oxKzUID+2BlPgx3Lc1j+c4mfbMNYtc61FQ=; b=DFGawpRuh+dmrl hIW19+FqnWXRROvYtbPyhe8rjrEqFIlpS+YTVlZkuqqWATGTGekSiD9MH8AxeHOuDtkSbN8IqaJKS 9wtuZYAJ+OMDROISihH9V2v7nJvpwMuzelrY/u6IIYJ+PdSN3Eu24iisVY7JSaaXt7lYKC/4WS23R UAcRH3iWupL3wg201l3t7Hgy0V4wNk3pJNa1AOkJMkUNnW0qN8pOYIqUwgN6p1r8SSeQn07CFNcyA CJVE4aQasq4Dkp0/0uflIkk/jxLYgUnc3yYLgsTaf/5GijCcV2qI4IKKkPzblKfLZGNZw7xviDekz 6S3ijekwDbc04kdEn0Uw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqx4P-00Dai8-5d; Wed, 09 Jun 2021 12:12:30 +0000 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqwer-00DQ8T-FA for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 11:46:07 +0000 Received: by mail-wm1-x330.google.com with SMTP id m41-20020a05600c3b29b02901b9e5d74f02so885989wms.3 for ; Wed, 09 Jun 2021 04:46:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hTvDkENCPab09HgXDxlMsoxGhYemDjuw3++n5X0d3bU=; b=NeBmF6OH5rUUh2pAh9vy9F6ha1ygMw5OyFOoS6PiY9MBzaAE9Du3uuiXw95tFzaMWQ x9l1JMfesm1LKHCoSstV1WDrUjA2JvFhCP/wh8Iogr/GgrLBOXzpgg6JFpurxXG9QcGD spNALgrzBRRbWXWNhthMLv8lkZI5B9Uau/wT3TvooqzJnsR03Fxp8WwKWHVPoekULsfq H3XEtIEDfDOXmtuSnb8lUssSDOjUQpDJG7pQoKz3Z2Uw7TeOp2A/5gtEbb2AMJwu2ZCY UpxObckTraMizySTeZpOXkrGeD36+gDWxrR2sR5aepO6SjFPocvyhsmkGuw1nKxoiI7+ re4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=hTvDkENCPab09HgXDxlMsoxGhYemDjuw3++n5X0d3bU=; b=MkYbD+Ov7By7Pi/+J6QuJlwrWw4lEOAe04ocPbta83QApg80ZFUfc4DRJkstxnee4X Ha2DQcFVgWDN8vbWlCkfK039PPm018vGev19WuY8CVQvH5qmGpCkgdueckWWumkl4TKB EKFoiA5U83ubqwD7TuoeE+/BENe2Vw5DNqXzfN0he8PvU5RcXq72RDvkIuy/HeLiBudX LiZy5ww7Nm4sF1yOw6zdu5W4RZdZBeuSFOt/6539Q7gSIA/dr+48xtQpXlZZLPpCYtVa mkSp5hRZQaaCqXbVFoUKLuISPt6aYF9J+2hBqB414EtDoGXAqK7guw7VXv0hwzRV1Dr2 yvMQ== X-Gm-Message-State: AOAM530iMimYYzOswndlo5tSktgp18fp3mQA4yrRjqGssaaJQ8jWbrEs ZZDlDgRcK0uDJ5GRMYHxlnfSUtOATs223KiX X-Google-Smtp-Source: ABdhPJx5rULiDy17JCZyiDmUA+Yl0k7L9Wc4WOSx+8SO31YI9MwVMq6LLXIXfQj5/lBc4GXpprWtHQ== X-Received: by 2002:a1c:9a45:: with SMTP id c66mr22222801wme.43.1623239164153; Wed, 09 Jun 2021 04:46:04 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::45a]) by smtp.gmail.com with ESMTPSA id 62sm25881849wrm.1.2021.06.09.04.46.03 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Jun 2021 04:46:03 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu, michal.simek@xilinx.com, git@xilinx.com, Viresh Kumar Cc: Krzysztof Kozlowski , Laurent Pinchart , Quanyang Wang , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 25/31] arm64: zynqmp: Wire qspi on multiple boards Date: Wed, 9 Jun 2021 13:45:01 +0200 Message-Id: <80671218c97ad2188df476cf1b49bcf6f64785df.1623239033.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_044605_583368_68F72C83 X-CRM114-Status: GOOD ( 13.39 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Couple of boards have qspi on the board that's why enable controller and describe them. Signed-off-by: Michal Simek --- .../arm64/boot/dts/xilinx/zynqmp-zc1232-revA.dts | 16 +++++++++++++++- .../arm64/boot/dts/xilinx/zynqmp-zc1254-revA.dts | 16 +++++++++++++++- .../boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 14 ++++++++++++++ .../boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts | 14 ++++++++++++++ .../arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 15 +++++++++++++++ .../arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts | 14 ++++++++++++++ .../arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts | 4 ++++ .../arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts | 15 +++++++++++++++ .../arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 15 +++++++++++++++ 9 files changed, 121 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1232-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1232-revA.dts index 2e05fa416955..f1598527e5ec 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zc1232-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1232-revA.dts @@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP ZC1232 * - * (C) Copyright 2017 - 2019, Xilinx, Inc. + * (C) Copyright 2017 - 2021, Xilinx, Inc. * * Michal Simek */ @@ -19,6 +19,7 @@ / { aliases { serial0 = &uart0; serial1 = &dcc; + spi0 = &qspi; }; chosen { @@ -36,6 +37,19 @@ &dcc { status = "okay"; }; +&qspi { + status = "okay"; + flash@0 { + compatible = "m25p80", "jedec,spi-nor"; /* 32MB */ + #address-cells = <1>; + #size-cells = <1>; + reg = <0x0>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <4>; + spi-max-frequency = <108000000>; /* Based on DC1 spec */ + }; +}; + &sata { status = "okay"; /* SATA OOB timing settings */ diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1254-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1254-revA.dts index 3d0aaa02f184..04efa1683eaa 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zc1254-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1254-revA.dts @@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP ZC1254 * - * (C) Copyright 2015 - 2019, Xilinx, Inc. + * (C) Copyright 2015 - 2021, Xilinx, Inc. * * Michal Simek * Siva Durga Prasad Paladugu @@ -20,6 +20,7 @@ / { aliases { serial0 = &uart0; serial1 = &dcc; + spi0 = &qspi; }; chosen { @@ -37,6 +38,19 @@ &dcc { status = "okay"; }; +&qspi { + status = "okay"; + flash@0 { + compatible = "m25p80", "jedec,spi-nor"; /* 32MB */ + #address-cells = <1>; + #size-cells = <1>; + reg = <0x0>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <4>; /* FIXME also DUAL configuration possible */ + spi-max-frequency = <108000000>; /* Based on DC1 spec */ + }; +}; + &uart0 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts index cd406947ec34..9f176307b62a 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts @@ -26,6 +26,7 @@ aliases { mmc1 = &sdhci1; rtc0 = &rtc; serial0 = &uart0; + spi0 = &qspi; }; chosen { @@ -339,6 +340,19 @@ conf { }; }; +&qspi { + status = "okay"; + flash@0 { + compatible = "m25p80", "jedec,spi-nor"; /* Micron MT25QU512ABB8ESF */ + #address-cells = <1>; + #size-cells = <1>; + reg = <0x0>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <4>; + spi-max-frequency = <108000000>; /* Based on DC1 spec */ + }; +}; + &rtc { status = "okay"; }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts index 8046f0df0f35..05a2b79738af 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts @@ -26,6 +26,7 @@ aliases { rtc0 = &rtc; serial0 = &uart0; serial1 = &uart1; + spi0 = &qspi; }; chosen { @@ -161,6 +162,19 @@ &i2c1 { status = "okay"; }; +&qspi { + status = "okay"; + flash@0 { + compatible = "m25p80", "jedec,spi-nor"; /* 32MB */ + #address-cells = <1>; + #size-cells = <1>; + reg = <0x0>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <4>; /* also DUAL configuration possible */ + spi-max-frequency = <108000000>; /* Based on DC1 spec */ + }; +}; + &rtc { status = "okay"; }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts index 3cbc51b4587d..becfc23a5610 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts @@ -30,6 +30,7 @@ aliases { serial0 = &uart0; serial1 = &uart1; serial2 = &dcc; + spi0 = &qspi; }; chosen { @@ -934,6 +935,20 @@ &psgtr { clock-names = "ref0", "ref1", "ref2", "ref3"; }; +&qspi { + status = "okay"; + is-dual = <1>; + flash@0 { + compatible = "m25p80", "jedec,spi-nor"; /* 32MB */ + #address-cells = <1>; + #size-cells = <1>; + reg = <0x0>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <4>; /* FIXME also DUAL configuration possible */ + spi-max-frequency = <108000000>; /* Based on DC1 spec */ + }; +}; + &rtc { status = "okay"; }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts index 4c328569c3ac..84c4a9003e2e 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts @@ -28,6 +28,7 @@ aliases { serial0 = &uart0; serial1 = &uart1; serial2 = &dcc; + spi0 = &qspi; }; chosen { @@ -427,6 +428,19 @@ &psgtr { clock-names = "ref1", "ref2", "ref3"; }; +&qspi { + status = "okay"; + flash@0 { + compatible = "m25p80", "jedec,spi-nor"; /* n25q512a 128MiB */ + #address-cells = <1>; + #size-cells = <1>; + reg = <0x0>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <4>; + spi-max-frequency = <108000000>; /* Based on DC1 spec */ + }; +}; + &sata { status = "okay"; /* SATA OOB timing settings */ diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts index 99d172867f6a..fb8d76b5c27f 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts @@ -28,6 +28,7 @@ aliases { serial0 = &uart0; serial1 = &uart1; serial2 = &dcc; + spi0 = &qspi; }; chosen { @@ -435,6 +436,9 @@ flash@0 { #address-cells = <1>; #size-cells = <1>; reg = <0x0>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <4>; + spi-max-frequency = <108000000>; /* Based on DC1 spec */ }; }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts index 464a76a13c24..d2219373580a 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts @@ -30,6 +30,7 @@ aliases { serial0 = &uart0; serial1 = &uart1; serial2 = &dcc; + spi0 = &qspi; }; chosen { @@ -928,6 +929,20 @@ &psgtr { clock-names = "ref1", "ref2", "ref3"; }; +&qspi { + status = "okay"; + is-dual = <1>; + flash@0 { + compatible = "m25p80", "jedec,spi-nor"; /* 32MB */ + #address-cells = <1>; + #size-cells = <1>; + reg = <0x0>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <4>; /* FIXME also DUAL configuration possible */ + spi-max-frequency = <108000000>; /* Based on DC1 spec */ + }; +}; + &rtc { status = "okay"; }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts index c9d41d16c3f0..4dc315ee91b7 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts @@ -29,6 +29,7 @@ aliases { rtc0 = &rtc; serial0 = &uart0; serial1 = &dcc; + spi0 = &qspi; }; chosen { @@ -772,6 +773,20 @@ &psgtr { clock-names = "ref1", "ref2", "ref3"; }; +&qspi { + status = "okay"; + is-dual = <1>; + flash@0 { + compatible = "m25p80", "jedec,spi-nor"; /* 32MB */ + #address-cells = <1>; + #size-cells = <1>; + reg = <0x0>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <4>; /* FIXME also DUAL configuration possible */ + spi-max-frequency = <108000000>; /* Based on DC1 spec */ + }; +}; + &rtc { status = "okay"; }; From patchwork Wed Jun 9 11:45:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 12310007 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=-17.0 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,USER_AGENT_GIT 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 5DB14C48BD1 for ; Wed, 9 Jun 2021 12:26:13 +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 2AB6E61351 for ; Wed, 9 Jun 2021 12:26:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2AB6E61351 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=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=0gO10XZSTeGa3Pt1vgYIsaUcX4AAe5X0EXZL41FP0M4=; b=nv3Vn/KiBTNuEj Mad0ECeohXQNS6Tv+BIowEThCLWRFC4I5vUYuiieSONQ8IOV8+r5R/f9qNHQ2sXPL+ipD4Ls/4M4d QKlNQV+PfBhccCBYxJJx/0dz2wlDROm0gDXUDc8hPGM3TakaRABmxcEKGAz40U22/nQBTAt5Sb/tw m3nLDyXS4NpVxHLAvnbSH31aQ0h+chf3GhlavloJEr/nePzE7Hk3JPF7sTg/6XTspEqXqypTM4O/A TaL6k34PRXi2u9oiEoaTBk+CvXDauidEwScoUEtnkvOFpwc8njkZAIp9OqpWIthfxRn67yNf6V2af ebM+qtT2nV+2L20X1HHg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqxFV-00DeoC-Ge; Wed, 09 Jun 2021 12:23:58 +0000 Received: from mail-wr1-f51.google.com ([209.85.221.51]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqwfr-00DQaD-MB for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 11:47:08 +0000 Received: by mail-wr1-f51.google.com with SMTP id y7so20488943wrh.7 for ; Wed, 09 Jun 2021 04:47:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nJFcESfNmuqpnzQeAxiF3OgzwQNYMvErOvMnIEXFWso=; b=0m6BMX+hvJl2iXhnYa7iPaGeS4es8Kt3pe3NumpAq4uCFqrPsVn2LwkKHM/PAI9VeD YA9zpilalIW2iMXDCtef3p1JwJV5uEduadwiVm4SBpQAIpjIf9rwobQxgWl706DLrpgK ZUptGOuem+gWhNI9aT4LRxbDVh8fv7LhnO1ImwZmYy25lzMssvgAMTUbdCO3t8vWaPXP he+uuEhW8dyBneqZ4FmyLujwSP81VbN1S0e5FvX3z17XhTjJrSC2IXXwK+2uy49oZicL qMe1lMAXvADLTU+9/TOk1H1qlkrffKM9er/Du0QzKmPUWNfDWeHJ+vr7/GRkQDS4dLXX E+4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=nJFcESfNmuqpnzQeAxiF3OgzwQNYMvErOvMnIEXFWso=; b=Dqc5x3f8szwQQqhVPe09ESkRrfodfdRuT6lr+KHrW7FbOeUprfcrt1K/dJTemGq/lG +n16QnEVUMCW8Oqd1VlnRZ7khp7JlJnCPL6x/PMDe0c6TslB7fgk/sWg0W4wwQuYjibe MKbM2rhE8v9axxgxbZSUJtMcGDBvS4diwHg7bpO4wVsJCFqi6OTZaqSY5FnqdJmkjZOm cIqXQb4Md6ZjWfhG9k550dp7hU/gB5AwCw8GFJTd59yzvwCmUf7SyJ4Z3fDVLRL71OHd 0w6t3Fm4WB693+G5j/wtC+EzmwfLxJnFX0pJ0X1ViDZ7E6kpnZc8LN8JrobZPQDSRx/V +dFg== X-Gm-Message-State: AOAM53260knMIukIk9ffYGluWsnNskFfJ5E92SVnilSxZxck8rMrowbi fQyAdgF83fPskJjkAecV1CttaQ== X-Google-Smtp-Source: ABdhPJwCyL97mdno19WFYlv8tJ9mnEcNXdfLVtVESfF8bMDKokS9YwVTG4/6DySDpifCcxHhsRG2ug== X-Received: by 2002:a5d:4fce:: with SMTP id h14mr27755410wrw.57.1623239165804; Wed, 09 Jun 2021 04:46:05 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::45a]) by smtp.gmail.com with ESMTPSA id m22sm5659459wmq.21.2021.06.09.04.46.05 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Jun 2021 04:46:05 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu, michal.simek@xilinx.com, git@xilinx.com, Viresh Kumar Cc: Laurent Pinchart , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 26/31] arm64: zynqmp: Move rtc to different location on zcu104-revA Date: Wed, 9 Jun 2021 13:45:02 +0200 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_044707_763649_728AF642 X-CRM114-Status: GOOD ( 11.47 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Move it the same location as is on zcu104-revC for easier comparison. Signed-off-by: Michal Simek --- arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts index 84c4a9003e2e..048df043b45c 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts @@ -417,10 +417,6 @@ conf-tx { }; }; -&rtc { - status = "okay"; -}; - &psgtr { status = "okay"; /* nc, sata, usb3, dp */ @@ -441,6 +437,10 @@ flash@0 { }; }; +&rtc { + status = "okay"; +}; + &sata { status = "okay"; /* SATA OOB timing settings */ From patchwork Wed Jun 9 11:45:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 12309985 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=-17.0 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,USER_AGENT_GIT 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 443DBC48BD1 for ; Wed, 9 Jun 2021 12:18:40 +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 0B39761364 for ; Wed, 9 Jun 2021 12:18:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0B39761364 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=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=b+FXoNDIp8Xp3K9UYvaXZxCHGLNR26LuL5i9jtgPaO8=; b=NmNtvqic2cPpvr 8qeV7XLZTOZy8Xe30DRdEvhPY/7p0/cpV2FafVoxOGNRxjdfVFAYW4duNnY0h8l11ZpH2kJ70sH9q 8nDxNTD2Co3s/C9sfZM/R1tnDj3TGyWm0r4nkj5EKhbitwrC9NLaKtom/RTkWOOhCuwiWQ3N/CNIm LYHQtpF2iecFW0secRS5ikh8JYkX6srRuPRVQVR6p/Xk6bfCDhV6OWWUS9jHtZn/RFURFIeeCg4SQ 1wkI+D3nKOz/bAKe/YuntUy6+N9J3J046cIPOhzeJLn/o3EK4s7amXv528DFcDHPYU73QdvWjPASC 2iCQvRwNsNwcMNv/u66w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqx5w-00DbFx-6c; Wed, 09 Jun 2021 12:14:04 +0000 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqwev-00DQ9N-Dl for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 11:46:10 +0000 Received: by mail-wm1-x32d.google.com with SMTP id t4-20020a1c77040000b029019d22d84ebdso4069459wmi.3 for ; Wed, 09 Jun 2021 04:46:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fh8Ijkb1J1EQRbMUlgIiVh7lHaVO6VD8BKhO7+YIbyY=; b=D/VNpJ3Luz2OD+p1JYllXDKuVZsLfQlJjEIoHdNrJKGh7AcbH+KHixYNJeuWORUqJy ulPePsO/kin9INWcNraTBSAf0IyO7tKfQMnQtCLaWTt8s6iF5AmihmJl8Dte1rDnGyEL HrdlLzdvk9hFz+WEMrBxnCQ6ieR+OITGstd8OdeISS0XrbAAq66RvZ3nlQwYDw0S6feA hdEgB7nAl+yNNOxz3UVjxvouSRl7UdguUroxoUMRN7Sc3/ZStvQgrSYlnlyTMBL/hinN cRpDF4tsidc5MoHTgbu01ByMW1RFnGa363MxpZOb0RKd9U2DGTYNzGG9XjFPk598Nt1L 106g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=fh8Ijkb1J1EQRbMUlgIiVh7lHaVO6VD8BKhO7+YIbyY=; b=K2/a3aTRMO8g3kJfEv6QVRPUIYZLIpUPgSh5GOC5HfqARehFeztZGwz801frGP3Ou6 G9f4709YXpJ9q+V1mDEsC76WYKwuZ6BMLh9jV7COoupL3cAPQiyOIGgnNczTgyxmg5Xv oq8pmsjeO0rqP+PZyWraSYWY1h4oEB8d0Crz22UOIJ2eJeJjNqQmwEw6rHtTlU8WlHGE w2zwXo3gL3uXYqUY6jvilwokNR6c0DBLPquk6sGOV7oR36usI0Ck4+50SImrMmq0p3rt G3yPL3eYmhTuIox0nvfQzicqEjQw4M4l4FSUNA7AWiFGGlw5GZAYhUeRGWBJu8xl53wO 4H/g== X-Gm-Message-State: AOAM530vobDxcf1kv0uGKw1yw0QoamL+OX77sBqyXPZojJB2vev8eUTI D1qTgQmMzRobi2EwPmihf8t6xA== X-Google-Smtp-Source: ABdhPJycDus8GKbp8t7/Pd8ttcToS1P6blHP7sMp1XcpcIJ2J7Ay0cG4bN89bUuVpSkKiQHZbuDkDA== X-Received: by 2002:a05:600c:2059:: with SMTP id p25mr26372912wmg.56.1623239167529; Wed, 09 Jun 2021 04:46:07 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::45a]) by smtp.gmail.com with ESMTPSA id n12sm8065135wrw.83.2021.06.09.04.46.06 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Jun 2021 04:46:07 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu, michal.simek@xilinx.com, git@xilinx.com, Viresh Kumar Cc: Krzysztof Kozlowski , Laurent Pinchart , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 27/31] arm64: zynqmp: Add reset description for sata Date: Wed, 9 Jun 2021 13:45:03 +0200 Message-Id: <95ef94aafc4abb374900b4e97d99f95eb22c342e.1623239033.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_044609_516478_AE4D96D3 X-CRM114-Status: GOOD ( 10.06 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Sata needs to get reset before configuration that's why add property for it there. Signed-off-by: Michal Simek --- arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi index da54a2d35552..6f0fcec28ae2 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi @@ -673,6 +673,7 @@ sata: ahci@fd0c0000 { interrupt-parent = <&gic>; interrupts = <0 133 4>; power-domains = <&zynqmp_firmware PD_SATA>; + resets = <&zynqmp_reset ZYNQMP_RESET_SATA>; #stream-id-cells = <4>; iommus = <&smmu 0x4c0>, <&smmu 0x4c1>, <&smmu 0x4c2>, <&smmu 0x4c3>; From patchwork Wed Jun 9 11:45:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 12310009 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=-17.0 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,USER_AGENT_GIT 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 E0D59C48BCD for ; Wed, 9 Jun 2021 12:27:05 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AB1F961351 for ; Wed, 9 Jun 2021 12:27:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AB1F961351 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=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=iL4S+udktc9TriRiZHm9nTVM81L6lZVCy3rTMQkbIYE=; b=rqg3xae8r9vsgg Ml9vhyqc86rhIQmfRf99dY/Ol+pHjNv5s68YLNYwN/KtBRgZVKVzCbGsw+cTthRJWq5qgdHwRA2AY OFnz+S34OjKIvXiiX6sU/6l9zmC0r6O2v9yPUTTIsgLcXkzqv8gRLUzLcWth2VH1yZEJI4XQFLIpC cvTqqXmHlde1BR3hgWTZSpLSUrbgNKPpCqVSl2/BrZuwWIORY1Edeclc2khvzWgkdPz4L69FjW0yW URa6KKbcmDX0YJ6XDhW2KQuZv/3UcXJoleNX0Mpo/B+BHbJBxIVIe8CIcDFDXiz4RP4D6sjAYEv5q +TlodLA7of2w/JP752/g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqxGO-00DfAm-QK; Wed, 09 Jun 2021 12:24:54 +0000 Received: from mail-wm1-f53.google.com ([209.85.128.53]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqwfv-00DQbw-1D for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 11:47:12 +0000 Received: by mail-wm1-f53.google.com with SMTP id s70-20020a1ca9490000b02901a589651424so3074946wme.0 for ; Wed, 09 Jun 2021 04:47:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=faDJwJkZnio3K1+D2/qEPWG8piye6Bb4xmyIkwVtbsM=; b=UmrttrlpGT6MTSmxtyJNOBUbmgFtWxEkrhN37QpZ+rjaocPopM9jfvdyufpxSLlm3G DdiTLtUDRpfqttGSfpsIllmhbJ3yPScaZZRUaRyJBZnNXj6wCa8gAabrGfeTZI1gYv8B iWLYVRax67K6VijlPRVRzhtdTgkuxDM8hXOCH+VVNa3OjM6deZP0eUuAGBbjkJ8vRiuL zu+VMO8ydFC+lQDEtpVBfrbRwMRXOe6wuzYmvRUBNhn6EDgRRTgpL1qFdSVUAnXjwYtC ZHZzvTOJNmF8AwrInbW5Kro32m3fh9DIeaXdNYkIyeLLcWbLrBPSgWUdKK3oT7IBb2N4 AdPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=faDJwJkZnio3K1+D2/qEPWG8piye6Bb4xmyIkwVtbsM=; b=dNTteDbmag+O3PXDbENp4RQB1a0EzN/XaFvLgGHP3SjzcU3Fv7uohOtlpdfNIXExg6 oPPK+tb7u4cLUdE0tx2tYD4crdPKq151Ko2/m1qARtycdSxswVKsjfrakuSOCS4lzx8E 6KxdUCJJmmJ8WoKE3mTBqIe8HlrPia2Mx5FRqlCCMvWSj/gE/iJeIW786Oup/p+hmL73 HaAAikiVXes5RfkQEXt5OB1Xp/qjnAs5NcPADI62fJgzRZQQrEVv+97GQh8UBWxSBVSs Ngg0pjNJICu2LdFtM7iafHxMEvEveZFEx9DZlk6xs5gSv+5S2Qlyaeh6lbHvxzUNTKVh 3cQA== X-Gm-Message-State: AOAM531995mP1yfEPzOWcgFuywjcDvf4N/Xpc3owuk+sE3tWmV+IBUz8 xmQT05QFRJoNUAXkD/jFQ++XZg== X-Google-Smtp-Source: ABdhPJwyvaRJV27WEeZvyOtiMcZITiOPSb+nkAyiLSj8gjv4MqWxJI0U3RW05ioxpVts1hS0s+ciiw== X-Received: by 2002:a05:600c:4f8f:: with SMTP id n15mr11461111wmq.116.1623239169240; Wed, 09 Jun 2021 04:46:09 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::45a]) by smtp.gmail.com with ESMTPSA id x18sm2153689wrw.19.2021.06.09.04.46.08 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Jun 2021 04:46:08 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu, michal.simek@xilinx.com, git@xilinx.com, Viresh Kumar Cc: Laurent Pinchart , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 28/31] arm64: zynqmp: Sync psgtr node location with zcu104-revA Date: Wed, 9 Jun 2021 13:45:04 +0200 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_044711_120331_CFE07E62 X-CRM114-Status: GOOD ( 11.78 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org zcu104-revA has node below pinctrl which is not the same on revC. Sync location for easier comparison. Also zc1751-dc1 is not using this position. Signed-off-by: Michal Simek --- .../boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 14 +++++++------- arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts index 9f176307b62a..d78439e891b9 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts @@ -58,13 +58,6 @@ clock_si5338_3: clk150 { }; }; -&psgtr { - status = "okay"; - /* dp, usb3, sata */ - clocks = <&clock_si5338_0>, <&clock_si5338_2>, <&clock_si5338_3>; - clock-names = "ref1", "ref2", "ref3"; -}; - &fpd_dma_chan1 { status = "okay"; }; @@ -340,6 +333,13 @@ conf { }; }; +&psgtr { + status = "okay"; + /* dp, usb3, sata */ + clocks = <&clock_si5338_0>, <&clock_si5338_2>, <&clock_si5338_3>; + clock-names = "ref1", "ref2", "ref3"; +}; + &qspi { status = "okay"; flash@0 { diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts index fb8d76b5c27f..c21d9612ce04 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts @@ -429,6 +429,13 @@ conf-tx { }; }; +&psgtr { + status = "okay"; + /* nc, sata, usb3, dp */ + clocks = <&clock_8t49n287_5>, <&clock_8t49n287_2>, <&clock_8t49n287_3>; + clock-names = "ref1", "ref2", "ref3"; +}; + &qspi { status = "okay"; flash@0 { @@ -446,13 +453,6 @@ &rtc { status = "okay"; }; -&psgtr { - status = "okay"; - /* nc, sata, usb3, dp */ - clocks = <&clock_8t49n287_5>, <&clock_8t49n287_2>, <&clock_8t49n287_3>; - clock-names = "ref1", "ref2", "ref3"; -}; - &sata { status = "okay"; /* SATA OOB timing settings */ From patchwork Wed Jun 9 11:45:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 12309989 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=-17.0 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,USER_AGENT_GIT 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 C4423C48BCD for ; Wed, 9 Jun 2021 12:19: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 8C69A61351 for ; Wed, 9 Jun 2021 12:19:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8C69A61351 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=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=YP/9e9HaSjEd49HUKZqrAP9kAEH2KS9xx/NdqmIu46w=; b=iakl563iE8a7u7 tZEUjf/hBaL2+JRmrDWq368lGhTIyxPIjFtJ+Y60q4ZLtvGft7E7++rUJopT7EPgsOHEn8HdGKszI C86dRvcMBoxlXbxgXnnBwosBMurj2j7xf8MrlXIrOMOLe4hCwUSvC9/Y/kin+qxPb5w6Dm6afEUcV rHE5aIIAKefvBxRdamYgtXD9WnzYsBsG2DQ6wb4zqJx1L5BAE/h64Y3cMTfPs5A+odXDUg3sIM2YH 2AmDEh2bDO3RMeSg6j4fAbU35HsW5fJASbbit+uIQuXBCmY/P7RFuGATcU2b/7X01bnYuaCWEmOqZ KVfZX8heUrN8ch++o1kA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqx7D-00Dbg5-Gl; Wed, 09 Jun 2021 12:15:24 +0000 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqwey-00DQAv-EA for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 11:46:13 +0000 Received: by mail-wm1-x333.google.com with SMTP id g204so3805811wmf.5 for ; Wed, 09 Jun 2021 04:46:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GrRo1AeZoDDEDA6M/EqmswKct0DqVxPXdJgVJq+2YZA=; b=GY1qLpbWuYmVm5FKBkxdLJUYsQPIfp10KhFKTtabDOkCaV1zDUJgQrtK7jqo2nLWP4 hjGtKmO3E4E/NVtw+e4F+ErynuqwTXZon7DW2gjWN37rp5VyopASRC8Y3wrOoYBtc2J2 PyyaP8z1hkHOMWn5i1DinqIzKkhM8R7fqVve3XhhaT7q2WNybF5TuSYQhw+Owa5Gs2VF o2t/orxFwEw5whdS+to0NJU2fpgrE9SZrELgcawgdnoI6Ty+uEsyWGjSJV0Kj0yVnEXS VR+QgEbLYa6ZlLaz3T9tqQG3hEyh8X8Cy2DADxtlEKdPKEjyhKo6DxYnXnFwv7A6KU7s Z/YA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=GrRo1AeZoDDEDA6M/EqmswKct0DqVxPXdJgVJq+2YZA=; b=N3EjKHDgOxay/lpQrV5etrEGdCavlwUJA+u/9h8x3w8VsFiD4DwAK2vbSr3I/PJ4Oc 2sUwgXKFD9D4pxkjFzHVBZL8Zoj9k4829vMHFl3msssdJx9habYxEELNRs92P3w0UJAr qOwNL436bxv+9ChQgCdfKIZGWBh+90I14vZf35QkflOQsuWJd/Nthd8cZv1v0LSAI5+S 56Z+Ge2cFDWg+6WlGiEFRo6zZvJSny8XYTUs8uzbZEok6HtLiFgMhhqFBzLT23NSnxMl BVGWVNT2VTY1EF9yFo5NHn0Zr9Q1zN0ODQKbwY1nYgUgN8Zqm+T3TpONPB6mJMs8FU/e YzKw== X-Gm-Message-State: AOAM531TkxKBWIehNh5q3Vm3Ba2Rs/qeQSoTIIKzaoGCNcRTF/iCuLmK jyUaNeLtvsUdcLGySBsOIlEuyg== X-Google-Smtp-Source: ABdhPJzzRtdjN5kgvGMcASKTrOWnR3p3hRAf6VvL5a3Smakef4Dv1FTRQLIMC6Y3h8ZSd1Juy0kiow== X-Received: by 2002:a05:600c:ada:: with SMTP id c26mr8515903wmr.189.1623239170763; Wed, 09 Jun 2021 04:46:10 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::45a]) by smtp.gmail.com with ESMTPSA id r2sm23913166wrv.39.2021.06.09.04.46.10 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Jun 2021 04:46:10 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu, michal.simek@xilinx.com, git@xilinx.com, Viresh Kumar Cc: Laurent Pinchart , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 29/31] arm64: zynqmp: Remove description for 8T49N287 and si5382 chips Date: Wed, 9 Jun 2021 13:45:05 +0200 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_044612_517904_766C3F3F X-CRM114-Status: GOOD ( 11.70 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Based on commit 73d677e9f379 ("arm64: dts: zynqmp: Remove si5328 device nodes") also remove description for clock chips which don't have Linux driver yet. Signed-off-by: Michal Simek --- arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts | 4 +--- arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts | 4 +--- arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts index 048df043b45c..86fff3632c7d 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts @@ -160,9 +160,7 @@ i2c@1 { #address-cells = <1>; #size-cells = <0>; reg = <1>; - clock_8t49n287: clock-generator@6c { /* 8T49N287 - u182 */ - reg = <0x6c>; - }; + /* 8T49N287 - u182 */ }; i2c@2 { diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts index c21d9612ce04..2a872d439804 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts @@ -184,9 +184,7 @@ i2c@1 { #address-cells = <1>; #size-cells = <0>; reg = <1>; - clock_8t49n287: clock-generator@6c { /* 8T49N287 - u182 */ - reg = <0x6c>; - }; + /* 8T49N287 - u182 */ }; i2c@2 { diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts index 4dc315ee91b7..dac5ba67a160 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts @@ -475,9 +475,7 @@ i2c@4 { #address-cells = <1>; #size-cells = <0>; reg = <4>; - si5382: clock-generator@69 { /* SI5382 - u48 */ - reg = <0x69>; - }; + /* SI5382 - u48 */ }; i2c@5 { #address-cells = <1>; From patchwork Wed Jun 9 11:45:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 12310019 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=-17.0 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,USER_AGENT_GIT autolearn=unavailable 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 78F7BC48BDF for ; Wed, 9 Jun 2021 12:28:20 +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 4ADBC613B9 for ; Wed, 9 Jun 2021 12:28:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4ADBC613B9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=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=8Mk0YWpgNwJ8cnSDxlr8HbSpDkaHpBmc/taMrCh2GVs=; b=T1T1E/EsIqVDvB OduEiEX8BCmwVf2++iW/VpYLoiTEAJM1eiHD4Q9FKB499ph9ee+db4LW69vDt0bcYSWVdbGA2untt 6BqEL/sdSmj6KS1dUHT/ouLVZ/9pU7wgU9+ISh22tAQa8Wz/DohNwdBNX6g5FEdzOcdnTfLyS+sZc ukq4i+EQx9uxceYsGZLBgFCWPawSdQifFjOftg+nuZ9awG1TaFhY6Mn0zqViBzrL+Vtn4u6jgPURG oADIARnhwDL/f82Y+39rO+8ZcBL08n3dhgUDl5myh4G+suKIpXGeSt/LEyOLmJaTH0SYsMsiPINbq gK96meVSmBOVonn5TC+A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqxHJ-00DfVC-9I; Wed, 09 Jun 2021 12:25:49 +0000 Received: from mail-wr1-f50.google.com ([209.85.221.50]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqwfy-00DQdi-8I for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 11:47:15 +0000 Received: by mail-wr1-f50.google.com with SMTP id a20so25193944wrc.0 for ; Wed, 09 Jun 2021 04:47:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=E1EohIqdC72FM7oJ+0Bb3pu1J7HtZfQcXJxneapHVDs=; b=jMK7SSL544Pz9+ssHsN6XkEi2VnlQzCqygce0If2ZnI8wOPgTi1HJHDFbB50FTazsw Thr370vDNGAPJmXNJaEWdioAge/6fadRTmKKzaVHcbdK1lC9KpQo6J/lFCtcQjtT6iBd WTJo6cw61gU3QzuTD+WB/sO5MZM8FAVUOjOV3UoVkkS5KOconBmonM0ImyJogh7DM3OX qGWsFSJ8Bg9Qm/zph6Uf54cTiD33HrywmWh9LyYPTMso7Eojbdajj5FLM2cRvZd9i2Rf zwEgPcPhSnhCBtxU15H1kP80tuzGnNRVPb2uSG+9JtmT7Bs3zpAOFZEO9IDJpqvBFF+k B3WQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=E1EohIqdC72FM7oJ+0Bb3pu1J7HtZfQcXJxneapHVDs=; b=QB2vvELFHuSjTGbdDEIuKjVEu4B5lNkQg/OtdyE6fnEyZKgfBPTm7obBXXe4Maj5VU /+fuf/So468aNfZLT1tU0nqhBffBQrWa945HMRPelaI/LXC9Z8OhUn/BGEqV2yKEx8TU o0Xvz6orFOQiG8aIn5rV0CPBk487Kjcos2GMck24sQKCCZIdesjyFNbMNZ2/IddO8SMN uWNlQESPeuPSKbPEwf9qmXg0Q+AcNw6w9LOokWXJiq64f6cVcaQLjtdV6Ydhsr+shonO qm6GU3XWCWSrHIRuoBPujuguSJwS8NjIvSgL4muDK+droyaC1lppKhROPPCsvl0M+894 Rhiw== X-Gm-Message-State: AOAM5307q5qE/XMYzYHPtTiZAMB6owiWzg7XLP3OzJXoW7y4iGFKtWKm eatWQYF3QiPV/l+SOn0XD0xdNQ== X-Google-Smtp-Source: ABdhPJxDbSSDrwL+y/nTPpabJWwtAyckk6kbuvqrbQvjOn28JPbrANIQ2yieRxF9SCJf84YUyz1Wlw== X-Received: by 2002:adf:d1cd:: with SMTP id b13mr8628554wrd.317.1623239172430; Wed, 09 Jun 2021 04:46:12 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::45a]) by smtp.gmail.com with ESMTPSA id t1sm23025810wrx.28.2021.06.09.04.46.11 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Jun 2021 04:46:12 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu, michal.simek@xilinx.com, git@xilinx.com, Viresh Kumar Cc: Krzysztof Kozlowski , Michael Walle , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 30/31] arm64: zynqmp: Add support for zcu102-rev1.1 board Date: Wed, 9 Jun 2021 13:45:06 +0200 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_044714_335045_1A825846 X-CRM114-Status: GOOD ( 16.18 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org zcu102 rev1.1 compare to rev1.0 is using by default different DDR memory which requires different configuration. The reason for adding this file to Linux kernel is that U-Boot fdtfile variable is composed based on board revision (in eeprom) and dtb file should exist in standard distibutions for passing it to Linux kernel. Signed-off-by: Michal Simek --- Documentation/devicetree/bindings/arm/xilinx.yaml | 1 + arch/arm64/boot/dts/xilinx/Makefile | 1 + .../boot/dts/xilinx/zynqmp-zcu102-rev1.1.dts | 15 +++++++++++++++ 3 files changed, 17 insertions(+) create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.1.dts diff --git a/Documentation/devicetree/bindings/arm/xilinx.yaml b/Documentation/devicetree/bindings/arm/xilinx.yaml index f52c7e8ce654..a0b1ae6e3e71 100644 --- a/Documentation/devicetree/bindings/arm/xilinx.yaml +++ b/Documentation/devicetree/bindings/arm/xilinx.yaml @@ -87,6 +87,7 @@ properties: - xlnx,zynqmp-zcu102-revA - xlnx,zynqmp-zcu102-revB - xlnx,zynqmp-zcu102-rev1.0 + - xlnx,zynqmp-zcu102-rev1.1 - const: xlnx,zynqmp-zcu102 - const: xlnx,zynqmp diff --git a/arch/arm64/boot/dts/xilinx/Makefile b/arch/arm64/boot/dts/xilinx/Makefile index 11fb4fd3ebd4..083ed52337fd 100644 --- a/arch/arm64/boot/dts/xilinx/Makefile +++ b/arch/arm64/boot/dts/xilinx/Makefile @@ -12,6 +12,7 @@ dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu100-revC.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu102-revA.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu102-revB.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu102-rev1.0.dtb +dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu102-rev1.1.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu104-revA.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu104-revC.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu106-revA.dtb diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.1.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.1.dts new file mode 100644 index 000000000000..b6798394fcf4 --- /dev/null +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.1.dts @@ -0,0 +1,15 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * dts file for Xilinx ZynqMP ZCU102 Rev1.1 + * + * (C) Copyright 2016 - 2020, Xilinx, Inc. + * + * Michal Simek + */ + +#include "zynqmp-zcu102-rev1.0.dts" + +/ { + model = "ZynqMP ZCU102 Rev1.1"; + compatible = "xlnx,zynqmp-zcu102-rev1.1", "xlnx,zynqmp-zcu102", "xlnx,zynqmp"; +}; From patchwork Wed Jun 9 11:45:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 12310021 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=-17.0 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,USER_AGENT_GIT 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 62CEDC48BCD for ; Wed, 9 Jun 2021 12:29:29 +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 2BB0661351 for ; Wed, 9 Jun 2021 12:29:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2BB0661351 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=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=10RnaaEWfsl3QLrhJjahs8OYLDposeKZYzYqtBDT11s=; b=RQR+evL/FgC6Mm 3esvMY9RGhQ9SSyDV/V6/D/EFiiWsUepbykYAGoun9yks2IlbJ/Uw1WLIvrnRtgpTJllNI6xQs1M0 5wKLGDISBZveLurqrNtYR0di5qB86iaJbVWQvDYlmi4c+M+dXe0WIKTUpyjtQrpkPydRTh9fMtJzJ MMd8GP5+BI8JpQEQMgaKTCfU6bAwIMjtgmbOR49QsNZL0Wua2GQd9nyCuQ2xXaG4y1LFDIg8Zz2wL ITN+UxuJuJb+UAwvJTaunrKHy2CYI7paBDuVMhu5NNPORkLQDAiP6kOvi/WjXKWdYof8m79slK4ac 085HfqYR4w9Fu6rr7DBQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqxI3-00Dflp-32; Wed, 09 Jun 2021 12:26:35 +0000 Received: from mail-wm1-f50.google.com ([209.85.128.50]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqwfz-00DQet-FP for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 11:47:19 +0000 Received: by mail-wm1-f50.google.com with SMTP id l11-20020a05600c4f0bb029017a7cd488f5so4026176wmq.0 for ; Wed, 09 Jun 2021 04:47:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cfLtTNNJiGvr55qHsiqGqf0rsZ8IwtangtgE/TkYmbA=; b=PxwsGurI5LFbUdiMPG9tgAXg/8gJkbrklsARX0YrESmDqzg6Giwj6Ut6rot1PKCt4E aD1LIVB+Uurn8Ru5PNApppk9cwb3h6OkwReNFU/sDhTQWJ522pGRzUWOeULX6gb1URRn g+JbL5fxWEdlt0noA4O1TjtDticVjl18SSCLZLj6zCjtQHVJMZokEzktYRjJqD4K0Bmv fFxMG68paOZROr0To5WxUqzVo1evTKIsM27EuX6jJeWeW0S6XSDnNqZ5Nyi0ikVKjkDj oE8REk5PKUNLUGWbQIJbj6yr22X2WvNncYhIItSONDlxn+qFWXfLAWI6fR+RpBNnRnV5 EF9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=cfLtTNNJiGvr55qHsiqGqf0rsZ8IwtangtgE/TkYmbA=; b=roH3RMg3NsIEN4EhyRzU+g3yX9BIxkRWos/VGI3N8rPRoTlJUVegC/eGCG6FxCwcI5 HHZn2xkHztnVkcxostsKALp4DReUN+0LLOSuvTALkQ4fWxemwnQ45c2oMBFlAnEZA626 3YsS1qyXgVWedx3hRbgeR0mI4i2HOljA++MKrFb3r6vkry6T8q6Y3mm7kJ8TDJCPPPgb AKZF/CbzYPKlaYNeaxtVTE+jfr9XqldbtVJ5f0Q7VmSsVGVjvZQUUrx1/Ag8KyXSCEWj skzIoG6u2dT/5rYPwU2JoI0m+0MrFN1goG1t9d2kFYH796dmqTZMvJfosAUiKJDXRNTA lYjw== X-Gm-Message-State: AOAM530PIdPjfNAJC6HAdFNhhyRXi/cxRBZNN6MJOVIXtmhaeOKT2UYz TlfvFU2tp+lOjAPnmkcJs1GkZQ== X-Google-Smtp-Source: ABdhPJyJRp2Y6BxdlZM8cR6adUoUx48/QEolsI59RFFzti4bjUtPbC8CZ1cRMROJilEWIYMzMQPdZA== X-Received: by 2002:a1c:7210:: with SMTP id n16mr9104082wmc.75.1623239174183; Wed, 09 Jun 2021 04:46:14 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::45a]) by smtp.gmail.com with ESMTPSA id p10sm11635975wrr.33.2021.06.09.04.46.13 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Jun 2021 04:46:13 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu, michal.simek@xilinx.com, git@xilinx.com, Viresh Kumar Cc: Geert Uytterhoeven , Krzysztof Kozlowski , Michael Walle , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 31/31] arm64: zynqmp: Add support for Xilinx Kria SOM board Date: Wed, 9 Jun 2021 13:45:07 +0200 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_044715_767654_DB8D711D X-CRM114-Status: GOOD ( 19.17 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org There are couple of revisions of SOMs (k26) and associated carrier cards (kv260). SOM itself has two major versions: sm-k26 - SOM with EMMC smk-k26 - SOM without EMMC used on starter kit with preprogrammed firmware in QSPI. SOMs are describing only devices available on the SOM or connections which are described in specification (for example UART, fwuen). Signed-off-by: Michal Simek --- https://www.xilinx.com/products/som/kria.html --- .../devicetree/bindings/arm/xilinx.yaml | 31 ++ arch/arm64/boot/dts/xilinx/Makefile | 11 + .../boot/dts/xilinx/zynqmp-sck-kv-g-revA.dts | 371 ++++++++++++++++++ .../boot/dts/xilinx/zynqmp-sck-kv-g-revB.dts | 351 +++++++++++++++++ .../boot/dts/xilinx/zynqmp-sm-k26-revA.dts | 289 ++++++++++++++ .../boot/dts/xilinx/zynqmp-smk-k26-revA.dts | 21 + 6 files changed, 1074 insertions(+) create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revA.dts create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revB.dts create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-smk-k26-revA.dts diff --git a/Documentation/devicetree/bindings/arm/xilinx.yaml b/Documentation/devicetree/bindings/arm/xilinx.yaml index a0b1ae6e3e71..1a4a03dfaf7f 100644 --- a/Documentation/devicetree/bindings/arm/xilinx.yaml +++ b/Documentation/devicetree/bindings/arm/xilinx.yaml @@ -116,6 +116,37 @@ properties: - const: xlnx,zynqmp-zcu111 - const: xlnx,zynqmp + - description: Xilinx Kria SOMs + items: + - const: xlnx,zynqmp-sm-k26-rev1 + - const: xlnx,zynqmp-sm-k26-revB + - const: xlnx,zynqmp-sm-k26-revA + - const: xlnx,zynqmp-sm-k26 + - const: xlnx,zynqmp + + - description: Xilinx Kria SOMs (starter) + items: + - const: xlnx,zynqmp-smk-k26-rev1 + - const: xlnx,zynqmp-smk-k26-revB + - const: xlnx,zynqmp-smk-k26-revA + - const: xlnx,zynqmp-smk-k26 + - const: xlnx,zynqmp + + - description: Xilinx Kria Carrier Cards (revA/Y/Z) + items: + - const: xlnx,zynqmp-sk-kv260-revZ + - const: xlnx,zynqmp-sk-kv260-revY + - const: xlnx,zynqmp-sk-kv260-revA + - const: xlnx,zynqmp-sk-k260 + - const: xlnx,zynqmp + + - description: Xilinx Kria Carrier Cards (revB/1) + items: + - const: xlnx,zynqmp-sk-kv260-rev1 + - const: xlnx,zynqmp-sk-kv260-revB + - const: xlnx,zynqmp-sk-k260 + - const: xlnx,zynqmp + additionalProperties: true ... diff --git a/arch/arm64/boot/dts/xilinx/Makefile b/arch/arm64/boot/dts/xilinx/Makefile index 083ed52337fd..bd7747770674 100644 --- a/arch/arm64/boot/dts/xilinx/Makefile +++ b/arch/arm64/boot/dts/xilinx/Makefile @@ -17,3 +17,14 @@ dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu104-revA.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu104-revC.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu106-revA.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu111-revA.dtb + + +dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sm-k26-revA.dtb +dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-smk-k26-revA.dtb + +som-AA-dtbs := zynqmp-sm-k26-revA.dtb zynqmp-sck-kv-g-revA.dtbo +som-AB-dtbs := zynqmp-sm-k26-revA.dtb zynqmp-sck-kv-g-revB.dtbo +starter-AA-dtbs := zynqmp-smk-k26-revA.dtb zynqmp-sck-kv-g-revA.dtbo +starter-AB-dtbs := zynqmp-smk-k26-revA.dtb zynqmp-sck-kv-g-revB.dtbo + +dtb-$(CONFIG_ARCH_ZYNQMP) += som-AA.dtb som-AB.dtb starter-AA.dtb starter-AB.dtb diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revA.dts new file mode 100644 index 000000000000..3c2918bf9897 --- /dev/null +++ b/arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revA.dts @@ -0,0 +1,371 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * dts file for KV260 revA Carrier Card + * + * (C) Copyright 2020, Xilinx, Inc. + * + * SD level shifter: + * "A" – A01 board un-modified (NXP) + * "Y" – A01 board modified with legacy interposer (Nexperia) + * "Z" – A01 board modified with Diode interposer + * + * Michal Simek + */ + + #include + #include + #include + #include + +/dts-v1/; +/plugin/; + +/{ + compatible = "xlnx,zynqmp-sk-kv260-revA", + "xlnx,zynqmp-sk-kv260-revY", + "xlnx,zynqmp-sk-kv260-revZ", + "xlnx,zynqmp-sk-kv260", "xlnx,zynqmp"; + + fragment1 { + target = <&i2c1>; /* I2C_SCK C23/C24 - MIO from SOM */ + + __overlay__ { + #address-cells = <1>; + #size-cells = <0>; + pinctrl-names = "default", "gpio"; + pinctrl-0 = <&pinctrl_i2c1_default>; + pinctrl-1 = <&pinctrl_i2c1_gpio>; + scl-gpios = <&gpio 24 GPIO_ACTIVE_HIGH>; + sda-gpios = <&gpio 25 GPIO_ACTIVE_HIGH>; + + u14: ina260@40 { /* u14 */ + compatible = "ti,ina260"; + #io-channel-cells = <1>; + label = "ina260-u14"; + reg = <0x40>; + }; + /* u27 - 0xe0 - STDP4320 DP/HDMI splitter */ + }; + }; + + fragment1a { + target = <&amba>; + __overlay__ { + ina260-u14 { + compatible = "iio-hwmon"; + io-channels = <&u14 0>, <&u14 1>, <&u14 2>; + }; + + si5332_0: si5332_0 { /* u17 */ + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <125000000>; + }; + + si5332_1: si5332_1 { /* u17 */ + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <25000000>; + }; + + si5332_2: si5332_2 { /* u17 */ + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <48000000>; + }; + + si5332_3: si5332_3 { /* u17 */ + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <24000000>; + }; + + si5332_4: si5332_4 { /* u17 */ + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <26000000>; + }; + + si5332_5: si5332_5 { /* u17 */ + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <27000000>; + }; + }; + }; + +/* DP/USB 3.0 and SATA */ + fragment2 { + target = <&psgtr>; + __overlay__ { + status = "okay"; + /* pcie, usb3, sata */ + clocks = <&si5332_5>, <&si5332_4>, <&si5332_0>; + clock-names = "ref0", "ref1", "ref2"; + }; + }; + + fragment3 { + target = <&sata>; + __overlay__ { + status = "okay"; + /* SATA OOB timing settings */ + ceva,p0-cominit-params = /bits/ 8 <0x18 0x40 0x18 0x28>; + ceva,p0-comwake-params = /bits/ 8 <0x06 0x14 0x08 0x0E>; + ceva,p0-burst-params = /bits/ 8 <0x13 0x08 0x4A 0x06>; + ceva,p0-retry-params = /bits/ 16 <0x96A4 0x3FFC>; + ceva,p1-cominit-params = /bits/ 8 <0x18 0x40 0x18 0x28>; + ceva,p1-comwake-params = /bits/ 8 <0x06 0x14 0x08 0x0E>; + ceva,p1-burst-params = /bits/ 8 <0x13 0x08 0x4A 0x06>; + ceva,p1-retry-params = /bits/ 16 <0x96A4 0x3FFC>; + phy-names = "sata-phy"; + phys = <&psgtr 3 PHY_TYPE_SATA 1 2>; + }; + }; + + fragment4 { + target = <&zynqmp_dpsub>; + __overlay__ { + status = "disabled"; + phy-names = "dp-phy0", "dp-phy1"; + phys = <&psgtr 1 PHY_TYPE_DP 0 0>, <&psgtr 0 PHY_TYPE_DP 1 0>; + }; + }; + + fragment9 { + target = <&zynqmp_dpdma>; + __overlay__ { + status = "okay"; + }; + }; + + fragment10 { + target = <&usb0>; + __overlay__ { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb0_default>; + usbhub: usb5744 { /* u43 */ + compatible = "microchip,usb5744"; + reset-gpios = <&gpio 44 GPIO_ACTIVE_HIGH>; + }; + }; + }; + + fragment11 { + target = <&dwc3_0>; + __overlay__ { + status = "okay"; + dr_mode = "host"; + snps,usb3_lpm_capable; + phy-names = "usb3-phy"; + phys = <&psgtr 2 PHY_TYPE_USB3 0 1>; + maximum-speed = "super-speed"; + }; + }; + + fragment12 { + target = <&sdhci1>; /* on CC with tuned parameters */ + __overlay__ { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sdhci1_default>; + /* + * SD 3.0 requires level shifter and this property + * should be removed if the board has level shifter and + * need to work in UHS mode + */ + no-1-8-v; + disable-wp; + xlnx,mio-bank = <1>; + }; + }; + + fragment13 { + target = <&gem3>; /* required by spec */ + __overlay__ { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gem3_default>; + phy-handle = <&phy0>; + phy-mode = "rgmii-id"; + + mdio: mdio { + #address-cells = <1>; + #size-cells = <0>; + reset-gpios = <&gpio 38 GPIO_ACTIVE_LOW>; + reset-delay-us = <2>; + + phy0: ethernet-phy@1 { + #phy-cells = <1>; + reg = <1>; + ti,rx-internal-delay = ; + ti,tx-internal-delay = ; + ti,fifo-depth = ; + ti,dp83867-rxctrl-strap-quirk; + }; + }; + }; + }; + + fragment14 { + target = <&pinctrl0>; /* required by spec */ + __overlay__ { + status = "okay"; + + pinctrl_uart1_default: uart1-default { + conf { + groups = "uart1_9_grp"; + slew-rate = ; + power-source = ; + drive-strength = <12>; + }; + + conf-rx { + pins = "MIO37"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO36"; + bias-disable; + }; + + mux { + groups = "uart1_9_grp"; + function = "uart1"; + }; + }; + + pinctrl_i2c1_default: i2c1-default { + conf { + groups = "i2c1_6_grp"; + bias-pull-up; + slew-rate = ; + power-source = ; + }; + + mux { + groups = "i2c1_6_grp"; + function = "i2c1"; + }; + }; + + pinctrl_i2c1_gpio: i2c1-gpio { + conf { + groups = "gpio0_24_grp", "gpio0_25_grp"; + slew-rate = ; + power-source = ; + }; + + mux { + groups = "gpio0_24_grp", "gpio0_25_grp"; + function = "gpio0"; + }; + }; + + pinctrl_gem3_default: gem3-default { + conf { + groups = "ethernet3_0_grp"; + slew-rate = ; + power-source = ; + }; + + conf-rx { + pins = "MIO70", "MIO72", "MIO74"; + bias-high-impedance; + low-power-disable; + }; + + conf-bootstrap { + pins = "MIO71", "MIO73", "MIO75"; + bias-disable; + low-power-disable; + }; + + conf-tx { + pins = "MIO64", "MIO65", "MIO66", + "MIO67", "MIO68", "MIO69"; + bias-disable; + low-power-enable; + }; + + conf-mdio { + groups = "mdio3_0_grp"; + slew-rate = ; + power-source = ; + bias-disable; + }; + + mux-mdio { + function = "mdio3"; + groups = "mdio3_0_grp"; + }; + + mux { + function = "ethernet3"; + groups = "ethernet3_0_grp"; + }; + }; + + pinctrl_usb0_default: usb0-default { + conf { + groups = "usb0_0_grp"; + slew-rate = ; + power-source = ; + }; + + conf-rx { + pins = "MIO52", "MIO53", "MIO55"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO54", "MIO56", "MIO57", "MIO58", "MIO59", + "MIO60", "MIO61", "MIO62", "MIO63"; + bias-disable; + }; + + mux { + groups = "usb0_0_grp"; + function = "usb0"; + }; + }; + + pinctrl_sdhci1_default: sdhci1-default { + conf { + groups = "sdio1_0_grp"; + slew-rate = ; + power-source = ; + bias-disable; + }; + + conf-cd { + groups = "sdio1_cd_0_grp"; + bias-high-impedance; + bias-pull-up; + slew-rate = ; + power-source = ; + }; + + mux-cd { + groups = "sdio1_cd_0_grp"; + function = "sdio1_cd"; + }; + + mux { + groups = "sdio1_0_grp"; + function = "sdio1"; + }; + }; + }; + }; + fragment15 { + target = <&uart1>; + __overlay__ { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart1_default>; + }; + }; +}; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revB.dts b/arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revB.dts new file mode 100644 index 000000000000..62d175cf3d5d --- /dev/null +++ b/arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revB.dts @@ -0,0 +1,351 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * dts file for KV260 revA Carrier Card + * + * (C) Copyright 2020, Xilinx, Inc. + * + * Michal Simek + */ + + #include + #include + #include + #include + +/dts-v1/; +/plugin/; + +/{ + compatible = "xlnx,zynqmp-sk-kv260-rev1", + "xlnx,zynqmp-sk-kv260-revB", + "xlnx,zynqmp-sk-kv260", "xlnx,zynqmp"; + + fragment1 { + target = <&i2c1>; /* I2C_SCK C23/C24 - MIO from SOM */ + + __overlay__ { + #address-cells = <1>; + #size-cells = <0>; + pinctrl-names = "default", "gpio"; + pinctrl-0 = <&pinctrl_i2c1_default>; + pinctrl-1 = <&pinctrl_i2c1_gpio>; + scl-gpios = <&gpio 24 GPIO_ACTIVE_HIGH>; + sda-gpios = <&gpio 25 GPIO_ACTIVE_HIGH>; + + u14: ina260@40 { /* u14 */ + compatible = "ti,ina260"; + #io-channel-cells = <1>; + label = "ina260-u14"; + reg = <0x40>; + }; + usbhub: usb5744@2d { /* u43 */ + compatible = "microchip,usb5744"; + reg = <0x2d>; + reset-gpios = <&gpio 44 GPIO_ACTIVE_HIGH>; + }; + /* u27 - 0xe0 - STDP4320 DP/HDMI splitter */ + }; + }; + + fragment1a { + target = <&amba>; + __overlay__ { + ina260-u14 { + compatible = "iio-hwmon"; + io-channels = <&u14 0>, <&u14 1>, <&u14 2>; + }; + + si5332_0: si5332_0 { /* u17 */ + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <125000000>; + }; + + si5332_1: si5332_1 { /* u17 */ + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <25000000>; + }; + + si5332_2: si5332_2 { /* u17 */ + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <48000000>; + }; + + si5332_3: si5332_3 { /* u17 */ + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <24000000>; + }; + + si5332_4: si5332_4 { /* u17 */ + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <26000000>; + }; + + si5332_5: si5332_5 { /* u17 */ + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <27000000>; + }; + }; + }; + +/* DP/USB 3.0 */ + fragment2 { + target = <&psgtr>; + __overlay__ { + status = "okay"; + /* pcie, usb3, sata */ + clocks = <&si5332_5>, <&si5332_4>, <&si5332_0>; + clock-names = "ref0", "ref1", "ref2"; + }; + }; + + fragment4 { + target = <&zynqmp_dpsub>; + __overlay__ { + status = "disabled"; + phy-names = "dp-phy0", "dp-phy1"; + phys = <&psgtr 1 PHY_TYPE_DP 0 0>, <&psgtr 0 PHY_TYPE_DP 1 0>; + }; + }; + + fragment9 { + target = <&zynqmp_dpdma>; + __overlay__ { + status = "okay"; + }; + }; + + fragment10 { + target = <&usb0>; + __overlay__ { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb0_default>; + }; + }; + + fragment11 { + target = <&dwc3_0>; + __overlay__ { + status = "okay"; + dr_mode = "host"; + snps,usb3_lpm_capable; + phy-names = "usb3-phy"; + phys = <&psgtr 2 PHY_TYPE_USB3 0 1>; + maximum-speed = "super-speed"; + }; + }; + + fragment12 { + target = <&sdhci1>; /* on CC with tuned parameters */ + __overlay__ { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sdhci1_default>; + /* + * SD 3.0 requires level shifter and this property + * should be removed if the board has level shifter and + * need to work in UHS mode + */ + no-1-8-v; + disable-wp; + xlnx,mio-bank = <1>; + clk-phase-sd-hs = <126>, <60>; + clk-phase-uhs-sdr25 = <120>, <60>; + clk-phase-uhs-ddr50 = <126>, <48>; + }; + }; + + fragment13 { + target = <&gem3>; /* required by spec */ + __overlay__ { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gem3_default>; + phy-handle = <&phy0>; + phy-mode = "rgmii-id"; + + mdio: mdio { + #address-cells = <1>; + #size-cells = <0>; + reset-gpios = <&gpio 38 GPIO_ACTIVE_LOW>; + reset-delay-us = <2>; + + phy0: ethernet-phy@1 { + #phy-cells = <1>; + reg = <1>; + ti,rx-internal-delay = ; + ti,tx-internal-delay = ; + ti,fifo-depth = ; + ti,dp83867-rxctrl-strap-quirk; + }; + }; + }; + }; + + fragment14 { + target = <&pinctrl0>; /* required by spec */ + __overlay__ { + status = "okay"; + + pinctrl_uart1_default: uart1-default { + conf { + groups = "uart1_9_grp"; + slew-rate = ; + power-source = ; + drive-strength = <12>; + }; + + conf-rx { + pins = "MIO37"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO36"; + bias-disable; + }; + + mux { + groups = "uart1_9_grp"; + function = "uart1"; + }; + }; + + pinctrl_i2c1_default: i2c1-default { + conf { + groups = "i2c1_6_grp"; + bias-pull-up; + slew-rate = ; + power-source = ; + }; + + mux { + groups = "i2c1_6_grp"; + function = "i2c1"; + }; + }; + + pinctrl_i2c1_gpio: i2c1-gpio { + conf { + groups = "gpio0_24_grp", "gpio0_25_grp"; + slew-rate = ; + power-source = ; + }; + + mux { + groups = "gpio0_24_grp", "gpio0_25_grp"; + function = "gpio0"; + }; + }; + + pinctrl_gem3_default: gem3-default { + conf { + groups = "ethernet3_0_grp"; + slew-rate = ; + power-source = ; + }; + + conf-rx { + pins = "MIO70", "MIO72", "MIO74"; + bias-high-impedance; + low-power-disable; + }; + + conf-bootstrap { + pins = "MIO71", "MIO73", "MIO75"; + bias-disable; + low-power-disable; + }; + + conf-tx { + pins = "MIO64", "MIO65", "MIO66", + "MIO67", "MIO68", "MIO69"; + bias-disable; + low-power-enable; + }; + + conf-mdio { + groups = "mdio3_0_grp"; + slew-rate = ; + power-source = ; + bias-disable; + }; + + mux-mdio { + function = "mdio3"; + groups = "mdio3_0_grp"; + }; + + mux { + function = "ethernet3"; + groups = "ethernet3_0_grp"; + }; + }; + + pinctrl_usb0_default: usb0-default { + conf { + groups = "usb0_0_grp"; + slew-rate = ; + power-source = ; + }; + + conf-rx { + pins = "MIO52", "MIO53", "MIO55"; + bias-high-impedance; + }; + + conf-tx { + pins = "MIO54", "MIO56", "MIO57", "MIO58", "MIO59", + "MIO60", "MIO61", "MIO62", "MIO63"; + bias-disable; + }; + + mux { + groups = "usb0_0_grp"; + function = "usb0"; + }; + }; + + pinctrl_sdhci1_default: sdhci1-default { + conf { + groups = "sdio1_0_grp"; + slew-rate = ; + power-source = ; + bias-disable; + }; + + conf-cd { + groups = "sdio1_cd_0_grp"; + bias-high-impedance; + bias-pull-up; + slew-rate = ; + power-source = ; + }; + + mux-cd { + groups = "sdio1_cd_0_grp"; + function = "sdio1_cd"; + }; + + mux { + groups = "sdio1_0_grp"; + function = "sdio1"; + }; + }; + }; + }; + fragment15 { + target = <&uart1>; + __overlay__ { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart1_default>; + }; + }; +}; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts new file mode 100644 index 000000000000..0051f41a59bf --- /dev/null +++ b/arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts @@ -0,0 +1,289 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * dts file for Xilinx ZynqMP SM-K26 rev1/B/A + * + * (C) Copyright 2020, Xilinx, Inc. + * + * Michal Simek + */ + +/dts-v1/; + +#include "zynqmp.dtsi" +#include "zynqmp-clk-ccf.dtsi" +#include +#include +#include + +/ { + model = "ZynqMP SM-K26 Rev1/B/A"; + compatible = "xlnx,zynqmp-sm-k26-rev1", "xlnx,zynqmp-sm-k26-revB", + "xlnx,zynqmp-sm-k26-revA", "xlnx,zynqmp-sm-k26", + "xlnx,zynqmp"; + + aliases { + i2c0 = &i2c0; + i2c1 = &i2c1; + mmc0 = &sdhci0; + mmc1 = &sdhci1; + nvmem0 = &eeprom; + nvmem1 = &eeprom_cc; + rtc0 = &rtc; + serial0 = &uart0; + serial1 = &uart1; + serial2 = &dcc; + spi0 = &qspi; + spi1 = &spi0; + spi2 = &spi1; + usb0 = &usb0; + usb1 = &usb1; + }; + + chosen { + bootargs = "earlycon"; + stdout-path = "serial1:115200n8"; + }; + + memory@0 { + device_type = "memory"; /* 4GB */ + reg = <0x0 0x0 0x0 0x80000000>, <0x8 0x00000000 0x0 0x80000000>; + }; + + gpio-keys { + compatible = "gpio-keys"; + autorepeat; + fwuen { + label = "fwuen"; + gpios = <&gpio 12 GPIO_ACTIVE_LOW>; + }; + }; + + leds { + compatible = "gpio-leds"; + ds35 { + label = "heartbeat"; + gpios = <&gpio 7 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "heartbeat"; + }; + + ds36 { + label = "vbus_det"; + gpios = <&gpio 8 GPIO_ACTIVE_HIGH>; + default-state = "on"; + }; + }; +}; + +&uart1 { /* MIO36/MIO37 */ + status = "okay"; +}; + +&qspi { /* MIO 0-5 - U143 */ + status = "okay"; + flash@0 { /* MT25QU512A */ + compatible = "mt25qu512a", "jedec,spi-nor"; /* 64MB */ + #address-cells = <1>; + #size-cells = <1>; + reg = <0>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <4>; + spi-max-frequency = <40000000>; /* 40MHz */ + partition@0 { + label = "Image Selector"; + reg = <0x0 0x80000>; /* 512KB */ + read-only; + lock; + }; + partition@80000 { + label = "Image Selector Golden"; + reg = <0x80000 0x80000>; /* 512KB */ + read-only; + lock; + }; + partition@100000 { + label = "Persistent Register"; + reg = <0x100000 0x20000>; /* 128KB */ + }; + partition@120000 { + label = "Persistent Register Backup"; + reg = <0x120000 0x20000>; /* 128KB */ + }; + partition@140000 { + label = "Open_1"; + reg = <0x140000 0xC0000>; /* 768KB */ + }; + partition@200000 { + label = "Image A (FSBL, PMU, ATF, U-Boot)"; + reg = <0x200000 0xD00000>; /* 13MB */ + }; + partition@f00000 { + label = "ImgSel Image A Catch"; + reg = <0xF00000 0x80000>; /* 512KB */ + read-only; + lock; + }; + partition@f80000 { + label = "Image B (FSBL, PMU, ATF, U-Boot)"; + reg = <0xF80000 0xD00000>; /* 13MB */ + }; + partition@1c80000 { + label = "ImgSel Image B Catch"; + reg = <0x1C80000 0x80000>; /* 512KB */ + read-only; + lock; + }; + partition@1d00000 { + label = "Open_2"; + reg = <0x1D00000 0x100000>; /* 1MB */ + }; + partition@1e00000 { + label = "Recovery Image"; + reg = <0x1E00000 0x200000>; /* 2MB */ + read-only; + lock; + }; + partition@2000000 { + label = "Recovery Image Backup"; + reg = <0x2000000 0x200000>; /* 2MB */ + read-only; + lock; + }; + partition@2200000 { + label = "U-Boot storage variables"; + reg = <0x2200000 0x20000>; /* 128KB */ + }; + partition@2220000 { + label = "U-Boot storage variables backup"; + reg = <0x2220000 0x20000>; /* 128KB */ + }; + partition@2240000 { + label = "SHA256"; + reg = <0x2240000 0x10000>; /* 256B but 64KB sector */ + read-only; + lock; + }; + partition@2250000 { + label = "User"; + reg = <0x2250000 0x1db0000>; /* 29.5 MB */ + }; + }; +}; + +&sdhci0 { /* MIO13-23 - 16GB emmc MTFC16GAPALBH-IT - U133A*/ + status = "okay"; + non-removable; + disable-wp; + bus-width = <8>; + xlnx,mio-bank = <0>; +}; + +&spi1 { /* MIO6, 9-11 */ + status = "okay"; + label = "TPM"; + num-cs = <1>; + tpm@0 { /* slm9670 - U144 */ + compatible = "infineon,slb9670", "tcg,tpm_tis-spi"; + reg = <0>; + spi-max-frequency = <18500000>; + }; +}; + +&i2c1 { + status = "okay"; + clock-frequency = <400000>; + scl-gpios = <&gpio 24 GPIO_ACTIVE_HIGH>; + sda-gpios = <&gpio 25 GPIO_ACTIVE_HIGH>; + + eeprom: eeprom@50 { /* u46 - also at address 0x58 */ + compatible = "st,24c64", "atmel,24c64"; /* st m24c64 */ + reg = <0x50>; + /* WP pin EE_WP_EN connected to slg7x644092@68 */ + }; + + eeprom_cc: eeprom@51 { /* required by spec - also at address 0x59 */ + compatible = "st,24c64", "atmel,24c64"; /* st m24c64 */ + reg = <0x51>; + }; + + /* da9062@30 - u170 - also at address 0x31 */ + /* da9131@33 - u167 */ + da9131: pmic@33 { + compatible = "dlg,da9131"; + reg = <0x33>; + regulators { + da9131_buck1: buck1 { + regulator-name = "da9131_buck1"; + regulator-boot-on; + regulator-always-on; + }; + da9131_buck2: buck2 { + regulator-name = "da9131_buck2"; + regulator-boot-on; + regulator-always-on; + }; + }; + }; + + /* da9130@32 - u166 */ + da9130: pmic@32 { + compatible = "dlg,da9130"; + reg = <0x32>; + regulators { + da9130_buck1: buck1 { + regulator-name = "da9130_buck1"; + regulator-boot-on; + regulator-always-on; + }; + }; + }; + + /* slg7x644091@70 - u168 NOT accessible due to address conflict with stdp4320 */ + /* + * stdp4320 - u27 FW has below two issues to be fixed in next board revision. + * Device acknowledging to addresses 0x5C, 0x5D, 0x70, 0x72, 0x76. + * Address conflict with slg7x644091@70 making both the devices NOT accessible. + * With the FW fix, stdp4320 should respond to address 0x73 only. + */ + /* slg7x644092@68 - u169 */ + /* Also connected via JA1C as C23/C24 */ +}; + +&gpio { + status = "okay"; + gpio-line-names = "QSPI_CLK", "QSPI_DQ1", "QSPI_DQ2", "QSPI_DQ3", "QSPI_DQ0", /* 0 - 4 */ + "QSPI_CS_B", "SPI_CLK", "LED1", "LED2", "SPI_CS_B", /* 5 - 9 */ + "SPI_MISO", "SPI_MOSI", "FWUEN", "EMMC_DAT0", "EMMC_DAT1", /* 10 - 14 */ + "EMMC_DAT2", "EMMC_DAT3", "EMMC_DAT4", "EMMC_DAT5", "EMMC_DAT6", /* 15 - 19 */ + "EMMC_DAT7", "EMMC_CMD", "EMMC_CLK", "EMMC_RST", "I2C1_SCL", /* 20 - 24 */ + "I2C1_SDA", "", "", "", "", /* 25 - 29 */ + "", "", "", "", "", /* 30 - 34 */ + "", "", "", "", "", /* 35 - 39 */ + "", "", "", "", "", /* 40 - 44 */ + "", "", "", "", "", /* 45 - 49 */ + "", "", "", "", "", /* 50 - 54 */ + "", "", "", "", "", /* 55 - 59 */ + "", "", "", "", "", /* 60 - 64 */ + "", "", "", "", "", /* 65 - 69 */ + "", "", "", "", "", /* 70 - 74 */ + "", "", "", /* 75 - 77, MIO end and EMIO start */ + "", "", /* 78 - 79 */ + "", "", "", "", "", /* 80 - 84 */ + "", "", "", "", "", /* 85 - 89 */ + "", "", "", "", "", /* 90 - 94 */ + "", "", "", "", "", /* 95 - 99 */ + "", "", "", "", "", /* 100 - 104 */ + "", "", "", "", "", /* 105 - 109 */ + "", "", "", "", "", /* 110 - 114 */ + "", "", "", "", "", /* 115 - 119 */ + "", "", "", "", "", /* 120 - 124 */ + "", "", "", "", "", /* 125 - 129 */ + "", "", "", "", "", /* 130 - 134 */ + "", "", "", "", "", /* 135 - 139 */ + "", "", "", "", "", /* 140 - 144 */ + "", "", "", "", "", /* 145 - 149 */ + "", "", "", "", "", /* 150 - 154 */ + "", "", "", "", "", /* 155 - 159 */ + "", "", "", "", "", /* 160 - 164 */ + "", "", "", "", "", /* 165 - 169 */ + "", "", "", ""; /* 170 - 174 */ +}; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-smk-k26-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-smk-k26-revA.dts new file mode 100644 index 000000000000..300edc880093 --- /dev/null +++ b/arch/arm64/boot/dts/xilinx/zynqmp-smk-k26-revA.dts @@ -0,0 +1,21 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * dts file for Xilinx ZynqMP SMK-K26 rev1/B/A + * + * (C) Copyright 2020, Xilinx, Inc. + * + * Michal Simek + */ + +#include "zynqmp-sm-k26-revA.dts" + +/ { + model = "ZynqMP SMK-K26 Rev1/B/A"; + compatible = "xlnx,zynqmp-smk-k26-rev1", "xlnx,zynqmp-smk-k26-revB", + "xlnx,zynqmp-smk-k26-revA", "xlnx,zynqmp-smk-k26", + "xlnx,zynqmp"; +}; + +&sdhci0 { + status = "disabled"; +};