mirror of
git://nv-tegra.nvidia.com/device/hardware/nvidia/t23x-public-dts.git
synced 2025-12-22 17:30:17 +03:00
Revert "t23x: overlay: Bump #address-cells and #size-cells"
This reverts commit 225d39c0084554c0dc1f0ab2ad4b747515710b99. The original change was bumping the address and cell size to <2> for the OOT 5.15 which is no more needed. Change-Id: I3718fff4e0f14a2dbc46c1b60519a1b39f057308 Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/platform/t23x/concord-generic-dts/+/2868360 Reviewed-by: Bitan Biswas <bbiswas@nvidia.com> Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com> Reviewed-by: Ashish Mhetre <amhetre@nvidia.com> GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com> Tested-by: Laxman Dewangan <ldewangan@nvidia.com>
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES.
|
* Copyright (c) 2022, NVIDIA CORPORATION & AFFILIATES.
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: GPL-2.0
|
* SPDX-License-Identifier: GPL-2.0
|
||||||
*/
|
*/
|
||||||
@@ -116,31 +116,17 @@
|
|||||||
fragment@0 {
|
fragment@0 {
|
||||||
target-path = "/bus@0/host1x@13e00000";
|
target-path = "/bus@0/host1x@13e00000";
|
||||||
__overlay__ {
|
__overlay__ {
|
||||||
#if LINUX_VERSION > 515
|
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <1>;
|
#size-cells = <1>;
|
||||||
#else
|
|
||||||
#address-cells = <2>;
|
|
||||||
#size-cells = <2>;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
interrupt-parent = <&gic>;
|
interrupt-parent = <&gic>;
|
||||||
|
|
||||||
#if LINUX_VERSION > 515
|
|
||||||
ranges = <0x14800000 0x14800000 0x02000000>,
|
ranges = <0x14800000 0x14800000 0x02000000>,
|
||||||
<0x24700000 0x24700000 0x00080000>;
|
<0x24700000 0x24700000 0x00080000>;
|
||||||
#else
|
|
||||||
ranges = <0x0 0x14800000 0x0 0x14800000 0x0 0x02000000>,
|
|
||||||
<0x0 0x24700000 0x0 0x24700000 0x0 0x00080000>;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
nvjpg@15380000 {
|
nvjpg@15380000 {
|
||||||
compatible = "nvidia,tegra234-nvjpg";
|
compatible = "nvidia,tegra234-nvjpg";
|
||||||
#if LINUX_VERSION > 515
|
|
||||||
reg = <0x15380000 0x00040000>;
|
reg = <0x15380000 0x00040000>;
|
||||||
#else
|
|
||||||
reg = <0x0 0x15380000 0x0 0x00040000>;
|
|
||||||
#endif
|
|
||||||
clocks = <&bpmp TEGRA234_CLK_NVJPG>;
|
clocks = <&bpmp TEGRA234_CLK_NVJPG>;
|
||||||
clock-names = "nvjpg";
|
clock-names = "nvjpg";
|
||||||
resets = <&bpmp TEGRA234_RESET_NVJPG>;
|
resets = <&bpmp TEGRA234_RESET_NVJPG>;
|
||||||
@@ -158,11 +144,7 @@
|
|||||||
|
|
||||||
nvdec@15480000 {
|
nvdec@15480000 {
|
||||||
compatible = "nvidia,tegra234-nvdec";
|
compatible = "nvidia,tegra234-nvdec";
|
||||||
#if LINUX_VERSION > 515
|
|
||||||
reg = <0x15480000 0x00040000>;
|
reg = <0x15480000 0x00040000>;
|
||||||
#else
|
|
||||||
reg = <0x0 0x15480000 0x0 0x00040000>;
|
|
||||||
#endif
|
|
||||||
clocks = <&bpmp TEGRA234_CLK_NVDEC>,
|
clocks = <&bpmp TEGRA234_CLK_NVDEC>,
|
||||||
<&bpmp TEGRA234_CLK_FUSE>,
|
<&bpmp TEGRA234_CLK_FUSE>,
|
||||||
<&bpmp TEGRA234_CLK_TSEC_PKA>;
|
<&bpmp TEGRA234_CLK_TSEC_PKA>;
|
||||||
@@ -181,11 +163,7 @@
|
|||||||
|
|
||||||
nvenc@154c0000 {
|
nvenc@154c0000 {
|
||||||
compatible = "nvidia,tegra234-nvenc";
|
compatible = "nvidia,tegra234-nvenc";
|
||||||
#if LINUX_VERSION > 515
|
|
||||||
reg = <0x154c0000 0x00040000>;
|
reg = <0x154c0000 0x00040000>;
|
||||||
#else
|
|
||||||
reg = <0x0 0x154c0000 0x0 0x00040000>;
|
|
||||||
#endif
|
|
||||||
clocks = <&bpmp TEGRA234_CLK_NVENC>;
|
clocks = <&bpmp TEGRA234_CLK_NVENC>;
|
||||||
clock-names = "nvenc";
|
clock-names = "nvenc";
|
||||||
resets = <&bpmp TEGRA234_RESET_NVENC>;
|
resets = <&bpmp TEGRA234_RESET_NVENC>;
|
||||||
@@ -201,11 +179,7 @@
|
|||||||
|
|
||||||
nvjpg@15540000 {
|
nvjpg@15540000 {
|
||||||
compatible = "nvidia,tegra234-nvjpg";
|
compatible = "nvidia,tegra234-nvjpg";
|
||||||
#if LINUX_VERSION > 515
|
|
||||||
reg = <0x15540000 0x00040000>;
|
reg = <0x15540000 0x00040000>;
|
||||||
#else
|
|
||||||
reg = <0x0 0x15540000 0x0 0x00040000>;
|
|
||||||
#endif
|
|
||||||
clocks = <&bpmp TEGRA234_CLK_NVJPG1>;
|
clocks = <&bpmp TEGRA234_CLK_NVJPG1>;
|
||||||
clock-names = "nvjpg";
|
clock-names = "nvjpg";
|
||||||
resets = <&bpmp TEGRA234_RESET_NVJPG1>;
|
resets = <&bpmp TEGRA234_RESET_NVJPG1>;
|
||||||
@@ -224,11 +198,7 @@
|
|||||||
nvdla0: nvdla0@15880000 {
|
nvdla0: nvdla0@15880000 {
|
||||||
compatible = "nvidia,tegra234-nvdla";
|
compatible = "nvidia,tegra234-nvdla";
|
||||||
power-domains = <&bpmp TEGRA234_POWER_DOMAIN_DLAA>;
|
power-domains = <&bpmp TEGRA234_POWER_DOMAIN_DLAA>;
|
||||||
#if LINUX_VERSION > 515
|
|
||||||
reg = <0x15880000 0x00040000>;
|
reg = <0x15880000 0x00040000>;
|
||||||
#else
|
|
||||||
reg = <0x0 0x15880000 0x0 0x00040000>;
|
|
||||||
#endif
|
|
||||||
interrupts = <GIC_SPI 236 IRQ_TYPE_LEVEL_HIGH>;
|
interrupts = <GIC_SPI 236 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
|
|
||||||
resets = <&bpmp TEGRA234_RESET_DLA0>;
|
resets = <&bpmp TEGRA234_RESET_DLA0>;
|
||||||
@@ -249,11 +219,7 @@
|
|||||||
nvdla1: nvdla1@158c0000 {
|
nvdla1: nvdla1@158c0000 {
|
||||||
compatible = "nvidia,tegra234-nvdla";
|
compatible = "nvidia,tegra234-nvdla";
|
||||||
power-domains = <&bpmp TEGRA234_POWER_DOMAIN_DLAB>;
|
power-domains = <&bpmp TEGRA234_POWER_DOMAIN_DLAB>;
|
||||||
#if LINUX_VERSION > 515
|
|
||||||
reg = <0x158c0000 0x00040000>;
|
reg = <0x158c0000 0x00040000>;
|
||||||
#else
|
|
||||||
reg = <0x0 0x158c0000 0x0 0x00040000>;
|
|
||||||
#endif
|
|
||||||
interrupts = <GIC_SPI 237 IRQ_TYPE_LEVEL_HIGH>;
|
interrupts = <GIC_SPI 237 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
|
|
||||||
resets = <&bpmp TEGRA234_RESET_DLA1>;
|
resets = <&bpmp TEGRA234_RESET_DLA1>;
|
||||||
@@ -273,11 +239,7 @@
|
|||||||
|
|
||||||
ofa@15a50000 {
|
ofa@15a50000 {
|
||||||
compatible = "nvidia,tegra234-ofa";
|
compatible = "nvidia,tegra234-ofa";
|
||||||
#if LINUX_VERSION > 515
|
|
||||||
reg = <0x15a50000 0x00040000>;
|
reg = <0x15a50000 0x00040000>;
|
||||||
#else
|
|
||||||
reg = <0x0 0x15a50000 0x0 0x00040000>;
|
|
||||||
#endif
|
|
||||||
clocks = <&bpmp TEGRA234_CLK_OFA>;
|
clocks = <&bpmp TEGRA234_CLK_OFA>;
|
||||||
clock-names = "ofa";
|
clock-names = "ofa";
|
||||||
resets = <&bpmp TEGRA234_RESET_OFA>;
|
resets = <&bpmp TEGRA234_RESET_OFA>;
|
||||||
@@ -294,13 +256,8 @@
|
|||||||
pva0: pva0@16000000 {
|
pva0: pva0@16000000 {
|
||||||
compatible = "nvidia,tegra234-pva";
|
compatible = "nvidia,tegra234-pva";
|
||||||
power-domains = <&bpmp TEGRA234_POWER_DOMAIN_PVA>;
|
power-domains = <&bpmp TEGRA234_POWER_DOMAIN_PVA>;
|
||||||
#if LINUX_VERSION > 515
|
|
||||||
reg = <0x16000000 0x800000>,
|
reg = <0x16000000 0x800000>,
|
||||||
<0x24700000 0x080000>;
|
<0x24700000 0x080000>;
|
||||||
#else
|
|
||||||
reg = <0x0 0x16000000 0x0 0x800000>,
|
|
||||||
<0x0 0x24700000 0x0 0x080000>;
|
|
||||||
#endif
|
|
||||||
interrupts = <0 234 0x04>,
|
interrupts = <0 234 0x04>,
|
||||||
<0 432 0x04>,
|
<0 432 0x04>,
|
||||||
<0 433 0x04>,
|
<0 433 0x04>,
|
||||||
@@ -382,25 +339,14 @@
|
|||||||
fragment@1 {
|
fragment@1 {
|
||||||
target-path = "/bus@0";
|
target-path = "/bus@0";
|
||||||
__overlay__ {
|
__overlay__ {
|
||||||
#if LINUX_VERSION > 515
|
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <1>;
|
#size-cells = <1>;
|
||||||
#else
|
|
||||||
#address-cells = <2>;
|
|
||||||
#size-cells = <2>;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
gpu@17000000 {
|
gpu@17000000 {
|
||||||
compatible = "nvidia,ga10b";
|
compatible = "nvidia,ga10b";
|
||||||
#if LINUX_VERSION > 515
|
|
||||||
reg = <0x17000000 0x01000000>,
|
reg = <0x17000000 0x01000000>,
|
||||||
<0x18000000 0x01000000>,
|
<0x18000000 0x01000000>,
|
||||||
<0x03b41000 0x00001000>;
|
<0x03b41000 0x00001000>;
|
||||||
#else
|
|
||||||
reg = <0x0 0x17000000 0x0 0x01000000>,
|
|
||||||
<0x0 0x18000000 0x0 0x01000000>,
|
|
||||||
<0x0 0x03b41000 0x0 0x00001000>;
|
|
||||||
#endif
|
|
||||||
interrupt-parent = <&gic>;
|
interrupt-parent = <&gic>;
|
||||||
interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>,
|
interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
<GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>,
|
<GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2022-2023, NVIDIA CORPORATION. All rights reserved.
|
* Copyright (c) 2022, NVIDIA CORPORATION. All rights reserved.
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify it
|
* This program is free software; you can redistribute it and/or modify it
|
||||||
* under the terms and conditions of the GNU General Public License,
|
* under the terms and conditions of the GNU General Public License,
|
||||||
@@ -32,11 +32,7 @@
|
|||||||
__overlay__ {
|
__overlay__ {
|
||||||
serial@31d0000 {
|
serial@31d0000 {
|
||||||
compatible = "arm,sbsa-uart";
|
compatible = "arm,sbsa-uart";
|
||||||
#if LINUX_VERSION > 515
|
|
||||||
reg = <0x31d0000 0x10000>;
|
reg = <0x31d0000 0x10000>;
|
||||||
#else
|
|
||||||
reg = <0x0 0x31d0000 0x0 0x10000>;
|
|
||||||
#endif
|
|
||||||
interrupts = <GIC_SPI 285 IRQ_TYPE_LEVEL_HIGH>;
|
interrupts = <GIC_SPI 285 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
current-speed = <115200>;
|
current-speed = <115200>;
|
||||||
status = "okay";
|
status = "okay";
|
||||||
|
|||||||
Reference in New Issue
Block a user