Skip to content

Commit

Permalink
clk: meson: axg-audio: don't register inputs in the onecell data
Browse files Browse the repository at this point in the history 
Clock inputs should not be exported outside the controller. It is a hack
to have a stable global clock name within the clock controller, even for
clocks external to the controller.

There is an ongoing effort to replace this hack with something better.
The first step is to not register those clocks in the provider anymore,
so we can completely remove them later on.

Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Link: https://lkml.kernel.org/r/20190329160649.31603-4-jbrunet@baylibre.com
  • Loading branch information
Jerome Brunet authored and Neil Armstrong committed Apr 8, 2019
1 parent b18819c commit 6d6d2a2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 44 deletions.
21 changes: 6 additions & 15 deletions drivers/clk/meson/axg-audio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -665,8 +665,7 @@ static int devm_clk_get_enable(struct device *dev, char *id)
}

static int axg_register_clk_hw_input(struct device *dev,
const char *name,
unsigned int clkid)
const char *name)
{
char *clk_name;
struct clk_hw *hw;
Expand All @@ -686,8 +685,6 @@ static int axg_register_clk_hw_input(struct device *dev,
if (err != -EPROBE_DEFER)
dev_err(dev, "failed to get %s clock", name);
}
} else {
axg_audio_hw_onecell_data.hws[clkid] = hw;
}

kfree(clk_name);
Expand All @@ -696,8 +693,7 @@ static int axg_register_clk_hw_input(struct device *dev,

static int axg_register_clk_hw_inputs(struct device *dev,
const char *basename,
unsigned int count,
unsigned int clkid)
unsigned int count)
{
char *name;
int i, ret;
Expand All @@ -707,7 +703,7 @@ static int axg_register_clk_hw_inputs(struct device *dev,
if (!name)
return -ENOMEM;

ret = axg_register_clk_hw_input(dev, name, clkid + i);
ret = axg_register_clk_hw_input(dev, name);
kfree(name);
if (ret)
return ret;
Expand Down Expand Up @@ -759,26 +755,21 @@ static int axg_audio_clkc_probe(struct platform_device *pdev)
if (IS_ERR(hw))
return PTR_ERR(hw);

axg_audio_hw_onecell_data.hws[AUD_CLKID_PCLK] = hw;

/* Register optional input master clocks */
ret = axg_register_clk_hw_inputs(dev, "mst_in",
AUD_MST_IN_COUNT,
AUD_CLKID_MST0);
AUD_MST_IN_COUNT);
if (ret)
return ret;

/* Register optional input slave sclks */
ret = axg_register_clk_hw_inputs(dev, "slv_sclk",
AUD_SLV_SCLK_COUNT,
AUD_CLKID_SLV_SCLK0);
AUD_SLV_SCLK_COUNT);
if (ret)
return ret;

/* Register optional input slave lrclks */
ret = axg_register_clk_hw_inputs(dev, "slv_lrclk",
AUD_SLV_LRCLK_COUNT,
AUD_CLKID_SLV_LRCLK0);
AUD_SLV_LRCLK_COUNT);
if (ret)
return ret;

Expand Down
29 changes: 0 additions & 29 deletions drivers/clk/meson/axg-audio.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,35 +51,6 @@
* These indices are entirely contrived and do not map onto the hardware.
*/

#define AUD_CLKID_PCLK 0
#define AUD_CLKID_MST0 1
#define AUD_CLKID_MST1 2
#define AUD_CLKID_MST2 3
#define AUD_CLKID_MST3 4
#define AUD_CLKID_MST4 5
#define AUD_CLKID_MST5 6
#define AUD_CLKID_MST6 7
#define AUD_CLKID_MST7 8
#define AUD_CLKID_SLV_SCLK0 9
#define AUD_CLKID_SLV_SCLK1 10
#define AUD_CLKID_SLV_SCLK2 11
#define AUD_CLKID_SLV_SCLK3 12
#define AUD_CLKID_SLV_SCLK4 13
#define AUD_CLKID_SLV_SCLK5 14
#define AUD_CLKID_SLV_SCLK6 15
#define AUD_CLKID_SLV_SCLK7 16
#define AUD_CLKID_SLV_SCLK8 17
#define AUD_CLKID_SLV_SCLK9 18
#define AUD_CLKID_SLV_LRCLK0 19
#define AUD_CLKID_SLV_LRCLK1 20
#define AUD_CLKID_SLV_LRCLK2 21
#define AUD_CLKID_SLV_LRCLK3 22
#define AUD_CLKID_SLV_LRCLK4 23
#define AUD_CLKID_SLV_LRCLK5 24
#define AUD_CLKID_SLV_LRCLK6 25
#define AUD_CLKID_SLV_LRCLK7 26
#define AUD_CLKID_SLV_LRCLK8 27
#define AUD_CLKID_SLV_LRCLK9 28
#define AUD_CLKID_MST_A_MCLK_SEL 59
#define AUD_CLKID_MST_B_MCLK_SEL 60
#define AUD_CLKID_MST_C_MCLK_SEL 61
Expand Down

0 comments on commit 6d6d2a2

Please sign in to comment.