diff options
| author | Joel Stanley <joel@jms.id.au> | 2022-03-08 10:48:37 +0300 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2022-03-08 10:48:40 +0300 |
| commit | c4c3fba61580d267568c5c9cf10c928a41ba38a4 (patch) | |
| tree | 96e9f51838e6b792a9d099c7580faeb51eb7d5bd /drivers/clk | |
| parent | de0980ea2d5360bd1d7472e62231a03c108f20c2 (diff) | |
| parent | 8993e6067f263765fd26edabf3e3012e3ec4d81e (diff) | |
| download | linux-c4c3fba61580d267568c5c9cf10c928a41ba38a4.tar.xz | |
Merge tag 'v5.15.26' into dev-5.15
This is the 5.15.26 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/ingenic/jz4725b-cgu.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/clk/ingenic/jz4725b-cgu.c b/drivers/clk/ingenic/jz4725b-cgu.c index 5154b0cf8ad6..66ff141da0a4 100644 --- a/drivers/clk/ingenic/jz4725b-cgu.c +++ b/drivers/clk/ingenic/jz4725b-cgu.c @@ -139,11 +139,10 @@ static const struct ingenic_cgu_clk_info jz4725b_cgu_clocks[] = { }, [JZ4725B_CLK_I2S] = { - "i2s", CGU_CLK_MUX | CGU_CLK_DIV | CGU_CLK_GATE, + "i2s", CGU_CLK_MUX | CGU_CLK_DIV, .parents = { JZ4725B_CLK_EXT, JZ4725B_CLK_PLL_HALF, -1, -1 }, .mux = { CGU_REG_CPCCR, 31, 1 }, .div = { CGU_REG_I2SCDR, 0, 1, 9, -1, -1, -1 }, - .gate = { CGU_REG_CLKGR, 6 }, }, [JZ4725B_CLK_SPI] = { |