From patchwork Thu Aug 25 06:21:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 9298851 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 38616608A7 for ; Thu, 25 Aug 2016 07:30:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2B78529201 for ; Thu, 25 Aug 2016 07:30:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1FAFA29203; Thu, 25 Aug 2016 07:30:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A335E29200 for ; Thu, 25 Aug 2016 07:30:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758272AbcHYH32 (ORCPT ); Thu, 25 Aug 2016 03:29:28 -0400 Received: from mirror2.csie.ntu.edu.tw ([140.112.30.76]:49148 "EHLO wens.csie.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756430AbcHYH3Y (ORCPT ); Thu, 25 Aug 2016 03:29:24 -0400 Received: by wens.csie.org (Postfix, from userid 1000) id B38665F7C9; Thu, 25 Aug 2016 14:22:04 +0800 (CST) From: Chen-Yu Tsai To: Maxime Ripard , Michael Turquette , Stephen Boyd Cc: Chen-Yu Tsai , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@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 Message-Id: <20160825062200.17206-2-wens@csie.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160825062200.17206-1-wens@csie.org> References: <20160825062200.17206-1-wens@csie.org> Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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, \