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: 126387 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp968156ljc; Wed, 31 Jan 2018 10:10:08 -0800 (PST) X-Google-Smtp-Source: AH8x224LVxVG/OjISJx7HXmzt8Q4fU1R5qlVTjZQi5Hm3ziw/Y0y8eosQ6Usrh2Z3AtQiOL7U/SG X-Received: by 10.101.78.12 with SMTP id r12mr27301400pgt.33.1517422208659; Wed, 31 Jan 2018 10:10:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517422208; cv=none; d=google.com; s=arc-20160816; b=ujbo7BLon5OhTsOidCFvCz9sQxoSyIOsoVSxNrKpVy6lQHm9YPsDC3+LmXUS4btWqb EU/vt6hWtJR/gBqnw5AxIz354qJPNmp0Hho3aaYrRtMXpEyMGY58qy30LsjJHZ5BxVnr 3k9bloDCGcwj2MgBaYNWzVYfPoM1SGGR6AVeDfdKHDcyGxXCQZ5VoPzYGo7s6seuyqW9 gIGbQqEcmutfJTkvJenBqTlOXsfLwGliFM7R+NrY3+Nr30xbAHHeAShx6QwZC1c1KgNu xS4s+7r6lE0b5Cd6UMlvz9itbcmQ1bcLIxgE3hOAZ5jjla/ZSo5nEs0W9qt/tW1qw+cj rtYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=sP0XncSfOKEiQ6mLEyel6iYjHdPUm77QR8eFRDIYp6o=; b=QuiiUsy0Ksk+K8IMGlMOTT/fS4lnE7zKOvD9apSlX8WoK/nugdkPnOykC/0B807V/q jjtmpmhqoTr2ZDJRpMgy8IImBB//CJJiJRvdOse/dQIMgWprygyYLIo3ZPyX9+rwg8o6 eHQ2r9ibga+wA+gV3COmeFJdfgwb5ePFf1OXvVbOCeBbms8EEc2MKgi7lZ5z0OnhSRSv sXjVK4Bmo79QKHcvLeTpmCcW6sHLZ6cjW1knhfK0MS8CLRW9i7bdubZJ6M7xMnkx9LpF BF0TWTXHtqHsX8A1Us+A2yEp/Q8gufNrf7QIVTgcG6Zr/bwMHd109lCep5r9H4wm2GmO YlDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=NoPAiLCp; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f9-v6si5973908pln.211.2018.01.31.10.10.08; Wed, 31 Jan 2018 10:10:08 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=NoPAiLCp; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753844AbeAaSKG (ORCPT + 28 others); Wed, 31 Jan 2018 13:10:06 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:53172 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753706AbeAaSJ6 (ORCPT ); Wed, 31 Jan 2018 13:09:58 -0500 Received: by mail-wm0-f65.google.com with SMTP id g1so861673wmg.2 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=i9jCy3ehqgqcjgbk4c19YR1bdgqI45TBuZXmgWVawQkjPGK/PxOFOiYY1Yd00+Z83N x69jk9Bxtgf8j1aaxwSnlFGxrEKdEy3Q0NkuxEAhOUrqxOcVq5G+Nh4pq16zxXdnJ3PW m2xY9xoCOXbfTz0Kgu7uX1tnDS+ngThZS79a6aUnULLwaNHXn4OZ/j+VtGFCIlAfP9qf Hpnymw+jXwCCbqulYnMEiIe8sK0pzmpTDMHQcYse7lUcfADxPMon96eCvZ1gXhSQ1XTF pnfv7qg+k823hUSapdedTJOPq+KmN4JLYswjkQ4smxctRCHhzRk+L+pB1Q7JPvJb1O8F i2OQ== X-Gm-Message-State: AKwxytfgj7o4enq18ptmtv9YENVJ44/oPU391e6KYVA4Ad1uQ2/I5bzb DYKuT0RAlBURLqV6kxzOOWbiUTDH 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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 -- 2.14.3 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 {