Commit 957a42e8 authored Mar 12, 2018 by Stephen Boyd

Merge tag 'sunxi-clk-fixes-for-4.16' of...

Merge tag 'sunxi-clk-fixes-for-4.16' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into clk-fixes

Pull Allwinner clock fixes for 4.16 from Chen-Yu Tsai:

A critical fix for the A31 sunxi-ng clock driver. The CLK_OUT clocks
had definitions paired with the incorrect type of clk ops. This results
in a serious oops starting with commit 946797aa ("clk: sunxi-ng:
Support fixed post-dividers on MP style clocks"), which exposed the
incorrect clk ops when it added a new field to the data structures,
which then nudged the underlying (compatible but incorrect) data
structures out of alignment.

* tag 'sunxi-clk-fixes-for-4.16' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  clk: sunxi-ng: a31: Fix CLK_OUT_* clock ops

parents 99652a46 5682e268

drivers/clk/sunxi-ng/ccu-sun6i-a31.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -762,7 +762,7 @@ static struct ccu_mp out_a_clk = {
		.features = CCU_FEATURE_FIXED_PREDIV,
		.hw.init = CLK_HW_INIT_PARENTS("out-a",
		clk_out_parents,
		&ccu_div_ops,
		&ccu_mp_ops,
		0),
		},
		};
		@@ -783,7 +783,7 @@ static struct ccu_mp out_b_clk = {
		.features = CCU_FEATURE_FIXED_PREDIV,
		.hw.init = CLK_HW_INIT_PARENTS("out-b",
		clk_out_parents,
		&ccu_div_ops,
		&ccu_mp_ops,
		0),
		},
		};
		@@ -804,7 +804,7 @@ static struct ccu_mp out_c_clk = {
		.features = CCU_FEATURE_FIXED_PREDIV,
		.hw.init = CLK_HW_INIT_PARENTS("out-c",
		clk_out_parents,
		&ccu_div_ops,
		&ccu_mp_ops,
		0),
		},
		};