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: 9775399 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 8A426601C3 for ; Thu, 8 Jun 2017 13:55:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7C71A26E5D for ; Thu, 8 Jun 2017 13:55:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 70E5B28548; Thu, 8 Jun 2017 13:55:53 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EFD2426E5D for ; Thu, 8 Jun 2017 13:55:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751721AbdFHNzw (ORCPT ); Thu, 8 Jun 2017 09:55:52 -0400 Received: from mail-wm0-f54.google.com ([74.125.82.54]:38033 "EHLO mail-wm0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751716AbdFHNzu (ORCPT ); Thu, 8 Jun 2017 09:55:50 -0400 Received: by mail-wm0-f54.google.com with SMTP id n195so31688415wmg.1 for ; Thu, 08 Jun 2017 06:55:49 -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=lrPsPHRKXNAkO+O7gtvMA3WWwBnxWGsS7hfipk8DyFgfJs24WiJmDR/uLs/WgzhJYN OUAZDCZYlLLwNcI7uF3/cZnbeQmODGWqCyZUmKCD0iRCzdc0SR09A8wJx5f1ubnAJZbP zfKJ8YXekkrmTR8GTr0R7kRdMfASDvUmf6AXA1efOgtsfZi9jmUjYuTpi4FNfi+ahVMP YvMKFbMNw39sHSHOGopThmvFD5pVVbtn4Rjv4piHWnPy4H5wzbG/lvTn8PJOu6MFScGi 2BvQU3xA6yjL4rwFltDaKzRWc6i+P/EiwtgosOJ5TgrF3eVUQ7LAp0tWvZrBi94uBi5J m8oQ== X-Gm-Message-State: AKS2vOwSDH2PE9GLqlgVQ4v70xPv7WsKJuzs4oooMQzRvx76I13D7C8l NqI1QNJuYW26lhMH 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 Cc: Jerome Brunet , Stephen Boyd , Michael Turquette , Kevin Hilman , Carlo Caione , linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org 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 Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.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), }, };