Commit b96e9eb6 authored Aug 01, 2018 by Jerome Brunet Committed by Thierry Reding Aug 20, 2018

pwm: meson: Fix mux clock names



Current clock name looks like this:
/soc/bus@ffd00000/pwm@1b000#mux0

This is bad because CCF uses the clock to create a directory in clk debugfs.
With such name, the directory creation (silently) fails and the debugfs
entry end up being created at the debugfs root.

With this change, the clock name will now be:
ffd1b000.pwm#mux0

This matches the clock naming scheme used in the ethernet and mmc driver.
It also fixes the problem with debugfs.

Fixes: 36af66a7 ("pwm: Convert to using %pOF instead of full_name")
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Acked-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>

parent 2c2059c0

drivers/pwm/pwm-meson.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -458,7 +458,6 @@ static int meson_pwm_init_channels(struct meson_pwm *meson,
		struct meson_pwm_channel *channels)
		{
		struct device *dev = meson->chip.dev;
		struct device_node *np = dev->of_node;
		struct clk_init_data init;
		unsigned int i;
		char name[255];
		@@ -467,7 +466,7 @@ static int meson_pwm_init_channels(struct meson_pwm *meson,
		for (i = 0; i < meson->chip.npwm; i++) {
		struct meson_pwm_channel *channel = &channels[i];

		snprintf(name, sizeof(name), "%pOF#mux%u", np, i);
		snprintf(name, sizeof(name), "%s#mux%u", dev_name(dev), i);

		init.name = name;
		init.ops = &clk_mux_ops;

Admin message