Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux (c1cea112) · Commits · 戴 / test

Pull clk fixes from Stephen Boyd: "Two small clk driver build fixes - Remove __packed from a Renesas struct to improve portability - Fix a linking problem with i.MX when config options don't agree" * tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: clk: renesas: r9a06g032: Drop __packed for portability clk: imx: scu: fix MXC_CLK_SCU module build break

drivers/clk/imx/Kconfig

+2 −2

Original line number	Diff line number	Diff line
		@@ -5,8 +5,8 @@ config MXC_CLK
		depends on ARCH_MXC \|\| COMPILE_TEST

		config MXC_CLK_SCU
		tristate "IMX SCU clock"
		depends on ARCH_MXC \|\| COMPILE_TEST
		tristate
		depends on ARCH_MXC
		depends on IMX_SCU && HAVE_ARM_SMCCC

		config CLK_IMX1

drivers/clk/renesas/r9a06g032-clocks.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -55,7 +55,7 @@ struct r9a06g032_clkdesc {
		u16 sel, g1, r1, g2, r2;
		} dual;
		};
		} __packed;
		};

		#define I_GATE(_clk, _rst, _rdy, _midle, _scon, _mirack, _mistat) \
		{ .gate = _clk, .reset = _rst, \

Admin message