@@ -118,90 +118,90 @@ static inline unsigned int to_tcon_channel(unsigned int channel)
118118 return (channel == 0 ) ? 0 : (channel + 1 );
119119}
120120
121- static void __pwm_samsung_manual_update (struct samsung_pwm_chip * chip ,
121+ static void __pwm_samsung_manual_update (struct samsung_pwm_chip * our_chip ,
122122 struct pwm_device * pwm )
123123{
124124 unsigned int tcon_chan = to_tcon_channel (pwm -> hwpwm );
125125 u32 tcon ;
126126
127- tcon = readl (chip -> base + REG_TCON );
127+ tcon = readl (our_chip -> base + REG_TCON );
128128 tcon |= TCON_MANUALUPDATE (tcon_chan );
129- writel (tcon , chip -> base + REG_TCON );
129+ writel (tcon , our_chip -> base + REG_TCON );
130130
131131 tcon &= ~TCON_MANUALUPDATE (tcon_chan );
132- writel (tcon , chip -> base + REG_TCON );
132+ writel (tcon , our_chip -> base + REG_TCON );
133133}
134134
135- static void pwm_samsung_set_divisor (struct samsung_pwm_chip * pwm ,
135+ static void pwm_samsung_set_divisor (struct samsung_pwm_chip * our_chip ,
136136 unsigned int channel , u8 divisor )
137137{
138138 u8 shift = TCFG1_SHIFT (channel );
139139 unsigned long flags ;
140140 u32 reg ;
141141 u8 bits ;
142142
143- bits = (fls (divisor ) - 1 ) - pwm -> variant .div_base ;
143+ bits = (fls (divisor ) - 1 ) - our_chip -> variant .div_base ;
144144
145145 spin_lock_irqsave (& samsung_pwm_lock , flags );
146146
147- reg = readl (pwm -> base + REG_TCFG1 );
147+ reg = readl (our_chip -> base + REG_TCFG1 );
148148 reg &= ~(TCFG1_MUX_MASK << shift );
149149 reg |= bits << shift ;
150- writel (reg , pwm -> base + REG_TCFG1 );
150+ writel (reg , our_chip -> base + REG_TCFG1 );
151151
152152 spin_unlock_irqrestore (& samsung_pwm_lock , flags );
153153}
154154
155- static int pwm_samsung_is_tdiv (struct samsung_pwm_chip * chip , unsigned int chan )
155+ static int pwm_samsung_is_tdiv (struct samsung_pwm_chip * our_chip , unsigned int chan )
156156{
157- struct samsung_pwm_variant * variant = & chip -> variant ;
157+ struct samsung_pwm_variant * variant = & our_chip -> variant ;
158158 u32 reg ;
159159
160- reg = readl (chip -> base + REG_TCFG1 );
160+ reg = readl (our_chip -> base + REG_TCFG1 );
161161 reg >>= TCFG1_SHIFT (chan );
162162 reg &= TCFG1_MUX_MASK ;
163163
164164 return (BIT (reg ) & variant -> tclk_mask ) == 0 ;
165165}
166166
167- static unsigned long pwm_samsung_get_tin_rate (struct samsung_pwm_chip * chip ,
167+ static unsigned long pwm_samsung_get_tin_rate (struct samsung_pwm_chip * our_chip ,
168168 unsigned int chan )
169169{
170170 unsigned long rate ;
171171 u32 reg ;
172172
173- rate = clk_get_rate (chip -> base_clk );
173+ rate = clk_get_rate (our_chip -> base_clk );
174174
175- reg = readl (chip -> base + REG_TCFG0 );
175+ reg = readl (our_chip -> base + REG_TCFG0 );
176176 if (chan >= 2 )
177177 reg >>= TCFG0_PRESCALER1_SHIFT ;
178178 reg &= TCFG0_PRESCALER_MASK ;
179179
180180 return rate / (reg + 1 );
181181}
182182
183- static unsigned long pwm_samsung_calc_tin (struct samsung_pwm_chip * chip ,
183+ static unsigned long pwm_samsung_calc_tin (struct samsung_pwm_chip * our_chip ,
184184 unsigned int chan , unsigned long freq )
185185{
186- struct samsung_pwm_variant * variant = & chip -> variant ;
186+ struct samsung_pwm_variant * variant = & our_chip -> variant ;
187187 unsigned long rate ;
188188 struct clk * clk ;
189189 u8 div ;
190190
191- if (!pwm_samsung_is_tdiv (chip , chan )) {
192- clk = (chan < 2 ) ? chip -> tclk0 : chip -> tclk1 ;
191+ if (!pwm_samsung_is_tdiv (our_chip , chan )) {
192+ clk = (chan < 2 ) ? our_chip -> tclk0 : our_chip -> tclk1 ;
193193 if (!IS_ERR (clk )) {
194194 rate = clk_get_rate (clk );
195195 if (rate )
196196 return rate ;
197197 }
198198
199- dev_warn (chip -> chip .dev ,
199+ dev_warn (our_chip -> chip .dev ,
200200 "tclk of PWM %d is inoperational, using tdiv\n" , chan );
201201 }
202202
203- rate = pwm_samsung_get_tin_rate (chip , chan );
204- dev_dbg (chip -> chip .dev , "tin parent at %lu\n" , rate );
203+ rate = pwm_samsung_get_tin_rate (our_chip , chan );
204+ dev_dbg (our_chip -> chip .dev , "tin parent at %lu\n" , rate );
205205
206206 /*
207207 * Compare minimum PWM frequency that can be achieved with possible
@@ -221,7 +221,7 @@ static unsigned long pwm_samsung_calc_tin(struct samsung_pwm_chip *chip,
221221 div = variant -> div_base ;
222222 }
223223
224- pwm_samsung_set_divisor (chip , chan , BIT (div ));
224+ pwm_samsung_set_divisor (our_chip , chan , BIT (div ));
225225
226226 return rate >> div ;
227227}
@@ -293,14 +293,14 @@ static void pwm_samsung_disable(struct pwm_chip *chip, struct pwm_device *pwm)
293293 spin_unlock_irqrestore (& samsung_pwm_lock , flags );
294294}
295295
296- static void pwm_samsung_manual_update (struct samsung_pwm_chip * chip ,
296+ static void pwm_samsung_manual_update (struct samsung_pwm_chip * our_chip ,
297297 struct pwm_device * pwm )
298298{
299299 unsigned long flags ;
300300
301301 spin_lock_irqsave (& samsung_pwm_lock , flags );
302302
303- __pwm_samsung_manual_update (chip , pwm );
303+ __pwm_samsung_manual_update (our_chip , pwm );
304304
305305 spin_unlock_irqrestore (& samsung_pwm_lock , flags );
306306}
@@ -384,7 +384,7 @@ static int pwm_samsung_config(struct pwm_chip *chip, struct pwm_device *pwm,
384384 return __pwm_samsung_config (chip , pwm , duty_ns , period_ns , false);
385385}
386386
387- static void pwm_samsung_set_invert (struct samsung_pwm_chip * chip ,
387+ static void pwm_samsung_set_invert (struct samsung_pwm_chip * our_chip ,
388388 unsigned int channel , bool invert )
389389{
390390 unsigned int tcon_chan = to_tcon_channel (channel );
@@ -393,17 +393,17 @@ static void pwm_samsung_set_invert(struct samsung_pwm_chip *chip,
393393
394394 spin_lock_irqsave (& samsung_pwm_lock , flags );
395395
396- tcon = readl (chip -> base + REG_TCON );
396+ tcon = readl (our_chip -> base + REG_TCON );
397397
398398 if (invert ) {
399- chip -> inverter_mask |= BIT (channel );
399+ our_chip -> inverter_mask |= BIT (channel );
400400 tcon |= TCON_INVERT (tcon_chan );
401401 } else {
402- chip -> inverter_mask &= ~BIT (channel );
402+ our_chip -> inverter_mask &= ~BIT (channel );
403403 tcon &= ~TCON_INVERT (tcon_chan );
404404 }
405405
406- writel (tcon , chip -> base + REG_TCON );
406+ writel (tcon , our_chip -> base + REG_TCON );
407407
408408 spin_unlock_irqrestore (& samsung_pwm_lock , flags );
409409}
@@ -506,9 +506,9 @@ static const struct of_device_id samsung_pwm_matches[] = {
506506};
507507MODULE_DEVICE_TABLE (of , samsung_pwm_matches );
508508
509- static int pwm_samsung_parse_dt (struct samsung_pwm_chip * chip )
509+ static int pwm_samsung_parse_dt (struct samsung_pwm_chip * our_chip )
510510{
511- struct device_node * np = chip -> chip .dev -> of_node ;
511+ struct device_node * np = our_chip -> chip .dev -> of_node ;
512512 const struct of_device_id * match ;
513513 struct property * prop ;
514514 const __be32 * cur ;
@@ -518,22 +518,22 @@ static int pwm_samsung_parse_dt(struct samsung_pwm_chip *chip)
518518 if (!match )
519519 return - ENODEV ;
520520
521- memcpy (& chip -> variant , match -> data , sizeof (chip -> variant ));
521+ memcpy (& our_chip -> variant , match -> data , sizeof (our_chip -> variant ));
522522
523523 of_property_for_each_u32 (np , "samsung,pwm-outputs" , prop , cur , val ) {
524524 if (val >= SAMSUNG_PWM_NUM ) {
525- dev_err (chip -> chip .dev ,
525+ dev_err (our_chip -> chip .dev ,
526526 "%s: invalid channel index in samsung,pwm-outputs property\n" ,
527527 __func__ );
528528 continue ;
529529 }
530- chip -> variant .output_mask |= BIT (val );
530+ our_chip -> variant .output_mask |= BIT (val );
531531 }
532532
533533 return 0 ;
534534}
535535#else
536- static int pwm_samsung_parse_dt (struct samsung_pwm_chip * chip )
536+ static int pwm_samsung_parse_dt (struct samsung_pwm_chip * our_chip )
537537{
538538 return - ENODEV ;
539539}
@@ -542,21 +542,21 @@ static int pwm_samsung_parse_dt(struct samsung_pwm_chip *chip)
542542static int pwm_samsung_probe (struct platform_device * pdev )
543543{
544544 struct device * dev = & pdev -> dev ;
545- struct samsung_pwm_chip * chip ;
545+ struct samsung_pwm_chip * our_chip ;
546546 unsigned int chan ;
547547 int ret ;
548548
549- chip = devm_kzalloc (& pdev -> dev , sizeof (* chip ), GFP_KERNEL );
550- if (chip == NULL )
549+ our_chip = devm_kzalloc (& pdev -> dev , sizeof (* our_chip ), GFP_KERNEL );
550+ if (our_chip == NULL )
551551 return - ENOMEM ;
552552
553- chip -> chip .dev = & pdev -> dev ;
554- chip -> chip .ops = & pwm_samsung_ops ;
555- chip -> chip .npwm = SAMSUNG_PWM_NUM ;
556- chip -> inverter_mask = BIT (SAMSUNG_PWM_NUM ) - 1 ;
553+ our_chip -> chip .dev = & pdev -> dev ;
554+ our_chip -> chip .ops = & pwm_samsung_ops ;
555+ our_chip -> chip .npwm = SAMSUNG_PWM_NUM ;
556+ our_chip -> inverter_mask = BIT (SAMSUNG_PWM_NUM ) - 1 ;
557557
558558 if (IS_ENABLED (CONFIG_OF ) && pdev -> dev .of_node ) {
559- ret = pwm_samsung_parse_dt (chip );
559+ ret = pwm_samsung_parse_dt (our_chip );
560560 if (ret )
561561 return ret ;
562562 } else {
@@ -565,58 +565,58 @@ static int pwm_samsung_probe(struct platform_device *pdev)
565565 return - EINVAL ;
566566 }
567567
568- memcpy (& chip -> variant , pdev -> dev .platform_data ,
569- sizeof (chip -> variant ));
568+ memcpy (& our_chip -> variant , pdev -> dev .platform_data ,
569+ sizeof (our_chip -> variant ));
570570 }
571571
572- chip -> base = devm_platform_ioremap_resource (pdev , 0 );
573- if (IS_ERR (chip -> base ))
574- return PTR_ERR (chip -> base );
572+ our_chip -> base = devm_platform_ioremap_resource (pdev , 0 );
573+ if (IS_ERR (our_chip -> base ))
574+ return PTR_ERR (our_chip -> base );
575575
576- chip -> base_clk = devm_clk_get (& pdev -> dev , "timers" );
577- if (IS_ERR (chip -> base_clk )) {
576+ our_chip -> base_clk = devm_clk_get (& pdev -> dev , "timers" );
577+ if (IS_ERR (our_chip -> base_clk )) {
578578 dev_err (dev , "failed to get timer base clk\n" );
579- return PTR_ERR (chip -> base_clk );
579+ return PTR_ERR (our_chip -> base_clk );
580580 }
581581
582- ret = clk_prepare_enable (chip -> base_clk );
582+ ret = clk_prepare_enable (our_chip -> base_clk );
583583 if (ret < 0 ) {
584584 dev_err (dev , "failed to enable base clock\n" );
585585 return ret ;
586586 }
587587
588588 for (chan = 0 ; chan < SAMSUNG_PWM_NUM ; ++ chan )
589- if (chip -> variant .output_mask & BIT (chan ))
590- pwm_samsung_set_invert (chip , chan , true);
589+ if (our_chip -> variant .output_mask & BIT (chan ))
590+ pwm_samsung_set_invert (our_chip , chan , true);
591591
592592 /* Following clocks are optional. */
593- chip -> tclk0 = devm_clk_get (& pdev -> dev , "pwm-tclk0" );
594- chip -> tclk1 = devm_clk_get (& pdev -> dev , "pwm-tclk1" );
593+ our_chip -> tclk0 = devm_clk_get (& pdev -> dev , "pwm-tclk0" );
594+ our_chip -> tclk1 = devm_clk_get (& pdev -> dev , "pwm-tclk1" );
595595
596- platform_set_drvdata (pdev , chip );
596+ platform_set_drvdata (pdev , our_chip );
597597
598- ret = pwmchip_add (& chip -> chip );
598+ ret = pwmchip_add (& our_chip -> chip );
599599 if (ret < 0 ) {
600600 dev_err (dev , "failed to register PWM chip\n" );
601- clk_disable_unprepare (chip -> base_clk );
601+ clk_disable_unprepare (our_chip -> base_clk );
602602 return ret ;
603603 }
604604
605605 dev_dbg (dev , "base_clk at %lu, tclk0 at %lu, tclk1 at %lu\n" ,
606- clk_get_rate (chip -> base_clk ),
607- !IS_ERR (chip -> tclk0 ) ? clk_get_rate (chip -> tclk0 ) : 0 ,
608- !IS_ERR (chip -> tclk1 ) ? clk_get_rate (chip -> tclk1 ) : 0 );
606+ clk_get_rate (our_chip -> base_clk ),
607+ !IS_ERR (our_chip -> tclk0 ) ? clk_get_rate (our_chip -> tclk0 ) : 0 ,
608+ !IS_ERR (our_chip -> tclk1 ) ? clk_get_rate (our_chip -> tclk1 ) : 0 );
609609
610610 return 0 ;
611611}
612612
613613static void pwm_samsung_remove (struct platform_device * pdev )
614614{
615- struct samsung_pwm_chip * chip = platform_get_drvdata (pdev );
615+ struct samsung_pwm_chip * our_chip = platform_get_drvdata (pdev );
616616
617- pwmchip_remove (& chip -> chip );
617+ pwmchip_remove (& our_chip -> chip );
618618
619- clk_disable_unprepare (chip -> base_clk );
619+ clk_disable_unprepare (our_chip -> base_clk );
620620}
621621
622622#ifdef CONFIG_PM_SLEEP
0 commit comments