devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Chen-Yu Tsai <wens@csie.org>
To: Maxime Ripard <maxime.ripard@free-electrons.com>,
	Michael Turquette <mturquette@baylibre.com>,
	Stephen Boyd <sboyd@codeaurora.org>
Cc: devicetree@vger.kernel.org, Chen-Yu Tsai <wens@csie.org>,
	linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH v3 1/6] clk: sunxi-ng: nkm: Correct mux clock macro name
Date: Thu, 25 Aug 2016 14:21:55 +0800	[thread overview]
Message-ID: <20160825062200.17206-2-wens@csie.org> (raw)
In-Reply-To: <20160825062200.17206-1-wens@csie.org>

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

  reply	other threads:[~2016-08-25  6:21 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-25  6:21 [PATCH v3 0/6] clk: sunxi-ng: Support A31/A31s CCU Chen-Yu Tsai
2016-08-25  6:21 ` Chen-Yu Tsai [this message]
2016-08-25 20:26   ` [PATCH v3 1/6] clk: sunxi-ng: nkm: Correct mux clock macro name Maxime Ripard
2016-08-25  6:21 ` [PATCH v3 2/6] clk: sunxi-ng: mux: Add support for mux tables Chen-Yu Tsai
2016-08-25 20:27   ` Maxime Ripard
2016-08-25  6:21 ` [PATCH v3 3/6] clk: sunxi-ng: mux: support fixed pre-dividers on multiple parents Chen-Yu Tsai
     [not found]   ` <20160825062200.17206-4-wens-jdAy2FN1RRM@public.gmane.org>
2016-08-25 20:27     ` Maxime Ripard
2016-08-25  6:21 ` [PATCH v3 4/6] clk: sunxi-ng: mux: Add clk notifier functions Chen-Yu Tsai
2016-08-25 20:31   ` Maxime Ripard
     [not found] ` <20160825062200.17206-1-wens-jdAy2FN1RRM@public.gmane.org>
2016-08-25  6:21   ` [PATCH v3 5/6] clk: sunxi-ng: Add A31/A31s clocks Chen-Yu Tsai
2016-08-25 20:31     ` Maxime Ripard
2016-08-25  6:22 ` [PATCH v3 6/6] ARM: dts: sun6i: switch A31/A31s to new CCU clock bindings Chen-Yu Tsai
2016-08-25 20:32   ` Maxime Ripard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160825062200.17206-2-wens@csie.org \
    --to=wens@csie.org \
    --cc=devicetree@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-clk@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=maxime.ripard@free-electrons.com \
    --cc=mturquette@baylibre.com \
    --cc=sboyd@codeaurora.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).