From 4a81700996ec0288a2f5cd624b8aa5b7621f992e Mon Sep 17 00:00:00 2001 From: Sugar Zhang Date: Mon, 8 Mar 2021 17:02:59 +0800 Subject: [PATCH] Revert "ASoC: rockchip: i2s-tdm: Add mclk oe for rk3568" This reverts commit 01a9a1b00a1956726678148b87ac1f06d9630736. 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 --- sound/soc/rockchip/rockchip_i2s_tdm.c | 3 --- sound/soc/rockchip/rockchip_i2s_tdm.h | 9 --------- 2 files changed, 12 deletions(-) diff --git a/sound/soc/rockchip/rockchip_i2s_tdm.c b/sound/soc/rockchip/rockchip_i2s_tdm.c index 910c3fc78d2b..d2c0202a43bb 100644 --- a/sound/soc/rockchip/rockchip_i2s_tdm.c +++ b/sound/soc/rockchip/rockchip_i2s_tdm.c @@ -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[] = { diff --git a/sound/soc/rockchip/rockchip_i2s_tdm.h b/sound/soc/rockchip/rockchip_i2s_tdm.h index ef0ebb0e0098..be8fb93e8b34 100644 --- a/sound/soc/rockchip/rockchip_i2s_tdm.h +++ b/sound/soc/rockchip/rockchip_i2s_tdm.h @@ -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)