mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 07:04:24 +00:00
ASoC: tegra: tegra20_das: Fold header file into only user
Since commit fcff5f9974 ("ASoC: tegra: remove unnecessary includes")
the header file (which at the time was named tegra_das.h) there is only
the actual driver that includes it. Just move the definitions into the
driver, drop the exports and remove the completely unused function.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20220629194224.175607-1-u.kleine-koenig@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Uwe Kleine-König
Mark Brown
parent
0ff9f8b9f5
commit
6dbc34d9c3
2 changed files with 83 additions and 147 deletions
|
|
@ -13,10 +13,90 @@
|
|||
#include <linux/regmap.h>
|
||||
#include <linux/slab.h>
|
||||
#include <sound/soc.h>
|
||||
#include "tegra20_das.h"
|
||||
|
||||
#define DRV_NAME "tegra20-das"
|
||||
|
||||
/* Register TEGRA20_DAS_DAP_CTRL_SEL */
|
||||
#define TEGRA20_DAS_DAP_CTRL_SEL 0x00
|
||||
#define TEGRA20_DAS_DAP_CTRL_SEL_COUNT 5
|
||||
#define TEGRA20_DAS_DAP_CTRL_SEL_STRIDE 4
|
||||
#define TEGRA20_DAS_DAP_CTRL_SEL_DAP_MS_SEL_P 31
|
||||
#define TEGRA20_DAS_DAP_CTRL_SEL_DAP_MS_SEL_S 1
|
||||
#define TEGRA20_DAS_DAP_CTRL_SEL_DAP_SDATA1_TX_RX_P 30
|
||||
#define TEGRA20_DAS_DAP_CTRL_SEL_DAP_SDATA1_TX_RX_S 1
|
||||
#define TEGRA20_DAS_DAP_CTRL_SEL_DAP_SDATA2_TX_RX_P 29
|
||||
#define TEGRA20_DAS_DAP_CTRL_SEL_DAP_SDATA2_TX_RX_S 1
|
||||
#define TEGRA20_DAS_DAP_CTRL_SEL_DAP_CTRL_SEL_P 0
|
||||
#define TEGRA20_DAS_DAP_CTRL_SEL_DAP_CTRL_SEL_S 5
|
||||
|
||||
/* Values for field TEGRA20_DAS_DAP_CTRL_SEL_DAP_CTRL_SEL */
|
||||
#define TEGRA20_DAS_DAP_SEL_DAC1 0
|
||||
#define TEGRA20_DAS_DAP_SEL_DAC2 1
|
||||
#define TEGRA20_DAS_DAP_SEL_DAC3 2
|
||||
#define TEGRA20_DAS_DAP_SEL_DAP1 16
|
||||
#define TEGRA20_DAS_DAP_SEL_DAP2 17
|
||||
#define TEGRA20_DAS_DAP_SEL_DAP3 18
|
||||
#define TEGRA20_DAS_DAP_SEL_DAP4 19
|
||||
#define TEGRA20_DAS_DAP_SEL_DAP5 20
|
||||
|
||||
/* Register TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL */
|
||||
#define TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL 0x40
|
||||
#define TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL_COUNT 3
|
||||
#define TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL_STRIDE 4
|
||||
#define TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL_DAC_SDATA2_SEL_P 28
|
||||
#define TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL_DAC_SDATA2_SEL_S 4
|
||||
#define TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL_DAC_SDATA1_SEL_P 24
|
||||
#define TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL_DAC_SDATA1_SEL_S 4
|
||||
#define TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL_DAC_CLK_SEL_P 0
|
||||
#define TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL_DAC_CLK_SEL_S 4
|
||||
|
||||
/*
|
||||
* Values for:
|
||||
* TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL_DAC_SDATA2_SEL
|
||||
* TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL_DAC_SDATA1_SEL
|
||||
* TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL_DAC_CLK_SEL
|
||||
*/
|
||||
#define TEGRA20_DAS_DAC_SEL_DAP1 0
|
||||
#define TEGRA20_DAS_DAC_SEL_DAP2 1
|
||||
#define TEGRA20_DAS_DAC_SEL_DAP3 2
|
||||
#define TEGRA20_DAS_DAC_SEL_DAP4 3
|
||||
#define TEGRA20_DAS_DAC_SEL_DAP5 4
|
||||
|
||||
/*
|
||||
* Names/IDs of the DACs/DAPs.
|
||||
*/
|
||||
|
||||
#define TEGRA20_DAS_DAP_ID_1 0
|
||||
#define TEGRA20_DAS_DAP_ID_2 1
|
||||
#define TEGRA20_DAS_DAP_ID_3 2
|
||||
#define TEGRA20_DAS_DAP_ID_4 3
|
||||
#define TEGRA20_DAS_DAP_ID_5 4
|
||||
|
||||
#define TEGRA20_DAS_DAC_ID_1 0
|
||||
#define TEGRA20_DAS_DAC_ID_2 1
|
||||
#define TEGRA20_DAS_DAC_ID_3 2
|
||||
|
||||
struct tegra20_das {
|
||||
struct device *dev;
|
||||
struct regmap *regmap;
|
||||
};
|
||||
|
||||
/*
|
||||
* Terminology:
|
||||
* DAS: Digital audio switch (HW module controlled by this driver)
|
||||
* DAP: Digital audio port (port/pins on Tegra device)
|
||||
* DAC: Digital audio controller (e.g. I2S or AC97 controller elsewhere)
|
||||
*
|
||||
* The Tegra DAS is a mux/cross-bar which can connect each DAP to a specific
|
||||
* DAC, or another DAP. When DAPs are connected, one must be the master and
|
||||
* one the slave. Each DAC allows selection of a specific DAP for input, to
|
||||
* cater for the case where N DAPs are connected to 1 DAC for broadcast
|
||||
* output.
|
||||
*
|
||||
* This driver is dumb; no attempt is made to ensure that a valid routing
|
||||
* configuration is programmed.
|
||||
*/
|
||||
|
||||
static struct tegra20_das *das;
|
||||
|
||||
static inline void tegra20_das_write(u32 reg, u32 val)
|
||||
|
|
@ -32,7 +112,7 @@ static inline u32 tegra20_das_read(u32 reg)
|
|||
return val;
|
||||
}
|
||||
|
||||
int tegra20_das_connect_dap_to_dac(int dap, int dac)
|
||||
static int tegra20_das_connect_dap_to_dac(int dap, int dac)
|
||||
{
|
||||
u32 addr;
|
||||
u32 reg;
|
||||
|
|
@ -48,31 +128,8 @@ int tegra20_das_connect_dap_to_dac(int dap, int dac)
|
|||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(tegra20_das_connect_dap_to_dac);
|
||||
|
||||
int tegra20_das_connect_dap_to_dap(int dap, int otherdap, int master,
|
||||
int sdata1rx, int sdata2rx)
|
||||
{
|
||||
u32 addr;
|
||||
u32 reg;
|
||||
|
||||
if (!das)
|
||||
return -ENODEV;
|
||||
|
||||
addr = TEGRA20_DAS_DAP_CTRL_SEL +
|
||||
(dap * TEGRA20_DAS_DAP_CTRL_SEL_STRIDE);
|
||||
reg = (otherdap << TEGRA20_DAS_DAP_CTRL_SEL_DAP_CTRL_SEL_P) |
|
||||
(!!sdata2rx << TEGRA20_DAS_DAP_CTRL_SEL_DAP_SDATA2_TX_RX_P) |
|
||||
(!!sdata1rx << TEGRA20_DAS_DAP_CTRL_SEL_DAP_SDATA1_TX_RX_P) |
|
||||
(!!master << TEGRA20_DAS_DAP_CTRL_SEL_DAP_MS_SEL_P);
|
||||
|
||||
tegra20_das_write(addr, reg);
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(tegra20_das_connect_dap_to_dap);
|
||||
|
||||
int tegra20_das_connect_dac_to_dap(int dac, int dap)
|
||||
static int tegra20_das_connect_dac_to_dap(int dac, int dap)
|
||||
{
|
||||
u32 addr;
|
||||
u32 reg;
|
||||
|
|
@ -90,7 +147,6 @@ int tegra20_das_connect_dac_to_dap(int dac, int dap)
|
|||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(tegra20_das_connect_dac_to_dap);
|
||||
|
||||
#define LAST_REG(name) \
|
||||
(TEGRA20_DAS_##name + \
|
||||
|
|
|
|||
|
|
@ -1,120 +0,0 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||
/*
|
||||
* tegra20_das.h - Definitions for Tegra20 DAS driver
|
||||
*
|
||||
* Author: Stephen Warren <swarren@nvidia.com>
|
||||
* Copyright (C) 2010,2012 - NVIDIA, Inc.
|
||||
*/
|
||||
|
||||
#ifndef __TEGRA20_DAS_H__
|
||||
#define __TEGRA20_DAS_H__
|
||||
|
||||
/* Register TEGRA20_DAS_DAP_CTRL_SEL */
|
||||
#define TEGRA20_DAS_DAP_CTRL_SEL 0x00
|
||||
#define TEGRA20_DAS_DAP_CTRL_SEL_COUNT 5
|
||||
#define TEGRA20_DAS_DAP_CTRL_SEL_STRIDE 4
|
||||
#define TEGRA20_DAS_DAP_CTRL_SEL_DAP_MS_SEL_P 31
|
||||
#define TEGRA20_DAS_DAP_CTRL_SEL_DAP_MS_SEL_S 1
|
||||
#define TEGRA20_DAS_DAP_CTRL_SEL_DAP_SDATA1_TX_RX_P 30
|
||||
#define TEGRA20_DAS_DAP_CTRL_SEL_DAP_SDATA1_TX_RX_S 1
|
||||
#define TEGRA20_DAS_DAP_CTRL_SEL_DAP_SDATA2_TX_RX_P 29
|
||||
#define TEGRA20_DAS_DAP_CTRL_SEL_DAP_SDATA2_TX_RX_S 1
|
||||
#define TEGRA20_DAS_DAP_CTRL_SEL_DAP_CTRL_SEL_P 0
|
||||
#define TEGRA20_DAS_DAP_CTRL_SEL_DAP_CTRL_SEL_S 5
|
||||
|
||||
/* Values for field TEGRA20_DAS_DAP_CTRL_SEL_DAP_CTRL_SEL */
|
||||
#define TEGRA20_DAS_DAP_SEL_DAC1 0
|
||||
#define TEGRA20_DAS_DAP_SEL_DAC2 1
|
||||
#define TEGRA20_DAS_DAP_SEL_DAC3 2
|
||||
#define TEGRA20_DAS_DAP_SEL_DAP1 16
|
||||
#define TEGRA20_DAS_DAP_SEL_DAP2 17
|
||||
#define TEGRA20_DAS_DAP_SEL_DAP3 18
|
||||
#define TEGRA20_DAS_DAP_SEL_DAP4 19
|
||||
#define TEGRA20_DAS_DAP_SEL_DAP5 20
|
||||
|
||||
/* Register TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL */
|
||||
#define TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL 0x40
|
||||
#define TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL_COUNT 3
|
||||
#define TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL_STRIDE 4
|
||||
#define TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL_DAC_SDATA2_SEL_P 28
|
||||
#define TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL_DAC_SDATA2_SEL_S 4
|
||||
#define TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL_DAC_SDATA1_SEL_P 24
|
||||
#define TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL_DAC_SDATA1_SEL_S 4
|
||||
#define TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL_DAC_CLK_SEL_P 0
|
||||
#define TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL_DAC_CLK_SEL_S 4
|
||||
|
||||
/*
|
||||
* Values for:
|
||||
* TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL_DAC_SDATA2_SEL
|
||||
* TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL_DAC_SDATA1_SEL
|
||||
* TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL_DAC_CLK_SEL
|
||||
*/
|
||||
#define TEGRA20_DAS_DAC_SEL_DAP1 0
|
||||
#define TEGRA20_DAS_DAC_SEL_DAP2 1
|
||||
#define TEGRA20_DAS_DAC_SEL_DAP3 2
|
||||
#define TEGRA20_DAS_DAC_SEL_DAP4 3
|
||||
#define TEGRA20_DAS_DAC_SEL_DAP5 4
|
||||
|
||||
/*
|
||||
* Names/IDs of the DACs/DAPs.
|
||||
*/
|
||||
|
||||
#define TEGRA20_DAS_DAP_ID_1 0
|
||||
#define TEGRA20_DAS_DAP_ID_2 1
|
||||
#define TEGRA20_DAS_DAP_ID_3 2
|
||||
#define TEGRA20_DAS_DAP_ID_4 3
|
||||
#define TEGRA20_DAS_DAP_ID_5 4
|
||||
|
||||
#define TEGRA20_DAS_DAC_ID_1 0
|
||||
#define TEGRA20_DAS_DAC_ID_2 1
|
||||
#define TEGRA20_DAS_DAC_ID_3 2
|
||||
|
||||
struct tegra20_das {
|
||||
struct device *dev;
|
||||
struct regmap *regmap;
|
||||
};
|
||||
|
||||
/*
|
||||
* Terminology:
|
||||
* DAS: Digital audio switch (HW module controlled by this driver)
|
||||
* DAP: Digital audio port (port/pins on Tegra device)
|
||||
* DAC: Digital audio controller (e.g. I2S or AC97 controller elsewhere)
|
||||
*
|
||||
* The Tegra DAS is a mux/cross-bar which can connect each DAP to a specific
|
||||
* DAC, or another DAP. When DAPs are connected, one must be the master and
|
||||
* one the slave. Each DAC allows selection of a specific DAP for input, to
|
||||
* cater for the case where N DAPs are connected to 1 DAC for broadcast
|
||||
* output.
|
||||
*
|
||||
* This driver is dumb; no attempt is made to ensure that a valid routing
|
||||
* configuration is programmed.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Connect a DAP to a DAC
|
||||
* dap_id: DAP to connect: TEGRA20_DAS_DAP_ID_*
|
||||
* dac_sel: DAC to connect to: TEGRA20_DAS_DAP_SEL_DAC*
|
||||
*/
|
||||
extern int tegra20_das_connect_dap_to_dac(int dap, int dac);
|
||||
|
||||
/*
|
||||
* Connect a DAP to another DAP
|
||||
* dap_id: DAP to connect: TEGRA20_DAS_DAP_ID_*
|
||||
* other_dap_sel: DAP to connect to: TEGRA20_DAS_DAP_SEL_DAP*
|
||||
* master: Is this DAP the master (1) or slave (0)
|
||||
* sdata1rx: Is this DAP's SDATA1 pin RX (1) or TX (0)
|
||||
* sdata2rx: Is this DAP's SDATA2 pin RX (1) or TX (0)
|
||||
*/
|
||||
extern int tegra20_das_connect_dap_to_dap(int dap, int otherdap,
|
||||
int master, int sdata1rx,
|
||||
int sdata2rx);
|
||||
|
||||
/*
|
||||
* Connect a DAC's input to a DAP
|
||||
* (DAC outputs are selected by the DAP)
|
||||
* dac_id: DAC ID to connect: TEGRA20_DAS_DAC_ID_*
|
||||
* dap_sel: DAP to receive input from: TEGRA20_DAS_DAC_SEL_DAP*
|
||||
*/
|
||||
extern int tegra20_das_connect_dac_to_dap(int dac, int dap);
|
||||
|
||||
#endif
|
||||
Loading…
Reference in a new issue