From 1d9547b3dd81a45e694d7c8e91b454e61ea296a9 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Mon, 3 May 2021 14:29:31 +0200 Subject: linux: bsp-41x: non-target: Move DTS changes for memory and/or dma-ranges There is no need to keep multiple separate DTS files to accomodate board variants that differ only in memory configuration: U-Boot will update memory nodes and dma-ranges properties accordingly. See commit b3db7be4e3726092 ("ARM: renesas: Update Gen3 PCIe dma-ranges before boot") in v2019.10-rc2 / rcar-3.10.0.rc1 and later. Signed-off-by: Geert Uytterhoeven Reviewed-by: Wolfram Sang Reviewed-by: Yoshihiro Shimoda --- projects/linux/bsp-41x-non-target.yaml | 7 +++++++ projects/linux/bsp-41x-upport-request.yaml | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'projects') diff --git a/projects/linux/bsp-41x-non-target.yaml b/projects/linux/bsp-41x-non-target.yaml index f20d3c8..3d8870f 100644 --- a/projects/linux/bsp-41x-non-target.yaml +++ b/projects/linux/bsp-41x-non-target.yaml @@ -546,3 +546,10 @@ bsp41x: - e4962e0a61d0b5a7a578dc1ce1c578bafd21df07 # arm64: dts: renesas: r8a779a0: Add SYS-DMAC and RT-DMAC support (RT-DMAC not used, SYS-DMAC added in torvalds: 1f4449e12c5c6682a6f4f8dbc7288c19c1c844f1 # arm64: dts: renesas: r8a779a0: Add SYS-DMAC nodes) - e98a497b44f55eda9ad2631e945ecf186f98f3ad # arm64: dts: r8a7796-salvator-xs-2x4g: Fix memory unit-address (cherry-picked from upstream) - 76c141540ffc9976856d84576d57eafa1f0c5756 # mtd: spi-nor: fix writes on S25FS512S (cherry-picked from upstream) + - 2866386193fc55159db40ea637df6193d10129fe # arm64: dts: renesas: convert to SPDX identifiers (Proposing 'N': memory and dma-ranges are passed by U-Boot) + - 751afb4cdf121aadc8ed33bd9502512086e319ed # arm64: dts: r8a7795-h3ulcb-4x2g: Overwrite dma-ranges of pcie nodes for R-Car H3 ES2.0/3.0 (Proposing 'N': dma-ranges is updated by U-Boot) + - d97faea949fb717a1058727d63ce96f480f8afc2 # arm64: dts: r8a7795-h3ulcb-4x2g.dts: Add H3ULCB (4 x 2 GiB) support (Proposing 'N': memory and dma-ranges are passed by U-Boot) + - fb98d6b76fc680f95b53c4c21cc624aa7cb1b0bd # arm64: dts: r8a77990-ebisu{,-4D}: Add support for R-Car E3 ES1.0 (Proposing 'N': memory and dma-ranges are passed by U-Boot) + - f9d4cc893a94b8c352f258b19e9c5e9256cc595f # arm64: dts: r8a77990-ebisu: Add Ebisu-4D board support (Proposing 'N': memory and dma-ranges are passed by U-Boot) + - f5505c6d62a4ed6b033c91b247fcf3fe8d39e35e # arm64: dts: r8a7796-salvator-xs: Add R-Car M3 ES3.0 (2 x 4 GiB) support (Proposing 'N': memory and dma-ranges are passed by U-Boot) + - f859d8760fd19715588bd50e60675347235b4874 # arm64: dts: r8a7795-salvator-xs: Add R-Car H3 ES3.0 (4 x 2 GiB) support (Proposing 'N': memory and dma-ranges are passed by U-Boot) diff --git a/projects/linux/bsp-41x-upport-request.yaml b/projects/linux/bsp-41x-upport-request.yaml index c9e1ab0..0d43ce7 100644 --- a/projects/linux/bsp-41x-upport-request.yaml +++ b/projects/linux/bsp-41x-upport-request.yaml @@ -81,7 +81,6 @@ bsp41x: - fa95493a4b2b894848d6fc63036343f1fc0e2112 # arm64: dts: renesas: r8a77965: Use default clock and reset property for secure public core - b375044112b6c01cb7c842a9be66a8cf135c0f35 # arm64: dts: renesas: r8a7796: Use default clock and reset property for secure public core - 3da0daf13d7656b91825718d49c03e493d50c2c5 # arm64: dts: renesas: r8a7795: Use default clock and reset property for secure public core - - 2866386193fc55159db40ea637df6193d10129fe # arm64: dts: renesas: convert to SPDX identifiers - 6794f96ba63bf2ca17c2c7209c427b3b8ebb8978 # arm64: dts: r8a77965: Fix power domain for FCPCS - 034b43d6d396793fff4c77033c9f6022aed60cac # arm64: dts: r8a7795: Fix clock, reset and power domain for iVDP1C - 4b4c6ce0ac6b3387bee08f3e37a8891ade1c8657 # arm64: dts: r8a77990: Enable IPMMU-DS1 and IPMMU-MM @@ -91,11 +90,8 @@ bsp41x: - e6c2c5a9d009658687f5028995ebf0a541ba891c # arm64: dts: renesas: r8a77990: Change default of all IPMMU devices to disable - 53eccb4433b01476365ddba4c77128bf14e1f50f # arm64: dts: renesas: r8a77965: Change default of all IPMMU devices to disable - 532fbdfa578bf5a4fccf1077a1da63e2b707ea8b # arm64: dts: r8a77990: Detach IPMMU-VI0/1 from FCPVD - - 751afb4cdf121aadc8ed33bd9502512086e319ed # arm64: dts: r8a7795-h3ulcb-4x2g: Overwrite dma-ranges of pcie nodes for R-Car H3 ES2.0/3.0 - - d97faea949fb717a1058727d63ce96f480f8afc2 # arm64: dts: r8a7795-h3ulcb-4x2g.dts: Add H3ULCB (4 x 2 GiB) support - 7ae113a9d05daf3ccacd80cd70fd4b640faa2ec6 # arm64: dts: r8a7796-m3ulcb: Disable CPUIdle support for CA53 - 1953c1378837d1e9610c65db96f1755c599e89e6 # arm64: dts: r8a7795-es1-h3ulcb: Disable HS400 of SDHI2 - - fb98d6b76fc680f95b53c4c21cc624aa7cb1b0bd # arm64: dts: r8a77990-ebisu{,-4D}: Add support for R-Car E3 ES1.0 - 7419b8b89c6c1050161320de804df61590978cf4 # crypto: ccree - fix handling of buffers managed by scatter list - 6a39a63743c59097d052ae6be8e23db7f7247bac # crypto: ccree - fix to Enc/Dec data of two pages or more - 6010b2b6f34c8098e370c1ac80f6259623e439a1 # arm64: defconfig: Disable 4K Sector size by default @@ -104,9 +100,6 @@ bsp41x: - 4e03f3c364e3118bf02639f4c9e6f2914c642abe # PCI: dwc: renesas: Add Renesas R-Car PCIe host controller driver - 444f75c7d0efd993ff20800ca20a39b87126abc3 # arm64: dts: renesaas: r8a77990: Fixup power-domains of 3DGE for R-Car E3 ES1.0 - de41ca23ae1893772b8a6d3fbc2c73943c86bd46 # arm64: dts: r8a77990-ebisu-4d: Add lossy descompress area - - f9d4cc893a94b8c352f258b19e9c5e9256cc595f # arm64: dts: r8a77990-ebisu: Add Ebisu-4D board support - - f5505c6d62a4ed6b033c91b247fcf3fe8d39e35e # arm64: dts: r8a7796-salvator-xs: Add R-Car M3 ES3.0 (2 x 4 GiB) support - - f859d8760fd19715588bd50e60675347235b4874 # arm64: dts: r8a7795-salvator-xs: Add R-Car H3 ES3.0 (4 x 2 GiB) support - 32e4514bfec79304b11109ccf769e9026f171485 # arm64: defconfig: Enable Renesas VMSA-compatible IPMMU support - b491e45c981136542a2c7445e38de19b5a8efcb9 # crypto: ccree - add support for Secure Key mode - 0c98ff021f256a963a80d3bc76c2b05fa7e51f7f # crypto: ccree - add support for MULTI2 mode -- cgit v1.2.3