From patchwork Sat Dec 3 00:37:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vinson Lee X-Patchwork-Id: 702202 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tVsbj5Jj4z9t1P for ; Sat, 3 Dec 2016 11:39:29 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1cCyKn-00066v-Fc; Sat, 03 Dec 2016 00:37:45 +0000 Received: from gabe.freedesktop.org ([131.252.210.177]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1cCyKg-0005xu-46 for linux-arm-kernel@lists.infradead.org; Sat, 03 Dec 2016 00:37:41 +0000 Received: from annarchy.freedesktop.org (annarchy.freedesktop.org [131.252.210.176]) by gabe.freedesktop.org (Postfix) with ESMTP id 29E6C6E013; Sat, 3 Dec 2016 00:37:16 +0000 (UTC) Received: by annarchy.freedesktop.org (Postfix, from userid 3222) id 2695D18251; Sat, 3 Dec 2016 00:37:16 +0000 (UTC) From: Vinson Lee To: linux-clk@vger.kernel.org Subject: [PATCH] clk: uniphier: Fix build with gcc-4.4. Date: Sat, 3 Dec 2016 00:37:16 +0000 Message-Id: <1480725436-9628-1-git-send-email-vlee@freedesktop.org> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161202_163738_327277_11327600 X-CRM114-Status: UNSURE ( 9.40 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -5.6 (-----) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-5.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [131.252.210.177 listed in list.dnswl.org] -1.4 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Masahiro Yamada , Michael Turquette , Stephen Boyd , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org gcc-4.4 has issues with anonymous unions in initializers. CC drivers/clk/uniphier/clk-uniphier-sys.o drivers/clk/uniphier/clk-uniphier-sys.c:45: error: unknown field ‘factor’ specified in initializer Fixes: 1574d5722636 ("clk: uniphier: remove unneeded member name for union") Signed-off-by: Vinson Lee --- drivers/clk/uniphier/clk-uniphier-mio.c | 4 ++-- drivers/clk/uniphier/clk-uniphier.h | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/clk/uniphier/clk-uniphier-mio.c b/drivers/clk/uniphier/clk-uniphier-mio.c index 4974d38..7441eeb 100644 --- a/drivers/clk/uniphier/clk-uniphier-mio.c +++ b/drivers/clk/uniphier/clk-uniphier-mio.c @@ -30,7 +30,7 @@ .name = "sd" #ch "-sel", \ .type = UNIPHIER_CLK_TYPE_MUX, \ .idx = -1, \ - .mux = { \ + { .mux = { \ .parent_names = { \ "sd-44m", \ "sd-33m", \ @@ -63,7 +63,7 @@ 0x00001200, \ 0x00001300, \ }, \ - }, \ + } }, \ }, \ UNIPHIER_CLK_GATE("sd" #ch, (_idx), "sd" #ch "-sel", 0x20 + 0x200 * (ch), 8) diff --git a/drivers/clk/uniphier/clk-uniphier.h b/drivers/clk/uniphier/clk-uniphier.h index 81d7e5c..8735a7d 100644 --- a/drivers/clk/uniphier/clk-uniphier.h +++ b/drivers/clk/uniphier/clk-uniphier.h @@ -81,12 +81,12 @@ struct uniphier_clk_data { .name = (_name), \ .type = UNIPHIER_CLK_TYPE_CPUGEAR, \ .idx = (_idx), \ - .cpugear = { \ + { .cpugear = { \ .parent_names = { __VA_ARGS__ }, \ .num_parents = (_num_parents), \ .regbase = (_regbase), \ .mask = (_mask) \ - }, \ + } }, \ } #define UNIPHIER_CLK_FACTOR(_name, _idx, _parent, _mult, _div) \ @@ -94,11 +94,11 @@ struct uniphier_clk_data { .name = (_name), \ .type = UNIPHIER_CLK_TYPE_FIXED_FACTOR, \ .idx = (_idx), \ - .factor = { \ + { .factor = { \ .parent_name = (_parent), \ .mult = (_mult), \ .div = (_div), \ - }, \ + } }, \ } #define UNIPHIER_CLK_GATE(_name, _idx, _parent, _reg, _bit) \ @@ -106,11 +106,11 @@ struct uniphier_clk_data { .name = (_name), \ .type = UNIPHIER_CLK_TYPE_GATE, \ .idx = (_idx), \ - .gate = { \ + { .gate = { \ .parent_name = (_parent), \ .reg = (_reg), \ .bit = (_bit), \ - }, \ + } }, \ } #define UNIPHIER_CLK_DIV(parent, div) \