From patchwork Wed Jan 31 18:09:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 10194391 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 A1CE260380 for ; Wed, 31 Jan 2018 18:13:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 79008287F5 for ; Wed, 31 Jan 2018 18:13:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6DEE7287F9; Wed, 31 Jan 2018 18:13:08 +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=unavailable 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 E2015287F8 for ; Wed, 31 Jan 2018 18:13:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753771AbeAaSKC (ORCPT ); Wed, 31 Jan 2018 13:10:02 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:54571 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753699AbeAaSJ6 (ORCPT ); Wed, 31 Jan 2018 13:09:58 -0500 Received: by mail-wm0-f66.google.com with SMTP id i186so835256wmi.4 for ; Wed, 31 Jan 2018 10:09:57 -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=NoPAiLCp8W7ydCRzphHb6/Y6OLY7OcXQkQIaKW1aDkr9vHHXg98xmyffHdJOmcPPKX ffIU3SqtlVHemBV1UoalekzFyF+UO2DL2tjfIZKZ1uQC7rCkmjoLNYcR0GQ/MztYrVaI HpnSmFaOUNvv5EVoiUX364BvMTUIcU66J5iu+fGzX1Z3lCsJZrd/Q8kpVaa2qI0sLLzo SM7R9Ip4VkiAxSvT2+XQLxVY7E+R9rGZJc11H9Z7n7zgTa0Yag8rEpfNI/ZoF5F8IGCh n4aqsen0lPwfSduL7ifyRwdtOWuLTTYIYORPherAQjP+eNL/6oYJJuGVr8otYJHF2V22 1ohA== 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=ni+qAblq6O/Nc6PlnRgYYTu9OTPE/mi7OwW6vaclg+jG3KVzdTFF/MokGPx5myMM4f FYeG9/4GtW7o3fbHGZMhitoxiHwQq5ExQJ58vOWMRAbXr1L6giHSh8dr0E5SUY6+Wavk v1zgxdXFzbIfhRoL+ooY0uN7RgRL3R2cxEgLdSxx/f7dq1hWriZu9R+oyYUi/6ZbR9DS wqHU7hdCG5sTeBhzUor+8G6371VpHTBgxd4zHuKSYaOD7nm+JM3jeZ70QvWiooEJp6l4 s2CpSE+HFG4BSiFyKC/KKZzMudMH4l8wIxkqfCG/L8Lm98DUrnimCcGHzNzZs6bjUJJr jr+Q== X-Gm-Message-State: AKwxytcOJNYODjeptJolLai/rYRGgK4RL/XzOd/cwT3Tz93B11YbrlBk ca7sB6DT3MxLxJVVuFfLLkuo1Q== X-Google-Smtp-Source: AH8x226dVMBnRj0bJ/X8BIl/2KtMRX7VHFA+rbHMrkYXQJoBZVoY/vvFRXy70asIS31UNGZ3XaY0Kw== X-Received: by 10.28.247.11 with SMTP id v11mr26656268wmh.27.1517422196962; Wed, 31 Jan 2018 10:09:56 -0800 (PST) Received: from boomer.baylibre.local ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id f8sm341977wmc.3.2018.01.31.10.09.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 31 Jan 2018 10:09:56 -0800 (PST) From: Jerome Brunet To: Neil Armstrong , Kevin Hilman Cc: Jerome Brunet , Stephen Boyd , Michael Turquette , Carlo Caione , linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 07/19] clk: meson: remove superseded aoclk_gate_regmap Date: Wed, 31 Jan 2018 19:09:33 +0100 Message-Id: <20180131180945.18025-8-jbrunet@baylibre.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180131180945.18025-1-jbrunet@baylibre.com> References: <20180131180945.18025-1-jbrunet@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 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 {