Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1469892 > unrolled thread

[PATCH v3 1/6] clk: sunxi-ng: nkm: Correct mux clock macro name

Started byChen-Yu Tsai <wens@csie.org>
First post2016-08-25 09:30 +0200
Last post2016-08-25 22:30 +0200
Articles 2 — 2 participants

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.


Contents

  [PATCH v3 1/6] clk: sunxi-ng: nkm: Correct mux clock macro name Chen-Yu Tsai <wens@csie.org> - 2016-08-25 09:30 +0200
    Re: [PATCH v3 1/6] clk: sunxi-ng: nkm: Correct mux clock macro name Maxime Ripard <maxime.ripard@free-electrons.com> - 2016-08-25 22:30 +0200

#1469892 — [PATCH v3 1/6] clk: sunxi-ng: nkm: Correct mux clock macro name

FromChen-Yu Tsai <wens@csie.org>
Date2016-08-25 09:30 +0200
Subject[PATCH v3 1/6] clk: sunxi-ng: nkm: Correct mux clock macro name
Message-ID<s9XgR-6iK-1@gated-at.bofh.it>
Mux support for NKM style clocks was added in commit a36583595c17 ("clk:
sunxi-ng: nkm: Add mux to support multiple parents"). The macros for mux
clocks was later changed in commit ad4578dc4cfa ("clk: sunxi-ng: mux:
Rename mux macro to be consistent"), but the NKM style clock header was
missed.

Fix the macro name so NKM with mux compiles correctly.

Fixes: a36583595c17 ("clk: sunxi-ng: nkm: Add mux to support multiple
		      parents")
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
Changes since v2: new patch
---
 drivers/clk/sunxi-ng/ccu_nkm.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clk/sunxi-ng/ccu_nkm.h b/drivers/clk/sunxi-ng/ccu_nkm.h
index fcb152fc4eda..35493fddd8ab 100644
--- a/drivers/clk/sunxi-ng/ccu_nkm.h
+++ b/drivers/clk/sunxi-ng/ccu_nkm.h
@@ -49,7 +49,7 @@ struct ccu_nkm {
 		.k		= _SUNXI_CCU_MULT(_kshift, _kwidth),	\
 		.n		= _SUNXI_CCU_MULT(_nshift, _nwidth),	\
 		.m		= _SUNXI_CCU_DIV(_mshift, _mwidth),	\
-		.mux		= SUNXI_CLK_MUX(_muxshift, _muxwidth),	\
+		.mux		= _SUNXI_CCU_MUX(_muxshift, _muxwidth),	\
 		.common		= {					\
 			.reg		= _reg,				\
 			.hw.init	= CLK_HW_INIT_PARENTS(_name,	\
-- 
2.9.3

[toc] | [next] | [standalone]


#1470398

FromMaxime Ripard <maxime.ripard@free-electrons.com>
Date2016-08-25 22:30 +0200
Message-ID<sa9rI-5Q6-21@gated-at.bofh.it>
In reply to#1469892

[Multipart message — attachments visible in raw view] — view raw

On Thu, Aug 25, 2016 at 02:21:55PM +0800, Chen-Yu Tsai wrote:
> Mux support for NKM style clocks was added in commit a36583595c17 ("clk:
> sunxi-ng: nkm: Add mux to support multiple parents"). The macros for mux
> clocks was later changed in commit ad4578dc4cfa ("clk: sunxi-ng: mux:
> Rename mux macro to be consistent"), but the NKM style clock header was
> missed.
> 
> Fix the macro name so NKM with mux compiles correctly.
> 
> Fixes: a36583595c17 ("clk: sunxi-ng: nkm: Add mux to support multiple
> 		      parents")
> Signed-off-by: Chen-Yu Tsai <wens@csie.org>
> ---
> Changes since v2: new patch

Squashed into the previous patch, thanks!
Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web