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: 128127 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp3288249ljc; Mon, 12 Feb 2018 06:59:49 -0800 (PST) X-Google-Smtp-Source: AH8x227j/V1DXVEv8wQGyMy0p/K2/c6FVqbd65Sji4TQXKSoE8j/FgUjBYXGpSBxtRYCWPgy+N/i X-Received: by 2002:a17:902:b945:: with SMTP id h5-v6mr11359865pls.38.1518447589028; Mon, 12 Feb 2018 06:59:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518447589; cv=none; d=google.com; s=arc-20160816; b=YMEptEoSRzZQvXAiAL7uqufTgHS2U2gR6H0WM0aPzB4E5oYotF2NCCTe0XwLBxZxjm 3D3FDF6YTk8rG9S+TpTWftYC4Motz6iCJ2x/TGn9xMKO2q9mvPlgBOAWR887lRl90Sf2 8V8Q3bmzvwOO7H/Ax7jjnSydZfTKRXBHMfDHm0BfGc/47yNoXPWb8CAGukcR5ZwSFMsz bEUH3lj4aaAVvD/VDWNiM3zZen0UtN5u1xAZCkzho1KLPnQMr5jIAY5MdUkakHWaiozM uvc9M3sO5bqQJzaCZeSqVFdzPoFL4sKQV64kKp5amohJD6VBb+lw0mPyqZffi/xeo+qo 1muA== 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=c7V5Msx7OxJ0MKALX0dFLbkk+i1f7vnQBvErXuYQ/8HvjUZWZryMQGcfJUNkYqdVO4 1eGxFC+AVBPkY/I84j2eb8yPBrXCta+fdOEZHTg8eopTours6vELJxd5K5NcPUenOVbn KfmiNn2Ux2mWNNlN8Zy8Puf5vUT4ZAKMDDkKIREEclFSvKclTlMav21sTwtB3HLMWsCg mOGm4Mlk4gOmy8wWvLF5athM9WAdlZvzKVffJIAYPA3X7lGi+iuwnFjxTFUXkFeVogod mRTI6vTCm6e6Zh0ec3tvFbEHsS3LGFze3Qvc90v8wEmvPQE+WLYApG7FfXFEu/6uNQFr wSyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=l5HEjuj4; 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 l63-v6si5898904plb.565.2018.02.12.06.59.48; Mon, 12 Feb 2018 06:59:49 -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=l5HEjuj4; 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 S932827AbeBLO7S (ORCPT + 15 others); Mon, 12 Feb 2018 09:59:18 -0500 Received: from mail-wr0-f195.google.com ([209.85.128.195]:41817 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932377AbeBLO67 (ORCPT ); Mon, 12 Feb 2018 09:58:59 -0500 Received: by mail-wr0-f195.google.com with SMTP id q11so3713864wre.8 for ; Mon, 12 Feb 2018 06:58: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=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=GPibsjjrmAX04D0AYxXk4bZ+TGHiOn1DS8zD+nlWVYR6xPW8OtCA+RiP5AJ5THvZiw KqwDZB07uzcpW2W6iwZR6RsURRVE3lxjkEog4TW3PKbeuZeiDJ4qBcmwdb24zLkWqvtg qZF8DJhoZwr8pik2qgsdv6zUL+CWZV3nuW67AkEYRFoIWUmJTKBxVwqpJi8PtiI7OCiJ WhlTflInXfqpgf26McdnHVzwVu0TIBBiP2cJcDGt4iZC/U/GKEkqnepQDyMAyDH7EnIp 2QCrIiDdenUhEH7NWA3SHacR2GWG+VFMHGnW/TbJGFC9PXc5y6fnouOdltG7dNJt14k4 civw== X-Gm-Message-State: APf1xPCiyGNG3kBCfg1YfY0rNWW+Zhb8rPSsrxQlX5VOQyMGp1FXamWf Ht/n/jRnyzCyLcG9zHe0+iJEmg== 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 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 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> 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 {