Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a501a14e authored by Maxime Ripard's avatar Maxime Ripard
Browse files

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: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: default avatarChen-Yu Tsai <wens@csie.org>
parent 35b1fc2c

drivers/clk/sunxi-ng/ccu_div.h

+3 −3
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#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

 * @width: Width of the divider field in its register

 * @max: Maximum value allowed for that divider. This is the
@@ -36,7 +36,7 @@ 
 * It is basically a wrapper around the clk_divider functions

 * arguments.

 */

struct _ccu_div {

struct ccu_div_internal {

	u8			shift;

	u8			width;
@@ -78,7 +78,7 @@ struct _ccu_div { 
struct ccu_div {

	u32			enable;



	struct _ccu_div		div;

	struct ccu_div_internal		div;

	struct ccu_mux_internal	mux;

	struct ccu_common	common;

};

drivers/clk/sunxi-ng/ccu_frac.c

+6 −6
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include "ccu_frac.h"



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))

		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,

			    struct _ccu_frac *cf)

			    struct ccu_frac_internal *cf)

{

	unsigned long flags;

	u32 reg;
@@ -38,7 +38,7 @@ void ccu_frac_helper_enable(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;

	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,

			      struct _ccu_frac *cf,

			      struct ccu_frac_internal *cf,

			      unsigned long rate)

{

	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,

					struct _ccu_frac *cf)

					struct ccu_frac_internal *cf)

{

	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,

			     struct _ccu_frac *cf,

			     struct ccu_frac_internal *cf,

			     unsigned long rate)

{

	unsigned long flags;

drivers/clk/sunxi-ng/ccu_frac.h

+7 −7
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


#include "ccu_common.h"



struct _ccu_frac {

struct ccu_frac_internal {

	u32		enable;

	u32		select;
@@ -33,21 +33,21 @@ struct _ccu_frac { 
	}



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,

			    struct _ccu_frac *cf);

			    struct ccu_frac_internal *cf);

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,

			      struct _ccu_frac *cf,

			      struct ccu_frac_internal *cf,

			      unsigned long rate);



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,

			     struct _ccu_frac *cf,

			     struct ccu_frac_internal *cf,

			     unsigned long rate);



#endif /* _CCU_FRAC_H_ */

drivers/clk/sunxi-ng/ccu_mp.h

+2 −2
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ 
struct ccu_mp {

	u32			enable;



	struct _ccu_div		m;

	struct _ccu_div		p;

	struct ccu_div_internal		m;

	struct ccu_div_internal		p;

	struct ccu_mux_internal	mux;

	struct ccu_common	common;

};

drivers/clk/sunxi-ng/ccu_mult.h

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#include "ccu_common.h"

#include "ccu_mux.h"



struct _ccu_mult {

struct ccu_mult_internal {

	u8	shift;

	u8	width;

};
@@ -18,7 +18,7 @@ struct _ccu_mult { 
struct ccu_mult {

	u32			enable;



	struct _ccu_mult	mult;

	struct ccu_mult_internal	mult;

	struct ccu_mux_internal	mux;

	struct ccu_common	common;

};