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 09:11:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

nv-public: p3737: Allow upstream AHUB drivers usage

Browse Source 
Upstream AHUB drivers have following variations when compared to
OOT versions:

  - Upstream AHUB drivers of I/O modules don't expose dummy DAIs.

    To use upstream AHUB drivers, legacy machine driver exposes
    dummy DAI and use the same here. There were objections from
    upstream maintainers to expose dummy DAIs from the I/O module
    drivers. Hence these are now exposed from the legacy machine
    driver.

  - DAI index of ADX input and output ports are different in
    upstream ADX driver.

    To use upstream ADX driver update the DAI index values.

  - Upstream SFC, OPE and MVC drivers use separate ports for
    input and output.

    To use upstream drivers, use correct DAI index of for these
    modules. Remove the TODO comment and cleanup the macro check.

  - ARAD, AFC and ADSP audio devices are yet to be upstreamed.

    Remove DAI links related to these modules to allow legacy
    machine driver to work with already upstreamed AHUB drivers.
    There is no plan to productize these modules with legacy
    machine driver and hence these can be removed. In future,
    these will be supported from graph card driver and the DT
    binding for it is going to be different anyways.

Bug 4451662
Bug 4432184
TAS-2251

Change-Id: I934a75c067e46433b41a484bdacaa5e2c66566cb
Signed-off-by: Sameer Pujar <spujar@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/t23x-public-dts/+/3059813
Reviewed-by: Mohan kumar <mkumard@nvidia.com>
Reviewed-by: Sheetal . <sheetal@nvidia.com>
Reviewed-by: Sharad Gupta <sharadg@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/tegra-public-dts/+/3171449
Tested-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
Sameer Pujar
2024-01-25 05:19:00 +00:00
committed by mobile promotions
parent f60e25fcf3
commit 550c2456a3
1 changed files with 12 additions and 36 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
// Copyright (c) 2019-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
// SPDX-FileCopyrightText: Copyright (c) 2019-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
#ifndef __DT_TEGRA_ASOC_DAIS_H
#define __DT_TEGRA_ASOC_DAIS_H
@@ -53,42 +53,17 @@
#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_TX 35
#define XBAR_SFC3_TX 37
#define XBAR_SFC4_TX 39
#define XBAR_MVC1_TX 41
#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_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_AMX1_IN1 44
#define XBAR_AMX1_IN2 45
#define XBAR_AMX1_IN3 46
@@ -158,6 +133,7 @@
#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
@@ -263,11 +239,11 @@
#define AMX_OUT 4
/* ADX */
#define ADX_OUT1 0
#define ADX_OUT2 1
#define ADX_OUT3 2
#define ADX_OUT4 3
#define ADX_IN 4
#define ADX_IN 0
#define ADX_OUT1 1
#define ADX_OUT2 2
#define ADX_OUT3 3
#define ADX_OUT4 4
/* ASRC */
#define ASRC_IN1 0