Commit bcc7fd20 authored May 01, 2013 by Axel Lin Committed by Mike Turquette May 28, 2013

clk: wm831x: Fix wm831x_clkout_get_parent



Current code looks strange because calling wm831x_clkout_set_parent() with 0 as
parent parameter, wm831x_clkout_get_parent() will return 1.

According to the datasheet:
R16528 (4090h) Clock Control1
        BIT 0: CLKOUT output source select
                0 = FLL output
                1 = 32.768kHz oscillator

Thus fix the entry order in wm831x_clkout_parents[] to make it has
the same meaning as the datasheet and make the return value
of wm831x_clkout_get_parent() consistent with the parent pass to
wm831x_clkout_set_parent().

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Mike Turquette <mturquette@linaro.org>

parent 6f8b3145

drivers/clk/clk-wm831x.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -299,8 +299,8 @@ static void wm831x_clkout_unprepare(struct clk_hw *hw)
		}

		static const char *wm831x_clkout_parents[] = {
		"xtal",
		"fll",
		"xtal",
		};

		static u8 wm831x_clkout_get_parent(struct clk_hw *hw)
		@@ -318,9 +318,9 @@ static u8 wm831x_clkout_get_parent(struct clk_hw *hw)
		}

		if (ret & WM831X_CLKOUT_SRC)
		return 0;
		else
		return 1;
		else
		return 0;
		}

		static int wm831x_clkout_set_parent(struct clk_hw *hw, u8 parent)