From patchwork Fri May 26 07:38:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guodong Xu X-Patchwork-Id: 9749833 X-Patchwork-Delegate: sboyd@codeaurora.org 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 A78CD6037E for ; Fri, 26 May 2017 07:39:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 97D72281B7 for ; Fri, 26 May 2017 07:39:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8C8A4283BF; Fri, 26 May 2017 07:39:07 +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.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 3C60A281B7 for ; Fri, 26 May 2017 07:39:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1035357AbdEZHil (ORCPT ); Fri, 26 May 2017 03:38:41 -0400 Received: from mail-pf0-f181.google.com ([209.85.192.181]:33346 "EHLO mail-pf0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1035348AbdEZHif (ORCPT ); Fri, 26 May 2017 03:38:35 -0400 Received: by mail-pf0-f181.google.com with SMTP id e193so4189334pfh.0 for ; Fri, 26 May 2017 00:38:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=eF1NCHRdgYeSwUw/BUsdYReuItV1TCgRBZS89MNcBOk=; b=gu9iI7YU5CrMF4dgiWeaDtHgsXgzr070I6r24/w/hqLQagZom0UMvmSTMUL7ZFHX7U 00ypER0KYZIdYareGF5qyf7KL2B3JqOZxY2M22jtUe3lIyvHKLk/D3GMVnYwXswctOLs 81aIlk3qqOKltBc3pZuHQgyxXBOlj1FpphPJQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=eF1NCHRdgYeSwUw/BUsdYReuItV1TCgRBZS89MNcBOk=; b=k26Mq1KP1bMJTnTkR9y6UNkbgQ0ClOUf1VTzNafjb2YQU8gA1t+JgHkN5fIhBMM+xh gq9FKHRJTtgCZ3FPkD3+HAJLlKgm487nDocEYzBa3X/SgPbmftES+NXAXrU+iqH+t/Ui 5sWoEjW1DWsIzD2RIQRxazDlq6XPAfak4ZMHPiFLeIBIan+unQejEiG3UahFNlifWpjR v/wJmHdk7YB4tyjyx5j/157Y6JkNPdqaZcm4ht1k7Z7bu2DC6bUTgck7gA6cZzlr5Z+J 9zKJAEmCxAm6KNseulONu6fBRzel/WRDu6eRILucrwKKdPrrE0SEt3kvqAkxEKUcShen dvvw== X-Gm-Message-State: AODbwcCxrzoz+7X0VbQ+b1BY/70xFC+SsgZgNAMtRTF9WAGqrMYV2OvN XhRJNG2/nmmyt9EK X-Received: by 10.98.0.8 with SMTP id 8mr709135pfa.127.1495784314904; Fri, 26 May 2017 00:38:34 -0700 (PDT) Received: from docularxu-ThinkPad-T440p.219.146.1.66 ([45.56.159.222]) by smtp.gmail.com with ESMTPSA id t3sm19106334pfl.60.2017.05.26.00.38.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 26 May 2017 00:38:34 -0700 (PDT) From: Guodong Xu To: mturquette@baylibre.com, sboyd@codeaurora.org, robh+dt@kernel.org, mark.rutland@arm.com Cc: chenjun14@huawei.com, zhongkaihua@huawei.com, zhangfei.gao@linaro.org, leo.yan@linaro.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, John Stultz , Guodong Xu Subject: [PATCH v2 1/3] clk: hi3660: fix wrong parent name of clk_mux_sysbus Date: Fri, 26 May 2017 15:38:19 +0800 Message-Id: <20170526073821.25971-2-guodong.xu@linaro.org> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170526073821.25971-1-guodong.xu@linaro.org> References: <20170526073821.25971-1-guodong.xu@linaro.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 From: Chen Jun Parent name of clk_mux_sysbus is not correct. This patch fixes it. Signed-off-by: Chen Jun Signed-off-by: John Stultz Signed-off-by: Guodong Xu Acked-by: Zhangfei Gao --- drivers/clk/hisilicon/clk-hi3660.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/clk/hisilicon/clk-hi3660.c b/drivers/clk/hisilicon/clk-hi3660.c index 96a9697..143ce0c 100644 --- a/drivers/clk/hisilicon/clk-hi3660.c +++ b/drivers/clk/hisilicon/clk-hi3660.c @@ -206,6 +206,8 @@ static const struct hisi_gate_clock hi3660_crgctrl_gate_clks[] = { }; static const char *const +clk_mux_sysbus_p[] = {"clk_ppll1", "clk_ppll0"}; +static const char *const clk_mux_sdio_sys_p[] = {"clk_factor_mmc", "clk_div_sdio",}; static const char *const clk_mux_sd_sys_p[] = {"clk_factor_mmc", "clk_div_sd",}; @@ -239,8 +241,8 @@ static const char *const clk_mux_i2c_p[] = {"clkin_sys", "clk_div_i2c",}; static const struct hisi_mux_clock hi3660_crgctrl_mux_clks[] = { - { HI3660_CLK_MUX_SYSBUS, "clk_mux_sysbus", clk_mux_sdio_sys_p, - ARRAY_SIZE(clk_mux_sdio_sys_p), CLK_SET_RATE_PARENT, 0xac, 0, 1, + { HI3660_CLK_MUX_SYSBUS, "clk_mux_sysbus", clk_mux_sysbus_p, + ARRAY_SIZE(clk_mux_sysbus_p), CLK_SET_RATE_PARENT, 0xac, 0, 1, CLK_MUX_HIWORD_MASK, }, { HI3660_CLK_MUX_UART0, "clk_mux_uart0", clk_mux_uart0_p, ARRAY_SIZE(clk_mux_uart0_p), CLK_SET_RATE_PARENT, 0xac, 2, 1,