@@ -39,10 +39,10 @@ struct rsnd_adg {
3939 int clkin_size ;
4040 int clkout_size ;
4141 u32 ckr ;
42- u32 rbga ;
43- u32 rbgb ;
42+ u32 brga ;
43+ u32 brgb ;
4444
45- int rbg_rate [ADG_HZ_SIZE ]; /* RBGA / RBGB */
45+ int brg_rate [ADG_HZ_SIZE ]; /* BRGA / BRGB */
4646};
4747
4848#define for_each_rsnd_clkin (pos , adg , i ) \
@@ -75,7 +75,7 @@ static const char * const clkout_name_gen2[] = {
7575 [CLKOUT3 ] = "audio_clkout3" ,
7676};
7777
78- static u32 rsnd_adg_calculate_rbgx (unsigned long div )
78+ static u32 rsnd_adg_calculate_brgx (unsigned long div )
7979{
8080 int i ;
8181
@@ -131,8 +131,8 @@ static void __rsnd_adg_get_timesel_ratio(struct rsnd_priv *priv,
131131 adg -> clkin_rate [CLKA ], /* 0000: CLKA */
132132 adg -> clkin_rate [CLKB ], /* 0001: CLKB */
133133 adg -> clkin_rate [CLKC ], /* 0010: CLKC */
134- adg -> rbg_rate [ADG_HZ_441 ], /* 0011: RBGA */
135- adg -> rbg_rate [ADG_HZ_48 ], /* 0100: RBGB */
134+ adg -> brg_rate [ADG_HZ_441 ], /* 0011: BRGA */
135+ adg -> brg_rate [ADG_HZ_48 ], /* 0100: BRGB */
136136 };
137137
138138 min = ~0 ;
@@ -323,10 +323,10 @@ int rsnd_adg_clk_query(struct rsnd_priv *priv, unsigned int rate)
323323 /*
324324 * find divided clock from BRGA/BRGB
325325 */
326- if (rate == adg -> rbg_rate [ADG_HZ_441 ])
326+ if (rate == adg -> brg_rate [ADG_HZ_441 ])
327327 return 0x10 ;
328328
329- if (rate == adg -> rbg_rate [ADG_HZ_48 ])
329+ if (rate == adg -> brg_rate [ADG_HZ_48 ])
330330 return 0x20 ;
331331
332332 return - EIO ;
@@ -358,13 +358,13 @@ int rsnd_adg_ssi_clk_try_start(struct rsnd_mod *ssi_mod, unsigned int rate)
358358 ckr = 0x80000000 ; /* BRGB output = 48kHz */
359359
360360 rsnd_mod_bset (adg_mod , BRGCKR , 0x80770000 , adg -> ckr | ckr );
361- rsnd_mod_write (adg_mod , BRRA , adg -> rbga );
362- rsnd_mod_write (adg_mod , BRRB , adg -> rbgb );
361+ rsnd_mod_write (adg_mod , BRRA , adg -> brga );
362+ rsnd_mod_write (adg_mod , BRRB , adg -> brgb );
363363
364364 dev_dbg (dev , "CLKOUT is based on BRG%c (= %dHz)\n" ,
365365 (ckr ) ? 'B' : 'A' ,
366- (ckr ) ? adg -> rbg_rate [ADG_HZ_48 ] :
367- adg -> rbg_rate [ADG_HZ_441 ]);
366+ (ckr ) ? adg -> brg_rate [ADG_HZ_48 ] :
367+ adg -> brg_rate [ADG_HZ_441 ]);
368368
369369 return 0 ;
370370}
@@ -484,7 +484,7 @@ static int rsnd_adg_get_clkout(struct rsnd_priv *priv)
484484 struct device * dev = rsnd_priv_to_dev (priv );
485485 struct device_node * np = dev -> of_node ;
486486 struct property * prop ;
487- u32 ckr , rbgx , rbga , rbgb ;
487+ u32 ckr , brgx , brga , brgb ;
488488 u32 rate , div ;
489489 u32 req_rate [ADG_HZ_SIZE ] = {};
490490 uint32_t count = 0 ;
@@ -501,8 +501,8 @@ static int rsnd_adg_get_clkout(struct rsnd_priv *priv)
501501 };
502502
503503 ckr = 0 ;
504- rbga = 2 ; /* default 1/6 */
505- rbgb = 2 ; /* default 1/6 */
504+ brga = 2 ; /* default 1/6 */
505+ brgb = 2 ; /* default 1/6 */
506506
507507 /*
508508 * ADG supports BRRA/BRRB output only
@@ -543,30 +543,30 @@ static int rsnd_adg_get_clkout(struct rsnd_priv *priv)
543543 if (0 == rate ) /* not used */
544544 continue ;
545545
546- /* RBGA */
547- if (!adg -> rbg_rate [ADG_HZ_441 ] && (0 == rate % 44100 )) {
546+ /* BRGA */
547+ if (!adg -> brg_rate [ADG_HZ_441 ] && (0 == rate % 44100 )) {
548548 div = 6 ;
549549 if (req_Hz [ADG_HZ_441 ])
550550 div = rate / req_Hz [ADG_HZ_441 ];
551- rbgx = rsnd_adg_calculate_rbgx (div );
552- if (BRRx_MASK (rbgx ) == rbgx ) {
553- rbga = rbgx ;
554- adg -> rbg_rate [ADG_HZ_441 ] = rate / div ;
551+ brgx = rsnd_adg_calculate_brgx (div );
552+ if (BRRx_MASK (brgx ) == brgx ) {
553+ brga = brgx ;
554+ adg -> brg_rate [ADG_HZ_441 ] = rate / div ;
555555 ckr |= brg_table [i ] << 20 ;
556556 if (req_Hz [ADG_HZ_441 ])
557557 parent_clk_name = __clk_get_name (clk );
558558 }
559559 }
560560
561- /* RBGB */
562- if (!adg -> rbg_rate [ADG_HZ_48 ] && (0 == rate % 48000 )) {
561+ /* BRGB */
562+ if (!adg -> brg_rate [ADG_HZ_48 ] && (0 == rate % 48000 )) {
563563 div = 6 ;
564564 if (req_Hz [ADG_HZ_48 ])
565565 div = rate / req_Hz [ADG_HZ_48 ];
566- rbgx = rsnd_adg_calculate_rbgx (div );
567- if (BRRx_MASK (rbgx ) == rbgx ) {
568- rbgb = rbgx ;
569- adg -> rbg_rate [ADG_HZ_48 ] = rate / div ;
566+ brgx = rsnd_adg_calculate_brgx (div );
567+ if (BRRx_MASK (brgx ) == brgx ) {
568+ brgb = brgx ;
569+ adg -> brg_rate [ADG_HZ_48 ] = rate / div ;
570570 ckr |= brg_table [i ] << 16 ;
571571 if (req_Hz [ADG_HZ_48 ])
572572 parent_clk_name = __clk_get_name (clk );
@@ -620,8 +620,8 @@ static int rsnd_adg_get_clkout(struct rsnd_priv *priv)
620620
621621rsnd_adg_get_clkout_end :
622622 adg -> ckr = ckr ;
623- adg -> rbga = rbga ;
624- adg -> rbgb = rbgb ;
623+ adg -> brga = brga ;
624+ adg -> brgb = brgb ;
625625
626626 return 0 ;
627627
@@ -663,9 +663,9 @@ void rsnd_adg_clk_dbg_info(struct rsnd_priv *priv, struct seq_file *m)
663663 __clk_get_name (clk ), clk , clk_get_rate (clk ));
664664
665665 dbg_msg (dev , m , "BRGCKR = 0x%08x, BRRA/BRRB = 0x%x/0x%x\n" ,
666- adg -> ckr , adg -> rbga , adg -> rbgb );
667- dbg_msg (dev , m , "BRGA (for 44100 base) = %d\n" , adg -> rbg_rate [ADG_HZ_441 ]);
668- dbg_msg (dev , m , "BRGB (for 48000 base) = %d\n" , adg -> rbg_rate [ADG_HZ_48 ]);
666+ adg -> ckr , adg -> brga , adg -> brgb );
667+ dbg_msg (dev , m , "BRGA (for 44100 base) = %d\n" , adg -> brg_rate [ADG_HZ_441 ]);
668+ dbg_msg (dev , m , "BRGB (for 48000 base) = %d\n" , adg -> brg_rate [ADG_HZ_48 ]);
669669
670670 /*
671671 * Actual CLKOUT will be exchanged in rsnd_adg_ssi_clk_try_start()
0 commit comments