From patchwork Mon Aug 10 04:40:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Chancellor X-Patchwork-Id: 11706961 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3D3E3739 for ; Mon, 10 Aug 2020 04:40:49 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 15343206B5 for ; Mon, 10 Aug 2020 04:40:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="1RW5/CbM"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bN00W7kq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 15343206B5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version: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=68dC/Y58SxdSnA4A/a59qO2l1/ov7uXCSstiwa87Ers=; b=1RW5/CbM2e2W4dKx8DAynFwa+V laycQ0fPCUEMLxyTelAKprbCAuGeINZuQ6wP3U8IYoLPX4zFlZywVNRRMO8z3MiRodb5o+JVFI+ch kqJvMsJoJ9qq0+m1ewYheZCkT8EBx7ZOAewiOee175HLuGnCtiabBVcNyTULDeDZ7hzwLcZ6AeY+B QkWG0Nnhh5X6D+YaaU2JO5XnhsDusOCXNdrJUwKCJU569x8pI8ipgejhSQTiVAYONA9Y2oD8aZe8g Zsu9lxOEP8R/QYjZ/d2VNTa28/iYUihJLcavbxgwBGhqWfBYR70F3ZHfVbvfAYyPKXLzkgbYIdOY5 TK57utIQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k4zc3-0007Go-Q4; Mon, 10 Aug 2020 04:40:43 +0000 Received: from mail-qk1-x741.google.com ([2607:f8b0:4864:20::741]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k4zbx-0007FZ-9M; Mon, 10 Aug 2020 04:40:38 +0000 Received: by mail-qk1-x741.google.com with SMTP id l64so7257382qkb.8; Sun, 09 Aug 2020 21:40:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=cPds9HzkVUDwwmYzqeRQutg+bwybNljwD4ACV/nwwSk=; b=bN00W7kq8K9TmaWZXuTw6dNePzWjNRTgoZzQ18PkpamTZNcXUb3ZPIiiz6Dsv2w6rp zc0aKugBlQz2R5LoDusvHgVjvMqEPblxR/zA0vSZcNSXKuMThprTLCpc88r6hY7rKSkY S0loyiaVZW+HUk6dVlVaZ1PVP2CIfFF82ocFLmAT9THuLRnM6CFjcQOPcO7OmAMl5tLi 302obDo5GVGpFlduTodqOJzdQA4M3rEXzvpxBQH/TyP0Lrsd+T15SPFDSLH0MjV2foSy BGfRQ4t42k4cfV6taDciFG+e3qkSofndTOXG0UVnE+8Koui+/GEC9lkzh7oBtiDuSevs Juuw== 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:mime-version :content-transfer-encoding; bh=cPds9HzkVUDwwmYzqeRQutg+bwybNljwD4ACV/nwwSk=; b=jIpcctr8vtlcT+CbsIE3nmaNBofAEW7xW9NcihBardfOCQpq2t2euMSSBGO4tx37of lvRatvFBXYAAIqlo49wo3oKMlkrMrtLPm/jFzB2Ft7bakfiFXwcZ3v/pNES+baC9mF0d XK/ynJK5cVkXT57XAnuLAK1OIa6BStplmoJY1e1csdPP6KB03VO+Tst9k+iW4F1zXBxG ZlVi+eODYnSHi5uOErNPRVAK684H5RhpGpNINIK+hvQVDJdbaIQ+qi1A2DLOTj4pZsYZ 94n6mnCRiKjFX7s6HzCSy0BlY6aqgR7BGvuyj2pJ4vnCRh+FSqs9D/bcNUB9Iy1QRTEM +gzQ== X-Gm-Message-State: AOAM533NyoeuIn4Wf7RUvilNbSpE0Rr+Zr/0EevJTaphdHgSNtP12827 hEkul18NNCn6rQUbEKJip8k= X-Google-Smtp-Source: ABdhPJxY3zxs2Ant+BaqLzC7XHeQJrChvgFX+/TFQ4dqxUX2ecSyT+XxQ1aBuxhafSOyH0NdTQIkQA== X-Received: by 2002:a37:48c7:: with SMTP id v190mr23581106qka.153.1597034434113; Sun, 09 Aug 2020 21:40:34 -0700 (PDT) Received: from localhost.localdomain ([2604:1380:45d1:2600::1]) by smtp.gmail.com with ESMTPSA id d203sm13169026qkc.10.2020.08.09.21.40.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Aug 2020 21:40:33 -0700 (PDT) From: Nathan Chancellor To: Michael Turquette , Stephen Boyd Subject: [PATCH] clk: rockchip: Fix initialization of mux_pll_src_4plls_p Date: Sun, 9 Aug 2020 21:40:20 -0700 Message-Id: <20200810044020.2063350-1-natechancellor@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-Patchwork-Bot: notify X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200810_004037_479937_204A6832 X-CRM114-Status: GOOD ( 14.88 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:741 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [natechancellor[at]gmail.com] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Heiko Stuebner , clang-built-linux@googlegroups.com, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Nathan Chancellor , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org A new warning in Clang points out that the initialization of mux_pll_src_4plls_p appears incorrect: ../drivers/clk/rockchip/clk-rk3228.c:140:58: warning: suspicious concatenation of string literals in an array initialization; did you mean to separate the elements with a comma? [-Wstring-concatenation] PNAME(mux_pll_src_4plls_p) = { "cpll", "gpll", "hdmiphy" "usb480m" }; ^ , ../drivers/clk/rockchip/clk-rk3228.c:140:48: note: place parentheses around the string literal to silence warning PNAME(mux_pll_src_4plls_p) = { "cpll", "gpll", "hdmiphy" "usb480m" }; ^ 1 warning generated. Given the name of the variable and the same variable name in rv1108, it seems that this should have been four distinct elements. Fix it up by adding the comma as suggested. Fixes: 307a2e9ac524 ("clk: rockchip: add clock controller for rk3228") Link: https://github.com/ClangBuiltLinux/linux/issues/1123 Signed-off-by: Nathan Chancellor Reviewed-by: Heiko Stuebner --- drivers/clk/rockchip/clk-rk3228.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/rockchip/clk-rk3228.c b/drivers/clk/rockchip/clk-rk3228.c index d7243c09cc84..47d6482dda9d 100644 --- a/drivers/clk/rockchip/clk-rk3228.c +++ b/drivers/clk/rockchip/clk-rk3228.c @@ -137,7 +137,7 @@ PNAME(mux_usb480m_p) = { "usb480m_phy", "xin24m" }; PNAME(mux_hdmiphy_p) = { "hdmiphy_phy", "xin24m" }; PNAME(mux_aclk_cpu_src_p) = { "cpll_aclk_cpu", "gpll_aclk_cpu", "hdmiphy_aclk_cpu" }; -PNAME(mux_pll_src_4plls_p) = { "cpll", "gpll", "hdmiphy" "usb480m" }; +PNAME(mux_pll_src_4plls_p) = { "cpll", "gpll", "hdmiphy", "usb480m" }; PNAME(mux_pll_src_3plls_p) = { "cpll", "gpll", "hdmiphy" }; PNAME(mux_pll_src_2plls_p) = { "cpll", "gpll" }; PNAME(mux_sclk_hdmi_cec_p) = { "cpll", "gpll", "xin24m" };