From patchwork Sat Sep 28 12:07:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 11165397 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D0EDC112B for ; Sat, 28 Sep 2019 12:08:04 +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 ACA8D20815 for ; Sat, 28 Sep 2019 12:08:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="QWoXxKxw"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=gmx.net header.i=@gmx.net header.b="dQQAfY4v" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ACA8D20815 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=gmx.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=0fjrs+PIMthtmucBjAhK4MHSy1MBtsaObzsRVLuh/Xw=; b=QWoXxKxwjM+cVjvtRFHW5Ak8Ge RG1PGmKaFGT0d4jeE0qDh/wzZwsHK2uEYza4ElJU5ss+qLkUUXlMfXHPXj0Zn3NPP9S6KtbeHsYLa qnYpDDMgCylAy/9tTz5LqVfjuEMFhONEpkw0sQiIFMjZq1PC6v7IP15fF2130aQJMh24F/tOsB6V0 2d8KePlPJiB2KicIYIv9G1HV3Af5me+teZUVsXOyCQSJf5eWYWr4LIwCxknBmBJzl0smFJ/tKVbFI FXZs5/9VMs94dYq/EDLGrHQX5ibhoszchK92JVaDyXOFnJtf56bFNrtBZwWuyfHHrmtbTCMRagzQU 2/u5hTKw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux)) id 1iEBW6-0006mU-VJ; Sat, 28 Sep 2019 12:08:02 +0000 Received: from mout.gmx.net ([212.227.15.18]) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1iEBVu-0006Z9-LL for linux-arm-kernel@lists.infradead.org; Sat, 28 Sep 2019 12:07:52 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1569672456; bh=Uiusfd++iO6W8WtYRF60ANQDODpBG+UQSmFz88xtJgk=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=dQQAfY4vF9eIiMhhnPGoT5NglegGATZLY2pWt5aHEKQTfHpbo5mXmBA2lOMMYtol9 0RYl9Xdf72oHrJejRZvgtxira0cT89r516zxoKJBQpQogQGbjbFKM/28zYVRed4eaT 1rCKc0ib8NpCUf/BH2aTQVuWU7ShKx1WkQMEmd9A= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([37.4.249.130]) by mail.gmx.com (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1Mk0Ne-1hlkaO1gXA-00kMD7; Sat, 28 Sep 2019 14:07:36 +0200 From: Stefan Wahren To: Rob Herring , Mark Rutland , Eric Anholt , Florian Fainelli , Ray Jui , Scott Branden Subject: [PATCH V3 1/8] ARM: dts: bcm283x: Remove simple-bus from fixed clocks Date: Sat, 28 Sep 2019 14:07:07 +0200 Message-Id: <1569672435-19823-2-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1569672435-19823-1-git-send-email-wahrenst@gmx.net> References: <1569672435-19823-1-git-send-email-wahrenst@gmx.net> X-Provags-ID: V03:K1:Qtvp3jbppime3Xe7fPvHlPdRWaE4I5Ik5MHiGVEb5DsNMGaIWjk VKQScuoHMcCmlS9y5vS4d3x+5fVvOllNTYU9pqisHOQI03U34MOGTzQCmdjyaBmm+z6pSsq PfBJnqBGdYamgCBvo/LP9ZbfAE/lt9bRqM5zLAIkR0UtaSM5+7EdYMYqGgRrxKcx8X7qqZ4 8bnsG4ILMaGfP4K0PFrVg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:b3YvHamCSD4=:9/VGlDodTXtRD2VUougHaS AJd7T1yanl95AH22mpgekYcnltdSxncVFWd7p9D4VjpOA2lWhCjhcd+tCvB7uk3uYo1PI78yl dG6zYU+LwEzwtMCUMnF77XL5/kJi4Waya71RhCRo6p0UifZ183Tzn4E9zIdTArV+OrXwGj8un 0LjCgyv93C3Zmtn1vBIAGzZHthTFSB3DhrUZfuUOQ3n9ET6DKvcdiw8tAFlx0O28rTf3+iix+ qyGHa0Tve1JBtuv6lXkJJUEYbM517UzkCU7JHnctOtYHjRMVwYhPCz8yrz4HkIGiALHVX/6dI MOAHfCswJEJQkxKXRUWHY5amfYsOCxXdfPt74mjbPoN8G698NiUHjDdhKIwDURiIK1DLNzxQM nAJjolUF1t25+Quqtny2SkKvhiIup2xrYZ7kOzEl54FPIRykR3gLtg4lZ+JBXQHmOGEYYtiOC 7OKHnCZ3jXQDov6RMeI4xlLBw3TqDU+mUBaE0LfKI45no4XYPnEmxQtkF6qsAGKwex3rz4Dh4 9c1E0peVbVSLovs0cMJcs7v9haXtCPVcVR+114tHZ3d3pD+uWxBhTNLxthADxerlZYmm5bDpE Hl906ScNr+21ETKFGVQO0SfhdSe78Dfh6xeEwjqAU7PvLC0eQ+swXcwJ7uh8WeYI+UJfiYRTH /AqVvfzYLJBZoqOq3p6ydsfwigpT9jzHYStB96jMIyxxw0pGPohr8yH08x/JVuc5aShJalrHv nWhhUL8D/bw8nAVUwpXQXV+sWNy39+D5EtsDa+gcI9Gf7AnmdwORvB3BNZ/Udvi6f2ZU/BJYw HJ3DRch/R223wqQlzT4qqZoxOeB7Wf2loDkEtJRhX9NTxfnJg0rK0nmrgnQYYHRLC+SlfRPQo NwMnH/wYQ43yRvi3mC0khxKDVBoBNnVb10pAyxwPrv6ox3tCHjlfxUWg7n8XF6yx4R0+Sq/Ob Bgw26uphkGX00YRMxUWzo5223DJvUiLSnD6J0wyi+sjKCLJV85Mh1aMLzi9Xp7bEq+0Wgf149 u4e/KRNTdJZnLxa2ayoYIJwS0vXuxydewt3ubMjKm5csistwzcexb2Q6C3aXpPr1Z+BllBrkI WK1LU5u28og2R1jqHSqCxF/vcj5yKE3zYN4mjBypAK+gsCZI5wcbyCqdCUH6d8+DY3YaS+lw3 gTJnN1iXzwsT6Xuf2Bt5Sk9It2/XKhal2IXZ6gzDc0yc7b9qeKDssQgI3K3omc4+M8OFuyvJ7 gEucJ7VG3anMiF6mkHrsN4bBibSbz9tKwLNFlsg== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190928_050751_023033_457C8E5D X-CRM114-Status: GOOD ( 11.88 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.15.18 listed in wl.mailspike.net] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (wahrenst[at]gmx.net) -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Catalin Marinas , bcm-kernel-feedback-list@broadcom.com, Stefan Wahren , Will Deacon , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The fixed clocks doesn't form some kind of bus. So let's remove it. This fixes the follow DT schema warnings: clocks: clock@3:reg:0: [3] is too short clocks: clock@4:reg:0: [4] is too short clocks: $nodename:0: 'clocks' does not match '^(bus|soc|axi|ahb|apb)(@[0-9a-f]+)?$' clocks: #size-cells:0:0: 0 is not one of [1, 2] clocks: 'ranges' is a required property clock@3: 'reg' does not match any of the regexes: 'pinctrl-[0-9]+' clock@4: 'reg' does not match any of the regexes: 'pinctrl-[0-9]+' Signed-off-by: Stefan Wahren --- arch/arm/boot/dts/bcm283x.dtsi | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) -- 2.7.4 diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi index 2d191fc..f16899d 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -650,22 +650,16 @@ }; clocks { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <0>; - /* The oscillator is the root of the clock tree. */ - clk_osc: clock@3 { + clk_osc: clk-osc { compatible = "fixed-clock"; - reg = <3>; #clock-cells = <0>; clock-output-names = "osc"; clock-frequency = <19200000>; }; - clk_usb: clock@4 { + clk_usb: clk-usb { compatible = "fixed-clock"; - reg = <4>; #clock-cells = <0>; clock-output-names = "otg"; clock-frequency = <480000000>; From patchwork Sat Sep 28 12:07:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 11165401 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4E264112B for ; Sat, 28 Sep 2019 12:08:45 +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 0F7F620815 for ; Sat, 28 Sep 2019 12:08:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Ve8tpZfN"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=gmx.net header.i=@gmx.net header.b="E0id8Rfs" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0F7F620815 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=gmx.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=q/cCQ8wQCydvI+uiory0/iMYkQa1MgRKxQkpsy3LLFU=; b=Ve8tpZfNQxLWK+fFwCX6j++NFX 1ImLaGf8+cCoTKOBJ0xIw+TTzBvZs7Jp1UaCzb3Bwdg8MOn2Lh5KXh3rZQIUuVkrggiSbd94oeHW6 LRN3+2JEk85bYdbViAoObIYveMJAyIeqFvUaN0sy+tKYcK7Q37vFJWdJ8s12sQjPByI06FaiRPONK C/cPLBEsdTgC2Ry7zy3ewU7gzrMAhxaoYTqTdoVVe9ILGPmWCR2lIhJT3Po2O0vouUWG24JVtAtAf DwxmqcyFF6pWh42joyPxZ7FjetcbRe7MNx8co5bkvo8+eSYNODzZqAE0VKoP4Lm+i2kiKpLmemxug VoOBF3+g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux)) id 1iEBWm-0007GM-36; Sat, 28 Sep 2019 12:08:44 +0000 Received: from mout.gmx.net ([212.227.15.15]) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1iEBVu-0006ZI-OZ for linux-arm-kernel@lists.infradead.org; Sat, 28 Sep 2019 12:07:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1569672465; bh=/ScWQbBAyXuNKzjoeYet94tK8hr90mgTZg1PlOrDDcw=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=E0id8RfsUQo/vu9AkkzEk2O7ctKxrU7xwLUwsgubIoNDr2/cSVPjoLPpMn89hW3Un R5xUlxlv3vPt8PzuFxnZXTkw1dKfu0gaaGLrjtCb+X5NSRDEXwYS5IesloR54zVJw4 bcMQZxDyfc7BYuSJy/G10hOkM9rL3VjQFmvvqnas= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([37.4.249.130]) by mail.gmx.com (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MhD6W-1hizhC3a4Y-00eKbf; Sat, 28 Sep 2019 14:07:36 +0200 From: Stefan Wahren To: Rob Herring , Mark Rutland , Eric Anholt , Florian Fainelli , Ray Jui , Scott Branden Subject: [PATCH V3 2/8] ARM: dts: bcm283x: Remove brcm, bcm2835-pl011 compatible Date: Sat, 28 Sep 2019 14:07:08 +0200 Message-Id: <1569672435-19823-3-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1569672435-19823-1-git-send-email-wahrenst@gmx.net> References: <1569672435-19823-1-git-send-email-wahrenst@gmx.net> X-Provags-ID: V03:K1:dC6viQ2JsjUhpbPXyk7+j5zSW/XlofqFAcv2ZESZEpI51n8HdEp ofgCOSTFiJibFbW0TUKZZClQc9BmePh7phF4RkRRYrpvPT/adkmaMHKTyzybCBHhs78Ig/G /WC5/N88kq497T5Sqm/ZoT2jKztjLhU5r7ng40Zpe20SdoTR3o9eVR4TOsRPEdpKPb/r/Xj ROy3oM/Srz0wY41/mxTSg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:bwrEiyAno3Y=:fYLpdrpFTwBDAp7xSQY3qR Wy0fIXnHzxf0pmrExq9z+Evktvo6QoHV16d77vr2FX5DcNAyyzFzuVa02VF6PrjzTN7da/xHA +ND+HKGFKGi10vWu323HutcLNwHpX2ZT3wiFcQ2X1bx3M+qucfWZLDcCETPtt/WC4CSMtFJuc 0OSMsXJ6RTbRHvIQ+xHTyQNOLCoGDQ4CdIjBsU5jj9AbxMgOwCw1uV45hiiPaUdvZPLATmCMh JMB5yOyU2YE3UzqcyFuArtAvX0278KYzOtOeRmxB22Fq2/gz+nBiBWHFRFVFtRaC43p7P9WlA NCm09+A1h2alBi+c8bCPo6qI6Ke3u/2BaHiVmFjQ9t+TwXRXpLJ3PhyRWkVcjIQTyU6beTbf4 LxVnmSCXqzQLHwh6hXeVJfOAlM9v2cPdNcxMn2xffboIFfApvkuycslVyNJBgWgsHtFXP6fcS FoIMKPS+WG563Xh6eExneeGS52p0LNMSTLzY1SjUOT8YNbQdVTzDhon5OnaeWRoX5Z4mUQCN7 CwyT5pdvHIcoTaUqTxuO01T6Cg/anM8hODL3Lv7bhw6Pt/x2lgX4u4AwhYwxMD9zlmhG/a7K2 lqn3HBrub3uP02hINz7azIMoPlsyuDuMu5gRe8L5+i5w/+oQgLqgiSDdT4G0QUolQWkzm6ucP lSR2Y0c1fJyxUXIivzJbr0o07WtlCMw2Ii5nNUESIke36iYYOi6ojzm6NBEwk2G1fz7qtovz8 RIRfiC673NGw4SlhIEgXRLb8WFbcvaGd5YzGccnm0egAXgnxspVKez9+OnfdwB0aKYKni67qB wjXwylt/RF3Y7LF89QsuUvaSU2GbVYW6a+Bh9Kli3N2zXjeVN/v9qbyLOvybN6Jcd6AUgQxL+ f+fkkskJSyIBcr4OXG7A2YKQnzPHDLFBV6U2Fby/euXAPExnXa0I1QJdc6qXgA6ILiDOYYemi QCFljRzKo+Ep3m76BYqBUl0MVOawy5yDWnXxy0jY2+eJSsGS+yLbNwRbPF1KcHMgVZFQOZc8Q 6OEoLoEHhYdiWZZtTmGQt0f1ibb3yHrWmEQVbw/IAqkKIQ/oDCPhuO/dbuL/iGURHzS+sl53H vx2hPPBhr90+GoCTNYexEvEKHVlHgJVw2OuVQyabNPV9p+ujC8LDIUtBMflNxx48jDA+GHD3B 0umGiseiHTJjBeJ/ImuXGX1glRMmokWianYxEeR3E7Qq3REuRM90V+YjhpOp8QjRxTe49JouV XJDXp07kDLDbcEFmnrnTMigZhLniYvmERAWTpmc4dYXI4VcDsOhztvVNiFZMJ+AqeDa3ib9YU rvpnVd8Z4zZg6prlXqusn4Y8q29yzXK7cTWIaaFuYMm0tOSGKzhYzdt9ufQ8ZYbkdRCF9nCnr AN+amtVvJ0DKD/+mujHQTpVrSHKsPzl/aCxm/SFH/1r5790SG8ZH+brO4HtWdUWtn98O/c0BG fZWRvy7WV1lou80GQt3mLONj9/B8OchrAaQo7NMOgkjV2wsNaz8Dv5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190928_050751_121148_09E7BD1A X-CRM114-Status: GOOD ( 12.29 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (wahrenst[at]gmx.net) -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Catalin Marinas , bcm-kernel-feedback-list@broadcom.com, Stefan Wahren , Will Deacon , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The downstream compatible brcm,bcm2835-pl011 hasn't been upstreamed yet. So remove it. Signed-off-by: Stefan Wahren --- arch/arm/boot/dts/bcm283x.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4 diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi index f16899d..ae8296f 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -396,7 +396,7 @@ }; uart0: serial@7e201000 { - compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell"; + compatible = "arm,pl011", "arm,primecell"; reg = <0x7e201000 0x200>; interrupts = <2 25>; clocks = <&clocks BCM2835_CLOCK_UART>, From patchwork Sat Sep 28 12:07:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 11165399 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 95A17112B for ; Sat, 28 Sep 2019 12:08: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 6464B20815 for ; Sat, 28 Sep 2019 12:08:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="EGerCJyf"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=gmx.net header.i=@gmx.net header.b="MO06V4tw" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6464B20815 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=gmx.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=NLZW/KV1Zz3Ptt1LMZ8ZzV8O7eUkRElaV3efyBeBJF0=; b=EGerCJyfuIsLGFh0nK5yBYEr9/ DA135UDOG7TMNH5ATUMzLb4itwTsPr7d/capGpNl03caMiXgPdduMVPZsf2qZSpSwlId2931yXq5t lkSQi0yJguNUezoTNLi/yJW8qcG2qw0uaS6BEnY28Blhngt6KtSqMKTCvFQtO/dIzVtq9p+PaShxh Z8BlRkyYJBdOmZ4HmmknMq35asR7CJmDN5kbEcmUyO9y6R3+R7M23+G7kd21iHAyzX/TCU0kOSWDY EigiAw0JmF0et8vO9wDzU2eKjDSikhnFkgvUVTtCkYEyAxsdHERlG86kRUpB4e382LyxCrfG2+l6s ts9npv6A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux)) id 1iEBWS-000735-VG; Sat, 28 Sep 2019 12:08:24 +0000 Received: from mout.gmx.net ([212.227.15.18]) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1iEBVu-0006Z7-LN for linux-arm-kernel@lists.infradead.org; Sat, 28 Sep 2019 12:07:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1569672457; bh=ju7Bd+dM/7yFl2EXq/i/+T9p6cJbvttYXIH7HB3K4LA=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=MO06V4tw9ITFvSFAsCsTbfpmle4bDMqTboMDKkGuDFJFAWi2S8mjEYGn48xh3KoUb OlOnHSo48IiPiqHtuUiBX0vgHZWpR0j3cWpL93K4Lvgg5874BWJbvwWfIsPDnkA8YD tc8Q/lefoRj5BE4QKAi7sVNZBT1vK+xls4S3sA0g= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([37.4.249.130]) by mail.gmx.com (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MfYPi-1hhKjZ1G1Y-00fyUv; Sat, 28 Sep 2019 14:07:37 +0200 From: Stefan Wahren To: Rob Herring , Mark Rutland , Eric Anholt , Florian Fainelli , Ray Jui , Scott Branden Subject: [PATCH V3 3/8] ARM: dts: bcm283x: Move BCM2835/6/7 specific to bcm2835-common.dtsi Date: Sat, 28 Sep 2019 14:07:09 +0200 Message-Id: <1569672435-19823-4-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1569672435-19823-1-git-send-email-wahrenst@gmx.net> References: <1569672435-19823-1-git-send-email-wahrenst@gmx.net> X-Provags-ID: V03:K1:rfi1TJTOMpvaFYav/L6kkd5dYIzFhDM2pH+LA2Yr8Wpdjb6OsuG 4ZRa+voWUgUTPnCfFEurpUDmEIa1JPNhUCgCkGmrx+fdxUFRyhawhMHXKP61fj/XP/Cxxgb HPCei5f5SFk0uUKLIo0/+zDgsUg0kkKb1xeXbn4YLg6irs3Cro33SdhRPXbkAoDih1lU2F8 ctvOHAdtwNiAGSf53C/+g== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:81yZYdK5xVs=:r28n+fKw1AhSnr3qo3hqP0 Nc3cK3wkgihs1BEZ9ZpKZCCkypp37Wkkh3VqOzvE2ev92mcoDrgOTBz4PAQg4QwN5DpgOguIh NthODUlk8sSIU7V9gvq8A/Nb8LksDYj81pFICPGUAEWA0vhRuHstF74upM9dEORjj/TGm6EHk QoOc7sG6vkUiRtmXBi639qBP+6lswBhHY7VJBXCqPPOEehlW/hsR//l5rH/utV/TkEP3l17tj 0PQB1kE2UCvVn7m5dJgCtZ2Q/ETTtmtt9ieRLV4UlNJycC+qIsXo+oyc6g6UoWfCeWHh+5ukp tQFBaplkTkz3qH8zr3j0r15K+NgVwa41B1EX0e2oRXVOcBuzaA8uFz8hWo5nrEayHLDC0a0U3 4TWhSZZrrNRhcD7W38nkOs3af/YR2sMPMOUsTdpX3dZmC3GBW38OePuxewIgXW0e7eRJEZx+H 1YTxLwQLFcb1noVNXfgYx7/cKCyaFOmHiypYwSgyXb7mfhmvnFK8cWHhYJB5VGq4f3HOGOzW9 MOViksMmRxnx3H36ZxAugms+HqVJcWdLs0nsr9UvFlpGm0Bp87BAuXStCqoRVN4LeBymA/2gt FrSy6qJ6TUnztV7mW0V+fBeiNFSb0LpODe+3jMzgq7FcEk/MGmLQf7f9cRW+mskydTM7QP28S zv6DXxLxxjoQgdPcs0NopYi5a5mIW3DRCQaRr3WlAuOS2ltfywlbV0iuOUbNHfyCI83ayscfv mrxoHDvTlZ4lsYIhyqxKqx0C2ML9AdZhHQfv3zuSoyXifsLLYmTJNf6X4B1Ejf5/fnW0nXRBO RVofYnr7g3rZYhryio9xO9PfdiDhLUEcLr08MF+deF//Lu8UMiQfBLi9IXDhBpXu48kduiivm WsAoJUWLiI26+nVFNjnjM8vsT9oYpQayBu6AxtMbU7R4L9TWq/Zka/YZWwfjUJqn9FFxATvAt fSOekAbVBFd65P4fu10u9BqpVyAwkHVXzaPmr44ulvwVelR/Rg2ot/6viZhNUnHTSnHtPlzwn xqnQDE8fTJFZkgZ4QGwk5GNJv+TNPgDUWp6EOAV+o9XJYz4HyYisWOamrWjm+nZfoTU+Q2C0/ GlnQQGsKTjkekKHvDcvkxTaK4d+Wm/PXzdZrNDPyu6/nlYLBxzLY209HR2+sD5kpSLcV1/yDj wdplZTSghZV82FXsi3dOTX2CcYCwiP3bTxtWExgvMBkzbTMjoCyx/L2hkUNbX0+7Ng7AOIvGf 0rZAKByqQ+QAhQp4jOpesbktCOeIEO5CRuzek3A== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190928_050751_044209_B5544CF4 X-CRM114-Status: GOOD ( 17.98 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.15.18 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (wahrenst[at]gmx.net) -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Catalin Marinas , bcm-kernel-feedback-list@broadcom.com, Stefan Wahren , Will Deacon , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org As preparation we want all common BCM2711 + BCM2835/6/7 functions in bcm283x.dtsi and all BCM2835/6/7 specific in the new bcm2835-common.dtsi. Since i2c2 is BCM2835 specific, we also need to move it to bcm2835-common.dtsi. Signed-off-by: Stefan Wahren Acked-by: Eric Anholt --- arch/arm/boot/dts/bcm2835-common.dtsi | 194 ++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/bcm2835-rpi.dtsi | 4 - arch/arm/boot/dts/bcm2835.dtsi | 1 + arch/arm/boot/dts/bcm2836.dtsi | 1 + arch/arm/boot/dts/bcm2837.dtsi | 1 + arch/arm/boot/dts/bcm283x.dtsi | 174 +----------------------------- 6 files changed, 198 insertions(+), 177 deletions(-) create mode 100644 arch/arm/boot/dts/bcm2835-common.dtsi -- 2.7.4 diff --git a/arch/arm/boot/dts/bcm2835-common.dtsi b/arch/arm/boot/dts/bcm2835-common.dtsi new file mode 100644 index 0000000..fe1ab40 --- /dev/null +++ b/arch/arm/boot/dts/bcm2835-common.dtsi @@ -0,0 +1,194 @@ +// SPDX-License-Identifier: GPL-2.0 + +/* This include file covers the common peripherals and configuration between + * bcm2835, bcm2836 and bcm2837 implementations. + */ + +/ { + interrupt-parent = <&intc>; + + soc { + dma: dma@7e007000 { + compatible = "brcm,bcm2835-dma"; + reg = <0x7e007000 0xf00>; + interrupts = <1 16>, + <1 17>, + <1 18>, + <1 19>, + <1 20>, + <1 21>, + <1 22>, + <1 23>, + <1 24>, + <1 25>, + <1 26>, + /* dma channel 11-14 share one irq */ + <1 27>, + <1 27>, + <1 27>, + <1 27>, + /* unused shared irq for all channels */ + <1 28>; + interrupt-names = "dma0", + "dma1", + "dma2", + "dma3", + "dma4", + "dma5", + "dma6", + "dma7", + "dma8", + "dma9", + "dma10", + "dma11", + "dma12", + "dma13", + "dma14", + "dma-shared-all"; + #dma-cells = <1>; + brcm,dma-channel-mask = <0x7f35>; + }; + + intc: interrupt-controller@7e00b200 { + compatible = "brcm,bcm2835-armctrl-ic"; + reg = <0x7e00b200 0x200>; + interrupt-controller; + #interrupt-cells = <2>; + }; + + pm: watchdog@7e100000 { + compatible = "brcm,bcm2835-pm", "brcm,bcm2835-pm-wdt"; + #power-domain-cells = <1>; + #reset-cells = <1>; + reg = <0x7e100000 0x114>, + <0x7e00a000 0x24>; + clocks = <&clocks BCM2835_CLOCK_V3D>, + <&clocks BCM2835_CLOCK_PERI_IMAGE>, + <&clocks BCM2835_CLOCK_H264>, + <&clocks BCM2835_CLOCK_ISP>; + clock-names = "v3d", "peri_image", "h264", "isp"; + system-power-controller; + }; + + pixelvalve@7e206000 { + compatible = "brcm,bcm2835-pixelvalve0"; + reg = <0x7e206000 0x100>; + interrupts = <2 13>; /* pwa0 */ + }; + + pixelvalve@7e207000 { + compatible = "brcm,bcm2835-pixelvalve1"; + reg = <0x7e207000 0x100>; + interrupts = <2 14>; /* pwa1 */ + }; + + thermal: thermal@7e212000 { + compatible = "brcm,bcm2835-thermal"; + reg = <0x7e212000 0x8>; + clocks = <&clocks BCM2835_CLOCK_TSENS>; + #thermal-sensor-cells = <0>; + status = "disabled"; + }; + + i2c2: i2c@7e805000 { + compatible = "brcm,bcm2835-i2c"; + reg = <0x7e805000 0x1000>; + interrupts = <2 21>; + clocks = <&clocks BCM2835_CLOCK_VPU>; + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + }; + + pixelvalve@7e807000 { + compatible = "brcm,bcm2835-pixelvalve2"; + reg = <0x7e807000 0x100>; + interrupts = <2 10>; /* pixelvalve */ + }; + + hdmi: hdmi@7e902000 { + compatible = "brcm,bcm2835-hdmi"; + reg = <0x7e902000 0x600>, + <0x7e808000 0x100>; + interrupts = <2 8>, <2 9>; + ddc = <&i2c2>; + clocks = <&clocks BCM2835_PLLH_PIX>, + <&clocks BCM2835_CLOCK_HSM>; + clock-names = "pixel", "hdmi"; + dmas = <&dma 17>; + dma-names = "audio-rx"; + status = "disabled"; + }; + + v3d: v3d@7ec00000 { + compatible = "brcm,bcm2835-v3d"; + reg = <0x7ec00000 0x1000>; + interrupts = <1 10>; + power-domains = <&pm BCM2835_POWER_DOMAIN_GRAFX_V3D>; + }; + + vc4: gpu { + compatible = "brcm,bcm2835-vc4"; + }; + }; +}; + +&cpu_thermal { + thermal-sensors = <&thermal>; +}; + +&gpio { + i2c_slave_gpio18: i2c_slave_gpio18 { + brcm,pins = <18 19 20 21>; + brcm,function = ; + }; + + jtag_gpio4: jtag_gpio4 { + brcm,pins = <4 5 6 12 13>; + brcm,function = ; + }; + + pwm0_gpio12: pwm0_gpio12 { + brcm,pins = <12>; + brcm,function = ; + }; + pwm0_gpio18: pwm0_gpio18 { + brcm,pins = <18>; + brcm,function = ; + }; + pwm0_gpio40: pwm0_gpio40 { + brcm,pins = <40>; + brcm,function = ; + }; + pwm1_gpio13: pwm1_gpio13 { + brcm,pins = <13>; + brcm,function = ; + }; + pwm1_gpio19: pwm1_gpio19 { + brcm,pins = <19>; + brcm,function = ; + }; + pwm1_gpio41: pwm1_gpio41 { + brcm,pins = <41>; + brcm,function = ; + }; + pwm1_gpio45: pwm1_gpio45 { + brcm,pins = <45>; + brcm,function = ; + }; +}; + +&i2s { + dmas = <&dma 2>, <&dma 3>; + dma-names = "tx", "rx"; +}; + +&sdhost { + dmas = <&dma 13>; + dma-names = "rx-tx"; +}; + +&spi { + dmas = <&dma 6>, <&dma 7>; + dma-names = "tx", "rx"; +}; diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi index 6c6a7f6..394c8a7 100644 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi @@ -59,10 +59,6 @@ clock-frequency = <100000>; }; -&i2c2 { - status = "okay"; -}; - &usb { power-domains = <&power RPI_POWER_DOMAIN_USB>; }; diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi index a5c3824..53bf457 100644 --- a/arch/arm/boot/dts/bcm2835.dtsi +++ b/arch/arm/boot/dts/bcm2835.dtsi @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "bcm283x.dtsi" +#include "bcm2835-common.dtsi" / { compatible = "brcm,bcm2835"; diff --git a/arch/arm/boot/dts/bcm2836.dtsi b/arch/arm/boot/dts/bcm2836.dtsi index c933e84..82d6c46 100644 --- a/arch/arm/boot/dts/bcm2836.dtsi +++ b/arch/arm/boot/dts/bcm2836.dtsi @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "bcm283x.dtsi" +#include "bcm2835-common.dtsi" / { compatible = "brcm,bcm2836"; diff --git a/arch/arm/boot/dts/bcm2837.dtsi b/arch/arm/boot/dts/bcm2837.dtsi index beb6c50..9e95fee 100644 --- a/arch/arm/boot/dts/bcm2837.dtsi +++ b/arch/arm/boot/dts/bcm2837.dtsi @@ -1,4 +1,5 @@ #include "bcm283x.dtsi" +#include "bcm2835-common.dtsi" / { compatible = "brcm,bcm2837"; diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi index ae8296f..addf3be 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -18,7 +18,6 @@ / { compatible = "brcm,bcm2835"; model = "BCM2835"; - interrupt-parent = <&intc>; #address-cells = <1>; #size-cells = <1>; @@ -36,8 +35,6 @@ polling-delay-passive = <0>; polling-delay = <1000>; - thermal-sensors = <&thermal>; - trips { cpu-crit { temperature = <80000>; @@ -73,68 +70,6 @@ interrupts = <1 11>; }; - dma: dma@7e007000 { - compatible = "brcm,bcm2835-dma"; - reg = <0x7e007000 0xf00>; - interrupts = <1 16>, - <1 17>, - <1 18>, - <1 19>, - <1 20>, - <1 21>, - <1 22>, - <1 23>, - <1 24>, - <1 25>, - <1 26>, - /* dma channel 11-14 share one irq */ - <1 27>, - <1 27>, - <1 27>, - <1 27>, - /* unused shared irq for all channels */ - <1 28>; - interrupt-names = "dma0", - "dma1", - "dma2", - "dma3", - "dma4", - "dma5", - "dma6", - "dma7", - "dma8", - "dma9", - "dma10", - "dma11", - "dma12", - "dma13", - "dma14", - "dma-shared-all"; - #dma-cells = <1>; - brcm,dma-channel-mask = <0x7f35>; - }; - - intc: interrupt-controller@7e00b200 { - compatible = "brcm,bcm2835-armctrl-ic"; - reg = <0x7e00b200 0x200>; - interrupt-controller; - #interrupt-cells = <2>; - }; - - pm: watchdog@7e100000 { - compatible = "brcm,bcm2835-pm", "brcm,bcm2835-pm-wdt"; - #power-domain-cells = <1>; - #reset-cells = <1>; - reg = <0x7e100000 0x114>, - <0x7e00a000 0x24>; - clocks = <&clocks BCM2835_CLOCK_V3D>, - <&clocks BCM2835_CLOCK_PERI_IMAGE>, - <&clocks BCM2835_CLOCK_H264>, - <&clocks BCM2835_CLOCK_ISP>; - clock-names = "v3d", "peri_image", "h264", "isp"; - system-power-controller; - }; - clocks: cprman@7e101000 { compatible = "brcm,bcm2835-cprman"; #clock-cells = <1>; @@ -184,8 +119,7 @@ interrupt-controller; #interrupt-cells = <2>; - /* Defines pin muxing groups according to - * BCM2835-ARM-Peripherals.pdf page 102. + /* Defines common pin muxing groups * * While each pin can have its mux selected * for various functions individually, some @@ -263,15 +197,7 @@ brcm,pins = <44 45>; brcm,function = ; }; - i2c_slave_gpio18: i2c_slave_gpio18 { - brcm,pins = <18 19 20 21>; - brcm,function = ; - }; - jtag_gpio4: jtag_gpio4 { - brcm,pins = <4 5 6 12 13>; - brcm,function = ; - }; jtag_gpio22: jtag_gpio22 { brcm,pins = <22 23 24 25 26 27>; brcm,function = ; @@ -286,35 +212,6 @@ brcm,function = ; }; - pwm0_gpio12: pwm0_gpio12 { - brcm,pins = <12>; - brcm,function = ; - }; - pwm0_gpio18: pwm0_gpio18 { - brcm,pins = <18>; - brcm,function = ; - }; - pwm0_gpio40: pwm0_gpio40 { - brcm,pins = <40>; - brcm,function = ; - }; - pwm1_gpio13: pwm1_gpio13 { - brcm,pins = <13>; - brcm,function = ; - }; - pwm1_gpio19: pwm1_gpio19 { - brcm,pins = <19>; - brcm,function = ; - }; - pwm1_gpio41: pwm1_gpio41 { - brcm,pins = <41>; - brcm,function = ; - }; - pwm1_gpio45: pwm1_gpio45 { - brcm,pins = <45>; - brcm,function = ; - }; - sdhost_gpio48: sdhost_gpio48 { brcm,pins = <48 49 50 51 52 53>; brcm,function = ; @@ -410,8 +307,6 @@ reg = <0x7e202000 0x100>; interrupts = <2 24>; clocks = <&clocks BCM2835_CLOCK_VPU>; - dmas = <&dma 13>; - dma-names = "rx-tx"; status = "disabled"; }; @@ -419,10 +314,6 @@ compatible = "brcm,bcm2835-i2s"; reg = <0x7e203000 0x24>; clocks = <&clocks BCM2835_CLOCK_PCM>; - - dmas = <&dma 2>, - <&dma 3>; - dma-names = "tx", "rx"; status = "disabled"; }; @@ -431,8 +322,6 @@ reg = <0x7e204000 0x200>; interrupts = <2 22>; clocks = <&clocks BCM2835_CLOCK_VPU>; - dmas = <&dma 6>, <&dma 7>; - dma-names = "tx", "rx"; #address-cells = <1>; #size-cells = <0>; status = "disabled"; @@ -448,18 +337,6 @@ status = "disabled"; }; - pixelvalve@7e206000 { - compatible = "brcm,bcm2835-pixelvalve0"; - reg = <0x7e206000 0x100>; - interrupts = <2 13>; /* pwa0 */ - }; - - pixelvalve@7e207000 { - compatible = "brcm,bcm2835-pixelvalve1"; - reg = <0x7e207000 0x100>; - interrupts = <2 14>; /* pwa1 */ - }; - dpi: dpi@7e208000 { compatible = "brcm,bcm2835-dpi"; reg = <0x7e208000 0x8c>; @@ -490,14 +367,6 @@ }; - thermal: thermal@7e212000 { - compatible = "brcm,bcm2835-thermal"; - reg = <0x7e212000 0x8>; - clocks = <&clocks BCM2835_CLOCK_TSENS>; - #thermal-sensor-cells = <0>; - status = "disabled"; - }; - aux: aux@7e215000 { compatible = "brcm,bcm2835-aux"; #clock-cells = <1>; @@ -587,16 +456,6 @@ status = "disabled"; }; - i2c2: i2c@7e805000 { - compatible = "brcm,bcm2835-i2c"; - reg = <0x7e805000 0x1000>; - interrupts = <2 21>; - clocks = <&clocks BCM2835_CLOCK_VPU>; - #address-cells = <1>; - #size-cells = <0>; - status = "disabled"; - }; - vec: vec@7e806000 { compatible = "brcm,bcm2835-vec"; reg = <0x7e806000 0x1000>; @@ -605,26 +464,6 @@ status = "disabled"; }; - pixelvalve@7e807000 { - compatible = "brcm,bcm2835-pixelvalve2"; - reg = <0x7e807000 0x100>; - interrupts = <2 10>; /* pixelvalve */ - }; - - hdmi: hdmi@7e902000 { - compatible = "brcm,bcm2835-hdmi"; - reg = <0x7e902000 0x600>, - <0x7e808000 0x100>; - interrupts = <2 8>, <2 9>; - ddc = <&i2c2>; - clocks = <&clocks BCM2835_PLLH_PIX>, - <&clocks BCM2835_CLOCK_HSM>; - clock-names = "pixel", "hdmi"; - dmas = <&dma 17>; - dma-names = "audio-rx"; - status = "disabled"; - }; - usb: usb@7e980000 { compatible = "brcm,bcm2835-usb"; reg = <0x7e980000 0x10000>; @@ -636,17 +475,6 @@ phys = <&usbphy>; phy-names = "usb2-phy"; }; - - v3d: v3d@7ec00000 { - compatible = "brcm,bcm2835-v3d"; - reg = <0x7ec00000 0x1000>; - interrupts = <1 10>; - power-domains = <&pm BCM2835_POWER_DOMAIN_GRAFX_V3D>; - }; - - vc4: gpu { - compatible = "brcm,bcm2835-vc4"; - }; }; clocks { From patchwork Sat Sep 28 12:07:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 11165409 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9BC40112B for ; Sat, 28 Sep 2019 12:09:39 +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 6947C20815 for ; Sat, 28 Sep 2019 12:09:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="B9t+/8iR"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=gmx.net header.i=@gmx.net header.b="LJMWIwR6" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6947C20815 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=gmx.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=fsUpXqj0gBYadgWYdEsLEKiTZimxsVq/R3+PkEBRwyY=; b=B9t+/8iRtoC2+zHrESqmTI3vfV pN1e8qUoVx99FzFwGCopABIpek3Y24DBUmiFj4LeAhUnuWAu7mMIf9x1vPBdKnUtkDuEXcs2h9ahZ rS47pd3eZoE8etqDhNVKkZveoe+yP+ruOTguULkYJLhEw2jywuHDYULP2ZHQmBMrCUoXCiVFWcMJB jAsn85WMBUVq4yfv72FIFUolM6J9QK3kHW9C80rfLgj1l57crb8tgTzHYuBI16F2fxDFCSFflEZUL PgtRe1edYMm5XUIDdg8BbQQu1b85ICiqVBBotBsQjVIjyX1sByKyptgbesaoK951tlSfKOQ7Oj7bG HzKU4PXg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux)) id 1iEBXe-0008CW-CS; Sat, 28 Sep 2019 12:09:38 +0000 Received: from mout.gmx.net ([212.227.15.18]) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1iEBVv-0006Ze-Dt for linux-arm-kernel@lists.infradead.org; Sat, 28 Sep 2019 12:07:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1569672461; bh=LcMfsnxhO6kOSa0AnNgyK4h2O4iLYDQzsFLyoMwIwo0=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=LJMWIwR6fr4u/J0cYrsdwudckU5DsEl7uoVq3B3GnVHdVv3mPGTamGMc8yJohKfBr muhF4QzWMRkD8UqNeXRH+esr9ak1Fu/Z/yRLHRRPkqP+3GyxdvWOCKeEl0oBnEy42o 5784rCn/75wCGNXLXMMzWLkrVpu65uSONrlNk3KQ= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([37.4.249.130]) by mail.gmx.com (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MtwZ4-1htLIz3GRQ-00uM7d; Sat, 28 Sep 2019 14:07:37 +0200 From: Stefan Wahren To: Rob Herring , Mark Rutland , Eric Anholt , Florian Fainelli , Ray Jui , Scott Branden Subject: [PATCH V3 4/8] dt-bindings: arm: Convert BCM2835 board/soc bindings to json-schema Date: Sat, 28 Sep 2019 14:07:10 +0200 Message-Id: <1569672435-19823-5-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1569672435-19823-1-git-send-email-wahrenst@gmx.net> References: <1569672435-19823-1-git-send-email-wahrenst@gmx.net> X-Provags-ID: V03:K1:qCLesiR7aMyeuVf0Jo2XSEWUMK56WxEpBx6SzZOdv1TuiLRnkOp FU2nqvIFrW+ITQAWS8kh9iMcwjS6r9cSwLHjuNH7aD4DLf10a++s2QAGvO7i5/1MICdSume yEgpUfKnpBvtrociexzhl5NexVys3Q/1jCiIv4A2Eq4dGjBs6Th8iH0F+i33kG8gAMSDmiM 5687Z+2Ok/TB6TB67OXkA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:x7zZ/15bT08=:WUtswYPaaSeE68BNhB9CCP L/xSpDqdwE4NSac3JJLPvxKG7Au2zdGeoyaFREbvnTXjHrb+LoV/Svg2YjFmE52EyCHNFiIoI 2pZai13x9DeODRPC21U4NENOZGAh9gu/rIU7JpiWkTXMoqGDOXB3q9UrvRAJoTxBPDdW8yaDt W/osS1/yO6MgYRuwEQsI+q7w32e12JXRpqIpkfBrid/1ZkQZ0vMho+NLZhYolnY6tEmfPHxTB 51lMSJtjNHMHSKKcoB4m2D6Pemv/W1N1SPznFyD+Fn2K8z+VPCmHRcXl2ZTcBprHy+jwHCMgL J9vBaVGpDtmr8oPt+qUy0xjQh8HgMBzxJnnAegJL9mvyx/rFKIYvRkykMVIHe7GNgrab4W9mU K3c2FF5NUWmcozYmXc17BKcUcy5Hd1itOh8VyXOeW+GksxQLt3bAGdExonjhYUyhEcDWEa+/W YEomW0pqpJ1lax2+BEbVaZg9pz9cxs3ETS1eqw7GxJV1p4pUT68hs4FTaFqVMR9NliWAhqn7u 6ciS8l1jwDBoE0m4s/46PLSGka1IL7yjUK7hYKvdE28SBDPknZlNQyi0e5mNPGuGBTpI7CvsE irOSxEswBEjrAJkI08nwifuBRKCGCaNeKGMtasSWgYjtKel0FOAd0gvJqLTbNqlVLA+X/2Esp wCroaMwHI1/+TTuigklJHQxCygkfMC1khNxW3JNGMKJWfLyE/bG1nLlhukwQ0pSLbyn96JDfh dKYhCGQ5esvMIDV9SAdpWsOrL0hTFPDPBrNAHvXqxpJRUnD3GOdxXg4MCosB5M4cUqaF6ROX0 2DuCwdC63sCHkX0XmsWurr5xiqjNEkC09pAi3J4ANFczaoc60J6BNYGHdwmJONNjPUthrdmWr vEZ9dQaQBSJ9qriwtw2t8fpBZe2nf7hqKigAD+CE6kv4yIB+RXNDFpJPWXNsBuhNs5jLOFewC 7FPxVguy6x/ior3Ef8QxjLXRjpgA4rxyTrvFr12V9KtXokMzNROH7g5xcOGVvi0NG055bfJ/9 n8OpmrWfYozG5YYYMigMJ4b4QI8GYJpL5nf6gtCInIMgCZe/90LAgbiX5XbIbIBQDwRehXr5a /MYLhPVeLqUGdP8RdYb+ziYArbJ3iDL/hgrqNw2jN72VvWuGgWiRG96/um9ViP86jUZn/mhhj pyteNH1nyTGme49r8/J3oKpNN1XzOMXSP8oPU1qM6X6IjNeK8A4I0/OD/TLZe1FD1s25hi8DC vwMhHYz2QqDfwx+Dx96lj2SorMZ/OTxv1wgr3bg== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190928_050751_806185_F70847AF X-CRM114-Status: GOOD ( 12.56 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.15.18 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (wahrenst[at]gmx.net) -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Catalin Marinas , bcm-kernel-feedback-list@broadcom.com, Stefan Wahren , Will Deacon , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Convert the BCM2835/6/7 SoC bindings to DT schema format using json-schema. All the other Broadcom boards are maintained by Florian Fainelli. Signed-off-by: Stefan Wahren Acked-by: Eric Anholt Reviewed-by: Rob Herring --- .../devicetree/bindings/arm/bcm/bcm2835.yaml | 48 ++++++++++++++++ .../devicetree/bindings/arm/bcm/brcm,bcm2835.txt | 67 ---------------------- 2 files changed, 48 insertions(+), 67 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/bcm/bcm2835.yaml delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt -- 2.7.4 diff --git a/Documentation/devicetree/bindings/arm/bcm/bcm2835.yaml b/Documentation/devicetree/bindings/arm/bcm/bcm2835.yaml new file mode 100644 index 0000000..67bf9e2 --- /dev/null +++ b/Documentation/devicetree/bindings/arm/bcm/bcm2835.yaml @@ -0,0 +1,48 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/arm/bcm/bcm2835.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Broadcom BCM2711/BCM2835 Platforms Device Tree Bindings + +maintainers: + - Eric Anholt + - Stefan Wahren + +properties: + $nodename: + const: '/' + compatible: + oneOf: + - description: BCM2835 based Boards + items: + - enum: + - raspberrypi,model-a + - raspberrypi,model-a-plus + - raspberrypi,model-b + - raspberrypi,model-b-i2c0 # Raspberry Pi Model B (no P5) + - raspberrypi,model-b-rev2 + - raspberrypi,model-b-plus + - raspberrypi,compute-module + - raspberrypi,model-zero + - raspberrypi,model-zero-w + - const: brcm,bcm2835 + + - description: BCM2836 based Boards + items: + - enum: + - raspberrypi,2-model-b + - const: brcm,bcm2836 + + - description: BCM2837 based Boards + items: + - enum: + - raspberrypi,3-model-a-plus + - raspberrypi,3-model-b + - raspberrypi,3-model-b-plus + - raspberrypi,3-compute-module + - raspberrypi,3-compute-module-lite + - const: brcm,bcm2837 + +... diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt deleted file mode 100644 index 245328f..0000000 --- a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt +++ /dev/null @@ -1,67 +0,0 @@ -Broadcom BCM2835 device tree bindings -------------------------------------------- - -Raspberry Pi Model A -Required root node properties: -compatible = "raspberrypi,model-a", "brcm,bcm2835"; - -Raspberry Pi Model A+ -Required root node properties: -compatible = "raspberrypi,model-a-plus", "brcm,bcm2835"; - -Raspberry Pi Model B -Required root node properties: -compatible = "raspberrypi,model-b", "brcm,bcm2835"; - -Raspberry Pi Model B (no P5) -early model B with I2C0 rather than I2C1 routed to the expansion header -Required root node properties: -compatible = "raspberrypi,model-b-i2c0", "brcm,bcm2835"; - -Raspberry Pi Model B rev2 -Required root node properties: -compatible = "raspberrypi,model-b-rev2", "brcm,bcm2835"; - -Raspberry Pi Model B+ -Required root node properties: -compatible = "raspberrypi,model-b-plus", "brcm,bcm2835"; - -Raspberry Pi 2 Model B -Required root node properties: -compatible = "raspberrypi,2-model-b", "brcm,bcm2836"; - -Raspberry Pi 3 Model A+ -Required root node properties: -compatible = "raspberrypi,3-model-a-plus", "brcm,bcm2837"; - -Raspberry Pi 3 Model B -Required root node properties: -compatible = "raspberrypi,3-model-b", "brcm,bcm2837"; - -Raspberry Pi 3 Model B+ -Required root node properties: -compatible = "raspberrypi,3-model-b-plus", "brcm,bcm2837"; - -Raspberry Pi Compute Module -Required root node properties: -compatible = "raspberrypi,compute-module", "brcm,bcm2835"; - -Raspberry Pi Compute Module 3 -Required root node properties: -compatible = "raspberrypi,3-compute-module", "brcm,bcm2837"; - -Raspberry Pi Compute Module 3 Lite -Required root node properties: -compatible = "raspberrypi,3-compute-module-lite", "brcm,bcm2837"; - -Raspberry Pi Zero -Required root node properties: -compatible = "raspberrypi,model-zero", "brcm,bcm2835"; - -Raspberry Pi Zero W -Required root node properties: -compatible = "raspberrypi,model-zero-w", "brcm,bcm2835"; - -Generic BCM2835 board -Required root node properties: -compatible = "brcm,bcm2835"; From patchwork Sat Sep 28 12:07:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 11165405 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2274B1599 for ; Sat, 28 Sep 2019 12:09: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 F316420866 for ; Sat, 28 Sep 2019 12:09:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="EoXjGCWR"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=gmx.net header.i=@gmx.net header.b="FtEJEaY3" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F316420866 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=gmx.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=bjIUaec9Z2m0xOWVd3Q2r6+IUINQzJ2lG8RXgDpcMNg=; b=EoXjGCWRtgKvFvXYBDNh5FQK1V +LU4b7L6E5qkglmpe57Xa+kbM7yqK+okMfcxbIpVYphaFYJGvOtet1pW0DFxYMCh1M7FCFc1GNPXU +y29WmQHhvLLWh4fjnP9q4DFTcsKGXApnhlUmO4ZB/nV34KfLar0g09XZ57N/rVSZ4EloiKTFxs5V SYS9PGlqxFL2hZ7f1Jk/kQBgGnx8C/BDgDfHJiaXDZDakt1cC8kcLd9WqobHZk2xm9DAg9Y0wyGcT z9AAB7H7hsamFMqbNKODziWtjH250Nu+WAlA5nQEpyBx+cstvx9Uz4aEWfEoQeo+egJ/ucJ5OC8Nd CaVggWOQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux)) id 1iEBXD-0007kZ-MC; Sat, 28 Sep 2019 12:09:11 +0000 Received: from mout.gmx.net ([212.227.15.18]) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1iEBVv-0006a1-UY for linux-arm-kernel@lists.infradead.org; Sat, 28 Sep 2019 12:07:55 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1569672458; bh=hfLTzkanvHdv0805iskYFMrxghx9/3ubOyaD3u2YZUY=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=FtEJEaY35SSLY0AJoBw0G9Ie8oJOAWqcnInt5Ic5QKMqyKjRuwA+ONAavEgU1Rgr1 zy+99Ag/jSTgjoIWBiKCQQbjBBRxu5hY5KNOM3xilQ5xTWWA3x/sNvGk7rqbGGcDMk CntXxdJ17OKRBtV2xzMucFyrjENsw8g/tpmYEGqQ= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([37.4.249.130]) by mail.gmx.com (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MHGCo-1iRR4E0xoe-00DDJd; Sat, 28 Sep 2019 14:07:38 +0200 From: Stefan Wahren To: Rob Herring , Mark Rutland , Eric Anholt , Florian Fainelli , Ray Jui , Scott Branden Subject: [PATCH V3 5/8] dt-bindings: arm: bcm2835: Add Raspberry Pi 4 to DT schema Date: Sat, 28 Sep 2019 14:07:11 +0200 Message-Id: <1569672435-19823-6-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1569672435-19823-1-git-send-email-wahrenst@gmx.net> References: <1569672435-19823-1-git-send-email-wahrenst@gmx.net> X-Provags-ID: V03:K1:oQxad6CfBtrzG7FQm3rKGx9Rbi/ZJs5SyFOtihvCF2Dk9OnwMHh tUmrUo8XmcrRCWKTKT62nO+g3zr5MWkifkP643JLzGoeujJq6eGOYKrsR9xcU55sQt+GwGE 8xLbrN1ppl1rpLhRwTWERXm6pXpryf4kLYOFEUQWnWOeFayq6kdAUnpFiitX9MPhZKVLDFr jaN/2aQTjxBXkLwvBl/Ww== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:Fsu58mNrVAg=:9qi++y7V/ZSNUId2RpTSc3 +frP7M5zoAMAVppp6iLSmNUSpc3g49oTX2qRpFgc1z220BfEiD9ASea7dxbLhh3RFu5XM8LMs +Abgl6+DJ7MU3sBEAR0cTauk1bnm0nJ+dflAkpr1SEBR6vtxqkAmx8+80GNw8iaDnE/R+a4Xy 09e1BCdk4laVvMnAIlzcQHqCBnx8unLAdjHb9yLyx8ucBNQkdbz7YIwsU6cds2Lie1I+X+Iqp NHqBrqy3RLTJ4mxCt4fwi8ONASZGNnP52OLOUj2UJkkKhPWiYfuPGX74dPyThvEQZM/IPTRq6 KrVmOcmca3UT8gQRpmMZCTWHsIs3kNhclIO4S9p7aYwfuy6lXkCJboCY+R2A1f5Spdnr4xgi8 rNU5Bb55vCDgg0chmgFn7wlbHE6lTtfQmLAyMmjJ32YUIGPrcNGOcdANepoz3ZolExKF19nkw NfQZcyFvW5GOKWGBHPOWMy1LyWnYuShbGMbXp2VmgSobwLpjnMuGU5fLNmMCPJVTVE9Q41w4x mCVB4/reD81DQswKlNjk1mSxeTf5qzQgfW2qsNGd8NxlkAFg7IjY92TfsiB1x2mvDmBi88EqN 8QHQZnJnst4g3us4+xbv1Ye8hsMxz32zS7kLBUNLRdFm+jBAT7dWrUYi1lQMqNSI30zZpSxIG TNbZ0bTYzpWTBbKlntg60yHp5ACHiSfwtL14nuNgJcduVXPDREk5rWlSno7CB7jWCQ/jnU/SX cq9C2NjDyIwAU6/6H32uAnoMNA2Thx9bh0uhNP1t0XTIsUMVH0iGULDDmQKriheYBLNPT8hM9 YBXDbmxCDVl4dvYoB/BiG/OwByS6DbjDRWlRpWFKREE9aYgcb++W4QziJPgXUMdtrNStAq8KT IVfvsvfup9NjObbHrHGmA31ez6BgP3OEd74qZOI1Jb8svUdjWeF4JgFsG0UbYraYmWXgTQBjt CI34cJwp0eV7kkg4iccK5gTUr0Bi3bMNpVKPeVda/wjKeSPCW6QxYx2DbKCt/rx1Rfd/LvPvv 0HAv7iZ+L2rKAm56zjMohOGNa056EMIrQBy892of7oxkC+SSNgqph1tkva5vKWReuq5YzEPE2 xx9pcLf8rC9lNmrgHzd410jo3d4QvL68tlmXHMXS1JFV6pL6e+VNK1qOCJUanQ3F9f09tabxg 2+z8AJ+YrtUoOcbDXgK5B/Lsz9aYD01ErkOndStLeJiLeB44myFj9iyxrHVzc+bbSOS8Dor5n JrP5Hfrmh5zT45ufe0eeQxKJpx+9CC3ClRKyZSw== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190928_050752_310518_32959526 X-CRM114-Status: UNSURE ( 9.74 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.15.18 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (wahrenst[at]gmx.net) -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Catalin Marinas , bcm-kernel-feedback-list@broadcom.com, Stefan Wahren , Will Deacon , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Add new Raspberry Pi 4 to DT schema. Signed-off-by: Stefan Wahren Acked-by: Eric Anholt Reviewed-by: Rob Herring --- Documentation/devicetree/bindings/arm/bcm/bcm2835.yaml | 6 ++++++ 1 file changed, 6 insertions(+) -- 2.7.4 diff --git a/Documentation/devicetree/bindings/arm/bcm/bcm2835.yaml b/Documentation/devicetree/bindings/arm/bcm/bcm2835.yaml index 67bf9e2..dd52e29 100644 --- a/Documentation/devicetree/bindings/arm/bcm/bcm2835.yaml +++ b/Documentation/devicetree/bindings/arm/bcm/bcm2835.yaml @@ -15,6 +15,12 @@ properties: const: '/' compatible: oneOf: + - description: BCM2711 based Boards + items: + - enum: + - raspberrypi,4-model-b + - const: brcm,bcm2711 + - description: BCM2835 based Boards items: - enum: From patchwork Sat Sep 28 12:07:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 11165411 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id ABF01112B for ; Sat, 28 Sep 2019 12:10:09 +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 894C920815 for ; Sat, 28 Sep 2019 12:10:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="S6pu8Jf1"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=gmx.net header.i=@gmx.net header.b="GEvAk6bm" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 894C920815 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=gmx.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=8cRrGyQMSV4JG8uhjnacwpr7LBOU+Mws6naSJBYIt5s=; b=S6pu8Jf1/rAYLZouO63kfOJp3C lVNl2Q3s8VkzVer0lZG6XsN1UNhABeuBkpGPoT8xukupmCJw80cOUBKGvDKtJKfubIEdswXuXZi8Q bXRJ73MDEaRT9npRSJ0SCwzVYfXsomyAMmZ6qw/B0UpvkTU8+cO3EpA5iHO0EOZ4tXNSGGQTLHuU2 O6Ck76j720j0M1BJF0vmTHp7SZFytHMXK0ie1XOmJ2h+LslxGFRu48jSOfOnxuaBX2kGWNYCbv3a3 rS0+vur7rOFdPrx7ezLH6oWUVFa5SrKew/cmVk/v2Q96f2KGO2BewC/SC3/TiWsn0/7LWLyl8myC2 9unC+NAg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux)) id 1iEBY9-0000v1-0U; Sat, 28 Sep 2019 12:10:09 +0000 Received: from mout.gmx.net ([212.227.15.19]) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1iEBWA-0006pA-5R for linux-arm-kernel@lists.infradead.org; Sat, 28 Sep 2019 12:08:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1569672467; bh=EpFhBA4p2FlCXDVmr2vPdA7dtjTxxcDk4dB260T1cOs=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=GEvAk6bmXyCJRjZnB5eCU3LIEtAdz0jKpmCs7kXxhW/eRUCGlP3QpjCnh1Ra7uHey Z3rUZi1tIvdSfGGXytTIIxs5P/G0A6zIolVQaikspW58ogamo7ibgzeWVoGxr2/wn2 kqweZ2Igo98y1YDNNT6FXvYn9lfck8vqml7WmkQA= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([37.4.249.130]) by mail.gmx.com (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MmUHj-1hngOh30qX-00iRTA; Sat, 28 Sep 2019 14:07:38 +0200 From: Stefan Wahren To: Rob Herring , Mark Rutland , Eric Anholt , Florian Fainelli , Ray Jui , Scott Branden Subject: [PATCH V3 6/8] ARM: bcm: Add support for BCM2711 SoC Date: Sat, 28 Sep 2019 14:07:12 +0200 Message-Id: <1569672435-19823-7-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1569672435-19823-1-git-send-email-wahrenst@gmx.net> References: <1569672435-19823-1-git-send-email-wahrenst@gmx.net> X-Provags-ID: V03:K1:3v9Ol3t2CWt+FT41hI8nI5XC5PPLlJXi+X26WAoPqBLGTxKOcmy 22GC6/stxKsrwz4T5TYFpsyKZL0fcMHNEdz++8DnB3MmRiEwehy8KAp1C3mGTYsx0GBpKW6 0JqhvwBm7LZOyUt9pui80vaRYXZPVYVryhEeBCBw+VguwQLU/RdfbgoityzuQCa28jq4yl4 kf+lIzwRVxODw3ibwDu7w== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:jlA0vyM2pA4=:kSs7ksZPicgRnY8m+D7Rsp BTkhoqkV/Wk4YYfetOJIYsahy6bwc/94vIOJgatnCbspsgHok3k7bkVqmZZWh1FmK5rPjmsnk fydIAAdVks/YQjo2fBegscPkoyupbJy3VNmkCP05uSiCYM/QC8nwP21+CkNJA/aC6TfhO3vcz cizxHsdNM7l9lgr1O4xKGCdyvQcCskH1N+u8FxCaC/WdAWWH6JcPKgeiRhQGG2nYhhsXMb7A8 E2M4IJ8KQS0FKOG6h798SF+CIRrJfza4YGVPZFJuJT9DhQMbM2g1aJ7zyWh1/fppp1J4ng1l4 KxpxepbvBVOVRBPAtlyU6w8ZSRzwL5DQ5PMwgVmLu242e+WbtzzlNzpG5jPyMg/dPlB4H2sdK k0ATLcgJ66PpmR5o6tERzEa5rOkKR8CNSMDFKXTSunSfTt3X1m0/rk2ePwF//X/6kIEJBFc4g qDXJIKQ6aQ9xwB17T1d+Ph6Ai8+AOiN6b2Lf9K9X+WOAd5yFia3hfyr+nqLTMsZ+09aWQyqyI 6eVP8zSqr3VsjMCGKZ+9v3wt00ptSf1hxRy/+efclmoI1TYHiA/KmasdmIozrCpwS0nsNzzXi 9EFY7CPcR8f4jjFLIJAB+uf7zyk6m3CxW30o71W59kq/DqGRuhoWh6ep+8eh5jfAgOmtHzoTF P7JAYJG5PQWzwL8EtefAQ6NJk2sdbRGxADMqiiFsPpwq0tGIGAwQsX0pdn9v4Vm07UaNJg7dj 8JsqfGd5ktQZXIPq/qNwys/BZoWytmcudFLWscVrTMZ8Nkfm40yF7ugUTeMvQj9f4oKVBtp53 AD1Y2RDrXLdzJVFhhdASMgoEonDvYktaI5Uxh42M78asg1bdOLJuhWMS05H6fALDZktdLFx+/ ObzDTZCzIZ21Xl6zq+6nDO1tBD2l6hp23/s1+fMNZnngZThV5SDZ1KKKuWdtiGOZnxIk+ywSj bYRWuMbeQhgj1Mr9rzYJpU9pu28c0ldwfJGO2hPNdgOZpaP6G6dg+40zooxamwkP1s6CwHyqc Ea4QE71kkLeTZGX1URqtrJK4veLBwmTlOS+b3QaQnYFjg+ZhOoDxzXMN36pJWkFGoPn852/Gp OvKdc6gyTf4jAp1Lr2I/Ld5ZnxXOszX1ktZ068HvzT+zFNv1J/7cyh0Mnc8IICFtBsaUOW2RD aSQPgEYY2k01RnyP8rFWP+cxeH2yZAl/zYRiUIPQgtiuFu0zwQkmf67sHMmsRZwmv21VsEgLV cqEHGyzMnk2/oU9CUSZgvkXKCW+ueS5Womt6rETE39WhoTfEI3nxVgxvdxGQN7JA1GCpf9D3C 06teAKe0b5p0wGGuWEhnhLN9/ZKHsR6Ihr6dNOk9elQA4dkOOv1+6oK++8zkWs0YU4+u4JQFF JIWmVZrqlVBXRBLVbkN/Oy5uO9n9v9fJrCuJt8SDKmZ46Flf/imisTkdUq8NzQWRlxjk1quAr 6VYSGjLmAnh+eEIHFRQLggQX6f3oVZ0XOWWcwVFV++hL+307D6K/nX X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190928_050806_524831_CE8D875A X-CRM114-Status: GOOD ( 15.66 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.15.19 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (wahrenst[at]gmx.net) -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Catalin Marinas , bcm-kernel-feedback-list@broadcom.com, Stefan Wahren , Will Deacon , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Add the BCM2711 to ARCH_BCM2835, but use new machine board code because of the differences. Signed-off-by: Stefan Wahren Reviewed-by: Eric Anholt Acked-by: Florian Fainelli --- arch/arm/mach-bcm/Kconfig | 3 ++- arch/arm/mach-bcm/Makefile | 3 ++- arch/arm/mach-bcm/bcm2711.c | 24 ++++++++++++++++++++++++ arch/arm64/Kconfig.platforms | 5 +++-- 4 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 arch/arm/mach-bcm/bcm2711.c -- 2.7.4 diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig index 5e5f1fa..39bcbea 100644 --- a/arch/arm/mach-bcm/Kconfig +++ b/arch/arm/mach-bcm/Kconfig @@ -161,6 +161,7 @@ config ARCH_BCM2835 select GPIOLIB select ARM_AMBA select ARM_ERRATA_411920 if ARCH_MULTI_V6 + select ARM_GIC if ARCH_MULTI_V7 select ARM_TIMER_SP804 select HAVE_ARM_ARCH_TIMER if ARCH_MULTI_V7 select TIMER_OF @@ -169,7 +170,7 @@ config ARCH_BCM2835 select PINCTRL_BCM2835 select MFD_CORE help - This enables support for the Broadcom BCM2835 and BCM2836 SoCs. + This enables support for the Broadcom BCM2711 and BCM283x SoCs. This SoC is used in the Raspberry Pi and Roku 2 devices. config ARCH_BCM_53573 diff --git a/arch/arm/mach-bcm/Makefile b/arch/arm/mach-bcm/Makefile index b59c813..7baa8c9 100644 --- a/arch/arm/mach-bcm/Makefile +++ b/arch/arm/mach-bcm/Makefile @@ -42,8 +42,9 @@ obj-$(CONFIG_ARCH_BCM_MOBILE_L2_CACHE) += kona_l2_cache.o obj-$(CONFIG_ARCH_BCM_MOBILE_SMC) += bcm_kona_smc.o # BCM2835 -obj-$(CONFIG_ARCH_BCM2835) += board_bcm2835.o ifeq ($(CONFIG_ARCH_BCM2835),y) +obj-y += board_bcm2835.o +obj-y += bcm2711.o ifeq ($(CONFIG_ARM),y) obj-$(CONFIG_SMP) += platsmp.o endif diff --git a/arch/arm/mach-bcm/bcm2711.c b/arch/arm/mach-bcm/bcm2711.c new file mode 100644 index 0000000..dbe2967 --- /dev/null +++ b/arch/arm/mach-bcm/bcm2711.c @@ -0,0 +1,24 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Stefan Wahren + */ + +#include + +#include + +#include "platsmp.h" + +static const char * const bcm2711_compat[] = { +#ifdef CONFIG_ARCH_MULTI_V7 + "brcm,bcm2711", +#endif +}; + +DT_MACHINE_START(BCM2711, "BCM2711") +#ifdef CONFIG_ZONE_DMA + .dma_zone_size = SZ_1G, +#endif + .dt_compat = bcm2711_compat, + .smp = smp_ops(bcm2836_smp_ops), +MACHINE_END diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 16d7614..b5d31dc 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -37,11 +37,12 @@ config ARCH_BCM2835 select PINCTRL select PINCTRL_BCM2835 select ARM_AMBA + select ARM_GIC select ARM_TIMER_SP804 select HAVE_ARM_ARCH_TIMER help - This enables support for the Broadcom BCM2837 SoC. - This SoC is used in the Raspberry Pi 3 device. + This enables support for the Broadcom BCM2837 and BCM2711 SoC. + This SoC is used in the Raspberry Pi 3 and 4 device. config ARCH_BCM_IPROC bool "Broadcom iProc SoC Family" From patchwork Sat Sep 28 12:07:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 11165407 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BB70C1599 for ; Sat, 28 Sep 2019 12:09: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 9598C20815 for ; Sat, 28 Sep 2019 12:09:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="aEcEUxkE"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=gmx.net header.i=@gmx.net header.b="WigL4aQa" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9598C20815 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=gmx.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=NAgtmpuQTv1a7HWvu7Au6M6aVRqKsRBb2DZhF5r4+lM=; b=aEcEUxkEjHDVB+Nmi4W9No8qRl klMcHvmx7pK9D7dTplYEfUkyOX8Oi67u1SFfq6Q82mKWn4vT4rjQPDZ5x7a4i8R53LUIaM/PeEY7t 3f4lashei66tX1sq+3Vr0RzAfuui9DUsK4h5TpQ5d81LoG3hRy/T5bQds8+h5JndP9Qd8conoi1yy Tijpl/q71c3NucCwMj69a/2e+KrbTGs/Aud9wLvoxSImRCXDcRzR2vgTEVCdSCC4il0OuI1kTJ4ch qI1th0q9heiJR7XcLAR/8IrITePYcqQYVp+qE8NHSpds3Kt92in2qP2QgyC3LJC9ypYHnbOproo0l dB4+/cXA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux)) id 1iEBXS-000803-2w; Sat, 28 Sep 2019 12:09:26 +0000 Received: from mout.gmx.net ([212.227.15.18]) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1iEBVx-0006e5-Su for linux-arm-kernel@lists.infradead.org; Sat, 28 Sep 2019 12:07:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1569672467; bh=dnplS3jLFPpM86eucFSUzGyzxs6oL/td/F7B0rWFaGU=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=WigL4aQa/LNR78r+ZlUk4QDQPfuvW+yhCg5vHddWx6SVFkTf9cIrmkxI5dC5sslqx NcryWRLNnHI6fsJHm6UNxifRNgYgXmMSO4+lAhpc8mc4lTNRkKU4kAEMuuiQ5iscG5 EplNyAax/+sel+HCUq0yOIYrf6+xqrBBrw6bfKis= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([37.4.249.130]) by mail.gmx.com (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MgNcz-1hfPC00lzT-00htVS; Sat, 28 Sep 2019 14:07:39 +0200 From: Stefan Wahren To: Rob Herring , Mark Rutland , Eric Anholt , Florian Fainelli , Ray Jui , Scott Branden Subject: [PATCH V3 7/8] ARM: dts: Add minimal Raspberry Pi 4 support Date: Sat, 28 Sep 2019 14:07:13 +0200 Message-Id: <1569672435-19823-8-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1569672435-19823-1-git-send-email-wahrenst@gmx.net> References: <1569672435-19823-1-git-send-email-wahrenst@gmx.net> X-Provags-ID: V03:K1:9pqgLEwQ8nJ6lQOC574b8X9b1dgVxGaIQa6ab3eds9BQKRuypPd dTwtC7Lp4eQFGStdR5G8o4k4vSJP0r3zWRBV+2dQqQrSPFZa7yNwDICDBXZDPOsfcxNPytg OVi52l5CY5r3xLjBWY9bngjyrfByK0pchRCCZxz2QliIawZwR3L759qDuX5PsDusivmWXsY XCr1ZQImtO4qYMMGjLBAQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:pSwLNB1xy8g=:5mPckWx1Xp0WEXvL4UyB8p EfJHYWxKF9gzxR3IGsGkiLLvhERP5AL2jWQ/cTWPCDGzdX8u1aBuACJYX8ZeIciecLgc7B/IZ pxv7ZoEZQdiVSHnRG6g+a+CYO4w0rMV9W8U8nU1+TaMLZdiT6dTQUP7nNNHcySIRbMArV6hU1 3d2xI+8FsFCxjshgW9deBaQKdVwCfdBuCULlCYKyHuMKrxCix5h+Xlm5+1TlKDyPKhPVwk2Nd CNVlPsIi3k7tAh1wFRIjYKGGsvADgR3xmlY+Y9FLAoA1zDYoHT1onuaaQqzOKnt4nrHf1Q6rn nHAYjsvCZj/og3XO8sVLq79XegCdRqokhxb56wDGiGO3MtspGGo+Hr4fYpBgHNHoGYQDfVBNZ EwrnBmQ5OSLyTUbbme+3dMoma1/49e20IbkXYmshAUsbynrF7maK+Xhkqc1i3SQuB27AcKhe1 vyZjCmMjZHRXNa08NmuNueAGSS6MFN09AvIjuhg2ar8G5m6+qcPUeM2vr5vaxgZ8A7eF0dkfx JUswwPgimXRtNbDkdUIcTW1gbZwyvobPsvtS+Yw8FQNLEQsz0U5bwiiad+8bDxd2NSmm3PnRF Ave/GuMrBNDoF/jMt51m6Vtc25i2H04tjBm/qbvpYTF8mZMNQbRGn9BDzP5v3DIvzuWlrzR2B QUsNIN77gOHd7GqmZiO8w4qjS0+QwEGhs/gkQML3qejD9GeAfQ66UYDzSczfid7/bFYX319wM +1mlzOaVhoSCFEUeMkaoiO33qQNoSXG9mQpJmm4BmWK02PpmJzOT1YMg8UfpWB0vUAjqdcEzz q4mvwqT5C6DSWu8gqF0oFA/BYFpzSVc6bMSJNEqSXDdgLNtCeQPYXlC0infX5N/w+jsd31LwD 4u/beD5DZM2zq8uXN4z/vFMR15IBIjxpQLi1aY32stRpgj7gtBR2k8ouXPsAeKjZ7Yfjm/a88 FuaWlOGsKT2TekOzQ+cmlPAsr8kKNMIGR1P2F0gj0u71E27SsS9/WWMOAMXg3KCuOCAmMjgKe RSz+6mfrHJOwdwlSKANrGkMwWa+LPtDpqAzt8uzXaIuTKnLJA1rTCl3i1nHeDNHQRH3SF8mwj LWDKLw44Jr7nFEBNTRbe3mxv1r/gTvrZUuGERv8u8sdyaA8VN6ePsForjA+J4ahN1li6LLl2q oQyPE35LAYNG4F6Z6Z14YamJYdboJYx62GilPZlPwxKtF+Tu0H05HjwcByyr2sz4PwskkFgI8 B98RSB3cNMTriTgIgrOJqFArvwdHYKvDkliNpa7MKW+7Mj4JNkdQ1F9eBPPpYM0xZSpGylB7G 8kWCIjvdKtr1KRwQy08qYVa6wSlSZ14oLC1MiZDbA3F8GZr8+eUNaxVoyxu2rRPw8f8K0SfYN uDt6mpWvE5oyYVxPZmi5TDS87WY7ujN0UtbqTNfdYhvQcpt0OsJ0HBCGWmI37vVgDa0cAxYsc KpcR2MVrGmECONKcSdrSy78V2ZfdtV8yWFvv7utAj+M3MlLV7rCMjh X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190928_050754_505201_F46C0165 X-CRM114-Status: GOOD ( 18.57 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.15.18 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (wahrenst[at]gmx.net) -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Catalin Marinas , bcm-kernel-feedback-list@broadcom.com, Stefan Wahren , Will Deacon , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org This adds minimal support for the new Raspberry Pi 4 without the fancy stuff like GENET, PCIe, xHCI, 40 bit DMA and V3D. The RPi 4 is available in 3 different variants (1, 2 and 4 GB RAM), so leave the memory size to zero and let the bootloader take care of it. The DWC2 is still usable as peripheral via the USB-C port. Other differences to the Raspberry Pi 3: - additional GIC 400 Interrupt controller - new thermal IP and HWRNG - additional MMC interface (emmc2) - additional UART, I2C, SPI and PWM interfaces - clock stretching bug in I2C IP has been fixed Signed-off-by: Stefan Wahren Acked-by: Eric Anholt --- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 121 ++++ arch/arm/boot/dts/bcm2711.dtsi | 838 ++++++++++++++++++++++ arch/arm/boot/dts/bcm283x-rpi-usb-peripheral.dtsi | 7 + arch/arm/boot/dts/bcm283x.dtsi | 4 +- 5 files changed, 969 insertions(+), 2 deletions(-) create mode 100644 arch/arm/boot/dts/bcm2711-rpi-4-b.dts create mode 100644 arch/arm/boot/dts/bcm2711.dtsi create mode 100644 arch/arm/boot/dts/bcm283x-rpi-usb-peripheral.dtsi -- 2.7.4 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index b21b3a6..21002cd 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -83,6 +83,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += \ bcm2837-rpi-3-b.dtb \ bcm2837-rpi-3-b-plus.dtb \ bcm2837-rpi-cm3-io3.dtb \ + bcm2711-rpi-4-b.dtb \ bcm2835-rpi-zero.dtb \ bcm2835-rpi-zero-w.dtb dtb-$(CONFIG_ARCH_BCM_5301X) += \ diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts new file mode 100644 index 0000000..3825273 --- /dev/null +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -0,0 +1,121 @@ +// SPDX-License-Identifier: GPL-2.0 +/dts-v1/; +#include "bcm2711.dtsi" +#include "bcm2835-rpi.dtsi" +#include "bcm283x-rpi-usb-peripheral.dtsi" + +/ { + compatible = "raspberrypi,4-model-b", "brcm,bcm2711"; + model = "Raspberry Pi 4 Model B"; + + chosen { + /* 8250 auxiliary UART instead of pl011 */ + stdout-path = "serial1:115200n8"; + }; + + memory@0 { + device_type = "memory"; + reg = <0 0 0x00000000>; + }; + + leds { + act { + gpios = <&gpio 42 GPIO_ACTIVE_HIGH>; + }; + + pwr { + label = "PWR"; + gpios = <&expgpio 2 GPIO_ACTIVE_LOW>; + }; + }; + + wifi_pwrseq: wifi-pwrseq { + compatible = "mmc-pwrseq-simple"; + reset-gpios = <&expgpio 1 GPIO_ACTIVE_LOW>; + }; + + sd_io_1v8_reg: sd_io_1v8_reg { + compatible = "regulator-gpio"; + regulator-name = "vdd-sd-io"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + regulator-always-on; + regulator-settling-time-us = <5000>; + gpios = <&expgpio 4 GPIO_ACTIVE_HIGH>; + states = <1800000 0x1 + 3300000 0x0>; + status = "okay"; + }; +}; + +&firmware { + expgpio: gpio { + compatible = "raspberrypi,firmware-gpio"; + gpio-controller; + #gpio-cells = <2>; + gpio-line-names = "BT_ON", + "WL_ON", + "PWR_LED_OFF", + "GLOBAL_RESET", + "VDD_SD_IO_SEL", + "CAM_GPIO", + "", + ""; + status = "okay"; + }; +}; + +&pwm1 { + pinctrl-names = "default"; + pinctrl-0 = <&pwm1_0_gpio40 &pwm1_1_gpio41>; + status = "okay"; +}; + +/* SDHCI is used to control the SDIO for wireless */ +&sdhci { + #address-cells = <1>; + #size-cells = <0>; + pinctrl-names = "default"; + pinctrl-0 = <&emmc_gpio34>; + bus-width = <4>; + non-removable; + mmc-pwrseq = <&wifi_pwrseq>; + status = "okay"; + + brcmf: wifi@1 { + reg = <1>; + compatible = "brcm,bcm4329-fmac"; + }; +}; + +/* EMMC2 is used to drive the SD card */ +&emmc2 { + vqmmc-supply = <&sd_io_1v8_reg>; + broken-cd; + status = "okay"; +}; + +/* uart0 communicates with the BT module */ +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_ctsrts_gpio30 &uart0_gpio32 &gpclk2_gpio43>; + status = "okay"; + + bluetooth { + compatible = "brcm,bcm43438-bt"; + max-speed = <2000000>; + shutdown-gpios = <&expgpio 0 GPIO_ACTIVE_HIGH>; + }; +}; + +/* uart1 is mapped to the pin header */ +&uart1 { + pinctrl-names = "default"; + pinctrl-0 = <&uart1_gpio14>; + status = "okay"; +}; + +&vchiq { + interrupts = ; +}; diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi new file mode 100644 index 0000000..a369a7e5 --- /dev/null +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -0,0 +1,838 @@ +// SPDX-License-Identifier: GPL-2.0 +#include "bcm283x.dtsi" + +#include +#include + +/ { + compatible = "brcm,bcm2711"; + + #address-cells = <2>; + #size-cells = <1>; + + interrupt-parent = <&gicv2>; + + soc { + ranges = <0x7e000000 0x0 0xfe000000 0x01800000>, + <0x7c000000 0x0 0xfc000000 0x02000000>, + <0x40000000 0x0 0xff800000 0x00800000>; + /* Emulate a contiguous 30-bit address range for DMA */ + dma-ranges = <0xc0000000 0x0 0x00000000 0x3c000000>; + + local_intc: local_intc@40000000 { + compatible = "brcm,bcm2836-l1-intc"; + reg = <0x40000000 0x100>; + }; + + gicv2: interrupt-controller@40041000 { + interrupt-controller; + #interrupt-cells = <3>; + compatible = "arm,gic-400"; + reg = <0x40041000 0x1000>, + <0x40042000 0x2000>, + <0x40044000 0x2000>, + <0x40046000 0x2000>; + interrupts = ; + }; + + dma: dma@7e007000 { + compatible = "brcm,bcm2835-dma"; + reg = <0x7e007000 0xb00>; + interrupts = , + , + , + , + , + , + , + /* DMA lite 7 - 10 */ + , + , + , + ; + interrupt-names = "dma0", + "dma1", + "dma2", + "dma3", + "dma4", + "dma5", + "dma6", + "dma7", + "dma8", + "dma9", + "dma10"; + #dma-cells = <1>; + brcm,dma-channel-mask = <0x07f5>; + }; + + pm: watchdog@7e100000 { + compatible = "brcm,bcm2835-pm", "brcm,bcm2835-pm-wdt"; + #power-domain-cells = <1>; + #reset-cells = <1>; + reg = <0x7e100000 0x114>, + <0x7e00a000 0x24>, + <0x7ec11000 0x20>; + clocks = <&clocks BCM2835_CLOCK_V3D>, + <&clocks BCM2835_CLOCK_PERI_IMAGE>, + <&clocks BCM2835_CLOCK_H264>, + <&clocks BCM2835_CLOCK_ISP>; + clock-names = "v3d", "peri_image", "h264", "isp"; + system-power-controller; + }; + + rng@7e104000 { + interrupts = ; + + /* RNG is incompatible to brcm,bcm2835-rng */ + status = "disabled"; + }; + + uart2: serial@7e201400 { + compatible = "arm,pl011", "arm,primecell"; + reg = <0x7e201400 0x200>; + interrupts = ; + clocks = <&clocks BCM2835_CLOCK_UART>, + <&clocks BCM2835_CLOCK_VPU>; + clock-names = "uartclk", "apb_pclk"; + arm,primecell-periphid = <0x00241011>; + status = "disabled"; + }; + + uart3: serial@7e201600 { + compatible = "arm,pl011", "arm,primecell"; + reg = <0x7e201600 0x200>; + interrupts = ; + clocks = <&clocks BCM2835_CLOCK_UART>, + <&clocks BCM2835_CLOCK_VPU>; + clock-names = "uartclk", "apb_pclk"; + arm,primecell-periphid = <0x00241011>; + status = "disabled"; + }; + + uart4: serial@7e201800 { + compatible = "arm,pl011", "arm,primecell"; + reg = <0x7e201800 0x200>; + interrupts = ; + clocks = <&clocks BCM2835_CLOCK_UART>, + <&clocks BCM2835_CLOCK_VPU>; + clock-names = "uartclk", "apb_pclk"; + arm,primecell-periphid = <0x00241011>; + status = "disabled"; + }; + + uart5: serial@7e201a00 { + compatible = "arm,pl011", "arm,primecell"; + reg = <0x7e201a00 0x200>; + interrupts = ; + clocks = <&clocks BCM2835_CLOCK_UART>, + <&clocks BCM2835_CLOCK_VPU>; + clock-names = "uartclk", "apb_pclk"; + arm,primecell-periphid = <0x00241011>; + status = "disabled"; + }; + + spi@7e204000 { + reg = <0x7e204000 0x0200>; + interrupts = ; + }; + + spi3: spi@7e204600 { + compatible = "brcm,bcm2835-spi"; + reg = <0x7e204600 0x0200>; + interrupts = ; + clocks = <&clocks BCM2835_CLOCK_VPU>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + + spi4: spi@7e204800 { + compatible = "brcm,bcm2835-spi"; + reg = <0x7e204800 0x0200>; + interrupts = ; + clocks = <&clocks BCM2835_CLOCK_VPU>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + + spi5: spi@7e204a00 { + compatible = "brcm,bcm2835-spi"; + reg = <0x7e204a00 0x0200>; + interrupts = ; + clocks = <&clocks BCM2835_CLOCK_VPU>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + + spi6: spi@7e204c00 { + compatible = "brcm,bcm2835-spi"; + reg = <0x7e204c00 0x0200>; + interrupts = ; + clocks = <&clocks BCM2835_CLOCK_VPU>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + + i2c3: i2c@7e205600 { + compatible = "brcm,bcm2711-i2c", "brcm,bcm2835-i2c"; + reg = <0x7e205600 0x200>; + interrupts = ; + clocks = <&clocks BCM2835_CLOCK_VPU>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + + i2c4: i2c@7e205800 { + compatible = "brcm,bcm2711-i2c", "brcm,bcm2835-i2c"; + reg = <0x7e205800 0x200>; + interrupts = ; + clocks = <&clocks BCM2835_CLOCK_VPU>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + + i2c5: i2c@7e205a00 { + compatible = "brcm,bcm2711-i2c", "brcm,bcm2835-i2c"; + reg = <0x7e205a00 0x200>; + interrupts = ; + clocks = <&clocks BCM2835_CLOCK_VPU>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + + i2c6: i2c@7e205c00 { + compatible = "brcm,bcm2711-i2c", "brcm,bcm2835-i2c"; + reg = <0x7e205c00 0x200>; + interrupts = ; + clocks = <&clocks BCM2835_CLOCK_VPU>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + + pwm1: pwm@7e20c800 { + compatible = "brcm,bcm2835-pwm"; + reg = <0x7e20c800 0x28>; + clocks = <&clocks BCM2835_CLOCK_PWM>; + assigned-clocks = <&clocks BCM2835_CLOCK_PWM>; + assigned-clock-rates = <10000000>; + #pwm-cells = <2>; + status = "disabled"; + }; + + emmc2: emmc2@7e340000 { + compatible = "brcm,bcm2711-emmc2"; + reg = <0x7e340000 0x100>; + interrupts = ; + clocks = <&clocks BCM2711_CLOCK_EMMC2>; + status = "disabled"; + }; + + hvs@7e400000 { + interrupts = ; + }; + }; + + arm-pmu { + compatible = "arm,cortex-a72-pmu", "arm,armv8-pmuv3"; + interrupts = , + , + , + ; + interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>; + }; + + timer { + compatible = "arm,armv8-timer"; + interrupts = , + , + , + ; + /* This only applies to the ARMv7 stub */ + arm,cpu-registers-not-fw-configured; + + /* The ARM cores doesn't enter deep enough states */ + always-on; + }; + + cpus: cpus { + #address-cells = <1>; + #size-cells = <0>; + enable-method = "brcm,bcm2836-smp"; // for ARM 32-bit + + cpu0: cpu@0 { + device_type = "cpu"; + compatible = "arm,cortex-a72"; + reg = <0>; + enable-method = "spin-table"; + cpu-release-addr = <0x0 0x000000d8>; + }; + + cpu1: cpu@1 { + device_type = "cpu"; + compatible = "arm,cortex-a72"; + reg = <1>; + enable-method = "spin-table"; + cpu-release-addr = <0x0 0x000000e0>; + }; + + cpu2: cpu@2 { + device_type = "cpu"; + compatible = "arm,cortex-a72"; + reg = <2>; + enable-method = "spin-table"; + cpu-release-addr = <0x0 0x000000e8>; + }; + + cpu3: cpu@3 { + device_type = "cpu"; + compatible = "arm,cortex-a72"; + reg = <3>; + enable-method = "spin-table"; + cpu-release-addr = <0x0 0x000000f0>; + }; + }; +}; + +&clk_osc { + clock-frequency = <54000000>; +}; + +&clocks { + compatible = "brcm,bcm2711-cprman"; +}; + +&cpu_thermal { + coefficients = <(-487) 410040>; +}; + +&dsi0 { + interrupts = ; +}; + +&dsi1 { + interrupts = ; +}; + +&gpio { + compatible = "brcm,bcm2711-gpio"; + interrupts = , + , + , + ; + + gpclk0_gpio49: gpclk0_gpio49 { + pin-gpclk { + pins = "gpio49"; + function = "alt1"; + bias-disable; + }; + }; + gpclk1_gpio50: gpclk1_gpio50 { + pin-gpclk { + pins = "gpio50"; + function = "alt1"; + bias-disable; + }; + }; + gpclk2_gpio51: gpclk2_gpio51 { + pin-gpclk { + pins = "gpio51"; + function = "alt1"; + bias-disable; + }; + }; + + i2c0_gpio46: i2c0_gpio46 { + pin-sda { + function = "alt0"; + pins = "gpio46"; + bias-pull-up; + }; + pin-scl { + function = "alt0"; + pins = "gpio47"; + bias-disable; + }; + }; + i2c1_gpio46: i2c1_gpio46 { + pin-sda { + function = "alt1"; + pins = "gpio46"; + bias-pull-up; + }; + pin-scl { + function = "alt1"; + pins = "gpio47"; + bias-disable; + }; + }; + i2c3_gpio2: i2c3_gpio2 { + pin-sda { + function = "alt5"; + pins = "gpio2"; + bias-pull-up; + }; + pin-scl { + function = "alt5"; + pins = "gpio3"; + bias-disable; + }; + }; + i2c3_gpio4: i2c3_gpio4 { + pin-sda { + function = "alt5"; + pins = "gpio4"; + bias-pull-up; + }; + pin-scl { + function = "alt5"; + pins = "gpio5"; + bias-disable; + }; + }; + i2c4_gpio6: i2c4_gpio6 { + pin-sda { + function = "alt5"; + pins = "gpio6"; + bias-pull-up; + }; + pin-scl { + function = "alt5"; + pins = "gpio7"; + bias-disable; + }; + }; + i2c4_gpio8: i2c4_gpio8 { + pin-sda { + function = "alt5"; + pins = "gpio8"; + bias-pull-up; + }; + pin-scl { + function = "alt5"; + pins = "gpio9"; + bias-disable; + }; + }; + i2c5_gpio10: i2c5_gpio10 { + pin-sda { + function = "alt5"; + pins = "gpio10"; + bias-pull-up; + }; + pin-scl { + function = "alt5"; + pins = "gpio11"; + bias-disable; + }; + }; + i2c5_gpio12: i2c5_gpio12 { + pin-sda { + function = "alt5"; + pins = "gpio12"; + bias-pull-up; + }; + pin-scl { + function = "alt5"; + pins = "gpio13"; + bias-disable; + }; + }; + i2c6_gpio0: i2c6_gpio0 { + pin-sda { + function = "alt5"; + pins = "gpio0"; + bias-pull-up; + }; + pin-scl { + function = "alt5"; + pins = "gpio1"; + bias-disable; + }; + }; + i2c6_gpio22: i2c6_gpio22 { + pin-sda { + function = "alt5"; + pins = "gpio22"; + bias-pull-up; + }; + pin-scl { + function = "alt5"; + pins = "gpio23"; + bias-disable; + }; + }; + i2c_slave_gpio8: i2c_slave_gpio8 { + pins-i2c-slave { + pins = "gpio8", + "gpio9", + "gpio10", + "gpio11"; + function = "alt3"; + }; + }; + + jtag_gpio48: jtag_gpio48 { + pins-jtag { + pins = "gpio48", + "gpio49", + "gpio50", + "gpio51", + "gpio52", + "gpio53"; + function = "alt4"; + }; + }; + + mii_gpio28: mii_gpio28 { + pins-mii { + pins = "gpio28", + "gpio29", + "gpio30", + "gpio31"; + function = "alt4"; + }; + }; + mii_gpio36: mii_gpio36 { + pins-mii { + pins = "gpio36", + "gpio37", + "gpio38", + "gpio39"; + function = "alt5"; + }; + }; + + pcm_gpio50: pcm_gpio50 { + pins-pcm { + pins = "gpio50", + "gpio51", + "gpio52", + "gpio53"; + function = "alt2"; + }; + }; + + pwm0_0_gpio12: pwm0_0_gpio12 { + pin-pwm { + pins = "gpio12"; + function = "alt0"; + bias-disable; + }; + }; + pwm0_0_gpio18: pwm0_0_gpio18 { + pin-pwm { + pins = "gpio18"; + function = "alt5"; + bias-disable; + }; + }; + pwm1_0_gpio40: pwm1_0_gpio40 { + pin-pwm { + pins = "gpio40"; + function = "alt0"; + bias-disable; + }; + }; + pwm0_1_gpio13: pwm0_1_gpio13 { + pin-pwm { + pins = "gpio13"; + function = "alt0"; + bias-disable; + }; + }; + pwm0_1_gpio19: pwm0_1_gpio19 { + pin-pwm { + pins = "gpio19"; + function = "alt5"; + bias-disable; + }; + }; + pwm1_1_gpio41: pwm1_1_gpio41 { + pin-pwm { + pins = "gpio41"; + function = "alt0"; + bias-disable; + }; + }; + pwm0_1_gpio45: pwm0_1_gpio45 { + pin-pwm { + pins = "gpio45"; + function = "alt0"; + bias-disable; + }; + }; + pwm0_0_gpio52: pwm0_0_gpio52 { + pin-pwm { + pins = "gpio52"; + function = "alt1"; + bias-disable; + }; + }; + pwm0_1_gpio53: pwm0_1_gpio53 { + pin-pwm { + pins = "gpio53"; + function = "alt1"; + bias-disable; + }; + }; + + rgmii_gpio35: rgmii_gpio35 { + pin-start-stop { + pins = "gpio35"; + function = "alt4"; + }; + pin-rx-ok { + pins = "gpio36"; + function = "alt4"; + }; + }; + rgmii_irq_gpio34: rgmii_irq_gpio34 { + pin-irq { + pins = "gpio34"; + function = "alt5"; + }; + }; + rgmii_irq_gpio39: rgmii_irq_gpio39 { + pin-irq { + pins = "gpio39"; + function = "alt4"; + }; + }; + rgmii_mdio_gpio28: rgmii_mdio_gpio28 { + pins-mdio { + pins = "gpio28", + "gpio29"; + function = "alt5"; + }; + }; + rgmii_mdio_gpio37: rgmii_mdio_gpio37 { + pins-mdio { + pins = "gpio37", + "gpio38"; + function = "alt4"; + }; + }; + + spi0_gpio46: spi0_gpio46 { + pins-spi { + pins = "gpio46", + "gpio47", + "gpio48", + "gpio49"; + function = "alt2"; + }; + }; + spi2_gpio46: spi2_gpio46 { + pins-spi { + pins = "gpio46", + "gpio47", + "gpio48", + "gpio49", + "gpio50"; + function = "alt5"; + }; + }; + spi3_gpio0: spi3_gpio0 { + pins-spi { + pins = "gpio0", + "gpio1", + "gpio2", + "gpio3"; + function = "alt3"; + }; + }; + spi4_gpio4: spi4_gpio4 { + pins-spi { + pins = "gpio4", + "gpio5", + "gpio6", + "gpio7"; + function = "alt3"; + }; + }; + spi5_gpio12: spi5_gpio12 { + pins-spi { + pins = "gpio12", + "gpio13", + "gpio14", + "gpio15"; + function = "alt3"; + }; + }; + spi6_gpio18: spi6_gpio18 { + pins-spi { + pins = "gpio18", + "gpio19", + "gpio20", + "gpio21"; + function = "alt3"; + }; + }; + + uart2_gpio0: uart2_gpio0 { + pin-tx { + pins = "gpio0"; + function = "alt4"; + bias-disable; + }; + pin-rx { + pins = "gpio1"; + function = "alt4"; + bias-pull-up; + }; + }; + uart2_ctsrts_gpio2: uart2_ctsrts_gpio2 { + pin-cts { + pins = "gpio2"; + function = "alt4"; + bias-pull-up; + }; + pin-rts { + pins = "gpio3"; + function = "alt4"; + bias-disable; + }; + }; + uart3_gpio4: uart3_gpio4 { + pin-tx { + pins = "gpio4"; + function = "alt4"; + bias-disable; + }; + pin-rx { + pins = "gpio5"; + function = "alt4"; + bias-pull-up; + }; + }; + uart3_ctsrts_gpio6: uart3_ctsrts_gpio6 { + pin-cts { + pins = "gpio6"; + function = "alt4"; + bias-pull-up; + }; + pin-rts { + pins = "gpio7"; + function = "alt4"; + bias-disable; + }; + }; + uart4_gpio8: uart4_gpio8 { + pin-tx { + pins = "gpio8"; + function = "alt4"; + bias-disable; + }; + pin-rx { + pins = "gpio9"; + function = "alt4"; + bias-pull-up; + }; + }; + uart4_ctsrts_gpio10: uart4_ctsrts_gpio10 { + pin-cts { + pins = "gpio10"; + function = "alt4"; + bias-pull-up; + }; + pin-rts { + pins = "gpio11"; + function = "alt4"; + bias-disable; + }; + }; + uart5_gpio12: uart5_gpio12 { + pin-tx { + pins = "gpio12"; + function = "alt4"; + bias-disable; + }; + pin-rx { + pins = "gpio13"; + function = "alt4"; + bias-pull-up; + }; + }; + uart5_ctsrts_gpio14: uart5_ctsrts_gpio14 { + pin-cts { + pins = "gpio14"; + function = "alt4"; + bias-pull-up; + }; + pin-rts { + pins = "gpio15"; + function = "alt4"; + bias-disable; + }; + }; +}; + +&i2c0 { + compatible = "brcm,bcm2711-i2c", "brcm,bcm2835-i2c"; + interrupts = ; +}; + +&i2c1 { + compatible = "brcm,bcm2711-i2c", "brcm,bcm2835-i2c"; + interrupts = ; +}; + +&mailbox { + interrupts = ; +}; + +&sdhci { + interrupts = ; +}; + +&sdhost { + interrupts = ; +}; + +&spi1 { + interrupts = ; +}; + +&spi2 { + interrupts = ; +}; + +&system_timer { + interrupts = , + , + , + ; +}; + +&txp { + interrupts = ; +}; + +&uart0 { + interrupts = ; +}; + +&uart1 { + interrupts = ; +}; + +&usb { + interrupts = ; +}; + +&vec { + interrupts = ; +}; diff --git a/arch/arm/boot/dts/bcm283x-rpi-usb-peripheral.dtsi b/arch/arm/boot/dts/bcm283x-rpi-usb-peripheral.dtsi new file mode 100644 index 0000000..0ff0e9e --- /dev/null +++ b/arch/arm/boot/dts/bcm283x-rpi-usb-peripheral.dtsi @@ -0,0 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 +&usb { + dr_mode = "peripheral"; + g-rx-fifo-size = <256>; + g-np-tx-fifo-size = <32>; + g-tx-fifo-size = <256 256 512 512 512 768 768>; +}; diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi index addf3be..3caaa57 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -53,7 +53,7 @@ #address-cells = <1>; #size-cells = <1>; - timer@7e003000 { + system_timer: timer@7e003000 { compatible = "brcm,bcm2835-system-timer"; reg = <0x7e003000 0x1000>; interrupts = <1 0>, <1 1>, <1 2>, <1 3>; @@ -64,7 +64,7 @@ clock-frequency = <1000000>; }; - txp@7e004000 { + txp: txp@7e004000 { compatible = "brcm,bcm2835-txp"; reg = <0x7e004000 0x20>; interrupts = <1 11>; From patchwork Sat Sep 28 12:07:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 11165403 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DBF62112B for ; Sat, 28 Sep 2019 12:08:59 +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 B8E3D20815 for ; Sat, 28 Sep 2019 12:08:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="QA1lURt0"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=gmx.net header.i=@gmx.net header.b="FbaHs9o3" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B8E3D20815 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=gmx.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=kex4+Bx5E6/8n9kZ3a3/eY2b6Uaw5EfHAkEb+pEiQFU=; b=QA1lURt09HPYgunHnNtqo+6GHW 73im9DkIPVs0uXrvGL27hR/j4e9Z3994g4i69DMRoAfV8UcnlLLs8uNhBQ0uy+nl0sL/JJkOXv4s6 pJ1GwPvruDrTQis8LRQZ8bJZK804G0uJsAmD9JJDHxQpMvqROULLtd82rZKCRi/mk2DIl73UIm3rL YDEwgOmW+UEcJ8Fd8JKyquRNaENmPneDTVbCdhOAinN5PU73rykQGpJ4Aoe3TWvXbvQc9cVUWt+c7 GfJTrxFqfwF3EBAzpxeoELHXUyJh5FTTqr6z385bjv+cXXw91u6MZNxpn9wP0DtUDlJU3z5C+sNAw HCkUmkRA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux)) id 1iEBX1-0007Xh-5P; Sat, 28 Sep 2019 12:08:59 +0000 Received: from mout.gmx.net ([212.227.15.19]) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1iEBVv-0006ZG-0b for linux-arm-kernel@lists.infradead.org; Sat, 28 Sep 2019 12:07:55 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1569672460; bh=ZImZAahcnUC+FQfe8Me4GQOgCgge3ZbsQMf5FxCzQ74=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=FbaHs9o3otier+ijkio2Bedmml36n9mNyP8wScF6sb8Ve2ec2JaPWCyMZYJDDaKqA o6PcZD73tGM8rJXRwbgcyr4nrFJ1Cdnv54/cidm84ZmRGDcbKLMypKa7lRv/bCOtR6 B9WwOYY6ZwrGiORtF8TB6N73KGntlY+1/0d+IGDw= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([37.4.249.130]) by mail.gmx.com (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1Mk0Ne-1hlkaR2tWS-00kMD7; Sat, 28 Sep 2019 14:07:39 +0200 From: Stefan Wahren To: Rob Herring , Mark Rutland , Eric Anholt , Florian Fainelli , Ray Jui , Scott Branden Subject: [PATCH V3 8/8] MAINTAINERS: Add BCM2711 to BCM2835 ARCH Date: Sat, 28 Sep 2019 14:07:14 +0200 Message-Id: <1569672435-19823-9-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1569672435-19823-1-git-send-email-wahrenst@gmx.net> References: <1569672435-19823-1-git-send-email-wahrenst@gmx.net> X-Provags-ID: V03:K1:UDpTJAU1MPUAlXMwedv/m4gEGTFPk9iDRiXEq9EnoWkZdvoZuAB TBUNbk+gDwBhHG7w35+Rsf6Xp6ykaXCGjqmAlZqCmSYPSO7kjnqF55P5uRz+ygNVMqs5Nh9 4Ff6ZUIkPn3FrpWBSsn8nCiaf1IqzanJRaFWsfI3xXYWsWvLZI486jLXkim1u3dlZKXc4a0 HTpp9Q9xpmHZ0/UDsYz2g== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:CdBwK5UlnAs=:lvdrA/NfApj+bc7ICAMkEu JSc2MetLb+48zGJrgpIJm25h4t41M4QO+6n/vc+gc6KV71yja9VLysXs7Tr/dwHo7Tep4iZhb sX9vra5jP38MfpT993ZrmaJBnWu1q11SF3f5vvWWxvacJ49JxtFmyoxBChGSnxSRGic4jTZwQ L8hAQVSJIoEx1Nbfz94genL/S9wh2d5vc2lE2eebL84DFWjYONxQ+cinRJCyFTKgncXPGJCNY iBqGVlNaMJ2c5zTIeHSERspZEwtUm4S/IyAAOE6yT2IItpzlJHb2AGnuMZbk0CilI8IeSXWIq 7RchQOjmOJ1tm9uU0fxMX02m52Oc4XSlBd/vW0ls3iP7+OZ1sobt3M24rGwv6GN6ZWbQ5E8dX bl48mjXGD48J+ndoc4ev+kd2cGPbpgbEvlwFmrSQXUhwI7Z7GUsNPiZyHe+5IcW3RjPwOrYJN hkRk3pGV1eNKkJs3f22OJgg7avCuOwsUu/4RPVZ5kFPPU0CWzjw89uZ9sKCksIIDahtQSnKcn 61YeP9nZ3p456ouh8xueGeWWf6EWELggfOWj6jViGnf6Vxa0W+xhrvzi0BULcE9cxtrWOeiQf Lvv7N6ztnLedjz/Jz6mo03y+J+xgZZi6ITx980pzR7k5fCwI88YFirfEpDYapA4jfazPdLkCC nfnAGMsqaVE4iKEm3A4M+crO494k4BD54RlpKclwy7MaoylTtU2sDJneNmRb0ZkpJlQxNOomr vzqHFwr/t/wGwaosD7JgFvO7EmwoqWVK3lo9uZBi8lDr/AeoRVB4YJbuRkCiooFNpbron70qF k1ql8/ZQICBhp1aGEYkSueQfwlPIZqEZuYGS/mqtl1mdOq8aGm90kFURCrhuDtAygWS2pPb5V hCuqHuD6s7GoL2pOJtVdms3sgVMyYV2lgOESXe9fi4+Fr6IyBt8Pfv4OvEa0yP7K5eo3YnvD8 XSiy/NN/3aRUdVp/2Zde2J2zO/jiszneo2tyz/n4xf6+GbAZd5BqfkkW74YD7qqLVJYs7sH8S 5xYUE+9KCG4IAftC5rvTOKV/fOp+OyMWdM5K5ermrHnjbcDBfn+mu78iknre1950KMkoJerOO ocYlHCtZdU22IS/lSJAM0bIhZ4vbpQ8McIFFz8pFIQ8n6NAG1Js4jQA6DskAFkc5Gtunyh92w O/qj7cBgVNPHN7V+udMhDpkwEqP60z6VXYKk3y0/OdwVVqM1r5w3SU1itmghaCs2WzBLLH6/x oAc2tV+OwiVqnRquSntGAZvy2P3l0nbIfuuMOVg== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190928_050751_368665_D192E514 X-CRM114-Status: GOOD ( 11.53 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.15.19 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (wahrenst[at]gmx.net) -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Catalin Marinas , bcm-kernel-feedback-list@broadcom.com, Stefan Wahren , Will Deacon , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Clarify that BCM2711 belongs to the BCM2835 ARCH. Signed-off-by: Stefan Wahren Acked-by: Eric Anholt --- MAINTAINERS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/MAINTAINERS b/MAINTAINERS index 857611c..49420e0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3186,7 +3186,7 @@ N: bcm216* N: kona F: arch/arm/mach-bcm/ -BROADCOM BCM2835 ARM ARCHITECTURE +BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE M: Eric Anholt M: Stefan Wahren L: bcm-kernel-feedback-list@broadcom.com @@ -3194,6 +3194,7 @@ L: linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) T: git git://github.com/anholt/linux S: Maintained +N: bcm2711 N: bcm2835 F: drivers/staging/vc04_services