Commit 0d51d0db authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge tag 'samsung-clk-6.2' of... 

Merge tag 'samsung-clk-6.2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into clk-fixes

Pull Samsung SoC clk driver fixes from Krzysztof Kozlowski:

 - Fix calling of_device_get_match_data() on wrong device (parent's) in
   Exynos clock out driver
 - Correct clock name in bindings of ExynosAutov9 clocks
 - Correct parents of div4 clock on Exynos7885

* tag 'samsung-clk-6.2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  clk: samsung: Revert "clk: samsung: exynos-clkout: Use of_device_get_match_data()"
  dt-bindings: clock: exynosautov9: fix reference to CMU_FSYS1
  clk: samsung: exynos7885: Correct "div4" clock parents
parents 4cc47e8a 2bc5febd

Documentation/devicetree/bindings/clock/samsung,exynosautov9-clock.yaml

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ allOf: 
          items:

            - const: oscclk

            - const: dout_clkcmu_fsys1_bus

            - const: dout_clkcmu_fsys1_mmc_card

            - const: gout_clkcmu_fsys1_mmc_card

            - const: dout_clkcmu_fsys1_usbdrd



  - if:

drivers/clk/samsung/clk-exynos-clkout.c

+4 −2
Original line number Diff line number Diff line
@@ -81,17 +81,19 @@ MODULE_DEVICE_TABLE(of, exynos_clkout_ids); 
static int exynos_clkout_match_parent_dev(struct device *dev, u32 *mux_mask)

{

	const struct exynos_clkout_variant *variant;

	const struct of_device_id *match;



	if (!dev->parent) {

		dev_err(dev, "not instantiated from MFD\n");

		return -EINVAL;

	}



	variant = of_device_get_match_data(dev->parent);

	if (!variant) {

	match = of_match_device(exynos_clkout_ids, dev->parent);

	if (!match) {

		dev_err(dev, "cannot match parent device\n");

		return -EINVAL;

	}

	variant = match->data;



	*mux_mask = variant->mux_mask;

drivers/clk/samsung/clk-exynos7885.c

+2 −2
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ static const struct samsung_div_clock top_div_clks[] __initconst = { 
	    CLK_CON_DIV_PLL_SHARED0_DIV2, 0, 1),

	DIV(CLK_DOUT_SHARED0_DIV3, "dout_shared0_div3", "fout_shared0_pll",

	    CLK_CON_DIV_PLL_SHARED0_DIV3, 0, 2),

	DIV(CLK_DOUT_SHARED0_DIV4, "dout_shared0_div4", "fout_shared0_pll",

	DIV(CLK_DOUT_SHARED0_DIV4, "dout_shared0_div4", "dout_shared0_div2",

	    CLK_CON_DIV_PLL_SHARED0_DIV4, 0, 1),

	DIV(CLK_DOUT_SHARED0_DIV5, "dout_shared0_div5", "fout_shared0_pll",

	    CLK_CON_DIV_PLL_SHARED0_DIV5, 0, 3),
@@ -239,7 +239,7 @@ static const struct samsung_div_clock top_div_clks[] __initconst = { 
	    CLK_CON_DIV_PLL_SHARED1_DIV2, 0, 1),

	DIV(CLK_DOUT_SHARED1_DIV3, "dout_shared1_div3", "fout_shared1_pll",

	    CLK_CON_DIV_PLL_SHARED1_DIV3, 0, 2),

	DIV(CLK_DOUT_SHARED1_DIV4, "dout_shared1_div4", "fout_shared1_pll",

	DIV(CLK_DOUT_SHARED1_DIV4, "dout_shared1_div4", "dout_shared1_div2",

	    CLK_CON_DIV_PLL_SHARED1_DIV4, 0, 1),



	/* CORE */