+1 -1

drivers/clk/ti/autoidle.c

reviewed

··· 205 205 return -ENOMEM; 206 206 207 207 clk->shift = shift; 208 208 - clk->name = node->name; 208 208 + clk->name = ti_dt_clk_name(node); 209 209 ret = ti_clk_get_reg_addr(node, 0, &clk->reg); 210 210 if (ret) { 211 211 kfree(clk);

+4 -2

drivers/clk/ti/clk-dra7-atl.c

reviewed

··· 173 173 struct dra7_atl_desc *clk_hw = NULL; 174 174 struct clk_init_data init = { NULL }; 175 175 const char **parent_names = NULL; 176 176 + const char *name; 176 177 struct clk *clk; 177 178 178 179 clk_hw = kzalloc(sizeof(*clk_hw), GFP_KERNEL); ··· 184 183 185 184 clk_hw->hw.init = &init; 186 185 clk_hw->divider = 1; 187 187 - init.name = node->name; 186 186 + name = ti_dt_clk_name(node); 187 187 + init.name = name; 188 188 init.ops = &atl_clk_ops; 189 189 init.flags = CLK_IGNORE_UNUSED; 190 190 init.num_parents = of_clk_get_parent_count(node); ··· 205 203 206 204 init.parent_names = parent_names; 207 205 208 208 - clk = ti_clk_register(NULL, &clk_hw->hw, node->name); 206 206 + clk = ti_clk_register(NULL, &clk_hw->hw, name); 209 207 210 208 if (!IS_ERR(clk)) { 211 209 of_clk_add_provider(node, of_clk_src_simple_get, clk);

+4 -2

drivers/clk/ti/composite.c

reviewed

··· 125 125 struct component_clk *comp; 126 126 int num_parents = 0; 127 127 const char **parent_names = NULL; 128 128 + const char *name; 128 129 int i; 129 130 int ret; 130 131 ··· 173 172 goto cleanup; 174 173 } 175 174 176 176 - clk = clk_register_composite(NULL, node->name, 175 175 + name = ti_dt_clk_name(node); 176 176 + clk = clk_register_composite(NULL, name, 177 177 parent_names, num_parents, 178 178 _get_hw(cclk, CLK_COMPONENT_TYPE_MUX), 179 179 &ti_clk_mux_ops, ··· 184 182 &ti_composite_gate_ops, 0); 185 183 186 184 if (!IS_ERR(clk)) { 187 187 - ret = ti_clk_add_alias(NULL, clk, node->name); 185 185 + ret = ti_clk_add_alias(NULL, clk, name); 188 186 if (ret) { 189 187 clk_unregister(clk); 190 188 goto cleanup;

+4 -2

drivers/clk/ti/divider.c

reviewed

··· 320 320 struct clk *clk; 321 321 struct clk_init_data init; 322 322 const char *parent_name; 323 323 + const char *name; 323 324 324 325 parent_name = of_clk_get_parent_name(node, 0); 325 326 326 326 - init.name = node->name; 327 327 + name = ti_dt_clk_name(node); 328 328 + init.name = name; 327 329 init.ops = &ti_clk_divider_ops; 328 330 init.flags = flags; 329 331 init.parent_names = (parent_name ? &parent_name : NULL); ··· 334 332 div->hw.init = &init; 335 333 336 334 /* register the clock */ 337 337 - clk = ti_clk_register(NULL, &div->hw, node->name); 335 335 + clk = ti_clk_register(NULL, &div->hw, name); 338 336 339 337 if (IS_ERR(clk)) 340 338 kfree(div);

+1 -1

drivers/clk/ti/fixed-factor.c

reviewed

··· 36 36 static void __init of_ti_fixed_factor_clk_setup(struct device_node *node) 37 37 { 38 38 struct clk *clk; 39 39 - const char *clk_name = node->name; 39 39 + const char *clk_name = ti_dt_clk_name(node); 40 40 const char *parent_name; 41 41 u32 div, mult; 42 42 u32 flags = 0;

+3 -1

drivers/clk/ti/gate.c

reviewed

··· 138 138 struct clk *clk; 139 139 const char *parent_name; 140 140 struct clk_omap_reg reg; 141 141 + const char *name; 141 142 u8 enable_bit = 0; 142 143 u32 val; 143 144 u32 flags = 0; ··· 165 164 if (of_property_read_bool(node, "ti,set-bit-to-disable")) 166 165 clk_gate_flags |= INVERT_ENABLE; 167 166 168 168 - clk = _register_gate(NULL, node->name, parent_name, flags, &reg, 167 167 + name = ti_dt_clk_name(node); 168 168 + clk = _register_gate(NULL, name, parent_name, flags, &reg, 169 169 enable_bit, clk_gate_flags, ops, hw_ops); 170 170 171 171 if (!IS_ERR(clk))

+3 -1

drivers/clk/ti/interface.c

reviewed

··· 72 72 const char *parent_name; 73 73 struct clk_omap_reg reg; 74 74 u8 enable_bit = 0; 75 75 + const char *name; 75 76 u32 val; 76 77 77 78 if (ti_clk_get_reg_addr(node, 0, &reg)) ··· 87 86 return; 88 87 } 89 88 90 90 - clk = _register_interface(NULL, node->name, parent_name, &reg, 89 89 + name = ti_dt_clk_name(node); 90 90 + clk = _register_interface(NULL, name, parent_name, &reg, 91 91 enable_bit, ops); 92 92 93 93 if (!IS_ERR(clk))

+3 -1

drivers/clk/ti/mux.c

reviewed

··· 176 176 struct clk_omap_reg reg; 177 177 unsigned int num_parents; 178 178 const char **parent_names; 179 179 + const char *name; 179 180 u8 clk_mux_flags = 0; 180 181 u32 mask = 0; 181 182 u32 shift = 0; ··· 214 213 215 214 mask = (1 << fls(mask)) - 1; 216 215 217 217 - clk = _register_mux(NULL, node->name, parent_names, num_parents, 216 216 + name = ti_dt_clk_name(node); 217 217 + clk = _register_mux(NULL, name, parent_names, num_parents, 218 218 flags, &reg, shift, mask, latch, clk_mux_flags, 219 219 NULL); 220 220