From patchwork Mon Jan 28 18:04:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 10784275 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 871036C2 for ; Mon, 28 Jan 2019 18:09:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7530F2B59D for ; Mon, 28 Jan 2019 18:09:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 697442B5B7; Mon, 28 Jan 2019 18:09:55 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 BCB812B59D for ; Mon, 28 Jan 2019 18:09:54 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=6PPjOkE5FDK+1wy5RzRbJiFDBUxHNF/pVPXRfOh7/Gs=; b=e7dxVPKBpDDH+Y uu5NBrEPRV+TQbZPwQNXeE3jtUopEMBNjX6fXJ0L0DYmqaF/60eqmoFsJqmf4IFGeXzr7ndR/Jrwk PDGaKVc5MwBmCoV1+UnUBozeEMOBhSxLq8krQV8KguSJ24hamWz4x9HGkBMoORLlGCA3hUuGGy2nH N+cl+E1siwlHbxLUFZNxsELzsOd+1j6Xu/oU3uniUnOTGZwW4mI1mjCWTLlvwiDDamMJa1bKZ5EGh vsS5uOYdQwZlDlNloJB8utq9sj9R/MWEuQ5ZdWDZU6Y9TNqscJloSL6WYHqUfUgS4Z/yag4KO1YTR afKYPDidzo+dFY0oZ7fA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1goBM0-0000gr-14; Mon, 28 Jan 2019 18:09:52 +0000 Received: from mail-wm1-f65.google.com ([209.85.128.65]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1goBHM-0003xo-OE for linux-arm-kernel@lists.infradead.org; Mon, 28 Jan 2019 18:05:27 +0000 Received: by mail-wm1-f65.google.com with SMTP id b11so15037404wmj.1 for ; Mon, 28 Jan 2019 10:05:04 -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 :mime-version:content-transfer-encoding; bh=loRq/ugG9YRm+V78WFAyEPfRVOulSUxZ0A2IJ042/eU=; b=FYN4Vmd1J1SLV0C2c+jYXqaQutGnDX7QOmp0ydJ2RTWdb8OzNgQKEeEN8nb3K4bppC bVgMhgGcrcsSX2NEFcSCMSg4cFwr5tmzfl33bN51K5+Z8XPrTmor7cQIXGOJMMoC2YGC YX03OMa3wH8nPSferwwrLd+TYYrzO+U7uT+Pjcr+PiWGH9s9OvGfPXfUX1mkPeDY/cas nGyPC7QI0Wo8LbfpZeuD78VUjAlf9K3JuaBt2cpLiz04eVGGF/2uK80rwGT+04pBlh6E 9qVjxrpU24DLFb2s7fEenIi1YBRdN9Ff8vLsuztd+LQ6l0MLbdAtI1WK37m7CEA8V39u jfwA== 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:mime-version:content-transfer-encoding; bh=loRq/ugG9YRm+V78WFAyEPfRVOulSUxZ0A2IJ042/eU=; b=DgKGLFCvDUkFDWLwIfBO5kZhhjvMMit9RbZAyXFzmXsQYWKR4qnQ7/HxHseRtn0zXY aMCWxCZM4XiS4X7ycV5nwv5C+PEr45KvHqm7EIgYTFCQfFrgL394BHg+7jGD5Qkd+ARI Cmj5Bc9LSKJXqLOfYfL489k3qBqQAvYzgOI4vVNc+ljcdJhUVTqvwjvt1iDpHKdRBshy 7WxF7TmP7A6ejLPXBEM62ZObAPf65tfgb5WMm2miZi4PNrqG51Be4STvMtRHeK7BIP8M 681Yk12J6aPkoDucbVqOYwqU/irqYGYmjN4/f9/nI1Sbj2pJqZwWBlZKxQQloxdmBBOB 9MfQ== X-Gm-Message-State: AJcUukdSAhfCv6ItvRYzF11r6ZRPth2/Wd7yN2tUHW9WC0Cb8dXz76py 7GjkQ0VIUZ2zZEiGhVRsBTPzng== X-Google-Smtp-Source: ALg8bN4XikoAiiZ6m8KJzjzTM2NutTFSa6HkbAhF85gQrbCVU3ZNEmYPDUjk9IzArKne3w1nrguH1g== X-Received: by 2002:a1c:2382:: with SMTP id j124mr17936184wmj.14.1548698702239; Mon, 28 Jan 2019 10:05:02 -0800 (PST) Received: from boomer.local ([2a01:e34:eeb6:4690:106b:bae3:31ed:7561]) by smtp.googlemail.com with ESMTPSA id p6sm145548193wrx.50.2019.01.28.10.05.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 28 Jan 2019 10:05:01 -0800 (PST) From: Jerome Brunet To: Neil Armstrong , Stephen Boyd , Michael Turquette Subject: [PATCH 12/14] clk: meson: clkc must die Date: Mon, 28 Jan 2019 19:04:28 +0100 Message-Id: <20190128180430.28689-13-jbrunet@baylibre.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190128180430.28689-1-jbrunet@baylibre.com> References: <20190128180430.28689-1-jbrunet@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190128_100505_784522_BDE40025 X-CRM114-Status: GOOD ( 13.66 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Hilman , linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jerome Brunet Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Jerome Brunet --- drivers/clk/meson/axg-aoclk.c | 1 - drivers/clk/meson/axg.c | 1 - drivers/clk/meson/clkc-audio.h | 3 ++- drivers/clk/meson/clkc.h | 17 ----------------- drivers/clk/meson/gxbb-aoclk.c | 1 - drivers/clk/meson/gxbb.c | 1 - drivers/clk/meson/meson-aoclk.h | 5 ++++- drivers/clk/meson/meson8b.c | 1 - drivers/clk/meson/sclk-div.c | 1 + 9 files changed, 7 insertions(+), 24 deletions(-) delete mode 100644 drivers/clk/meson/clkc.h diff --git a/drivers/clk/meson/axg-aoclk.c b/drivers/clk/meson/axg-aoclk.c index 6b408edb1608..0086f31288eb 100644 --- a/drivers/clk/meson/axg-aoclk.c +++ b/drivers/clk/meson/axg-aoclk.c @@ -12,7 +12,6 @@ #include #include #include -#include "clkc.h" #include "meson-aoclk.h" #include "axg-aoclk.h" diff --git a/drivers/clk/meson/axg.c b/drivers/clk/meson/axg.c index 12de206b82c2..cbbdd93b175d 100644 --- a/drivers/clk/meson/axg.c +++ b/drivers/clk/meson/axg.c @@ -17,7 +17,6 @@ #include #include -#include "clkc.h" #include "clk-input.h" #include "clk-regmap.h" #include "clk-pll.h" diff --git a/drivers/clk/meson/clkc-audio.h b/drivers/clk/meson/clkc-audio.h index 8e1de2a72610..1eaf4ecac4f7 100644 --- a/drivers/clk/meson/clkc-audio.h +++ b/drivers/clk/meson/clkc-audio.h @@ -7,7 +7,8 @@ #ifndef __MESON_CLKC_AUDIO_H #define __MESON_CLKC_AUDIO_H -#include "clkc.h" +#include +#include "parm.h" struct meson_sclk_div_data { struct parm div; diff --git a/drivers/clk/meson/clkc.h b/drivers/clk/meson/clkc.h deleted file mode 100644 index 3b167803a602..000000000000 --- a/drivers/clk/meson/clkc.h +++ /dev/null @@ -1,17 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* - * Copyright (c) 2015 Endless Mobile, Inc. - * Author: Carlo Caione - */ - -#ifndef __CLKC_H -#define __CLKC_H - -#include -#include "clk-regmap.h" -#include "parm.h" - -/* clk_ops */ -extern const struct clk_ops meson_clk_cpu_ops; - -#endif /* __CLKC_H */ diff --git a/drivers/clk/meson/gxbb-aoclk.c b/drivers/clk/meson/gxbb-aoclk.c index 26578622fc91..449f6ac189d8 100644 --- a/drivers/clk/meson/gxbb-aoclk.c +++ b/drivers/clk/meson/gxbb-aoclk.c @@ -5,7 +5,6 @@ */ #include #include -#include "clkc.h" #include "meson-aoclk.h" #include "gxbb-aoclk.h" diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c index 393472b5309b..3741db9a9fe1 100644 --- a/drivers/clk/meson/gxbb.c +++ b/drivers/clk/meson/gxbb.c @@ -12,7 +12,6 @@ #include #include -#include "clkc.h" #include "gxbb.h" #include "clk-input.h" #include "clk-regmap.h" diff --git a/drivers/clk/meson/meson-aoclk.h b/drivers/clk/meson/meson-aoclk.h index 0758b35d4427..999cde3868f7 100644 --- a/drivers/clk/meson/meson-aoclk.h +++ b/drivers/clk/meson/meson-aoclk.h @@ -11,9 +11,12 @@ #ifndef __MESON_AOCLK_H__ #define __MESON_AOCLK_H__ +#include #include +#include #include -#include "clkc.h" + +#include "clk-regmap.h" struct meson_aoclk_input { const char *name; diff --git a/drivers/clk/meson/meson8b.c b/drivers/clk/meson/meson8b.c index 91a5306b13f6..23b1e355a849 100644 --- a/drivers/clk/meson/meson8b.c +++ b/drivers/clk/meson/meson8b.c @@ -16,7 +16,6 @@ #include #include -#include "clkc.h" #include "meson8b.h" #include "clk-regmap.h" #include "clk-pll.h" diff --git a/drivers/clk/meson/sclk-div.c b/drivers/clk/meson/sclk-div.c index bc64019b8eeb..d3eea53945e9 100644 --- a/drivers/clk/meson/sclk-div.c +++ b/drivers/clk/meson/sclk-div.c @@ -17,6 +17,7 @@ */ #include "clkc-audio.h" +#include "clk-regmap.h" static inline struct meson_sclk_div_data * meson_sclk_div_data(struct clk_regmap *clk)