Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

clk: zynq: Move const initdata into correct code section

Use __initconst instead of __initdata for constant init data.

Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: Mike Turquette <mturquette@linaro.org>

authored by

Soren Brinkmann and committed by
Mike Turquette
8eaf5034 034cc6eb

+14 -15
+14 -15
drivers/clk/zynq/clkc.c
··· 85 85 static DEFINE_SPINLOCK(dbgclk_lock); 86 86 static DEFINE_SPINLOCK(aperclk_lock); 87 87 88 - static const char dummy_nm[] __initconst = "dummy_name"; 89 - 90 - static const char *armpll_parents[] __initdata = {"armpll_int", "ps_clk"}; 91 - static const char *ddrpll_parents[] __initdata = {"ddrpll_int", "ps_clk"}; 92 - static const char *iopll_parents[] __initdata = {"iopll_int", "ps_clk"}; 93 - static const char *gem0_mux_parents[] __initdata = {"gem0_div1", dummy_nm}; 94 - static const char *gem1_mux_parents[] __initdata = {"gem1_div1", dummy_nm}; 95 - static const char *can0_mio_mux2_parents[] __initdata = {"can0_gate", 88 + static const char *armpll_parents[] __initconst = {"armpll_int", "ps_clk"}; 89 + static const char *ddrpll_parents[] __initconst = {"ddrpll_int", "ps_clk"}; 90 + static const char *iopll_parents[] __initconst = {"iopll_int", "ps_clk"}; 91 + static const char *gem0_mux_parents[] __initconst = {"gem0_div1", "dummy_name"}; 92 + static const char *gem1_mux_parents[] __initconst = {"gem1_div1", "dummy_name"}; 93 + static const char *can0_mio_mux2_parents[] __initconst = {"can0_gate", 96 94 "can0_mio_mux"}; 97 - static const char *can1_mio_mux2_parents[] __initdata = {"can1_gate", 95 + static const char *can1_mio_mux2_parents[] __initconst = {"can1_gate", 98 96 "can1_mio_mux"}; 99 - static const char *dbg_emio_mux_parents[] __initdata = {"dbg_div", 100 - dummy_nm}; 97 + static const char *dbg_emio_mux_parents[] __initconst = {"dbg_div", 98 + "dummy_name"}; 101 99 102 - static const char *dbgtrc_emio_input_names[] __initdata = {"trace_emio_clk"}; 103 - static const char *gem0_emio_input_names[] __initdata = {"gem0_emio_clk"}; 104 - static const char *gem1_emio_input_names[] __initdata = {"gem1_emio_clk"}; 105 - static const char *swdt_ext_clk_input_names[] __initdata = {"swdt_ext_clk"}; 100 + static const char *dbgtrc_emio_input_names[] __initconst = {"trace_emio_clk"}; 101 + static const char *gem0_emio_input_names[] __initconst = {"gem0_emio_clk"}; 102 + static const char *gem1_emio_input_names[] __initconst = {"gem1_emio_clk"}; 103 + static const char *swdt_ext_clk_input_names[] __initconst = {"swdt_ext_clk"}; 106 104 107 105 static void __init zynq_clk_register_fclk(enum zynq_clk fclk, 108 106 const char *clk_name, void __iomem *fclk_ctrl_reg, ··· 228 230 const char *periph_parents[4]; 229 231 const char *swdt_ext_clk_mux_parents[2]; 230 232 const char *can_mio_mux_parents[NUM_MIO_PINS]; 233 + const char *dummy_nm = "dummy_name"; 231 234 232 235 pr_info("Zynq clock init\n"); 233 236