From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934952AbcIFNCV (ORCPT ); Tue, 6 Sep 2016 09:02:21 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:51151 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932428AbcIFNCS (ORCPT ); Tue, 6 Sep 2016 09:02:18 -0400 From: Arnd Bergmann To: Michael Turquette , Stephen Boyd Cc: Arnd Bergmann , Carlo Caione , Kevin Hilman , =?UTF-8?q?Alexander=20M=C3=BCller?= , Paul Gortmaker , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] clk: meson: fix CLKID_GCLK_VENCI_INT typo Date: Tue, 6 Sep 2016 15:01:10 +0200 Message-Id: <20160906130130.1645496-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:htUqRnQYL0RcKiCa66mr8lKUEJWoa02vPFmnCmjZuOR5+MHWW84 GvaRVc3cDw+mRC5cWlz+7JbgAy6sRN2u/o68BDk/s2phRtfeFQjtpilSkT3X6ILO8/I/mVt lRlmg84TeNE3mfefaYdN6O2JHCTMU/XDRyLbbMTLUq5bpoJGsUCnXAo4Zdw/rSQpwSh6SHr xkRkAKiRAv1juRLdqRGvQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:Wo1p4cErpTU=:YeqNn5AeO+O3yW2k2Yzim8 n48GmUGLSdPluGBa2v4EjHZ0h11yj0R2PVbUpEzf+1XuJWAzs043iZDPk56xEK/to5AY27dL9 MPurjBh2VYfsxvVz/yHvsTougb4heM+N69G339igt1mb6JwKQUV2uuEhbBneqTVT8J0D7JGwG CH3vSccjtiJEszzRyycxDHLRoRbcj5T9vL2T0WKs/RPy11vFeNvsoUYPa6iHPjjeJgydkIQIx pPIeKTOU25DCcL3VVdeEHGlQxrghmKHsTTKm4G5dhMjMAJHmNhy2IhDQJmqtbvUOTc3859lXg B9ODExe8zPM+WqW8TccZfjbBF7jMAAlN9WjpH6HGEmI8VauPv7oV1yUAE61ax3pmV6jLMHNSq SpSPrtAaR+hxn3Z5W6vPoenqPBodoO/hQ+B3z79QoBGgfj6BuAEebd4tTDqf6F54d+lOeKtss hOgnlxUBXFrRmHcHEKu2g6/6GgG9TFZMvdR1tTaEUoCMwfG4N9fYm7tlDC7rLubFI7IbuyTO4 8HT/TZYOYQ7t5U6MUf7+NVbe0fuh2ZVL/OPq2TFGPJu8dfGlpEl5M/kPGn7akkmngw8K4obGL 7GDbqloTaM7+iQJbJU46Aw8K7Ja1PadJjGc6eUrhGMXkcHTLvK/BVsLamcqbkyQd+TC0K+cAi l8itM+TmXVcxqUypl92m4hIbdrbgZpnxOCbxH0ZiAcrrFGCcXUhJ66BepgkA+ZRmiXNs= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The addition of many gate clocks added two entries in an array for the same value: drivers/clk/meson/meson8b.c:479:10: error: initialized field overwritten [-Werror=override-init] [CLKID_GCLK_VENCI_INT] = &meson8b_gclk_venci_int.hw, [CLKID_GCLK_VENCI_INT] = &meson8b_gclk_vencp_int.hw, This was clearly an accident, and since all other identifiers are listed in the order in which they are defined, I'm changing the first one to CLKID_GCLK_VENCI_INT0, making it all consistent again. Signed-off-by: Arnd Bergmann Fixes: e31a1900c1ff ("meson: clk: Add support for clock gates") --- drivers/clk/meson/meson8b.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/meson/meson8b.c b/drivers/clk/meson/meson8b.c index e1d4aa145a03..0d45ec20c737 100644 --- a/drivers/clk/meson/meson8b.c +++ b/drivers/clk/meson/meson8b.c @@ -476,7 +476,7 @@ static struct clk_hw_onecell_data meson8b_hw_onecell_data = { [CLKID_VCLK2_VENCP0] = &meson8b_vclk2_vencp0.hw, [CLKID_VCLK2_VENCP1] = &meson8b_vclk2_vencp1.hw, [CLKID_GCLK_VENCI_INT] = &meson8b_gclk_venci_int.hw, - [CLKID_GCLK_VENCI_INT] = &meson8b_gclk_vencp_int.hw, + [CLKID_GCLK_VENCP_INT] = &meson8b_gclk_vencp_int.hw, [CLKID_DAC_CLK] = &meson8b_dac_clk.hw, [CLKID_AOCLK_GATE] = &meson8b_aoclk_gate.hw, [CLKID_IEC958_GATE] = &meson8b_iec958_gate.hw, -- 2.9.0