shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 03:15:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ASoC: rockchip: i2s-tdm: Add mclk oe for rk3568"

Browse Source 
This reverts commit 01a9a1b00a.

Instead, clk framework will handle this with the patchs:

[1] 27e692bdf18a (clk: rockchip: rk3568: Allow config i2s mclk as out/in)
[2] 5505f2112d69 (arm64: dts: rockchip: rk356x: Change to use I2Sx_MCLKOUT)

Change-Id: I0278a633bc3806c93d9ad2e6361ac9129798ec8d
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
This commit is contained in:
Sugar Zhang
2021-03-08 17:02:59 +08:00
committed by Tao Huang
parent d32dcf7014
commit 4a81700996
2 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sound/soc/rockchip/rockchip_i2s_tdm.c
View File

@@ -1356,11 +1356,8 @@ static const struct txrx_config rk3308_txrx_config[] = {
static const struct txrx_config rk3568_txrx_config[] = {
{ 0xfe410000, 0x504, RK3568_I2S1_CLK_TXONLY, RK3568_I2S1_CLK_RXONLY },
{ 0xfe410000, 0x508, RK3568_I2S1_MCLK_TX_OE, RK3568_I2S1_MCLK_RX_OE },
{ 0xfe420000, 0x508, RK3568_I2S2_MCLK_OE, RK3568_I2S2_MCLK_OE },
{ 0xfe430000, 0x504, RK3568_I2S3_CLK_TXONLY, RK3568_I2S3_CLK_RXONLY },
{ 0xfe430000, 0x508, RK3568_I2S3_MCLK_TXONLY, RK3568_I2S3_MCLK_RXONLY },
{ 0xfe430000, 0x508, RK3568_I2S3_MCLK_OE, RK3568_I2S3_MCLK_OE },
};
static const struct txrx_config rv1126_txrx_config[] = {

9
sound/soc/rockchip/rockchip_i2s_tdm.h
View File

@@ -380,15 +380,6 @@ enum {
(RK3568_I2S3_SCLK_SRC_FROM_RX | \
RK3568_I2S3_LRCK_SRC_FROM_RX)
#define RK3568_I2S3_MCLK_IE HIWORD_UPDATE(0, 3, 3)
#define RK3568_I2S3_MCLK_OE HIWORD_UPDATE(1, 3, 3)
#define RK3568_I2S2_MCLK_IE HIWORD_UPDATE(0, 2, 2)
#define RK3568_I2S2_MCLK_OE HIWORD_UPDATE(1, 2, 2)
#define RK3568_I2S1_MCLK_TX_IE HIWORD_UPDATE(0, 1, 1)
#define RK3568_I2S1_MCLK_TX_OE HIWORD_UPDATE(1, 1, 1)
#define RK3568_I2S1_MCLK_RX_IE HIWORD_UPDATE(0, 0, 0)
#define RK3568_I2S1_MCLK_RX_OE HIWORD_UPDATE(1, 0, 0)
/* RV1126 GRF CONFIGS*/
#define RV1126_I2S0_MCLK_OUT_SRC_FROM_TX HIWORD_UPDATE(0, 9, 9)
#define RV1126_I2S0_MCLK_OUT_SRC_FROM_RX HIWORD_UPDATE(1, 9, 9)