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

sh: clock-sh7723: add CLKDEV_ICK_ID for cleanup

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

authored by

Kuninori Morimoto and committed by
Paul Mundt
7e28c7bb 56242a1f

+13 -63
+13 -63
arch/sh/kernel/cpu/sh4a/clock-sh7723.c
··· 233 233 CLKDEV_CON_ID("sh0", &mstp_clks[HWBLK_SHYWAY]), 234 234 CLKDEV_CON_ID("hudi0", &mstp_clks[HWBLK_HUDI]), 235 235 CLKDEV_CON_ID("ubc0", &mstp_clks[HWBLK_UBC]), 236 - { 237 - /* TMU0 */ 238 - .dev_id = "sh_tmu.0", 239 - .con_id = "tmu_fck", 240 - .clk = &mstp_clks[HWBLK_TMU0], 241 - }, { 242 - /* TMU1 */ 243 - .dev_id = "sh_tmu.1", 244 - .con_id = "tmu_fck", 245 - .clk = &mstp_clks[HWBLK_TMU0], 246 - }, { 247 - /* TMU2 */ 248 - .dev_id = "sh_tmu.2", 249 - .con_id = "tmu_fck", 250 - .clk = &mstp_clks[HWBLK_TMU0], 251 - }, 252 236 CLKDEV_CON_ID("cmt_fck", &mstp_clks[HWBLK_CMT]), 253 237 CLKDEV_CON_ID("rwdt0", &mstp_clks[HWBLK_RWDT]), 254 238 CLKDEV_CON_ID("dmac1", &mstp_clks[HWBLK_DMAC1]), 255 - { 256 - /* TMU3 */ 257 - .dev_id = "sh_tmu.3", 258 - .con_id = "tmu_fck", 259 - .clk = &mstp_clks[HWBLK_TMU1], 260 - }, { 261 - /* TMU4 */ 262 - .dev_id = "sh_tmu.4", 263 - .con_id = "tmu_fck", 264 - .clk = &mstp_clks[HWBLK_TMU1], 265 - }, { 266 - /* TMU5 */ 267 - .dev_id = "sh_tmu.5", 268 - .con_id = "tmu_fck", 269 - .clk = &mstp_clks[HWBLK_TMU1], 270 - }, 271 239 CLKDEV_CON_ID("flctl0", &mstp_clks[HWBLK_FLCTL]), 272 - { 273 - /* SCIF0 */ 274 - .dev_id = "sh-sci.0", 275 - .con_id = "sci_fck", 276 - .clk = &mstp_clks[HWBLK_SCIF0], 277 - }, { 278 - /* SCIF1 */ 279 - .dev_id = "sh-sci.1", 280 - .con_id = "sci_fck", 281 - .clk = &mstp_clks[HWBLK_SCIF1], 282 - }, { 283 - /* SCIF2 */ 284 - .dev_id = "sh-sci.2", 285 - .con_id = "sci_fck", 286 - .clk = &mstp_clks[HWBLK_SCIF2], 287 - }, { 288 - /* SCIF3 */ 289 - .dev_id = "sh-sci.3", 290 - .con_id = "sci_fck", 291 - .clk = &mstp_clks[HWBLK_SCIF3], 292 - }, { 293 - /* SCIF4 */ 294 - .dev_id = "sh-sci.4", 295 - .con_id = "sci_fck", 296 - .clk = &mstp_clks[HWBLK_SCIF4], 297 - }, { 298 - /* SCIF5 */ 299 - .dev_id = "sh-sci.5", 300 - .con_id = "sci_fck", 301 - .clk = &mstp_clks[HWBLK_SCIF5], 302 - }, 303 240 CLKDEV_CON_ID("msiof0", &mstp_clks[HWBLK_MSIOF0]), 304 241 CLKDEV_CON_ID("msiof1", &mstp_clks[HWBLK_MSIOF1]), 305 242 CLKDEV_CON_ID("meram0", &mstp_clks[HWBLK_MERAM]), ··· 261 324 CLKDEV_CON_ID("veu0", &mstp_clks[HWBLK_VEU2H0]), 262 325 CLKDEV_CON_ID("vpu0", &mstp_clks[HWBLK_VPU]), 263 326 CLKDEV_CON_ID("lcdc0", &mstp_clks[HWBLK_LCDC]), 327 + 328 + CLKDEV_ICK_ID("tmu_fck", "sh_tmu.0", &mstp_clks[HWBLK_TMU0]), 329 + CLKDEV_ICK_ID("tmu_fck", "sh_tmu.1", &mstp_clks[HWBLK_TMU0]), 330 + CLKDEV_ICK_ID("tmu_fck", "sh_tmu.2", &mstp_clks[HWBLK_TMU0]), 331 + CLKDEV_ICK_ID("tmu_fck", "sh_tmu.3", &mstp_clks[HWBLK_TMU1]), 332 + CLKDEV_ICK_ID("tmu_fck", "sh_tmu.4", &mstp_clks[HWBLK_TMU1]), 333 + CLKDEV_ICK_ID("tmu_fck", "sh_tmu.5", &mstp_clks[HWBLK_TMU1]), 334 + CLKDEV_ICK_ID("sci_fck", "sh-sci.0", &mstp_clks[HWBLK_SCIF0]), 335 + CLKDEV_ICK_ID("sci_fck", "sh-sci.1", &mstp_clks[HWBLK_SCIF1]), 336 + CLKDEV_ICK_ID("sci_fck", "sh-sci.2", &mstp_clks[HWBLK_SCIF2]), 337 + CLKDEV_ICK_ID("sci_fck", "sh-sci.3", &mstp_clks[HWBLK_SCIF3]), 338 + CLKDEV_ICK_ID("sci_fck", "sh-sci.4", &mstp_clks[HWBLK_SCIF4]), 339 + CLKDEV_ICK_ID("sci_fck", "sh-sci.5", &mstp_clks[HWBLK_SCIF5]), 264 340 }; 265 341 266 342 int __init arch_clk_init(void)