From patchwork Mon May 15 05:54:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guodong Xu X-Patchwork-Id: 9726109 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 E14B660380 for ; Mon, 15 May 2017 05:55:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D0BA92894E for ; Mon, 15 May 2017 05:55:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C560628954; Mon, 15 May 2017 05:55:24 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6161D2894E for ; Mon, 15 May 2017 05:55:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=353DU8mbjzviByB8aRLspX/F/jEAoInB2qS/P1miCq4=; b=rOY jJ6SE0P8Zw8XdyN1rdlmF/HHyyro5X5HCyuvTaNtCuk01z88TP7PiKnuN2g4m8DNs67Ui537Z8+eb q8gbYhWTalck9idhE/eYKCvLUDqfQrqolhh6FgiFJB3ZZlrXVPjjmd7Q9WklUCSWdwWgX+/ZhK7xz +Kvg7VnOGiP5EaT0AyKRL2dCVVjdgk6zIsUU0dl5D0hn+usONIOpPuEX6kJSs46aYQ9JzG38Uvh7g pZboxP9iJnpdIJgps4XwphCr+PA7AsmKWn0fwRDgXcppVLwfMHOOclwWYHQ41bD6Lyp59J3Ifi8eB ebYyRUs9cjWiZ1XlMjg4BViewNL9G0w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dA8yY-0004HT-Mu; Mon, 15 May 2017 05:55:22 +0000 Received: from mail-pf0-x232.google.com ([2607:f8b0:400e:c00::232]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dA8yV-00033i-HZ for linux-arm-kernel@lists.infradead.org; Mon, 15 May 2017 05:55:21 +0000 Received: by mail-pf0-x232.google.com with SMTP id n23so52421971pfb.2 for ; Sun, 14 May 2017 22:54:58 -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; bh=eF1NCHRdgYeSwUw/BUsdYReuItV1TCgRBZS89MNcBOk=; b=ia+cc9lpENR8QEGwE9JaquEvmIQbE3FB4OvZ41EvcpHA9kJTbvryRk3UeiiCvHdA/h qqtorc9DTifPiIDGWgk+f6BOr40xcw7rs7tTVaG1P6lyn+UKJ019yPOkFRIVl84VVptX gv3puW/h5dHySbezEQX3862ydH62aK1NaxihQ= 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; bh=eF1NCHRdgYeSwUw/BUsdYReuItV1TCgRBZS89MNcBOk=; b=YvV0JBzkhcSZn4Ae+JlCcef3BT1MVoy2lMH9/jTjtKYLn7RtP5LTzBSCawhDQ8TUnz KrS8BzCgS3e+sbqdAFAlfBHGv8E1MPSsuH7sd/GgPx096Xx/7eC+evL+FmyRKAx1VZYB AxZKx0GjX4N4H4vwOAGVdoh3ar4xEz4psw1FMDmZSkvt7sQsxYo63RbeEGeyMSiGMupD UjUHLyULTot2biH2X9i3o9q5VbpDfJZN9JjQ2ZZsojpNTilo+8dVCJks2Vz2+X0gMXbZ cmss7LJA5QXZ/ISCMItFdBnfxeZ8sLPO+l0LXwb4QhHlWJLKcPg65dybeDN/F4vIf5Vz VhVQ== X-Gm-Message-State: AODbwcBhHVHuXEWhDj98ifLfgKcBxJfIZ6Fb+ADqzltbVwes09HXq65g lHuD6ehr6SqG1fjj X-Received: by 10.98.212.66 with SMTP id u2mr4412888pfl.73.1494827697634; Sun, 14 May 2017 22:54:57 -0700 (PDT) Received: from localhost.localdomain ([45.56.159.87]) by smtp.gmail.com with ESMTPSA id t5sm17315105pgo.48.2017.05.14.22.54.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 14 May 2017 22:54:56 -0700 (PDT) From: Guodong Xu To: mturquette@baylibre.com, sboyd@codeaurora.org, robh+dt@kernel.org, mark.rutland@arm.com, guodong.xu@linaro.org, chenjun14@huawei.com, zhongkaihua@huawei.com, zhangfei.gao@linaro.org, leo.yan@linaro.org Subject: [PATCH 1/3] clk: hi3660: fix wrong parent name of clk_mux_sysbus Date: Mon, 15 May 2017 13:54:21 +0800 Message-Id: <20170515055423.1803-1-guodong.xu@linaro.org> X-Mailer: git-send-email 2.10.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170514_225519_613812_DCB75C3E X-CRM114-Status: GOOD ( 10.13 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, John Stultz , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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 --- 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,