Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b41da80 authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Mark Brown
Browse files

ASoC: samsung: i2s: Provide I2S device for registered clocks 



This patch adds pointer to I2S device to clk_register_* functions.
This in the future allow clock framework to ensure proper runtime state
of the I2S device during all operations on the clocks provided by I2S
module.

Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent afa99da8

sound/soc/samsung/i2s.c

+3 −3
Original line number Diff line number Diff line
@@ -1191,13 +1191,13 @@ static int i2s_register_clock_provider(struct platform_device *pdev) 
		u32 val = readl(i2s->addr + I2SPSR);

		writel(val | PSR_PSREN, i2s->addr + I2SPSR);



		i2s->clk_table[CLK_I2S_RCLK_SRC] = clk_register_mux(NULL,

		i2s->clk_table[CLK_I2S_RCLK_SRC] = clk_register_mux(dev,

				"i2s_rclksrc", p_names, ARRAY_SIZE(p_names),

				CLK_SET_RATE_NO_REPARENT | CLK_SET_RATE_PARENT,

				i2s->addr + I2SMOD, reg_info->rclksrc_off,

				1, 0, i2s->lock);



		i2s->clk_table[CLK_I2S_RCLK_PSR] = clk_register_divider(NULL,

		i2s->clk_table[CLK_I2S_RCLK_PSR] = clk_register_divider(dev,

				"i2s_presc", "i2s_rclksrc",

				CLK_SET_RATE_PARENT,

				i2s->addr + I2SPSR, 8, 6, 0, i2s->lock);
@@ -1208,7 +1208,7 @@ static int i2s_register_clock_provider(struct platform_device *pdev) 
	of_property_read_string_index(dev->of_node,

				"clock-output-names", 0, &clk_name[0]);



	i2s->clk_table[CLK_I2S_CDCLK] = clk_register_gate(NULL, clk_name[0],

	i2s->clk_table[CLK_I2S_CDCLK] = clk_register_gate(dev, clk_name[0],

				p_names[0], CLK_SET_RATE_PARENT,

				i2s->addr + I2SMOD, reg_info->cdclkcon_off,

				CLK_GATE_SET_TO_DISABLE, i2s->lock);