From nobody Sat Apr 11 14:31:11 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E0223C7618D for ; Tue, 7 Mar 2023 10:58:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231260AbjCGK6D (ORCPT ); Tue, 7 Mar 2023 05:58:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42784 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231164AbjCGK5U (ORCPT ); Tue, 7 Mar 2023 05:57:20 -0500 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1EB6F5BCA0 for ; Tue, 7 Mar 2023 02:57:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=sang-engineering.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=k1; bh=dJBOGd647MQDIh GLO7K2LOAhZbvKu6Gsk4myiM4hGrY=; b=Yb0g7pvOoWHRIkg88gumubrnprHbga 1rD1WCxbwzN7j+QwS9/AdqYV+aqCUMITyQ8wLvXtC0QLbIW9uxeFx72xAMAqBXCr sSwP/Plf/qcgqH3SPUPZhppYnuowYw4nmb7s18FetYYVAPEc5gFRSkglkWE67XUj B2tGXzbzKdWaw= Received: (qmail 650912 invoked from network); 7 Mar 2023 11:57:06 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 7 Mar 2023 11:57:06 +0100 X-UD-Smtp-Session: l3s3148p1@z9u/RU32JoggAQnoAFQ+AGEn9EY5VOxJ From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Wolfram Sang , Laurent Pinchart , Geert Uytterhoeven , Magnus Damm , Rob Herring , Krzysztof Kozlowski , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/5] arm64: dts: renesas: remove R-Car H3 ES1.* devicetrees Date: Tue, 7 Mar 2023 11:56:38 +0100 Message-Id: <20230307105645.5285-3-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230307105645.5285-1-wsa+renesas@sang-engineering.com> References: <20230307105645.5285-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" R-Car H3 ES1.* was only available to an internal development group and needed a lot of quirks and workarounds. These become a maintenance burden now, so our development group decided to remove upstream support and disable booting for this SoC. Public users only have ES2 onwards. Reviewed-by: Laurent Pinchart Reviewed-by: Geert Uytterhoeven Signed-off-by: Wolfram Sang --- arch/arm64/boot/dts/renesas/Makefile | 4 - .../boot/dts/renesas/r8a77950-salvator-x.dts | 49 --- .../boot/dts/renesas/r8a77950-ulcb-kf.dts | 16 - arch/arm64/boot/dts/renesas/r8a77950-ulcb.dts | 37 -- arch/arm64/boot/dts/renesas/r8a77950.dtsi | 330 ------------------ 5 files changed, 436 deletions(-) delete mode 100644 arch/arm64/boot/dts/renesas/r8a77950-salvator-x.dts delete mode 100644 arch/arm64/boot/dts/renesas/r8a77950-ulcb-kf.dts delete mode 100644 arch/arm64/boot/dts/renesas/r8a77950-ulcb.dts delete mode 100644 arch/arm64/boot/dts/renesas/r8a77950.dtsi diff --git a/arch/arm64/boot/dts/renesas/Makefile b/arch/arm64/boot/dts/ren= esas/Makefile index 0699b51c1247..366fddbd3c91 100644 --- a/arch/arm64/boot/dts/renesas/Makefile +++ b/arch/arm64/boot/dts/renesas/Makefile @@ -28,10 +28,6 @@ dtb-$(CONFIG_ARCH_R8A774E1) +=3D r8a774e1-hihope-rzg2h-e= x.dtb dtb-$(CONFIG_ARCH_R8A774E1) +=3D r8a774e1-hihope-rzg2h-ex-idk-1110wr.dtb dtb-$(CONFIG_ARCH_R8A774E1) +=3D r8a774e1-hihope-rzg2h-ex-mipi-2.1.dtb =20 -dtb-$(CONFIG_ARCH_R8A77950) +=3D r8a77950-salvator-x.dtb -dtb-$(CONFIG_ARCH_R8A77950) +=3D r8a77950-ulcb.dtb -dtb-$(CONFIG_ARCH_R8A77950) +=3D r8a77950-ulcb-kf.dtb - dtb-$(CONFIG_ARCH_R8A77951) +=3D r8a77951-salvator-x.dtb dtb-$(CONFIG_ARCH_R8A77951) +=3D r8a77951-salvator-xs.dtb dtb-$(CONFIG_ARCH_R8A77951) +=3D r8a77951-ulcb.dtb diff --git a/arch/arm64/boot/dts/renesas/r8a77950-salvator-x.dts b/arch/arm= 64/boot/dts/renesas/r8a77950-salvator-x.dts deleted file mode 100644 index c6ca61a8ed40..000000000000 --- a/arch/arm64/boot/dts/renesas/r8a77950-salvator-x.dts +++ /dev/null @@ -1,49 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Device Tree Source for the Salvator-X board with R-Car H3 ES1.x - * - * Copyright (C) 2015 Renesas Electronics Corp. - */ - -/dts-v1/; -#include "r8a77950.dtsi" -#include "salvator-x.dtsi" - -/ { - model =3D "Renesas Salvator-X board based on r8a77950"; - compatible =3D "renesas,salvator-x", "renesas,r8a7795"; - - memory@48000000 { - device_type =3D "memory"; - /* first 128MB is reserved for secure area. */ - reg =3D <0x0 0x48000000 0x0 0x38000000>; - }; - - memory@500000000 { - device_type =3D "memory"; - reg =3D <0x5 0x00000000 0x0 0x40000000>; - }; - - memory@600000000 { - device_type =3D "memory"; - reg =3D <0x6 0x00000000 0x0 0x40000000>; - }; - - memory@700000000 { - device_type =3D "memory"; - reg =3D <0x7 0x00000000 0x0 0x40000000>; - }; -}; - -&du { - clocks =3D <&cpg CPG_MOD 724>, - <&cpg CPG_MOD 723>, - <&cpg CPG_MOD 722>, - <&cpg CPG_MOD 721>, - <&versaclock5 1>, - <&x21_clk>, - <&x22_clk>, - <&versaclock5 2>; - clock-names =3D "du.0", "du.1", "du.2", "du.3", - "dclkin.0", "dclkin.1", "dclkin.2", "dclkin.3"; -}; diff --git a/arch/arm64/boot/dts/renesas/r8a77950-ulcb-kf.dts b/arch/arm64/= boot/dts/renesas/r8a77950-ulcb-kf.dts deleted file mode 100644 index 85f008ef63de..000000000000 --- a/arch/arm64/boot/dts/renesas/r8a77950-ulcb-kf.dts +++ /dev/null @@ -1,16 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Device Tree Source for the H3ULCB Kingfisher board with R-Car H3 ES1.x - * - * Copyright (C) 2017 Renesas Electronics Corp. - * Copyright (C) 2017 Cogent Embedded, Inc. - */ - -#include "r8a77950-ulcb.dts" -#include "ulcb-kf.dtsi" - -/ { - model =3D "Renesas H3ULCB Kingfisher board based on r8a77950"; - compatible =3D "shimafuji,kingfisher", "renesas,h3ulcb", - "renesas,r8a7795"; -}; diff --git a/arch/arm64/boot/dts/renesas/r8a77950-ulcb.dts b/arch/arm64/boo= t/dts/renesas/r8a77950-ulcb.dts deleted file mode 100644 index 5340579931e3..000000000000 --- a/arch/arm64/boot/dts/renesas/r8a77950-ulcb.dts +++ /dev/null @@ -1,37 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Device Tree Source for the H3ULCB (R-Car Starter Kit Premier) board wit= h R-Car H3 ES1.x - * - * Copyright (C) 2016 Renesas Electronics Corp. - * Copyright (C) 2016 Cogent Embedded, Inc. - */ - -/dts-v1/; -#include "r8a77950.dtsi" -#include "ulcb.dtsi" - -/ { - model =3D "Renesas H3ULCB board based on r8a77950"; - compatible =3D "renesas,h3ulcb", "renesas,r8a7795"; - - memory@48000000 { - device_type =3D "memory"; - /* first 128MB is reserved for secure area. */ - reg =3D <0x0 0x48000000 0x0 0x38000000>; - }; - - memory@500000000 { - device_type =3D "memory"; - reg =3D <0x5 0x00000000 0x0 0x40000000>; - }; - - memory@600000000 { - device_type =3D "memory"; - reg =3D <0x6 0x00000000 0x0 0x40000000>; - }; - - memory@700000000 { - device_type =3D "memory"; - reg =3D <0x7 0x00000000 0x0 0x40000000>; - }; -}; diff --git a/arch/arm64/boot/dts/renesas/r8a77950.dtsi b/arch/arm64/boot/dt= s/renesas/r8a77950.dtsi deleted file mode 100644 index 57eb88177e92..000000000000 --- a/arch/arm64/boot/dts/renesas/r8a77950.dtsi +++ /dev/null @@ -1,330 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Device Tree Source for the R-Car H3 (R8A77950) SoC - * - * Copyright (C) 2015 Renesas Electronics Corp. - */ - -#include "r8a77951.dtsi" - -#undef SOC_HAS_USB2_CH3 - -&audma0 { - iommus =3D <&ipmmu_mp1 0>, <&ipmmu_mp1 1>, - <&ipmmu_mp1 2>, <&ipmmu_mp1 3>, - <&ipmmu_mp1 4>, <&ipmmu_mp1 5>, - <&ipmmu_mp1 6>, <&ipmmu_mp1 7>, - <&ipmmu_mp1 8>, <&ipmmu_mp1 9>, - <&ipmmu_mp1 10>, <&ipmmu_mp1 11>, - <&ipmmu_mp1 12>, <&ipmmu_mp1 13>, - <&ipmmu_mp1 14>, <&ipmmu_mp1 15>; -}; - -&audma1 { - iommus =3D <&ipmmu_mp1 16>, <&ipmmu_mp1 17>, - <&ipmmu_mp1 18>, <&ipmmu_mp1 19>, - <&ipmmu_mp1 20>, <&ipmmu_mp1 21>, - <&ipmmu_mp1 22>, <&ipmmu_mp1 23>, - <&ipmmu_mp1 24>, <&ipmmu_mp1 25>, - <&ipmmu_mp1 26>, <&ipmmu_mp1 27>, - <&ipmmu_mp1 28>, <&ipmmu_mp1 29>, - <&ipmmu_mp1 30>, <&ipmmu_mp1 31>; -}; - -&cluster0_opp { - /delete-node/ opp-1600000000; - /delete-node/ opp-1700000000; -}; - -&du { - renesas,vsps =3D <&vspd0 0>, <&vspd1 0>, <&vspd2 0>, <&vspd3 0>; -}; - -&fcpvb1 { - iommus =3D <&ipmmu_vp0 7>; -}; - -&fcpf1 { - iommus =3D <&ipmmu_vp0 1>; -}; - -&fcpvi1 { - iommus =3D <&ipmmu_vp0 9>; -}; - -&fcpvd2 { - iommus =3D <&ipmmu_vi0 10>; -}; - -&gpio1 { - gpio-ranges =3D <&pfc 0 32 28>; -}; - -&ipmmu_vi0 { - renesas,ipmmu-main =3D <&ipmmu_mm 11>; -}; - -&ipmmu_vp0 { - renesas,ipmmu-main =3D <&ipmmu_mm 12>; -}; - -&ipmmu_vc0 { - renesas,ipmmu-main =3D <&ipmmu_mm 9>; -}; - -&ipmmu_vc1 { - renesas,ipmmu-main =3D <&ipmmu_mm 10>; -}; - -&ipmmu_rt { - renesas,ipmmu-main =3D <&ipmmu_mm 7>; -}; - -&soc { - /delete-node/ dma-controller@e6460000; - /delete-node/ dma-controller@e6470000; - - ipmmu_mp1: iommu@ec680000 { - compatible =3D "renesas,ipmmu-r8a7795"; - reg =3D <0 0xec680000 0 0x1000>; - renesas,ipmmu-main =3D <&ipmmu_mm 5>; - power-domains =3D <&sysc R8A7795_PD_ALWAYS_ON>; - #iommu-cells =3D <1>; - }; - - ipmmu_sy: iommu@e7730000 { - compatible =3D "renesas,ipmmu-r8a7795"; - reg =3D <0 0xe7730000 0 0x1000>; - renesas,ipmmu-main =3D <&ipmmu_mm 8>; - power-domains =3D <&sysc R8A7795_PD_ALWAYS_ON>; - #iommu-cells =3D <1>; - }; - - /delete-node/ iommu@fd950000; - /delete-node/ iommu@fd960000; - /delete-node/ iommu@fd970000; - /delete-node/ iommu@febe0000; - /delete-node/ iommu@fe980000; - - xhci1: usb@ee040000 { - compatible =3D "renesas,xhci-r8a7795", "renesas,rcar-gen3-xhci"; - reg =3D <0 0xee040000 0 0xc00>; - interrupts =3D ; - clocks =3D <&cpg CPG_MOD 327>; - power-domains =3D <&sysc R8A7795_PD_ALWAYS_ON>; - resets =3D <&cpg 327>; - status =3D "disabled"; - }; - - /delete-node/ usb@e659c000; - /delete-node/ usb@ee0e0000; - /delete-node/ usb@ee0e0100; - - /delete-node/ usb-phy@ee0e0200; - - fdp1@fe948000 { - compatible =3D "renesas,fdp1"; - reg =3D <0 0xfe948000 0 0x2400>; - interrupts =3D ; - clocks =3D <&cpg CPG_MOD 117>; - power-domains =3D <&sysc R8A7795_PD_A3VP>; - resets =3D <&cpg 117>; - renesas,fcp =3D <&fcpf2>; - }; - - fcpf2: fcp@fe952000 { - compatible =3D "renesas,fcpf"; - reg =3D <0 0xfe952000 0 0x200>; - clocks =3D <&cpg CPG_MOD 613>; - power-domains =3D <&sysc R8A7795_PD_A3VP>; - resets =3D <&cpg 613>; - iommus =3D <&ipmmu_vp0 2>; - }; - - fcpvd3: fcp@fea3f000 { - compatible =3D "renesas,fcpv"; - reg =3D <0 0xfea3f000 0 0x200>; - clocks =3D <&cpg CPG_MOD 600>; - power-domains =3D <&sysc R8A7795_PD_ALWAYS_ON>; - resets =3D <&cpg 600>; - iommus =3D <&ipmmu_vi0 11>; - }; - - fcpvi2: fcp@fe9cf000 { - compatible =3D "renesas,fcpv"; - reg =3D <0 0xfe9cf000 0 0x200>; - clocks =3D <&cpg CPG_MOD 609>; - power-domains =3D <&sysc R8A7795_PD_A3VP>; - resets =3D <&cpg 609>; - iommus =3D <&ipmmu_vp0 10>; - }; - - vspd3: vsp@fea38000 { - compatible =3D "renesas,vsp2"; - reg =3D <0 0xfea38000 0 0x5000>; - interrupts =3D ; - clocks =3D <&cpg CPG_MOD 620>; - power-domains =3D <&sysc R8A7795_PD_ALWAYS_ON>; - resets =3D <&cpg 620>; - - renesas,fcp =3D <&fcpvd3>; - }; - - vspi2: vsp@fe9c0000 { - compatible =3D "renesas,vsp2"; - reg =3D <0 0xfe9c0000 0 0x8000>; - interrupts =3D ; - clocks =3D <&cpg CPG_MOD 629>; - power-domains =3D <&sysc R8A7795_PD_A3VP>; - resets =3D <&cpg 629>; - - renesas,fcp =3D <&fcpvi2>; - }; - - csi21: csi2@fea90000 { - compatible =3D "renesas,r8a7795-csi2"; - reg =3D <0 0xfea90000 0 0x10000>; - interrupts =3D ; - clocks =3D <&cpg CPG_MOD 713>; - power-domains =3D <&sysc R8A7795_PD_ALWAYS_ON>; - resets =3D <&cpg 713>; - status =3D "disabled"; - - ports { - #address-cells =3D <1>; - #size-cells =3D <0>; - - port@0 { - reg =3D <0>; - }; - - port@1 { - #address-cells =3D <1>; - #size-cells =3D <0>; - - reg =3D <1>; - - csi21vin0: endpoint@0 { - reg =3D <0>; - remote-endpoint =3D <&vin0csi21>; - }; - csi21vin1: endpoint@1 { - reg =3D <1>; - remote-endpoint =3D <&vin1csi21>; - }; - csi21vin2: endpoint@2 { - reg =3D <2>; - remote-endpoint =3D <&vin2csi21>; - }; - csi21vin3: endpoint@3 { - reg =3D <3>; - remote-endpoint =3D <&vin3csi21>; - }; - csi21vin4: endpoint@4 { - reg =3D <4>; - remote-endpoint =3D <&vin4csi21>; - }; - csi21vin5: endpoint@5 { - reg =3D <5>; - remote-endpoint =3D <&vin5csi21>; - }; - csi21vin6: endpoint@6 { - reg =3D <6>; - remote-endpoint =3D <&vin6csi21>; - }; - csi21vin7: endpoint@7 { - reg =3D <7>; - remote-endpoint =3D <&vin7csi21>; - }; - }; - }; - }; -}; - -&vin0 { - ports { - port@1 { - vin0csi21: endpoint@1 { - reg =3D <1>; - remote-endpoint =3D <&csi21vin0>; - }; - }; - }; -}; - -&vin1 { - ports { - port@1 { - vin1csi21: endpoint@1 { - reg =3D <1>; - remote-endpoint =3D <&csi21vin1>; - }; - }; - }; -}; - -&vin2 { - ports { - port@1 { - vin2csi21: endpoint@1 { - reg =3D <1>; - remote-endpoint =3D <&csi21vin2>; - }; - }; - }; -}; - -&vin3 { - ports { - port@1 { - vin3csi21: endpoint@1 { - reg =3D <1>; - remote-endpoint =3D <&csi21vin3>; - }; - }; - }; -}; - -&vin4 { - ports { - port@1 { - vin4csi21: endpoint@1 { - reg =3D <1>; - remote-endpoint =3D <&csi21vin4>; - }; - }; - }; -}; - -&vin5 { - ports { - port@1 { - vin5csi21: endpoint@1 { - reg =3D <1>; - remote-endpoint =3D <&csi21vin5>; - }; - }; - }; -}; - -&vin6 { - ports { - port@1 { - vin6csi21: endpoint@1 { - reg =3D <1>; - remote-endpoint =3D <&csi21vin6>; - }; - }; - }; -}; - -&vin7 { - ports { - port@1 { - vin7csi21: endpoint@1 { - reg =3D <1>; - remote-endpoint =3D <&csi21vin7>; - }; - }; - }; -}; --=20 2.35.1