nv-tegra-mirror/tegra-public-dts
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/device/hardware/nvidia/tegra-public-dts.git synced 2025-12-22 17:28:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert "nv-public: p3737: Allow upstream AHUB drivers usage"

Browse Source 
This reverts commit 69c14e5a515230ff4a95901bb029a5f5fc0b04c4.
This is done to unblock gvs intermittency of audio test and
kernel warning test failure.

Bug 4508166

Change-Id: Ia0af6a00e9e9ef6c2ec6b20fbf7672ac4db59dec
Signed-off-by: Sameer Pujar <spujar@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/t23x-public-dts/+/3082640
Reviewed-by: Shubham Chandra <shubhamc@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
Tested-by: Shubham Chandra <shubhamc@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/tegra-public-dts/+/3171450
GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
Tested-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
This commit is contained in:
Sameer Pujar
2024-02-23 11:04:23 +00:00
committed by mobile promotions
parent 550c2456a3
commit f7eccd45e4
1 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
include/nvidia-oot/dt-bindings/sound/tegra-asoc-dais.h
View File

@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
// SPDX-FileCopyrightText: Copyright (c) 2019-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
// Copyright (c) 2019-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
#ifndef __DT_TEGRA_ASOC_DAIS_H
#define __DT_TEGRA_ASOC_DAIS_H
@@ -53,17 +53,42 @@
#define XBAR_DSPK1 30
#define XBAR_DSPK2 31
#define XBAR_SFC1_RX 32
/*
* TODO As per downstream kernel code there will be routing issue
* if DAI names are updated for SFC, MVC and OPE input and
* output. Due to that using single DAI with same name as downstream
* kernel for input and output and added output DAIs just to keep
* similar to upstream kernel, so that it will be easy to upstream
* later.
*
* Once the routing changes are done for above mentioned modules,
* use the commented output dai index and define output dai
* links in tegra186-audio-graph.dtsi
*/
#if 0
#define XBAR_SFC1_TX 33
#define XBAR_SFC2_RX 34
#define XBAR_SFC2_TX 35
#define XBAR_SFC3_RX 36
#define XBAR_SFC3_TX 37
#define XBAR_SFC4_RX 38
#define XBAR_SFC4_TX 39
#define XBAR_MVC1_RX 40
#define XBAR_MVC1_TX 41
#define XBAR_MVC2_RX 42
#define XBAR_MVC2_TX 43
#define XBAR_OPE1_TX 113
#else
#define XBAR_SFC1_TX XBAR_SFC1_RX
#define XBAR_SFC2_TX XBAR_SFC2_RX
#define XBAR_SFC3_TX XBAR_SFC3_RX
#define XBAR_SFC4_TX XBAR_SFC4_RX
#define XBAR_MVC1_TX XBAR_MVC1_RX
#define XBAR_MVC2_TX XBAR_MVC2_RX
#define XBAR_OPE1_TX XBAR_OPE1_RX
#endif
#define XBAR_SFC2_RX 34
#define XBAR_SFC3_RX 36
#define XBAR_SFC4_RX 38
#define XBAR_MVC1_RX 40
#define XBAR_MVC2_RX 42
#define XBAR_AMX1_IN1 44
#define XBAR_AMX1_IN2 45
#define XBAR_AMX1_IN3 46
@@ -133,7 +158,6 @@
#define XBAR_ASRC_OUT6 110
#define XBAR_ASRC_IN7 111
#define XBAR_OPE1_RX 112
#define XBAR_OPE1_TX 113
#define XBAR_AFC1 114
#define XBAR_AFC2 115
#define XBAR_AFC3 116
@@ -239,11 +263,11 @@
#define AMX_OUT 4
/* ADX */
#define ADX_IN 0
#define ADX_OUT1 1
#define ADX_OUT2 2
#define ADX_OUT3 3
#define ADX_OUT4 4
#define ADX_OUT1 0
#define ADX_OUT2 1
#define ADX_OUT3 2
#define ADX_OUT4 3
#define ADX_IN 4
/* ASRC */
#define ASRC_IN1 0