mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-18 19:05:39 +00:00
clk: sunxi-ng: Rename the internal structures
Rename the structures meant to be embedded in other structures to make it consistent with the mux structure name Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Chen-Yu Tsai <wens@csie.org>
This commit is contained in:
parent
35b1fc2cd7
commit
a501a14e38
@ -20,7 +20,7 @@
|
|||||||
#include "ccu_mux.h"
|
#include "ccu_mux.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* struct _ccu_div - Internal divider description
|
* struct ccu_div_internal - Internal divider description
|
||||||
* @shift: Bit offset of the divider in its register
|
* @shift: Bit offset of the divider in its register
|
||||||
* @width: Width of the divider field in its register
|
* @width: Width of the divider field in its register
|
||||||
* @max: Maximum value allowed for that divider. This is the
|
* @max: Maximum value allowed for that divider. This is the
|
||||||
@ -36,7 +36,7 @@
|
|||||||
* It is basically a wrapper around the clk_divider functions
|
* It is basically a wrapper around the clk_divider functions
|
||||||
* arguments.
|
* arguments.
|
||||||
*/
|
*/
|
||||||
struct _ccu_div {
|
struct ccu_div_internal {
|
||||||
u8 shift;
|
u8 shift;
|
||||||
u8 width;
|
u8 width;
|
||||||
|
|
||||||
@ -78,7 +78,7 @@ struct _ccu_div {
|
|||||||
struct ccu_div {
|
struct ccu_div {
|
||||||
u32 enable;
|
u32 enable;
|
||||||
|
|
||||||
struct _ccu_div div;
|
struct ccu_div_internal div;
|
||||||
struct ccu_mux_internal mux;
|
struct ccu_mux_internal mux;
|
||||||
struct ccu_common common;
|
struct ccu_common common;
|
||||||
};
|
};
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
#include "ccu_frac.h"
|
#include "ccu_frac.h"
|
||||||
|
|
||||||
bool ccu_frac_helper_is_enabled(struct ccu_common *common,
|
bool ccu_frac_helper_is_enabled(struct ccu_common *common,
|
||||||
struct _ccu_frac *cf)
|
struct ccu_frac_internal *cf)
|
||||||
{
|
{
|
||||||
if (!(common->features & CCU_FEATURE_FRACTIONAL))
|
if (!(common->features & CCU_FEATURE_FRACTIONAL))
|
||||||
return false;
|
return false;
|
||||||
@ -23,7 +23,7 @@ bool ccu_frac_helper_is_enabled(struct ccu_common *common,
|
|||||||
}
|
}
|
||||||
|
|
||||||
void ccu_frac_helper_enable(struct ccu_common *common,
|
void ccu_frac_helper_enable(struct ccu_common *common,
|
||||||
struct _ccu_frac *cf)
|
struct ccu_frac_internal *cf)
|
||||||
{
|
{
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
u32 reg;
|
u32 reg;
|
||||||
@ -38,7 +38,7 @@ void ccu_frac_helper_enable(struct ccu_common *common,
|
|||||||
}
|
}
|
||||||
|
|
||||||
void ccu_frac_helper_disable(struct ccu_common *common,
|
void ccu_frac_helper_disable(struct ccu_common *common,
|
||||||
struct _ccu_frac *cf)
|
struct ccu_frac_internal *cf)
|
||||||
{
|
{
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
u32 reg;
|
u32 reg;
|
||||||
@ -53,7 +53,7 @@ void ccu_frac_helper_disable(struct ccu_common *common,
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool ccu_frac_helper_has_rate(struct ccu_common *common,
|
bool ccu_frac_helper_has_rate(struct ccu_common *common,
|
||||||
struct _ccu_frac *cf,
|
struct ccu_frac_internal *cf,
|
||||||
unsigned long rate)
|
unsigned long rate)
|
||||||
{
|
{
|
||||||
if (!(common->features & CCU_FEATURE_FRACTIONAL))
|
if (!(common->features & CCU_FEATURE_FRACTIONAL))
|
||||||
@ -63,7 +63,7 @@ bool ccu_frac_helper_has_rate(struct ccu_common *common,
|
|||||||
}
|
}
|
||||||
|
|
||||||
unsigned long ccu_frac_helper_read_rate(struct ccu_common *common,
|
unsigned long ccu_frac_helper_read_rate(struct ccu_common *common,
|
||||||
struct _ccu_frac *cf)
|
struct ccu_frac_internal *cf)
|
||||||
{
|
{
|
||||||
u32 reg;
|
u32 reg;
|
||||||
|
|
||||||
@ -84,7 +84,7 @@ unsigned long ccu_frac_helper_read_rate(struct ccu_common *common,
|
|||||||
}
|
}
|
||||||
|
|
||||||
int ccu_frac_helper_set_rate(struct ccu_common *common,
|
int ccu_frac_helper_set_rate(struct ccu_common *common,
|
||||||
struct _ccu_frac *cf,
|
struct ccu_frac_internal *cf,
|
||||||
unsigned long rate)
|
unsigned long rate)
|
||||||
{
|
{
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
#include "ccu_common.h"
|
#include "ccu_common.h"
|
||||||
|
|
||||||
struct _ccu_frac {
|
struct ccu_frac_internal {
|
||||||
u32 enable;
|
u32 enable;
|
||||||
u32 select;
|
u32 select;
|
||||||
|
|
||||||
@ -33,21 +33,21 @@ struct _ccu_frac {
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool ccu_frac_helper_is_enabled(struct ccu_common *common,
|
bool ccu_frac_helper_is_enabled(struct ccu_common *common,
|
||||||
struct _ccu_frac *cf);
|
struct ccu_frac_internal *cf);
|
||||||
void ccu_frac_helper_enable(struct ccu_common *common,
|
void ccu_frac_helper_enable(struct ccu_common *common,
|
||||||
struct _ccu_frac *cf);
|
struct ccu_frac_internal *cf);
|
||||||
void ccu_frac_helper_disable(struct ccu_common *common,
|
void ccu_frac_helper_disable(struct ccu_common *common,
|
||||||
struct _ccu_frac *cf);
|
struct ccu_frac_internal *cf);
|
||||||
|
|
||||||
bool ccu_frac_helper_has_rate(struct ccu_common *common,
|
bool ccu_frac_helper_has_rate(struct ccu_common *common,
|
||||||
struct _ccu_frac *cf,
|
struct ccu_frac_internal *cf,
|
||||||
unsigned long rate);
|
unsigned long rate);
|
||||||
|
|
||||||
unsigned long ccu_frac_helper_read_rate(struct ccu_common *common,
|
unsigned long ccu_frac_helper_read_rate(struct ccu_common *common,
|
||||||
struct _ccu_frac *cf);
|
struct ccu_frac_internal *cf);
|
||||||
|
|
||||||
int ccu_frac_helper_set_rate(struct ccu_common *common,
|
int ccu_frac_helper_set_rate(struct ccu_common *common,
|
||||||
struct _ccu_frac *cf,
|
struct ccu_frac_internal *cf,
|
||||||
unsigned long rate);
|
unsigned long rate);
|
||||||
|
|
||||||
#endif /* _CCU_FRAC_H_ */
|
#endif /* _CCU_FRAC_H_ */
|
||||||
|
@ -29,8 +29,8 @@
|
|||||||
struct ccu_mp {
|
struct ccu_mp {
|
||||||
u32 enable;
|
u32 enable;
|
||||||
|
|
||||||
struct _ccu_div m;
|
struct ccu_div_internal m;
|
||||||
struct _ccu_div p;
|
struct ccu_div_internal p;
|
||||||
struct ccu_mux_internal mux;
|
struct ccu_mux_internal mux;
|
||||||
struct ccu_common common;
|
struct ccu_common common;
|
||||||
};
|
};
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
#include "ccu_common.h"
|
#include "ccu_common.h"
|
||||||
#include "ccu_mux.h"
|
#include "ccu_mux.h"
|
||||||
|
|
||||||
struct _ccu_mult {
|
struct ccu_mult_internal {
|
||||||
u8 shift;
|
u8 shift;
|
||||||
u8 width;
|
u8 width;
|
||||||
};
|
};
|
||||||
@ -18,7 +18,7 @@ struct _ccu_mult {
|
|||||||
struct ccu_mult {
|
struct ccu_mult {
|
||||||
u32 enable;
|
u32 enable;
|
||||||
|
|
||||||
struct _ccu_mult mult;
|
struct ccu_mult_internal mult;
|
||||||
struct ccu_mux_internal mux;
|
struct ccu_mux_internal mux;
|
||||||
struct ccu_common common;
|
struct ccu_common common;
|
||||||
};
|
};
|
||||||
|
@ -30,8 +30,8 @@ struct ccu_nk {
|
|||||||
u32 enable;
|
u32 enable;
|
||||||
u32 lock;
|
u32 lock;
|
||||||
|
|
||||||
struct _ccu_mult n;
|
struct ccu_mult_internal n;
|
||||||
struct _ccu_mult k;
|
struct ccu_mult_internal k;
|
||||||
|
|
||||||
unsigned int fixed_post_div;
|
unsigned int fixed_post_div;
|
||||||
|
|
||||||
|
@ -29,9 +29,9 @@ struct ccu_nkm {
|
|||||||
u32 enable;
|
u32 enable;
|
||||||
u32 lock;
|
u32 lock;
|
||||||
|
|
||||||
struct _ccu_mult n;
|
struct ccu_mult_internal n;
|
||||||
struct _ccu_mult k;
|
struct ccu_mult_internal k;
|
||||||
struct _ccu_div m;
|
struct ccu_div_internal m;
|
||||||
struct ccu_mux_internal mux;
|
struct ccu_mux_internal mux;
|
||||||
|
|
||||||
struct ccu_common common;
|
struct ccu_common common;
|
||||||
|
@ -29,10 +29,10 @@ struct ccu_nkmp {
|
|||||||
u32 enable;
|
u32 enable;
|
||||||
u32 lock;
|
u32 lock;
|
||||||
|
|
||||||
struct _ccu_mult n;
|
struct ccu_mult_internal n;
|
||||||
struct _ccu_mult k;
|
struct ccu_mult_internal k;
|
||||||
struct _ccu_div m;
|
struct ccu_div_internal m;
|
||||||
struct _ccu_div p;
|
struct ccu_div_internal p;
|
||||||
|
|
||||||
struct ccu_common common;
|
struct ccu_common common;
|
||||||
};
|
};
|
||||||
|
@ -30,9 +30,9 @@ struct ccu_nm {
|
|||||||
u32 enable;
|
u32 enable;
|
||||||
u32 lock;
|
u32 lock;
|
||||||
|
|
||||||
struct _ccu_mult n;
|
struct ccu_mult_internal n;
|
||||||
struct _ccu_div m;
|
struct ccu_div_internal m;
|
||||||
struct _ccu_frac frac;
|
struct ccu_frac_internal frac;
|
||||||
|
|
||||||
struct ccu_common common;
|
struct ccu_common common;
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user