leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clk: sunxi-ng: mux: Rename mux macro to be consistent

Browse Source 
Rename the internal mux macro to be consistent with the other internal
structure macros.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
This commit is contained in:
Maxime Ripard 2016-07-20 23:45:35 +02:00
parent a36583595c
commit 89af85253c
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/clk/sunxi-ng/ccu_div.h
View File

@ -83,7 +83,7 @@ struct ccu_div {
struct ccu_div _struct = { \ struct ccu_div _struct = { \
.enable = _gate, \ .enable = _gate, \
.div = _SUNXI_CCU_DIV(_mshift, _mwidth), \ .div = _SUNXI_CCU_DIV(_mshift, _mwidth), \
.mux = SUNXI_CLK_MUX(_muxshift, _muxwidth), \ .mux = _SUNXI_CCU_MUX(_muxshift, _muxwidth), \
.common = { \ .common = { \
.reg = _reg, \ .reg = _reg, \
.hw.init = CLK_HW_INIT_PARENTS(_name, \ .hw.init = CLK_HW_INIT_PARENTS(_name, \

2
drivers/clk/sunxi-ng/ccu_mp.h
View File

@ -44,7 +44,7 @@ struct ccu_mp {
.enable = _gate, \ .enable = _gate, \
.m = _SUNXI_CCU_DIV(_mshift, _mwidth), \ .m = _SUNXI_CCU_DIV(_mshift, _mwidth), \
.p = _SUNXI_CCU_DIV(_pshift, _pwidth), \ .p = _SUNXI_CCU_DIV(_pshift, _pwidth), \
.mux = SUNXI_CLK_MUX(_muxshift, _muxwidth), \ .mux = _SUNXI_CCU_MUX(_muxshift, _muxwidth), \
.common = { \ .common = { \
.reg = _reg, \ .reg = _reg, \
.hw.init = CLK_HW_INIT_PARENTS(_name, \ .hw.init = CLK_HW_INIT_PARENTS(_name, \

6
drivers/clk/sunxi-ng/ccu_mux.h
View File

@ -21,7 +21,7 @@ struct ccu_mux_internal {
} variable_prediv; } variable_prediv;
}; };
#define SUNXI_CLK_MUX(_shift, _width) \ #define _SUNXI_CCU_MUX(_shift, _width) \
{ \ { \
.shift = _shift, \ .shift = _shift, \
.width = _width, \ .width = _width, \
@ -37,7 +37,7 @@ struct ccu_mux {
#define SUNXI_CCU_MUX(_struct, _name, _parents, _reg, _shift, _width, _flags) \ #define SUNXI_CCU_MUX(_struct, _name, _parents, _reg, _shift, _width, _flags) \
struct ccu_mux _struct = { \ struct ccu_mux _struct = { \
.mux = SUNXI_CLK_MUX(_shift, _width), \ .mux = _SUNXI_CCU_MUX(_shift, _width), \
.common = { \ .common = { \
.reg = _reg, \ .reg = _reg, \
.hw.init = CLK_HW_INIT_PARENTS(_name, \ .hw.init = CLK_HW_INIT_PARENTS(_name, \
@ -51,7 +51,7 @@ struct ccu_mux {
_shift, _width, _gate, _flags) \ _shift, _width, _gate, _flags) \
struct ccu_mux _struct = { \ struct ccu_mux _struct = { \
.enable = _gate, \ .enable = _gate, \
.mux = SUNXI_CLK_MUX(_shift, _width), \ .mux = _SUNXI_CCU_MUX(_shift, _width), \
.common = { \ .common = { \
.reg = _reg, \ .reg = _reg, \
.hw.init = CLK_HW_INIT_PARENTS(_name, \ .hw.init = CLK_HW_INIT_PARENTS(_name, \

2
drivers/clk/sunxi-ng/ccu_nkm.h
View File

@ -49,7 +49,7 @@ struct ccu_nkm {
.k = _SUNXI_CCU_MULT(_kshift, _kwidth), \ .k = _SUNXI_CCU_MULT(_kshift, _kwidth), \
.n = _SUNXI_CCU_MULT(_nshift, _nwidth), \ .n = _SUNXI_CCU_MULT(_nshift, _nwidth), \
.m = _SUNXI_CCU_DIV(_mshift, _mwidth), \ .m = _SUNXI_CCU_DIV(_mshift, _mwidth), \
.mux = SUNXI_CLK_MUX(_muxshift, _muxwidth), \ .mux = _SUNXI_CCU_MUX(_muxshift, _muxwidth), \
.common = { \ .common = { \
.reg = _reg, \ .reg = _reg, \
.hw.init = CLK_HW_INIT_PARENTS(_name, \ .hw.init = CLK_HW_INIT_PARENTS(_name, \