diff options
author | Marek Szyprowski <m.szyprowski@samsung.com> | 2016-12-29 06:34:07 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-12-31 13:36:31 -0500 |
commit | 9b41da80e09128574f09bed8dc5a5fc6f72a8239 (patch) | |
tree | 0f6ea99410c1626082c51f03e8b43adf87c53f09 | |
parent | afa99da863e8e00efd8ce2f8840ed31d50abb889 (diff) |
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: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | sound/soc/samsung/i2s.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index b2b9ee4a177a..2a5b92c672fb 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c | |||
@@ -1191,13 +1191,13 @@ static int i2s_register_clock_provider(struct platform_device *pdev) | |||
1191 | u32 val = readl(i2s->addr + I2SPSR); | 1191 | u32 val = readl(i2s->addr + I2SPSR); |
1192 | writel(val | PSR_PSREN, i2s->addr + I2SPSR); | 1192 | writel(val | PSR_PSREN, i2s->addr + I2SPSR); |
1193 | 1193 | ||
1194 | i2s->clk_table[CLK_I2S_RCLK_SRC] = clk_register_mux(NULL, | 1194 | i2s->clk_table[CLK_I2S_RCLK_SRC] = clk_register_mux(dev, |
1195 | "i2s_rclksrc", p_names, ARRAY_SIZE(p_names), | 1195 | "i2s_rclksrc", p_names, ARRAY_SIZE(p_names), |
1196 | CLK_SET_RATE_NO_REPARENT | CLK_SET_RATE_PARENT, | 1196 | CLK_SET_RATE_NO_REPARENT | CLK_SET_RATE_PARENT, |
1197 | i2s->addr + I2SMOD, reg_info->rclksrc_off, | 1197 | i2s->addr + I2SMOD, reg_info->rclksrc_off, |
1198 | 1, 0, i2s->lock); | 1198 | 1, 0, i2s->lock); |
1199 | 1199 | ||
1200 | i2s->clk_table[CLK_I2S_RCLK_PSR] = clk_register_divider(NULL, | 1200 | i2s->clk_table[CLK_I2S_RCLK_PSR] = clk_register_divider(dev, |
1201 | "i2s_presc", "i2s_rclksrc", | 1201 | "i2s_presc", "i2s_rclksrc", |
1202 | CLK_SET_RATE_PARENT, | 1202 | CLK_SET_RATE_PARENT, |
1203 | i2s->addr + I2SPSR, 8, 6, 0, i2s->lock); | 1203 | i2s->addr + I2SPSR, 8, 6, 0, i2s->lock); |
@@ -1208,7 +1208,7 @@ static int i2s_register_clock_provider(struct platform_device *pdev) | |||
1208 | of_property_read_string_index(dev->of_node, | 1208 | of_property_read_string_index(dev->of_node, |
1209 | "clock-output-names", 0, &clk_name[0]); | 1209 | "clock-output-names", 0, &clk_name[0]); |
1210 | 1210 | ||
1211 | i2s->clk_table[CLK_I2S_CDCLK] = clk_register_gate(NULL, clk_name[0], | 1211 | i2s->clk_table[CLK_I2S_CDCLK] = clk_register_gate(dev, clk_name[0], |
1212 | p_names[0], CLK_SET_RATE_PARENT, | 1212 | p_names[0], CLK_SET_RATE_PARENT, |
1213 | i2s->addr + I2SMOD, reg_info->cdclkcon_off, | 1213 | i2s->addr + I2SMOD, reg_info->cdclkcon_off, |
1214 | CLK_GATE_SET_TO_DISABLE, i2s->lock); | 1214 | CLK_GATE_SET_TO_DISABLE, i2s->lock); |