From patchwork Sun Feb 10 22:26:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 10804939 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 1AD3513A4 for ; Sun, 10 Feb 2019 22:26:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0A41F29B96 for ; Sun, 10 Feb 2019 22:26:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F288429B99; Sun, 10 Feb 2019 22:26: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=-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 A425129B98 for ; Sun, 10 Feb 2019 22:26: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: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=d7QE/yZCILKZoi AWXAfFJr8Vz8tQ0BJUwV0lRdyq/+VyFe62cgQ7tvfv40XyJ5BFo6VYuj9ZzLIdHmxICkI9PZwqH8N OKSlDBa16NN/DlkyxZy4quJ4mDp1s2FUWS1kwMbnt2MYRKuJsGm5shlZalk5yYE8I7DA6lgkVuldN fx8jgfl2ov73l/uJ4+/ANNPuiX6jTJNXEsIj0RjagBcDu5IIk8Ar2LvPJ88SqrtBB9NOrgb0pHMyJ hEOjm23MyNN3vrl/ka9P+LMmMmj25f0I+aGfkqoSxNc8NbOlhMyB803f6XATQGZgQ5Zjj3rm9xUAZ o909+Odqz0iWiGyJj7/Q==; 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 1gsxYW-0000t1-VU; Sun, 10 Feb 2019 22:26:32 +0000 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gsxYT-0000rU-ST; Sun, 10 Feb 2019 22:26:31 +0000 Received: by mail-wm1-x32b.google.com with SMTP id p6so13317765wmc.1; Sun, 10 Feb 2019 14:26:29 -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=jjJ/LUqgiivo4ybNNx8VXJ8xpv6uAvDtXSJzrKyfkTKApoia4xS0nG7OI7T0mvIuU4 +HJH7CobjoW6z9FeJLiMP3fmfyPTG+j13M0Hd5184Tc6j6Sa0El4JhZZT7GQ7buWUada oteoPBKBReaD+TNTa/bDV2xcwRX9VXKPdvHu6oNWf59yDCVhd0dIK3kTLb/TMalC3sDM AcETk7TCmZuN6ZQoLfZLh7QnZ56OSCpTBFpKC44+IbfDvbmrqRarIHwGMdkQAVEFBnP3 Ep4CriSqdmwX0fUz2F95mXKZ4nilUEtWOuxfCEOayUPhUyZ5+6OA3er059Ab+y1Plr4y y7mw== 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=YSzV30K2jD5oeJFmWL4I/zlOiNbD8ffBVLXSsYuw2b6Urp6ka2RBrzLx0t5QtG33zQ rAG4RTFteWt4K22MiAeF2/zyUtLOk8lex0TbQ1/s2Q8BzJx7fsllEbThCj424yj8unwi 8fHYbxcAwkigykg61TpmKNP2Ti/0myilam/434mlc0g47ojXJawFFpMFHTCOoOxJpKli jDrkx1zSy8Xpf74Czqi9+NE9XiDVq+WHDrBKuixcueYR/tloHnBlRA3RAumLGTr+a0pO CV6utcVXwv34AEM80OByHyhUuXUKHeTvMGfjUqQ5S96AWO7/o0VjWggRpjCh84TfZpnJ mFJA== X-Gm-Message-State: AHQUAuaetzGFXTd7pI2BU9RyPRlJDQrM6X0j4o5GoH0ill+T4CVED2Og m3YxLSUync0DUjt0EFpFjSzd9shq X-Google-Smtp-Source: AHgI3IaXjoT47lxbtsg47YPQ5DqyvjDltZAZSAX75NeQ0BzFEG8dXRQHyoZhkNt/5q7WwIQFRaAOzg== X-Received: by 2002:a5d:43cd:: with SMTP id v13mr25276183wrr.194.1549837587435; Sun, 10 Feb 2019 14:26:27 -0800 (PST) Received: from blackbox.darklights.net (p200300DCD70B4600C064670D88EA61CD.dip0.t-ipconnect.de. [2003:dc:d70b:4600:c064:670d:88ea:61cd]) by smtp.googlemail.com with ESMTPSA id b14sm15523330wrx.36.2019.02.10.14.26.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Feb 2019 14:26:26 -0800 (PST) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org, narmstrong@baylibre.com, robh+dt@kernel.org, devicetree@vger.kernel.org Subject: [RESEND PATCH v2 1/2] dt-bindings: clock: meson8b: add APB clock definition Date: Sun, 10 Feb 2019 23:26:02 +0100 Message-Id: <20190210222603.6404-2-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190210222603.6404-1-martin.blumenstingl@googlemail.com> References: <20190210222603.6404-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-20190210_142629_928485_5F2C29AA X-CRM114-Status: GOOD ( 11.90 ) 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: mark.rutland@arm.com, sboyd@kernel.org, mturquette@baylibre.com, Martin Blumenstingl , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, jbrunet@baylibre.com 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 Sun Feb 10 22:26:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 10804947 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 296D46C2 for ; Sun, 10 Feb 2019 22:27:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1834E29B96 for ; Sun, 10 Feb 2019 22:27:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 09AFD29B99; Sun, 10 Feb 2019 22:27: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=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 90C7C29B96 for ; Sun, 10 Feb 2019 22:27:05 +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=Bik5rDs+nB24gB nN5j0oDJyFhUxtUHuw66F1iDb0jTBuj8AwJTg8j9JvruWkF0/RGHoavWo/NQ11t42fcxeL1mByRVt IrGpuwX8k38W32Ly1ebxMbuGh+hvkV9HPw2+mvrv5p6cbITXzCYjD1PS0nlCnw5Ezju/7/vNU8vvI qGUuZDBccMcytWonxBCmt16QrR6yXzLv14h9YTgIUaEb2oH/rms0TIl/0LgyJ70c6Oh3cqOBs0fpS nNQulh69VlPbn1cn1qch7778qgfBUA65WuNzUB5+J9s031LQ4bGbhKAhjSUhGVxaQNybSaIdv+GgF jSLSxkUow9I0NFIPrs+w==; 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 1gsxZ0-0001NB-Ca; Sun, 10 Feb 2019 22:27:02 +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 1gsxYU-0000rX-Er; Sun, 10 Feb 2019 22:26:32 +0000 Received: by mail-wm1-x343.google.com with SMTP id p6so13317820wmc.1; Sun, 10 Feb 2019 14:26:30 -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=bJi0a0brTJm18tD1GZq18LRx2ISjf9B7E1g5n6s+IuqGwFqIlV5KLWnW8RqTvij2WD b2uChcio4hBJMuggJMY6uYfzGQs/Vi8DFk5OIBxosoM3lny9UEdqN8oXvBUIPfYA4X0k hbORLq5rDJi5FEwaaRJrj+Z5BQMlsmE3AOxiL7zMgF4WZs98WJ+OkZez2tUZXg3XInYg TABtNmflnT8Q23vuCUh6Vtn+Zbc2CnybQIhZx2rzTJYQ9rAClFBG2akqngyxRBN/nUO1 sORnL7dhRyT2VPJS26GSl9zFG+9rZxdjPYqQwBeeSe///u/n+k/SHVJLNJF9O0sATWVU ebWA== 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=ffvvPc7srL81JW2xpIyBVesql0TwY1uKLMfyrx+GjXugOHLGKwociFJYSF6xrppTg9 Nwky+73Ua00AgACQ2K8pB0N565JFpY2PN3Ruztwd/iDkjbmHC8H5Z/ATT3Mrz/+xt/2R zBnY7F9KZhUjHsIspy7GXFhKuMxXKSIEVGcAxYyYAsPJj284XRyF//XG/AtdLioUZWOc hdMSR3IO1aJJORxMyF+IXc2jmBdzQylxYyRU2QrsriS0hWqVvJHw/ZR3sVcbA/KLyXMx zCJC/4uLJFuBlP8ENpmCSKiLyZKQMHLqNAt8QIapfxUz+ZBHcI17tEIeh/voo6YrbTo0 rQSA== X-Gm-Message-State: AHQUAub9ZEUWZ8jul+nVhX95kU1zG2j96yE68+gKFaRZHuvLbxPs2TSN EEH9GG/oEH/u2a00KD5UeAwgKkWX X-Google-Smtp-Source: AHgI3IbfxM8tKqJeMQysco4NbTaCmbBKD6am73OmrGJ6Rkrk1V4lpsD5tZ73YkKKLXSLnOgJBG/5sg== X-Received: by 2002:a1c:720f:: with SMTP id n15mr2648738wmc.64.1549837588716; Sun, 10 Feb 2019 14:26:28 -0800 (PST) Received: from blackbox.darklights.net (p200300DCD70B4600C064670D88EA61CD.dip0.t-ipconnect.de. [2003:dc:d70b:4600:c064:670d:88ea:61cd]) by smtp.googlemail.com with ESMTPSA id b14sm15523330wrx.36.2019.02.10.14.26.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Feb 2019 14:26:28 -0800 (PST) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org, narmstrong@baylibre.com, robh+dt@kernel.org, devicetree@vger.kernel.org Subject: [RESEND PATCH v2 2/2] clk: meson: meson8b: fix the naming of the APB clocks Date: Sun, 10 Feb 2019 23:26:03 +0100 Message-Id: <20190210222603.6404-3-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190210222603.6404-1-martin.blumenstingl@googlemail.com> References: <20190210222603.6404-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-20190210_142630_570018_62B7670C X-CRM114-Status: GOOD ( 11.34 ) 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: mark.rutland@arm.com, sboyd@kernel.org, mturquette@baylibre.com, Martin Blumenstingl , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, jbrunet@baylibre.com 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