clk: make clk_init_data const (0777066d) · Commits · jan.koester / Linux

drivers/clk/clk-twl6040.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -82,7 +82,7 @@ static const struct clk_ops twl6040_pdmclk_ops = {
	.recalc_rate = twl6040_pdmclk_recalc_rate,		.recalc_rate = twl6040_pdmclk_recalc_rate,
	};		};

	static struct clk_init_data twl6040_pdmclk_init = {		static const struct clk_init_data twl6040_pdmclk_init = {
	.name = "pdmclk",		.name = "pdmclk",
	.ops = &twl6040_pdmclk_ops,		.ops = &twl6040_pdmclk_ops,
	.flags = CLK_GET_RATE_NOCACHE,		.flags = CLK_GET_RATE_NOCACHE,

drivers/clk/clk-wm831x.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -52,7 +52,7 @@ static const struct clk_ops wm831x_xtal_ops = {
	.recalc_rate = wm831x_xtal_recalc_rate,		.recalc_rate = wm831x_xtal_recalc_rate,
	};		};

	static struct clk_init_data wm831x_xtal_init = {		static const struct clk_init_data wm831x_xtal_init = {
	.name = "xtal",		.name = "xtal",
	.ops = &wm831x_xtal_ops,		.ops = &wm831x_xtal_ops,
	};		};
	@@ -225,7 +225,7 @@ static const struct clk_ops wm831x_fll_ops = {
	.get_parent = wm831x_fll_get_parent,		.get_parent = wm831x_fll_get_parent,
	};		};

	static struct clk_init_data wm831x_fll_init = {		static const struct clk_init_data wm831x_fll_init = {
	.name = "fll",		.name = "fll",
	.ops = &wm831x_fll_ops,		.ops = &wm831x_fll_ops,
	.parent_names = wm831x_fll_parents,		.parent_names = wm831x_fll_parents,
	@@ -338,7 +338,7 @@ static const struct clk_ops wm831x_clkout_ops = {
	.set_parent = wm831x_clkout_set_parent,		.set_parent = wm831x_clkout_set_parent,
	};		};

	static struct clk_init_data wm831x_clkout_init = {		static const struct clk_init_data wm831x_clkout_init = {
	.name = "clkout",		.name = "clkout",
	.ops = &wm831x_clkout_ops,		.ops = &wm831x_clkout_ops,
	.parent_names = wm831x_clkout_parents,		.parent_names = wm831x_clkout_parents,

drivers/clk/sirf/clk-atlas6.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -42,7 +42,7 @@ static struct clk_dmn clk_mmc45 = {
	},		},
	};		};

	static struct clk_init_data clk_nand_init = {		static const struct clk_init_data clk_nand_init = {
	.name = "nand",		.name = "nand",
	.ops = &dmn_ops,		.ops = &dmn_ops,
	.parent_names = dmn_clk_parents,		.parent_names = dmn_clk_parents,

drivers/clk/sirf/clk-atlas7.c

+9 −9

Original line number	Original line	Diff line number	Diff line
	@@ -392,7 +392,7 @@ static const char * const pll_clk_parents[] = {
	"xin",		"xin",
	};		};

	static struct clk_init_data clk_cpupll_init = {		static const struct clk_init_data clk_cpupll_init = {
	.name = "cpupll_vco",		.name = "cpupll_vco",
	.ops = &ab_pll_ops,		.ops = &ab_pll_ops,
	.parent_names = pll_clk_parents,		.parent_names = pll_clk_parents,
	@@ -406,7 +406,7 @@ static struct clk_pll clk_cpupll = {
	},		},
	};		};

	static struct clk_init_data clk_mempll_init = {		static const struct clk_init_data clk_mempll_init = {
	.name = "mempll_vco",		.name = "mempll_vco",
	.ops = &ab_pll_ops,		.ops = &ab_pll_ops,
	.parent_names = pll_clk_parents,		.parent_names = pll_clk_parents,
	@@ -420,7 +420,7 @@ static struct clk_pll clk_mempll = {
	},		},
	};		};

	static struct clk_init_data clk_sys0pll_init = {		static const struct clk_init_data clk_sys0pll_init = {
	.name = "sys0pll_vco",		.name = "sys0pll_vco",
	.ops = &ab_pll_ops,		.ops = &ab_pll_ops,
	.parent_names = pll_clk_parents,		.parent_names = pll_clk_parents,
	@@ -434,7 +434,7 @@ static struct clk_pll clk_sys0pll = {
	},		},
	};		};

	static struct clk_init_data clk_sys1pll_init = {		static const struct clk_init_data clk_sys1pll_init = {
	.name = "sys1pll_vco",		.name = "sys1pll_vco",
	.ops = &ab_pll_ops,		.ops = &ab_pll_ops,
	.parent_names = pll_clk_parents,		.parent_names = pll_clk_parents,
	@@ -448,7 +448,7 @@ static struct clk_pll clk_sys1pll = {
	},		},
	};		};

	static struct clk_init_data clk_sys2pll_init = {		static const struct clk_init_data clk_sys2pll_init = {
	.name = "sys2pll_vco",		.name = "sys2pll_vco",
	.ops = &ab_pll_ops,		.ops = &ab_pll_ops,
	.parent_names = pll_clk_parents,		.parent_names = pll_clk_parents,
	@@ -462,7 +462,7 @@ static struct clk_pll clk_sys2pll = {
	},		},
	};		};

	static struct clk_init_data clk_sys3pll_init = {		static const struct clk_init_data clk_sys3pll_init = {
	.name = "sys3pll_vco",		.name = "sys3pll_vco",
	.ops = &ab_pll_ops,		.ops = &ab_pll_ops,
	.parent_names = pll_clk_parents,		.parent_names = pll_clk_parents,
	@@ -596,7 +596,7 @@ static const char * const audiodto_clk_parents[] = {
	"sys3pll_clk1",		"sys3pll_clk1",
	};		};

	static struct clk_init_data clk_audiodto_init = {		static const struct clk_init_data clk_audiodto_init = {
	.name = "audio_dto",		.name = "audio_dto",
	.ops = &dto_ops,		.ops = &dto_ops,
	.parent_names = audiodto_clk_parents,		.parent_names = audiodto_clk_parents,
	@@ -617,7 +617,7 @@ static const char * const disp0dto_clk_parents[] = {
	"sys3pll_clk1",		"sys3pll_clk1",
	};		};

	static struct clk_init_data clk_disp0dto_init = {		static const struct clk_init_data clk_disp0dto_init = {
	.name = "disp0_dto",		.name = "disp0_dto",
	.ops = &dto_ops,		.ops = &dto_ops,
	.parent_names = disp0dto_clk_parents,		.parent_names = disp0dto_clk_parents,
	@@ -638,7 +638,7 @@ static const char * const disp1dto_clk_parents[] = {
	"sys3pll_clk1",		"sys3pll_clk1",
	};		};

	static struct clk_init_data clk_disp1dto_init = {		static const struct clk_init_data clk_disp1dto_init = {
	.name = "disp1_dto",		.name = "disp1_dto",
	.ops = &dto_ops,		.ops = &dto_ops,
	.parent_names = disp1dto_clk_parents,		.parent_names = disp1dto_clk_parents,

drivers/clk/sirf/clk-common.c

+40 −40

Original line number	Original line	Diff line number	Diff line
	@@ -194,21 +194,21 @@ static const char * const pll_clk_parents[] = {
	"osc",		"osc",
	};		};

	static struct clk_init_data clk_pll1_init = {		static const struct clk_init_data clk_pll1_init = {
	.name = "pll1",		.name = "pll1",
	.ops = &std_pll_ops,		.ops = &std_pll_ops,
	.parent_names = pll_clk_parents,		.parent_names = pll_clk_parents,
	.num_parents = ARRAY_SIZE(pll_clk_parents),		.num_parents = ARRAY_SIZE(pll_clk_parents),
	};		};

	static struct clk_init_data clk_pll2_init = {		static const struct clk_init_data clk_pll2_init = {
	.name = "pll2",		.name = "pll2",
	.ops = &std_pll_ops,		.ops = &std_pll_ops,
	.parent_names = pll_clk_parents,		.parent_names = pll_clk_parents,
	.num_parents = ARRAY_SIZE(pll_clk_parents),		.num_parents = ARRAY_SIZE(pll_clk_parents),
	};		};

	static struct clk_init_data clk_pll3_init = {		static const struct clk_init_data clk_pll3_init = {
	.name = "pll3",		.name = "pll3",
	.ops = &std_pll_ops,		.ops = &std_pll_ops,
	.parent_names = pll_clk_parents,		.parent_names = pll_clk_parents,
	@@ -271,7 +271,7 @@ static const struct clk_ops usb_pll_ops = {
	.recalc_rate = usb_pll_clk_recalc_rate,		.recalc_rate = usb_pll_clk_recalc_rate,
	};		};

	static struct clk_init_data clk_usb_pll_init = {		static const struct clk_init_data clk_usb_pll_init = {
	.name = "usb_pll",		.name = "usb_pll",
	.ops = &usb_pll_ops,		.ops = &usb_pll_ops,
	.parent_names = pll_clk_parents,		.parent_names = pll_clk_parents,
	@@ -445,7 +445,7 @@ static const struct clk_ops msi_ops = {
	.get_parent = dmn_clk_get_parent,		.get_parent = dmn_clk_get_parent,
	};		};

	static struct clk_init_data clk_mem_init = {		static const struct clk_init_data clk_mem_init = {
	.name = "mem",		.name = "mem",
	.ops = &msi_ops,		.ops = &msi_ops,
	.parent_names = dmn_clk_parents,		.parent_names = dmn_clk_parents,
	@@ -459,7 +459,7 @@ static struct clk_dmn clk_mem = {
	},		},
	};		};

	static struct clk_init_data clk_sys_init = {		static const struct clk_init_data clk_sys_init = {
	.name = "sys",		.name = "sys",
	.ops = &msi_ops,		.ops = &msi_ops,
	.parent_names = dmn_clk_parents,		.parent_names = dmn_clk_parents,
	@@ -474,7 +474,7 @@ static struct clk_dmn clk_sys = {
	},		},
	};		};

	static struct clk_init_data clk_io_init = {		static const struct clk_init_data clk_io_init = {
	.name = "io",		.name = "io",
	.ops = &msi_ops,		.ops = &msi_ops,
	.parent_names = dmn_clk_parents,		.parent_names = dmn_clk_parents,
	@@ -496,7 +496,7 @@ static const struct clk_ops cpu_ops = {
	.recalc_rate = cpu_clk_recalc_rate,		.recalc_rate = cpu_clk_recalc_rate,
	};		};

	static struct clk_init_data clk_cpu_init = {		static const struct clk_init_data clk_cpu_init = {
	.name = "cpu",		.name = "cpu",
	.ops = &cpu_ops,		.ops = &cpu_ops,
	.parent_names = dmn_clk_parents,		.parent_names = dmn_clk_parents,
	@@ -524,7 +524,7 @@ static const struct clk_ops dmn_ops = {

	/* dsp, gfx, mm, lcd and vpp domain */		/* dsp, gfx, mm, lcd and vpp domain */

	static struct clk_init_data clk_dsp_init = {		static const struct clk_init_data clk_dsp_init = {
	.name = "dsp",		.name = "dsp",
	.ops = &dmn_ops,		.ops = &dmn_ops,
	.parent_names = dmn_clk_parents,		.parent_names = dmn_clk_parents,
	@@ -539,7 +539,7 @@ static struct clk_dmn clk_dsp = {
	},		},
	};		};

	static struct clk_init_data clk_gfx_init = {		static const struct clk_init_data clk_gfx_init = {
	.name = "gfx",		.name = "gfx",
	.ops = &dmn_ops,		.ops = &dmn_ops,
	.parent_names = dmn_clk_parents,		.parent_names = dmn_clk_parents,
	@@ -554,7 +554,7 @@ static struct clk_dmn clk_gfx = {
	},		},
	};		};

	static struct clk_init_data clk_mm_init = {		static const struct clk_init_data clk_mm_init = {
	.name = "mm",		.name = "mm",
	.ops = &dmn_ops,		.ops = &dmn_ops,
	.parent_names = dmn_clk_parents,		.parent_names = dmn_clk_parents,
	@@ -574,7 +574,7 @@ static struct clk_dmn clk_mm = {
	*/		*/
	#define clk_gfx2d clk_mm		#define clk_gfx2d clk_mm

	static struct clk_init_data clk_lcd_init = {		static const struct clk_init_data clk_lcd_init = {
	.name = "lcd",		.name = "lcd",
	.ops = &dmn_ops,		.ops = &dmn_ops,
	.parent_names = dmn_clk_parents,		.parent_names = dmn_clk_parents,
	@@ -589,7 +589,7 @@ static struct clk_dmn clk_lcd = {
	},		},
	};		};

	static struct clk_init_data clk_vpp_init = {		static const struct clk_init_data clk_vpp_init = {
	.name = "vpp",		.name = "vpp",
	.ops = &dmn_ops,		.ops = &dmn_ops,
	.parent_names = dmn_clk_parents,		.parent_names = dmn_clk_parents,
	@@ -604,21 +604,21 @@ static struct clk_dmn clk_vpp = {
	},		},
	};		};

	static struct clk_init_data clk_mmc01_init = {		static const struct clk_init_data clk_mmc01_init = {
	.name = "mmc01",		.name = "mmc01",
	.ops = &dmn_ops,		.ops = &dmn_ops,
	.parent_names = dmn_clk_parents,		.parent_names = dmn_clk_parents,
	.num_parents = ARRAY_SIZE(dmn_clk_parents),		.num_parents = ARRAY_SIZE(dmn_clk_parents),
	};		};

	static struct clk_init_data clk_mmc23_init = {		static const struct clk_init_data clk_mmc23_init = {
	.name = "mmc23",		.name = "mmc23",
	.ops = &dmn_ops,		.ops = &dmn_ops,
	.parent_names = dmn_clk_parents,		.parent_names = dmn_clk_parents,
	.num_parents = ARRAY_SIZE(dmn_clk_parents),		.num_parents = ARRAY_SIZE(dmn_clk_parents),
	};		};

	static struct clk_init_data clk_mmc45_init = {		static const struct clk_init_data clk_mmc45_init = {
	.name = "mmc45",		.name = "mmc45",
	.ops = &dmn_ops,		.ops = &dmn_ops,
	.parent_names = dmn_clk_parents,		.parent_names = dmn_clk_parents,
	@@ -685,7 +685,7 @@ static const struct clk_ops ios_ops = {
	.disable = std_clk_disable,		.disable = std_clk_disable,
	};		};

	static struct clk_init_data clk_cphif_init = {		static const struct clk_init_data clk_cphif_init = {
	.name = "cphif",		.name = "cphif",
	.ops = &ios_ops,		.ops = &ios_ops,
	.parent_names = std_clk_io_parents,		.parent_names = std_clk_io_parents,
	@@ -699,7 +699,7 @@ static struct clk_std clk_cphif = {
	},		},
	};		};

	static struct clk_init_data clk_dmac0_init = {		static const struct clk_init_data clk_dmac0_init = {
	.name = "dmac0",		.name = "dmac0",
	.ops = &ios_ops,		.ops = &ios_ops,
	.parent_names = std_clk_io_parents,		.parent_names = std_clk_io_parents,
	@@ -713,7 +713,7 @@ static struct clk_std clk_dmac0 = {
	},		},
	};		};

	static struct clk_init_data clk_dmac1_init = {		static const struct clk_init_data clk_dmac1_init = {
	.name = "dmac1",		.name = "dmac1",
	.ops = &ios_ops,		.ops = &ios_ops,
	.parent_names = std_clk_io_parents,		.parent_names = std_clk_io_parents,
	@@ -727,7 +727,7 @@ static struct clk_std clk_dmac1 = {
	},		},
	};		};

	static struct clk_init_data clk_audio_init = {		static const struct clk_init_data clk_audio_init = {
	.name = "audio",		.name = "audio",
	.ops = &ios_ops,		.ops = &ios_ops,
	.parent_names = std_clk_io_parents,		.parent_names = std_clk_io_parents,
	@@ -741,7 +741,7 @@ static struct clk_std clk_audio = {
	},		},
	};		};

	static struct clk_init_data clk_uart0_init = {		static const struct clk_init_data clk_uart0_init = {
	.name = "uart0",		.name = "uart0",
	.ops = &ios_ops,		.ops = &ios_ops,
	.parent_names = std_clk_io_parents,		.parent_names = std_clk_io_parents,
	@@ -755,7 +755,7 @@ static struct clk_std clk_uart0 = {
	},		},
	};		};

	static struct clk_init_data clk_uart1_init = {		static const struct clk_init_data clk_uart1_init = {
	.name = "uart1",		.name = "uart1",
	.ops = &ios_ops,		.ops = &ios_ops,
	.parent_names = std_clk_io_parents,		.parent_names = std_clk_io_parents,
	@@ -769,7 +769,7 @@ static struct clk_std clk_uart1 = {
	},		},
	};		};

	static struct clk_init_data clk_uart2_init = {		static const struct clk_init_data clk_uart2_init = {
	.name = "uart2",		.name = "uart2",
	.ops = &ios_ops,		.ops = &ios_ops,
	.parent_names = std_clk_io_parents,		.parent_names = std_clk_io_parents,
	@@ -783,7 +783,7 @@ static struct clk_std clk_uart2 = {
	},		},
	};		};

	static struct clk_init_data clk_usp0_init = {		static const struct clk_init_data clk_usp0_init = {
	.name = "usp0",		.name = "usp0",
	.ops = &ios_ops,		.ops = &ios_ops,
	.parent_names = std_clk_io_parents,		.parent_names = std_clk_io_parents,
	@@ -797,7 +797,7 @@ static struct clk_std clk_usp0 = {
	},		},
	};		};

	static struct clk_init_data clk_usp1_init = {		static const struct clk_init_data clk_usp1_init = {
	.name = "usp1",		.name = "usp1",
	.ops = &ios_ops,		.ops = &ios_ops,
	.parent_names = std_clk_io_parents,		.parent_names = std_clk_io_parents,
	@@ -811,7 +811,7 @@ static struct clk_std clk_usp1 = {
	},		},
	};		};

	static struct clk_init_data clk_usp2_init = {		static const struct clk_init_data clk_usp2_init = {
	.name = "usp2",		.name = "usp2",
	.ops = &ios_ops,		.ops = &ios_ops,
	.parent_names = std_clk_io_parents,		.parent_names = std_clk_io_parents,
	@@ -825,7 +825,7 @@ static struct clk_std clk_usp2 = {
	},		},
	};		};

	static struct clk_init_data clk_vip_init = {		static const struct clk_init_data clk_vip_init = {
	.name = "vip",		.name = "vip",
	.ops = &ios_ops,		.ops = &ios_ops,
	.parent_names = std_clk_io_parents,		.parent_names = std_clk_io_parents,
	@@ -839,7 +839,7 @@ static struct clk_std clk_vip = {
	},		},
	};		};

	static struct clk_init_data clk_spi0_init = {		static const struct clk_init_data clk_spi0_init = {
	.name = "spi0",		.name = "spi0",
	.ops = &ios_ops,		.ops = &ios_ops,
	.parent_names = std_clk_io_parents,		.parent_names = std_clk_io_parents,
	@@ -853,7 +853,7 @@ static struct clk_std clk_spi0 = {
	},		},
	};		};

	static struct clk_init_data clk_spi1_init = {		static const struct clk_init_data clk_spi1_init = {
	.name = "spi1",		.name = "spi1",
	.ops = &ios_ops,		.ops = &ios_ops,
	.parent_names = std_clk_io_parents,		.parent_names = std_clk_io_parents,
	@@ -867,7 +867,7 @@ static struct clk_std clk_spi1 = {
	},		},
	};		};

	static struct clk_init_data clk_tsc_init = {		static const struct clk_init_data clk_tsc_init = {
	.name = "tsc",		.name = "tsc",
	.ops = &ios_ops,		.ops = &ios_ops,
	.parent_names = std_clk_io_parents,		.parent_names = std_clk_io_parents,
	@@ -881,7 +881,7 @@ static struct clk_std clk_tsc = {
	},		},
	};		};

	static struct clk_init_data clk_i2c0_init = {		static const struct clk_init_data clk_i2c0_init = {
	.name = "i2c0",		.name = "i2c0",
	.ops = &ios_ops,		.ops = &ios_ops,
	.parent_names = std_clk_io_parents,		.parent_names = std_clk_io_parents,
	@@ -895,7 +895,7 @@ static struct clk_std clk_i2c0 = {
	},		},
	};		};

	static struct clk_init_data clk_i2c1_init = {		static const struct clk_init_data clk_i2c1_init = {
	.name = "i2c1",		.name = "i2c1",
	.ops = &ios_ops,		.ops = &ios_ops,
	.parent_names = std_clk_io_parents,		.parent_names = std_clk_io_parents,
	@@ -909,7 +909,7 @@ static struct clk_std clk_i2c1 = {
	},		},
	};		};

	static struct clk_init_data clk_pwmc_init = {		static const struct clk_init_data clk_pwmc_init = {
	.name = "pwmc",		.name = "pwmc",
	.ops = &ios_ops,		.ops = &ios_ops,
	.parent_names = std_clk_io_parents,		.parent_names = std_clk_io_parents,
	@@ -923,7 +923,7 @@ static struct clk_std clk_pwmc = {
	},		},
	};		};

	static struct clk_init_data clk_efuse_init = {		static const struct clk_init_data clk_efuse_init = {
	.name = "efuse",		.name = "efuse",
	.ops = &ios_ops,		.ops = &ios_ops,
	.parent_names = std_clk_io_parents,		.parent_names = std_clk_io_parents,
	@@ -937,7 +937,7 @@ static struct clk_std clk_efuse = {
	},		},
	};		};

	static struct clk_init_data clk_pulse_init = {		static const struct clk_init_data clk_pulse_init = {
	.name = "pulse",		.name = "pulse",
	.ops = &ios_ops,		.ops = &ios_ops,
	.parent_names = std_clk_io_parents,		.parent_names = std_clk_io_parents,
	@@ -955,7 +955,7 @@ static const char * const std_clk_dsp_parents[] = {
	"dsp",		"dsp",
	};		};

	static struct clk_init_data clk_gps_init = {		static const struct clk_init_data clk_gps_init = {
	.name = "gps",		.name = "gps",
	.ops = &ios_ops,		.ops = &ios_ops,
	.parent_names = std_clk_dsp_parents,		.parent_names = std_clk_dsp_parents,
	@@ -969,7 +969,7 @@ static struct clk_std clk_gps = {
	},		},
	};		};

	static struct clk_init_data clk_mf_init = {		static const struct clk_init_data clk_mf_init = {
	.name = "mf",		.name = "mf",
	.ops = &ios_ops,		.ops = &ios_ops,
	.parent_names = std_clk_io_parents,		.parent_names = std_clk_io_parents,
	@@ -987,7 +987,7 @@ static const char * const std_clk_sys_parents[] = {
	"sys",		"sys",
	};		};

	static struct clk_init_data clk_security_init = {		static const struct clk_init_data clk_security_init = {
	.name = "security",		.name = "security",
	.ops = &ios_ops,		.ops = &ios_ops,
	.parent_names = std_clk_sys_parents,		.parent_names = std_clk_sys_parents,
	@@ -1005,7 +1005,7 @@ static const char * const std_clk_usb_parents[] = {
	"usb_pll",		"usb_pll",
	};		};

	static struct clk_init_data clk_usb0_init = {		static const struct clk_init_data clk_usb0_init = {
	.name = "usb0",		.name = "usb0",
	.ops = &ios_ops,		.ops = &ios_ops,
	.parent_names = std_clk_usb_parents,		.parent_names = std_clk_usb_parents,
	@@ -1019,7 +1019,7 @@ static struct clk_std clk_usb0 = {
	},		},
	};		};

	static struct clk_init_data clk_usb1_init = {		static const struct clk_init_data clk_usb1_init = {
	.name = "usb1",		.name = "usb1",
	.ops = &ios_ops,		.ops = &ios_ops,
	.parent_names = std_clk_usb_parents,		.parent_names = std_clk_usb_parents,