From patchwork Fri Jun 10 00:27:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Turquette X-Patchwork-Id: 9168635 X-Patchwork-Delegate: mturquette@baylibre.com 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 E757A604DB for ; Fri, 10 Jun 2016 00:27:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DA71E27248 for ; Fri, 10 Jun 2016 00:27:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CF45D28364; Fri, 10 Jun 2016 00:27:59 +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 3C60D2835A for ; Fri, 10 Jun 2016 00:27:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751832AbcFJA17 (ORCPT ); Thu, 9 Jun 2016 20:27:59 -0400 Received: from mail-pa0-f48.google.com ([209.85.220.48]:36036 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751056AbcFJA16 (ORCPT ); Thu, 9 Jun 2016 20:27:58 -0400 Received: by mail-pa0-f48.google.com with SMTP id b5so17896541pas.3 for ; Thu, 09 Jun 2016 17:27:57 -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:in-reply-to:references; bh=FRKDj1dOTK2Mqw1yVO7t8c/raqzzlCKqkKekg2Bem6k=; b=Yu4eJpkHKFfoNVZzEje/ym2OkT4t2iTFU4gkFAGHWdAmH6X989WuxXub5i8MqNLrNm 1Qi3TTKqO6wIFMaLtsmAKox1iYrbS955kdxRuraoWJHXWqUyfV7nNut4XM73tfZFOBje 6cEvceOMpR+YM2RzAOeAuN1DfF2BY8dyoXMTCNSS7/KXWAuq1i4IFJCEbys+40XiCSJv 5e3MLJ1WthihyUFISPcpCqlcZq/ZMW7h36rJqkRxV7wKwMlMaCB8ilPXzrfGPdQDJk08 Zor0Elehzs1AvU9+KEeEwGeYKLSxUcqRT2KgxCIkABvlpUwfNZGqG1H3Pr15PgnzJP7i jQNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=FRKDj1dOTK2Mqw1yVO7t8c/raqzzlCKqkKekg2Bem6k=; b=LMTIocPWltIBSN4ZLk0qHNn0OPP2gPBrOlOFZD+C4sUBiuWUnZro7quJvtsd8j+Jnh 3WX8mC64Yd+y3BdHdno67ZgklosDOmqNhJQQLu6RXCuNS8ZX/ZOwyYXKnsZnkGgYgcrJ bdVB8jD6AKDPyt/0yE0taIdO0XHKDFMkqoYLerNGfPZYj7B0UinKMp+Vvl8qTYlvxcsm 3Ju5KTxWfQ33HtcO4gBzRl5a/dOXAUHn1pLXru1AHuD/5X82ESZFTR1rTlq4J/+lbDul dnR1+fq2LwFBHTCDNPpSEmSheSdSQsK5VryMCOb8xTZH21MY7hdv/h+MprF9myxFfpQs F9Vw== X-Gm-Message-State: ALyK8tLw//Clj39WQnX1UNZ+l7zAU2rA0GwbhcRLa/4tN7cMXiREeBav3FcKv0Cci42sy7ol X-Received: by 10.66.152.232 with SMTP id vb8mr15461043pab.41.1465518477384; Thu, 09 Jun 2016 17:27:57 -0700 (PDT) Received: from localhost (cpe-172-248-200-249.socal.res.rr.com. [172.248.200.249]) by smtp.gmail.com with ESMTPSA id ke3sm12649295pad.41.2016.06.09.17.27.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Jun 2016 17:27:56 -0700 (PDT) From: Michael Turquette To: linux-clk@vger.kernel.org Cc: linux-amlogic@lists.infradead.org, khilman@baylibre.com, carlo@endlessm.com, victor.wan@amlogic.com, jerry.cao@amlogic.com, xing.xu@amlogic.com Subject: [PATCH 06/10] clk: meson8b: remove mali clk Date: Thu, 9 Jun 2016 17:27:43 -0700 Message-Id: <1465518467-23939-7-git-send-email-mturquette@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1465518467-23939-1-git-send-email-mturquette@baylibre.com> References: <1465518467-23939-1-git-send-email-mturquette@baylibre.com> 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 This clock is undocumented and always orphaned. Get rid of it until we have more complete clock tree documentation. Signed-off-by: Michael Turquette --- drivers/clk/meson/meson8b-clkc.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/drivers/clk/meson/meson8b-clkc.c b/drivers/clk/meson/meson8b-clkc.c index 94512b6..dcd8f03 100644 --- a/drivers/clk/meson/meson8b-clkc.c +++ b/drivers/clk/meson/meson8b-clkc.c @@ -112,11 +112,8 @@ static const struct clk_div_table cpu_div_table[] = { }; PNAME(p_clk81) = { "fclk_div3", "fclk_div4", "fclk_div5" }; -PNAME(p_mali) = { "fclk_div3", "fclk_div4", "fclk_div5", - "fclk_div7", "zero" }; static u32 mux_table_clk81[] = { 6, 5, 7 }; -static u32 mux_table_mali[] = { 6, 5, 7, 4, 0 }; static const struct composite_conf clk81_conf __initconst = { .mux_table = mux_table_clk81, @@ -126,13 +123,6 @@ static const struct composite_conf clk81_conf __initconst = { .gate_parm = PARM(0x00, 7, 1), }; -static const struct composite_conf mali_conf __initconst = { - .mux_table = mux_table_mali, - .mux_parm = PARM(0x00, 9, 3), - .div_parm = PARM(0x00, 0, 7), - .gate_parm = PARM(0x00, 8, 1), -}; - static struct clk_fixed_rate meson8b_xtal = { .fixed_rate = 24000000, .hw.init = &(struct clk_init_data){ @@ -142,15 +132,6 @@ static struct clk_fixed_rate meson8b_xtal = { }, }; -static struct clk_fixed_rate meson8b_zero = { - .fixed_rate = 0, - .hw.init = &(struct clk_init_data){ - .name = "zero", - .num_parents = 0, - .ops = &clk_fixed_rate_ops, - }, -}; - static struct meson_clk_pll meson8b_fixed_pll = { .m = { .reg_off = MESON8B_REG_PLL_FIXED, @@ -301,8 +282,6 @@ static struct meson_clk_cpu meson8b_cpu_clk = { static const struct clk_conf meson8b_clk_confs[] __initconst = { COMPOSITE(MESON8B_REG_HHI_MPEG, CLKID_CLK81, "clk81", p_clk81, CLK_SET_RATE_NO_REPARENT | CLK_IGNORE_UNUSED, &clk81_conf), - COMPOSITE(MESON8B_REG_MALI, CLKID_MALI, "mali", p_mali, - CLK_IGNORE_UNUSED, &mali_conf), }; /* @@ -315,7 +294,6 @@ static const struct clk_conf meson8b_clk_confs[] __initconst = { static struct clk_hw_onecell_data meson8b_hw_onecell_data = { .hws = { [CLKID_XTAL] = &meson8b_xtal.hw, - [CLKID_ZERO] = &meson8b_zero.hw, [CLKID_PLL_FIXED] = &meson8b_fixed_pll.hw, [CLKID_PLL_VID] = &meson8b_vid_pll.hw, [CLKID_PLL_SYS] = &meson8b_sys_pll.hw,