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: 10194327 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 B5A4E60595 for ; Wed, 31 Jan 2018 18:10:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8374328783 for ; Wed, 31 Jan 2018 18:10:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 77D07287E2; Wed, 31 Jan 2018 18:10:33 +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 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 2C11528783 for ; Wed, 31 Jan 2018 18:10:33 +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: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=lWGPhi9IN+baaOTOGjvzACnnub FWleGxFKoLbu4np7m5oHlyMSxL4ro7nLcBDx4TgiAjfMzgcM2NulJ/RwV8/CQG79bBLiI4U3utikB QtZJFfRaWbHcXwunKnDFxcp9WjvY5ACHUimNPK3XAbYtujhIjBzm+nWZtiL/vWqHv/6wIuTE51FDX xxNTZCew8xYzMgEght7LQzCdGcu/6vaQ5kps0+cnrhF1tNSzBSR6eG7UytKD041DM3JrEqvZ2bCoc sE8nZ+5jFuVBV6RpLGzdWj3wY54wskDoFaUI9+HGRRhDetagUHOZ/jCpZxYyr6IMb7Ik3kvr+Vs2W hCF4IF0Q==; 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 1egwpz-0001qO-Ib; Wed, 31 Jan 2018 18:10:23 +0000 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1egwpk-0000Kr-NG for linux-amlogic@lists.infradead.org; Wed, 31 Jan 2018 18:10:13 +0000 Received: by mail-wm0-x241.google.com with SMTP id r71so882964wmd.1 for ; Wed, 31 Jan 2018 10:09:58 -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=nUG8CRxARv8Qh9BBZeJKb7oOWWedl/OSnl62xzmqQQLkufqn9he8zttJrabuOAyyQL Llw0E3rvHCj/CnsXW2ecehnZ2QnCQ5Cx6H6j6kO2JHwh6jYGxQRLf37o7uk0VJd2Bhq6 UbtreePWYdbIil/FEZwCKL96UzToHl+Lns5EMurfJwydmA76chbF2sndaLDruTJCRz/2 ucK9Yt3ZFj9HJOIh45sZaRyPfMpKk+A50OK0xcI+OgTV+nx2836o8HsV7CicissFcVFl 0Zq1ikiqzRrxDlSMbFAxSD3qr580T7G7wBqVUB8IwDQ5q8wL9+YlqV00o/0WDoz7HyQI QAfA== X-Gm-Message-State: AKwxytcSkxuS1R6e/tNVfl3LNMbDgybXkx1xs6a58VL9enOswfYtqEBE CNi2nQoR/US7fki4kk74IT1i9Q== 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 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> 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 {