From patchwork Thu Jun 8 13:55:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 9775405 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 DDEB3601C3 for ; Thu, 8 Jun 2017 13:56:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CF57426E5D for ; Thu, 8 Jun 2017 13:56:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C399B28548; Thu, 8 Jun 2017 13:56:22 +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 553DE26E5D for ; Thu, 8 Jun 2017 13:56:22 +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=5bncDpNH+RZP0mEZNicVSu6nk2LAkW+eYnA/gB2Js6A=; b=qci UmnXK0ug8E89iyafqZzmA88eW01XPSohBSnLacaFD7a+oHz1/FRoRoJ7n0sGBpJSivPiKgKGD+6pZ w8FhOrffYP7sZ1EBcG3kR2mkqYuF2hhphBe30M7uJP91eYbysJUUnoWTov7wwDf0UJzBNzKlzwwK6 rF8Q+278XTokc/ppPSx4mwb/fwDNoRjMOl22fFdOz1iuGdSHowunwe2X3OjahWDPEJNtkg+MyRY1N QeIkG3TiaVe67kDNpYgxbcfK+15+y+c+78XWHPTI8udZF5PZ+PHTp1KkvqdvpiJYi1emD3CXne+Ao ni8MwEgPYMZJcoFQeGlnCPshiZ6jOZQ==; 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 1dIxv3-00017r-Tn; Thu, 08 Jun 2017 13:56:13 +0000 Received: from mail-wm0-x22f.google.com ([2a00:1450:400c:c09::22f]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dIxv0-0000vp-IC for linux-amlogic@lists.infradead.org; Thu, 08 Jun 2017 13:56:12 +0000 Received: by mail-wm0-x22f.google.com with SMTP id n195so31688420wmg.1 for ; Thu, 08 Jun 2017 06:55:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=VJeuHR6Abv8udhcb7e4Aha+xDTxW0MXi2nvANDoB+wU=; b=dOQNTV15JgQ/1fhqft5b/TmKRk8G6w8NdKbdD31IYEQ0hDfgjse7nPCUAALJPxJUK3 r1DxcH3zD41fcR/QG6T2amR6W173jm6cDtnocjViI9BZOkVIY5te8n06a5Orv1lwM27H EgkAy2S8vXF4XxVfQzjPiSq23YvzsaoNvTjeJmypmVSnuuStx2aO3tIJzEJeoFDEyaFM kHV76+v8aSNXDSw/Iaymx20Y/sowkWJT5dryRQr2GJXgxMX+1ZyJEln7XMqR2GSzcpgL 7KZmR2+NEBZD90hvtpKuH43zoyM6405jh/MQbRciq82S46LhMPuQa7zpn9MUb2pa2qLd 4nJw== 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=VJeuHR6Abv8udhcb7e4Aha+xDTxW0MXi2nvANDoB+wU=; b=b8dJ6/I3m0pwgHZwC4euaw3N2aAzj74JrKg+SBO4NXl5Qv9nwXUtdVYXENqz4dtIOZ xb1FJ7tTdU9BDLmR1wZUbhm8RlvPRRt31SPDyICThXY2TE4WPWvfOUYx90UEd9lj+Wcq RegFB06b+tM9CZ+74l4IJrhTWu9p2Mx+KaLLPruNOJY+x/jkymMc1efHs7bWSLbBy1lB VcCZM1MW1KLy6acNgKzs+3xFx9d+SB6vm5/9mROWrpId0UQ062ZiSOLo/2lML8zEz3h2 baYP7hp+jIn+K6EUYjrtiPLryyTH+YTpNSrRRT1rXfxyObLHgKdEYcxohGhqpnfdn3/1 7R3g== X-Gm-Message-State: AKS2vOxAz0NPt4NGX20wqWdUKBSiL8sOe6PeM2imOIkw9PMSliPiErbi a5UfSh9J9FU+0E12 X-Received: by 10.28.236.71 with SMTP id k68mr3751757wmh.107.1496930148843; Thu, 08 Jun 2017 06:55:48 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id r186sm4793617wmr.30.2017.06.08.06.55.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Jun 2017 06:55:48 -0700 (PDT) From: Jerome Brunet To: Neil Armstrong Subject: [PATCH] clk: meson: gxbb: add all clk81 parents Date: Thu, 8 Jun 2017 15:55:45 +0200 Message-Id: <20170608135545.31499-1-jbrunet@baylibre.com> X-Mailer: git-send-email 2.9.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170608_065610_754038_6FC77E14 X-CRM114-Status: UNSURE ( 9.66 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Hilman , Michael Turquette , Stephen Boyd , linux-kernel@vger.kernel.org, Carlo Caione , linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org, Jerome Brunet MIME-Version: 1.0 Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Remove the FIXME on clk81 mux and add all the documented parents Signed-off-by: Jerome Brunet Acked-by: Neil Armstrong --- drivers/clk/meson/gxbb.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c index 36c0e455437e..a897ea45327c 100644 --- a/drivers/clk/meson/gxbb.c +++ b/drivers/clk/meson/gxbb.c @@ -603,7 +603,11 @@ static struct meson_clk_mpll gxbb_mpll2 = { * coordinated clock rates feature */ -static u32 mux_table_clk81[] = { 6, 5, 7 }; +static u32 mux_table_clk81[] = { 0, 2, 3, 4, 5, 6, 7 }; +static const char * const clk81_parent_names[] = { + "xtal", "fclk_div7", "mpll1", "mpll2", "fclk_div4", + "fclk_div3", "fclk_div5" +}; static struct clk_mux gxbb_mpeg_clk_sel = { .reg = (void *)HHI_MPEG_CLK_CNTL, @@ -616,13 +620,12 @@ static struct clk_mux gxbb_mpeg_clk_sel = { .name = "mpeg_clk_sel", .ops = &clk_mux_ro_ops, /* - * FIXME bits 14:12 selects from 8 possible parents: + * bits 14:12 selects from 8 possible parents: * xtal, 1'b0 (wtf), fclk_div7, mpll_clkout1, mpll_clkout2, * fclk_div4, fclk_div3, fclk_div5 */ - .parent_names = (const char *[]){ "fclk_div3", "fclk_div4", - "fclk_div5" }, - .num_parents = 3, + .parent_names = clk81_parent_names, + .num_parents = ARRAY_SIZE(clk81_parent_names), .flags = (CLK_SET_RATE_NO_REPARENT | CLK_IGNORE_UNUSED), }, };