From patchwork Sat Jan 19 20:51:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 10772205 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 9835713B5 for ; Sat, 19 Jan 2019 20:52:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 88A6F2B90F for ; Sat, 19 Jan 2019 20:52:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7CF572B94E; Sat, 19 Jan 2019 20:52:06 +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_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham 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 20A692B913 for ; Sat, 19 Jan 2019 20:52:06 +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=Hy5OFPMc/hAyy4keO9vqsa3LyXC5Ler2m7ef0+EEDlY=; b=TrY0omwIOiBpLz U4nyEpmRB0Ndq+IulTLXtDlcRLSqAb1GjPeL4fMyUf1Zfssjr8Hzrpz6cUuvCrJzCTGXlcbxqeTQD qKOf1pPmrcIbuPq1Oa3EIen/VPzmh+tbxcUU0aMvN87bz1GA0EbuiB1CpnFg++NaN931xR2+RH4TL NQxg+m6QUogVxvfdTDZvtKt7WT6izTdgBhKEvg7hJp/IjQ7jd7noda6K9chIHTDHriYS0kg4tIzaY iy1sYjetCbASPLGnSscgh+XijIpvB6StT2AJjl4W5Fyn0RV0XFNJC9XBXUDaOnUddqCAZ/iusNuUb pRFksfwxCGocGixSxkLA==; 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 1gkxb1-0004wk-US; Sat, 19 Jan 2019 20:52:04 +0000 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gkxaX-0004R3-Dd; Sat, 19 Jan 2019 20:51:35 +0000 Received: by mail-wm1-x333.google.com with SMTP id p6so7490307wmc.1; Sat, 19 Jan 2019 12:51:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mfga5LPr/J3+vtuLs6sE/4iTgznBPBA3E+j5LobqNYM=; b=EJZhMqa5fQqTJmlghkIfuLCEMOmi48PSWTE5qyegX9Uubem0S/mX2THXZEkvuwKQ1T z/4mwV1wNpAKZ4/aYapso4cq30p/1S1M2h6fdwDqBW+JV0ZI9ogTPOlqtazC3DjySZAz dgnGd1NwjKSYx9z95K5rpcwELS133MLnPKXm8zOzuGVLssHyC2ym02zsQcE6ulBwZ/pE aHB6CQq7YlvPOfo6GNNsQZQmPip/eyFKzUVMHoP7nuO6Dr6DfoSg26leMksoxIFs0Q8b La2VLE/WvfzNAI+396CCgwhJN+Rt8VkUx+tHxyX1MeSoOaHPp1v0kbUYM7WT0rlhp90q kYdQ== 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=mfga5LPr/J3+vtuLs6sE/4iTgznBPBA3E+j5LobqNYM=; b=KI4dDfI55snRlpYCe6bkXuyduKkq+2CZhgziGWj87Y+jeBgxzbCiqxAnOABf/HRhHQ 8/z9GtQ9kbGlE87jmQtNHBbMwXiiGUeTbC/2QHrKyVagsRTCFjPZZlaKWVGrBjz37MhA AKR/Lfg4YzGbw1odHXCpJhCc6Uw5+VdfZpeKF/8wCVAn4q8zxKezp+BAZQHVP0Afrx6R NEoEybm5bmLqoTIkhV4kLfb15BYN8B7hn8jSM0Jm9CMSWtxN/FBWPbT8Km5jA474x3dP rZU+RGFt2XHEHYZ8L26iteGTkG4+8T5U6Rzsams8vmWHKERoCiwd521ehqeKTYMylFy7 6qPg== X-Gm-Message-State: AJcUukdKkKJwqnXk3moiTh5jFUIok/r57KZH5bXKF/lxr+P8dQoDLjD2 9zE2Llv6RaKApIVRq8f+/aZt3zoE X-Google-Smtp-Source: ALg8bN4y5b0+bvYgqHjfawOqam5SUACzfUYhonkChTE8cEjTKNxwf5Rdy6cPF/WFZPTbvp/63Mx3eQ== X-Received: by 2002:a1c:8acf:: with SMTP id m198mr20859820wmd.143.1547931089236; Sat, 19 Jan 2019 12:51:29 -0800 (PST) Received: from blackbox.darklights.net (p200300DCD73A8100FDA9BD4E9DEACC2C.dip0.t-ipconnect.de. [2003:dc:d73a:8100:fda9:bd4e:9dea:cc2c]) by smtp.googlemail.com with ESMTPSA id 10sm58176662wmy.40.2019.01.19.12.51.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Jan 2019 12:51:28 -0800 (PST) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org, narmstrong@baylibre.com, jbrunet@baylibre.com Subject: [PATCH v2 1/2] dt-bindings: clock: meson8b: add APB clock definition Date: Sat, 19 Jan 2019 21:51:20 +0100 Message-Id: <20190119205121.9621-2-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190119205121.9621-1-martin.blumenstingl@googlemail.com> References: <20190119205121.9621-1-martin.blumenstingl@googlemail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190119_125133_454025_76ED2D9C X-CRM114-Status: GOOD ( 12.71 ) 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: sboyd@kernel.org, Martin Blumenstingl , mturquette@baylibre.com, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Commit 8e1dd17c8b0e3f ("dt-bindings: clock: meson8b: export the CPU post dividers") added a clock with the name "ABP". The actual name of this clock is "APB". Add a new #define with the same ID but the correct name. The old #define will be dropped in a follow-up patch because each commit in the tree must compile on it's own (the old #define is still used by the clock controller driver). Fixes: 8e1dd17c8b0e3f ("dt-bindings: clock: meson8b: export the CPU post dividers") Signed-off-by: Martin Blumenstingl --- include/dt-bindings/clock/meson8b-clkc.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/dt-bindings/clock/meson8b-clkc.h b/include/dt-bindings/clock/meson8b-clkc.h index 5fe2923382d0..8067077a62ca 100644 --- a/include/dt-bindings/clock/meson8b-clkc.h +++ b/include/dt-bindings/clock/meson8b-clkc.h @@ -104,6 +104,7 @@ #define CLKID_MPLL2 95 #define CLKID_NAND_CLK 112 #define CLKID_ABP 124 +#define CLKID_APB 124 #define CLKID_PERIPH 126 #define CLKID_AXI 128 #define CLKID_L2_DRAM 130 From patchwork Sat Jan 19 20:51:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 10772197 X-Patchwork-Delegate: neil.armstrong@linaro.org 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 A0CF114E5 for ; Sat, 19 Jan 2019 20:51:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 90F582B87F for ; Sat, 19 Jan 2019 20:51:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 83FB62B800; Sat, 19 Jan 2019 20:51:36 +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_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,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 25B132B86B for ; Sat, 19 Jan 2019 20:51:35 +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=DZf4yPmVwaLXF+B3y9bHhWK3nihNgiVYJBMYHQAX4/M=; b=b+MbOVd9Sw39xM 8VL95Rwt1Zq2ijCNFNjnbqh5BuIK4cp+Yrto9POSNHn6u6SYYwZE06y0ho2a9ft/CIUFHvkvrINLc 5JhFYMq8c9iHI52nkyeP8pJOm8+fBCcB89/fT3QrXtHOGrgQ4PFvftezydy/LRqRXwVmZP6r0jgSR 9JvzC0Wob1J9lEdRhurojXroqqVm4wc0WU0hUXjOyp53bYM27wwWVwhXe0DKFqkUKCuaR+bffGpKf niWRdyK7i4AnEkFkxgQVOzafndhL70Cgwis0NBZq+bASOQ2IeSrB0nwCG2avrwoPtKYQ/1ipXK840 Uy+uj3OpYc/kQLX5FVpw==; 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 1gkxaZ-0004S2-4B; Sat, 19 Jan 2019 20:51:35 +0000 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gkxaW-0004R4-T3; Sat, 19 Jan 2019 20:51:34 +0000 Received: by mail-wm1-x343.google.com with SMTP id y139so7445892wmc.5; Sat, 19 Jan 2019 12:51:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=d9TVCi4BNICq2gxmx5zxYBJwQZn7VtKY6OR4lKjIRLA=; b=bqiAuIbnn3kzSJAlg+3/H4JKE6zmYpS6OR2AWZhTAlg5e5WpOPBT4WCVAalnS/xjWb dZ9KTYnZ5NeL24rlJXCpeosLzWzg2o8Fsxnd92N9HLT+MHn8FEYJIfF65i5o/xeqyFSK 4uTgE7k6NmZY1kX1l4IKf4xjAD1184UaJo4liM3U7koVs7W8j0NGOQF98OulmvComHnZ YN3jPxYWn24htRbaPU860/zoiMSevMvSoe0xrQlkl/8FEOKJTFecVNHLJGj1oZyH3Ll+ hBh9yDUzuPz0m/URo2tHjTh21Sr/GXq50IQuYoK7qCO/RVRAOssaWGMLDwNM4G5SoCYM cmCg== 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=d9TVCi4BNICq2gxmx5zxYBJwQZn7VtKY6OR4lKjIRLA=; b=XFFK2zG2EAWtdEn++vzh43gDZsXxrAxq98/726eaChZftPiDepMWddDRf55ATv23uX 1Wv2v8zP9C65AmG4M+yUezdI/0j5vJbB5eZoV9NgyItOfROTTOyKcNynOJX6cVZFoDsk Dn0rbxS5gqfqcJd+ZYxYsB9jTO7E+TqmyYg0sCs7aZrQSQCFufpL1cz4sWYyvQDbvgUp l2MG9gFDGeh4B+12EwFf6hXik+jRf3zAZ10vCJLst5H1WoibXLywAJZhswMontssv9St aZOR0/KC43g4JZ438870Jt+IshUf1YmwZY+G5jqiD+WbBkTuzBuMlOGhL4260m3tWT4c C3+Q== X-Gm-Message-State: AJcUukfNA34ack6Zkw/Z5PWM0wX2NOVc5FrMP2WzDzxenBofTIY/NpKB 5xyznseJv7UAyuWYskXJP6wJVwhz X-Google-Smtp-Source: ALg8bN46fAbumI7GKlnWvTT6AZEONa7xuPEn/aobI3ZQImj8PLnoZsamGNELCvALaFNt1ks2HSHPYw== X-Received: by 2002:a1c:9855:: with SMTP id a82mr18638098wme.20.1547931090309; Sat, 19 Jan 2019 12:51:30 -0800 (PST) Received: from blackbox.darklights.net (p200300DCD73A8100FDA9BD4E9DEACC2C.dip0.t-ipconnect.de. [2003:dc:d73a:8100:fda9:bd4e:9dea:cc2c]) by smtp.googlemail.com with ESMTPSA id 10sm58176662wmy.40.2019.01.19.12.51.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Jan 2019 12:51:29 -0800 (PST) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org, narmstrong@baylibre.com, jbrunet@baylibre.com Subject: [PATCH v2 2/2] clk: meson: meson8b: fix the naming of the APB clocks Date: Sat, 19 Jan 2019 21:51:21 +0100 Message-Id: <20190119205121.9621-3-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190119205121.9621-1-martin.blumenstingl@googlemail.com> References: <20190119205121.9621-1-martin.blumenstingl@googlemail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190119_125132_933628_56DED29A X-CRM114-Status: GOOD ( 12.14 ) 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: sboyd@kernel.org, Martin Blumenstingl , mturquette@baylibre.com, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Fix a typo in the APB clock names by renaming them from "abp" to "apb". No functional changes. Fixes: a7d19b05ce817d ("clk: meson: meson8b: add the CPU clock post divider clocks") Signed-off-by: Martin Blumenstingl --- drivers/clk/meson/meson8b.c | 26 +++++++++++++------------- drivers/clk/meson/meson8b.h | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/clk/meson/meson8b.c b/drivers/clk/meson/meson8b.c index 748552c5f6c8..5136300c7915 100644 --- a/drivers/clk/meson/meson8b.c +++ b/drivers/clk/meson/meson8b.c @@ -803,16 +803,16 @@ static struct clk_fixed_factor meson8b_cpu_clk_div8 = { }, }; -static u32 mux_table_abp[] = { 1, 2, 3, 4, 5, 6, 7 }; -static struct clk_regmap meson8b_abp_clk_sel = { +static u32 mux_table_apb[] = { 1, 2, 3, 4, 5, 6, 7 }; +static struct clk_regmap meson8b_apb_clk_sel = { .data = &(struct clk_regmap_mux_data){ .offset = HHI_SYS_CPU_CLK_CNTL1, .mask = 0x7, .shift = 3, - .table = mux_table_abp, + .table = mux_table_apb, }, .hw.init = &(struct clk_init_data){ - .name = "abp_clk_sel", + .name = "apb_clk_sel", .ops = &clk_regmap_mux_ops, .parent_names = (const char *[]){ "cpu_clk_div2", "cpu_clk_div3", @@ -825,16 +825,16 @@ static struct clk_regmap meson8b_abp_clk_sel = { }, }; -static struct clk_regmap meson8b_abp_clk_gate = { +static struct clk_regmap meson8b_apb_clk_gate = { .data = &(struct clk_regmap_gate_data){ .offset = HHI_SYS_CPU_CLK_CNTL1, .bit_idx = 16, .flags = CLK_GATE_SET_TO_DISABLE, }, .hw.init = &(struct clk_init_data){ - .name = "abp_clk_dis", + .name = "apb_clk_dis", .ops = &clk_regmap_gate_ro_ops, - .parent_names = (const char *[]){ "abp_clk_sel" }, + .parent_names = (const char *[]){ "apb_clk_sel" }, .num_parents = 1, .flags = CLK_SET_RATE_PARENT, }, @@ -1910,8 +1910,8 @@ static struct clk_hw_onecell_data meson8_hw_onecell_data = { [CLKID_CPU_CLK_DIV6] = &meson8b_cpu_clk_div6.hw, [CLKID_CPU_CLK_DIV7] = &meson8b_cpu_clk_div7.hw, [CLKID_CPU_CLK_DIV8] = &meson8b_cpu_clk_div8.hw, - [CLKID_ABP_SEL] = &meson8b_abp_clk_sel.hw, - [CLKID_ABP] = &meson8b_abp_clk_gate.hw, + [CLKID_APB_SEL] = &meson8b_apb_clk_sel.hw, + [CLKID_APB] = &meson8b_apb_clk_gate.hw, [CLKID_PERIPH_SEL] = &meson8b_periph_clk_sel.hw, [CLKID_PERIPH] = &meson8b_periph_clk_gate.hw, [CLKID_AXI_SEL] = &meson8b_axi_clk_sel.hw, @@ -2092,8 +2092,8 @@ static struct clk_hw_onecell_data meson8b_hw_onecell_data = { [CLKID_CPU_CLK_DIV6] = &meson8b_cpu_clk_div6.hw, [CLKID_CPU_CLK_DIV7] = &meson8b_cpu_clk_div7.hw, [CLKID_CPU_CLK_DIV8] = &meson8b_cpu_clk_div8.hw, - [CLKID_ABP_SEL] = &meson8b_abp_clk_sel.hw, - [CLKID_ABP] = &meson8b_abp_clk_gate.hw, + [CLKID_APB_SEL] = &meson8b_apb_clk_sel.hw, + [CLKID_APB] = &meson8b_apb_clk_gate.hw, [CLKID_PERIPH_SEL] = &meson8b_periph_clk_sel.hw, [CLKID_PERIPH] = &meson8b_periph_clk_gate.hw, [CLKID_AXI_SEL] = &meson8b_axi_clk_sel.hw, @@ -2261,8 +2261,8 @@ static struct clk_regmap *const meson8b_clk_regmaps[] = { &meson8b_fixed_pll_dco, &meson8b_hdmi_pll_dco, &meson8b_sys_pll_dco, - &meson8b_abp_clk_sel, - &meson8b_abp_clk_gate, + &meson8b_apb_clk_sel, + &meson8b_apb_clk_gate, &meson8b_periph_clk_sel, &meson8b_periph_clk_gate, &meson8b_axi_clk_sel, diff --git a/drivers/clk/meson/meson8b.h b/drivers/clk/meson/meson8b.h index f212e2304ff5..b8c58faeae52 100644 --- a/drivers/clk/meson/meson8b.h +++ b/drivers/clk/meson/meson8b.h @@ -92,7 +92,7 @@ #define CLKID_CPU_CLK_DIV6 120 #define CLKID_CPU_CLK_DIV7 121 #define CLKID_CPU_CLK_DIV8 122 -#define CLKID_ABP_SEL 123 +#define CLKID_APB_SEL 123 #define CLKID_PERIPH_SEL 125 #define CLKID_AXI_SEL 127 #define CLKID_L2_DRAM_SEL 129