From patchwork Mon Feb 12 14:58:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 10213213 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 2448060329 for ; Mon, 12 Feb 2018 15:02:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 15FC228786 for ; Mon, 12 Feb 2018 15:02:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0A8CB287B6; Mon, 12 Feb 2018 15:02:49 +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=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 972B828786 for ; Mon, 12 Feb 2018 15:02:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:References:In-Reply-To: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:List-Owner; bh=1sufE738E+7gFIIF+CDDRqxgPAaPO+5OagaogmcSz0I=; b=nDpE38MJEGAy5JmG2gNs6+/CaD 1gbVlI3mdZqF0OIcJyUlwNhbOGxw18Hnhfs8lEhHspbzkQSeyqMctZ8JvsIzKVPiOChIkocWhNzSN /fmHUHDSpcSBm8CPASjBH86s1l/IoHeP02Qz5GlCBRS08hythVYpqU12evZ+unTQtp13W4wPZFb70 VZl/uVFtezPGy0N74ziL9RalGm3RvfFHeGpC1cHRuUB2hprg80tFPvDq/Q/XQCTY7EAeiFhvbC/vt KFfOoOMiV97hlmNAgcVdnwcBY0nr4fEKZpMZaHS4mro/Hf11E43im1yXlIBdbMiZyYoNLWSTsOb2g xPjgy2OA==; Received: from [198.137.202.133] (helo=bombadil.infradead.org) by casper.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1elFcr-0003Sw-1q for patchwork-linux-amlogic@patchwork.kernel.org; Mon, 12 Feb 2018 15:02:37 +0000 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:References: In-Reply-To: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:List-Owner; bh=1sufE738E+7gFIIF+CDDRqxgPAaPO+5OagaogmcSz0I=; b=psXt7KJE04KV/B+nBEbE23piUJ Jwvg2mpajbicsAffU5AFwzf3bYyTJLLR00MTa22utHwiv2mzthwzujjMBUoZeCS4K5oHQeSQcWpci UMiYLSGnEavWZ5XiQ3/zfoJgdx7pim3qSU8TqRxXWvHOyTQ2qsEIFQDaVAIYjFyX5WZEnj0Vupwb6 nmlc72Og0+CqTrDWNpskO2nbnD0qivtqCn7yOefGCS8sGEdWmkSU5OhvlUzxVcGcF2lPBVqNM5EDC jMcj9osNeZOAMOeQPO25tc88t/8+LQs2lsoN7QxJP3g1ts1Oi13M9yzRupNfo8ge+KJHW0by47QH5 h365J5cQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1elFZx-0001ot-IP; Mon, 12 Feb 2018 14:59:37 +0000 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1elFZV-0000Wk-Ir for linux-amlogic@lists.infradead.org; Mon, 12 Feb 2018 14:59:10 +0000 Received: by mail-wr0-x241.google.com with SMTP id k9so1707323wre.9 for ; Mon, 12 Feb 2018 06:58:59 -0800 (PST) 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=sP0XncSfOKEiQ6mLEyel6iYjHdPUm77QR8eFRDIYp6o=; b=l5HEjuj4ogo+8F85STZ+UPAPl2VIINT2qku0znEhR9Y48FIepXTjy3iQq/Gbh4zyM/ CRfCNIIbmE+g9Uv5IQbtI6oNr/mNKqKV16/ZtLgszuxrroN/FhNxONkgcao4VWsB3ZzU oEYwkZCSsdLJGivCTzPnNMd4jzqZP4IEshjKnTJmT+a764HGQgsNmjbtRaG2Vo4p+txO FMPuPhRHXrQYn6nZ8VAuOFVml8fqztCL/Jy/X8CrulG4HZI64ePQ7NINqA1FTnZj3kHt g/YW14Akbh2VzTDKT8VxRXWkNzndrifcYt36NKBBkakR5z0yq47ZO2ofFeLEb9+BOVvd ncOQ== 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:in-reply-to :references; bh=sP0XncSfOKEiQ6mLEyel6iYjHdPUm77QR8eFRDIYp6o=; b=e74j5mGjVurqiRVS/gH8SDHL4iANEVbtlRinJNQuR+7k0lwMpenSPalHsjuwMPomzN jieOXOiuFAoz8CPL28AUWOuT2yYG/Tq9gSKKSwQWjYajaO0K//mVHp1MAqJTyc9f8tFX lBnvWOJIM6hWCeikXomzIx1YSaG7AdR4Y4Cvm71wz9AwfFK+ouGXCn7/59503tAgTvAn GBRu+GcTPcgi7w6dTSkmGUzkByjE2L229MAocGkDk1AH03JuBRwe5lxc//JI7PX+X30U brPc79zv3ZTy7a3aU+oMhKPXC/EcgkCWT3DETukRbjKYQt4mzZSDCDz1gMDKxYbSQaN1 NnLg== X-Gm-Message-State: APf1xPALQl8BU+so/swvxz6UxNB/a8056KbwVdbrVd8T60mgJOOFi5Wb WxYLmtmn9wPbAjf+iHGVqR7FWA== X-Google-Smtp-Source: AH8x227GAn4AuI1/MFej3GoFpeu+0UO3oBUsfOGr/TahWAE10gP8GcARp1VWA4HSWhsaFAPRNTVAhg== X-Received: by 10.223.201.11 with SMTP id m11mr1983988wrh.146.1518447537878; Mon, 12 Feb 2018 06:58:57 -0800 (PST) Received: from boomer.baylibre.local ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id p21sm4633218wmc.28.2018.02.12.06.58.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Feb 2018 06:58:56 -0800 (PST) From: Jerome Brunet To: Neil Armstrong , Kevin Hilman Subject: [PATCH v2 07/19] clk: meson: remove superseded aoclk_gate_regmap Date: Mon, 12 Feb 2018 15:58:34 +0100 Message-Id: <20180212145846.19380-8-jbrunet@baylibre.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180212145846.19380-1-jbrunet@baylibre.com> References: <20180212145846.19380-1-jbrunet@baylibre.com> 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: 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 aoclk_gate_regmap has been replaced by meson's clk_regmap. It is no longer necessary so, remove it Signed-off-by: Jerome Brunet --- drivers/clk/meson/gxbb-aoclk-regmap.c | 46 ----------------------------------- drivers/clk/meson/gxbb-aoclk.h | 10 -------- 2 files changed, 56 deletions(-) delete mode 100644 drivers/clk/meson/gxbb-aoclk-regmap.c diff --git a/drivers/clk/meson/gxbb-aoclk-regmap.c b/drivers/clk/meson/gxbb-aoclk-regmap.c deleted file mode 100644 index 2515fbfa0467..000000000000 --- a/drivers/clk/meson/gxbb-aoclk-regmap.c +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (c) 2017 BayLibre, SAS. - * Author: Neil Armstrong - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include -#include -#include -#include "gxbb-aoclk.h" - -static int aoclk_gate_regmap_enable(struct clk_hw *hw) -{ - struct aoclk_gate_regmap *gate = to_aoclk_gate_regmap(hw); - - return regmap_update_bits(gate->regmap, AO_RTI_GEN_CNTL_REG0, - BIT(gate->bit_idx), BIT(gate->bit_idx)); -} - -static void aoclk_gate_regmap_disable(struct clk_hw *hw) -{ - struct aoclk_gate_regmap *gate = to_aoclk_gate_regmap(hw); - - regmap_update_bits(gate->regmap, AO_RTI_GEN_CNTL_REG0, - BIT(gate->bit_idx), 0); -} - -static int aoclk_gate_regmap_is_enabled(struct clk_hw *hw) -{ - struct aoclk_gate_regmap *gate = to_aoclk_gate_regmap(hw); - unsigned int val; - int ret; - - ret = regmap_read(gate->regmap, AO_RTI_GEN_CNTL_REG0, &val); - if (ret) - return ret; - - return (val & BIT(gate->bit_idx)) != 0; -} - -const struct clk_ops meson_aoclk_gate_regmap_ops = { - .enable = aoclk_gate_regmap_enable, - .disable = aoclk_gate_regmap_disable, - .is_enabled = aoclk_gate_regmap_is_enabled, -}; diff --git a/drivers/clk/meson/gxbb-aoclk.h b/drivers/clk/meson/gxbb-aoclk.h index 127d58954cca..0be78383f257 100644 --- a/drivers/clk/meson/gxbb-aoclk.h +++ b/drivers/clk/meson/gxbb-aoclk.h @@ -17,16 +17,6 @@ #define AO_RTC_ALT_CLK_CNTL0 0x94 #define AO_RTC_ALT_CLK_CNTL1 0x98 -struct aoclk_gate_regmap { - struct clk_hw hw; - unsigned bit_idx; - struct regmap *regmap; - spinlock_t *lock; -}; - -#define to_aoclk_gate_regmap(_hw) \ - container_of(_hw, struct aoclk_gate_regmap, hw) - extern const struct clk_ops meson_aoclk_gate_regmap_ops; struct aoclk_cec_32k {