Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61fd58dc authored by Giacomo A. Catenazzi's avatar Giacomo A. Catenazzi Committed by Mike Turquette
Browse files

clk: sunxi: "cpu_data" is defined in header files of some architectures 



In some architectures, the #define cpu_data is not a "macro-function",
so the compiler will substitute the identifier with probably something
wrong.

Signed-off-by: default avatarGiacomo A. Catenazzi <cate@cateee.net>
Signed-off-by: default avatarEmilio López <emilio@elopez.com.ar>
[emilio@elopez.com.ar: use cpu_mux_data instead of this_cpu_data]
Signed-off-by: default avatarMike Turquette <mturquette@linaro.org>
parent 0e56523f

drivers/clk/sunxi/clk-sunxi.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -239,7 +239,7 @@ struct mux_data { 
	u8 shift;

	u8 shift;

};

};





static const __initconst struct mux_data cpu_data = {

static const __initconst struct mux_data cpu_mux_data = {

	.shift = 16,

	.shift = 16,

};

};
@@ -433,7 +433,7 @@ static const __initconst struct of_device_id clk_div_match[] = { 




/* Matches for mux clocks */

/* Matches for mux clocks */

static const __initconst struct of_device_id clk_mux_match[] = {

static const __initconst struct of_device_id clk_mux_match[] = {

	{.compatible = "allwinner,sun4i-cpu-clk", .data = &cpu_data,},

	{.compatible = "allwinner,sun4i-cpu-clk", .data = &cpu_mux_data,},

	{.compatible = "allwinner,sun4i-apb1-mux-clk", .data = &apb1_mux_data,},

	{.compatible = "allwinner,sun4i-apb1-mux-clk", .data = &apb1_mux_data,},

	{}

	{}

};

};