From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3A754D2ED12 for ; Tue, 20 Jan 2026 14:38:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Gs7UUBCr88HTtQnY8uC3b4ZM8uaaIy30jyMS9SVxfK8=; b=j4XqAPpQWWGoUAC/2KiI/COt6C AFrSFpWb0mtqMrA+hR7440FIQwdCRC7UyTokKhvNLxqZeL2CmoycrrtrHNJwMQdrXdBKlBviziPqE ytoWzY5xzYCS8hy3ToYqAxDbP3hnmt9euowGcJf2w/Iy04q67DsLfdoF1ZZIJmN6bzt8reFgA9sNf OYIC3+obZ+6i91BpGuCZxQZjhaPLyUU/fAVxBotyR9M6RsxM8pm+a0zuNk9W18mjEJiMkAA0WsH43 gwfWX8u0KP23SKIarFGKuqrk8CEi2V40GjyD5FyKLlQmuKZsR2VpwBdPeMd+pJDioLHi3hE4G4CSC B8g2jg0g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1viCsX-00000003ztG-3HZf; Tue, 20 Jan 2026 14:38:45 +0000 Received: from mail.thorsis.com ([217.92.40.78]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1viCsR-00000003zqj-0WBZ for linux-arm-kernel@lists.infradead.org; Tue, 20 Jan 2026 14:38:40 +0000 Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id CB3D1148AD45; Tue, 20 Jan 2026 15:38:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=thorsis.com; s=dkim; t=1768919917; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=Gs7UUBCr88HTtQnY8uC3b4ZM8uaaIy30jyMS9SVxfK8=; b=BabQEu/PuiKF7w3NBqhKL0w1Uzi5kLIrtnmbxbViw2JagpNz6xC7Vf9m228yqzjoJAx4RL vU8zTAkIyjCTosu2zGp/aO9hfaCSZ0yXm86/wEL+bYWsIlMWLBhf9qIZXKCt3CtEghiTxi /xQAlpa/jKoImB4QwO+3iowlT8Bmh93EjhNgKN31PPzkluQ1ysK592nk1CE0mFAZpgNua0 m660XfRhLn7CB+3kCOYddz69Jjm78+2cLtqJpCSZMQOzOMOeEyEJRNhfjMHSIs1vhliTOl diiiY2KRRSy54EM11CHHwlLfLCN4kwgknqwskZgf3bt092pBqefMz+bMuRq7BQ== From: Alexander Dahl To: Claudiu Beznea Cc: Nicolas Ferre , Alexandre Belloni , Ryan Wanner , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, Michael Turquette , Stephen Boyd , Cristian Birsan , Varshini Rajendran , Balamanikandan Gunasundar Subject: [PATCH v3 04/19] clk: at91: Use new PMC bindings Date: Tue, 20 Jan 2026 15:37:25 +0100 Message-ID: <20260120143759.904013-5-ada@thorsis.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260120143759.904013-1-ada@thorsis.com> References: <20260120143759.904013-1-ada@thorsis.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Last-TLS-Session-Version: TLSv1.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260120_063839_493635_B8E91B8D X-CRM114-Status: GOOD ( 12.75 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The bindings were split up per SoC before adding new array members for missing clocks. Signed-off-by: Alexander Dahl --- Notes: v3: - extend to all SoC specific at91 clk drivers v2: - new patch, not present in v1 drivers/clk/at91/at91rm9200.c | 12 +++++------ drivers/clk/at91/at91sam9260.c | 14 ++++++------- drivers/clk/at91/at91sam9g45.c | 12 +++++------ drivers/clk/at91/at91sam9n12.c | 12 +++++------ drivers/clk/at91/at91sam9rl.c | 12 +++++------ drivers/clk/at91/at91sam9x5.c | 12 +++++------ drivers/clk/at91/sam9x60.c | 14 ++++++------- drivers/clk/at91/sam9x7.c | 22 ++++++++++---------- drivers/clk/at91/sama5d2.c | 22 ++++++++++---------- drivers/clk/at91/sama5d3.c | 10 ++++----- drivers/clk/at91/sama5d4.c | 12 +++++------ drivers/clk/at91/sama7d65.c | 38 +++++++++++++++++----------------- drivers/clk/at91/sama7g5.c | 28 ++++++++++++------------- 13 files changed, 110 insertions(+), 110 deletions(-) diff --git a/drivers/clk/at91/at91rm9200.c b/drivers/clk/at91/at91rm9200.c index 3f19e737ae4d2..6f5c758ab3ec6 100644 --- a/drivers/clk/at91/at91rm9200.c +++ b/drivers/clk/at91/at91rm9200.c @@ -3,7 +3,7 @@ #include #include -#include +#include #include "pmc.h" @@ -100,7 +100,7 @@ static void __init at91rm9200_pmc_setup(struct device_node *np) if (IS_ERR(regmap)) return; - at91rm9200_pmc = pmc_data_allocate(PMC_PLLBCK + 1, + at91rm9200_pmc = pmc_data_allocate(AT91RM9200_PMC_PLLBCK + 1, nck(at91rm9200_systemck), nck(at91rm9200_periphck), 0, 4); if (!at91rm9200_pmc) @@ -117,7 +117,7 @@ static void __init at91rm9200_pmc_setup(struct device_node *np) if (IS_ERR(hw)) goto err_free; - at91rm9200_pmc->chws[PMC_MAIN] = hw; + at91rm9200_pmc->chws[AT91RM9200_PMC_MAIN] = hw; hw = at91_clk_register_pll(regmap, "pllack", "mainck", 0, &at91rm9200_pll_layout, @@ -125,7 +125,7 @@ static void __init at91rm9200_pmc_setup(struct device_node *np) if (IS_ERR(hw)) goto err_free; - at91rm9200_pmc->chws[PMC_PLLACK] = hw; + at91rm9200_pmc->chws[AT91RM9200_PMC_PLLACK] = hw; hw = at91_clk_register_pll(regmap, "pllbck", "mainck", 1, &at91rm9200_pll_layout, @@ -133,7 +133,7 @@ static void __init at91rm9200_pmc_setup(struct device_node *np) if (IS_ERR(hw)) goto err_free; - at91rm9200_pmc->chws[PMC_PLLBCK] = hw; + at91rm9200_pmc->chws[AT91RM9200_PMC_PLLBCK] = hw; parent_names[0] = slowxtal_name; parent_names[1] = "mainck"; @@ -155,7 +155,7 @@ static void __init at91rm9200_pmc_setup(struct device_node *np) if (IS_ERR(hw)) goto err_free; - at91rm9200_pmc->chws[PMC_MCK] = hw; + at91rm9200_pmc->chws[AT91RM9200_PMC_MCK] = hw; hw = at91rm9200_clk_register_usb(regmap, "usbck", "pllbck", usb_div); if (IS_ERR(hw)) diff --git a/drivers/clk/at91/at91sam9260.c b/drivers/clk/at91/at91sam9260.c index 0799a13060ea4..492114c13e40d 100644 --- a/drivers/clk/at91/at91sam9260.c +++ b/drivers/clk/at91/at91sam9260.c @@ -3,7 +3,7 @@ #include #include -#include +#include #include "pmc.h" @@ -354,7 +354,7 @@ static void __init at91sam926x_pmc_setup(struct device_node *np, if (IS_ERR(regmap)) return; - at91sam9260_pmc = pmc_data_allocate(PMC_PLLBCK + 1, + at91sam9260_pmc = pmc_data_allocate(AT91SAM9260_PMC_PLLBCK + 1, ndck(data->sck, data->num_sck), ndck(data->pck, data->num_pck), 0, data->num_progck); @@ -372,7 +372,7 @@ static void __init at91sam926x_pmc_setup(struct device_node *np, if (IS_ERR(hw)) goto err_free; - at91sam9260_pmc->chws[PMC_MAIN] = hw; + at91sam9260_pmc->chws[AT91SAM9260_PMC_MAIN] = hw; if (data->has_slck) { hw = clk_hw_register_fixed_rate_with_accuracy(NULL, @@ -389,7 +389,7 @@ static void __init at91sam926x_pmc_setup(struct device_node *np, if (IS_ERR(hw)) goto err_free; - at91sam9260_pmc->chws[PMC_SLOW] = hw; + at91sam9260_pmc->chws[AT91SAM9260_PMC_SLOW] = hw; slck_name = "slck"; } else { slck_name = slowxtal_name; @@ -401,7 +401,7 @@ static void __init at91sam926x_pmc_setup(struct device_node *np, if (IS_ERR(hw)) goto err_free; - at91sam9260_pmc->chws[PMC_PLLACK] = hw; + at91sam9260_pmc->chws[AT91SAM9260_PMC_PLLACK] = hw; hw = at91_clk_register_pll(regmap, "pllbck", "mainck", 1, data->pllb_layout, @@ -409,7 +409,7 @@ static void __init at91sam926x_pmc_setup(struct device_node *np, if (IS_ERR(hw)) goto err_free; - at91sam9260_pmc->chws[PMC_PLLBCK] = hw; + at91sam9260_pmc->chws[AT91SAM9260_PMC_PLLBCK] = hw; parent_names[0] = slck_name; parent_names[1] = "mainck"; @@ -432,7 +432,7 @@ static void __init at91sam926x_pmc_setup(struct device_node *np, if (IS_ERR(hw)) goto err_free; - at91sam9260_pmc->chws[PMC_MCK] = hw; + at91sam9260_pmc->chws[AT91SAM9260_PMC_MCK] = hw; hw = at91rm9200_clk_register_usb(regmap, "usbck", "pllbck", usb_div); if (IS_ERR(hw)) diff --git a/drivers/clk/at91/at91sam9g45.c b/drivers/clk/at91/at91sam9g45.c index f45a7b80f7d8b..f41bbff76a541 100644 --- a/drivers/clk/at91/at91sam9g45.c +++ b/drivers/clk/at91/at91sam9g45.c @@ -3,7 +3,7 @@ #include #include -#include +#include #include "pmc.h" @@ -115,7 +115,7 @@ static void __init at91sam9g45_pmc_setup(struct device_node *np) if (IS_ERR(regmap)) return; - at91sam9g45_pmc = pmc_data_allocate(PMC_PLLACK + 1, + at91sam9g45_pmc = pmc_data_allocate(AT91SAM9G45_PMC_PLLACK + 1, nck(at91sam9g45_systemck), nck(at91sam9g45_periphck), 0, 2); if (!at91sam9g45_pmc) @@ -132,7 +132,7 @@ static void __init at91sam9g45_pmc_setup(struct device_node *np) if (IS_ERR(hw)) goto err_free; - at91sam9g45_pmc->chws[PMC_MAIN] = hw; + at91sam9g45_pmc->chws[AT91SAM9G45_PMC_MAIN] = hw; hw = at91_clk_register_pll(regmap, "pllack", "mainck", 0, &at91rm9200_pll_layout, &plla_characteristics); @@ -143,13 +143,13 @@ static void __init at91sam9g45_pmc_setup(struct device_node *np) if (IS_ERR(hw)) goto err_free; - at91sam9g45_pmc->chws[PMC_PLLACK] = hw; + at91sam9g45_pmc->chws[AT91SAM9G45_PMC_PLLACK] = hw; hw = at91_clk_register_utmi(regmap, NULL, "utmick", "mainck", NULL); if (IS_ERR(hw)) goto err_free; - at91sam9g45_pmc->chws[PMC_UTMI] = hw; + at91sam9g45_pmc->chws[AT91SAM9G45_PMC_UTMI] = hw; parent_names[0] = slck_name; parent_names[1] = "mainck"; @@ -172,7 +172,7 @@ static void __init at91sam9g45_pmc_setup(struct device_node *np) if (IS_ERR(hw)) goto err_free; - at91sam9g45_pmc->chws[PMC_MCK] = hw; + at91sam9g45_pmc->chws[AT91SAM9G45_PMC_MCK] = hw; parent_names[0] = "plladivck"; parent_names[1] = "utmick"; diff --git a/drivers/clk/at91/at91sam9n12.c b/drivers/clk/at91/at91sam9n12.c index 751786184ae2b..f6210fac26f39 100644 --- a/drivers/clk/at91/at91sam9n12.c +++ b/drivers/clk/at91/at91sam9n12.c @@ -3,7 +3,7 @@ #include #include -#include +#include #include "pmc.h" @@ -135,7 +135,7 @@ static void __init at91sam9n12_pmc_setup(struct device_node *np) if (IS_ERR(regmap)) return; - at91sam9n12_pmc = pmc_data_allocate(PMC_PLLBCK + 1, + at91sam9n12_pmc = pmc_data_allocate(AT91SAM9N12_PMC_PLLBCK + 1, nck(at91sam9n12_systemck), 31, 0, 2); if (!at91sam9n12_pmc) return; @@ -158,7 +158,7 @@ static void __init at91sam9n12_pmc_setup(struct device_node *np) if (IS_ERR(hw)) goto err_free; - at91sam9n12_pmc->chws[PMC_MAIN] = hw; + at91sam9n12_pmc->chws[AT91SAM9N12_PMC_MAIN] = hw; hw = at91_clk_register_pll(regmap, "pllack", "mainck", 0, &at91rm9200_pll_layout, &plla_characteristics); @@ -169,14 +169,14 @@ static void __init at91sam9n12_pmc_setup(struct device_node *np) if (IS_ERR(hw)) goto err_free; - at91sam9n12_pmc->chws[PMC_PLLACK] = hw; + at91sam9n12_pmc->chws[AT91SAM9N12_PMC_PLLACK] = hw; hw = at91_clk_register_pll(regmap, "pllbck", "mainck", 1, &at91rm9200_pll_layout, &pllb_characteristics); if (IS_ERR(hw)) goto err_free; - at91sam9n12_pmc->chws[PMC_PLLBCK] = hw; + at91sam9n12_pmc->chws[AT91SAM9N12_PMC_PLLBCK] = hw; parent_names[0] = slck_name; parent_names[1] = "mainck"; @@ -199,7 +199,7 @@ static void __init at91sam9n12_pmc_setup(struct device_node *np) if (IS_ERR(hw)) goto err_free; - at91sam9n12_pmc->chws[PMC_MCK] = hw; + at91sam9n12_pmc->chws[AT91SAM9N12_PMC_MCK] = hw; hw = at91sam9n12_clk_register_usb(regmap, "usbck", "pllbck"); if (IS_ERR(hw)) diff --git a/drivers/clk/at91/at91sam9rl.c b/drivers/clk/at91/at91sam9rl.c index 969f809e7d65a..4664e4afc69cf 100644 --- a/drivers/clk/at91/at91sam9rl.c +++ b/drivers/clk/at91/at91sam9rl.c @@ -3,7 +3,7 @@ #include #include -#include +#include #include "pmc.h" @@ -89,7 +89,7 @@ static void __init at91sam9rl_pmc_setup(struct device_node *np) if (IS_ERR(regmap)) return; - at91sam9rl_pmc = pmc_data_allocate(PMC_PLLACK + 1, + at91sam9rl_pmc = pmc_data_allocate(AT91SAM9RL_PMC_PLLACK + 1, nck(at91sam9rl_systemck), nck(at91sam9rl_periphck), 0, 2); if (!at91sam9rl_pmc) @@ -99,7 +99,7 @@ static void __init at91sam9rl_pmc_setup(struct device_node *np) if (IS_ERR(hw)) goto err_free; - at91sam9rl_pmc->chws[PMC_MAIN] = hw; + at91sam9rl_pmc->chws[AT91SAM9RL_PMC_MAIN] = hw; hw = at91_clk_register_pll(regmap, "pllack", "mainck", 0, &at91rm9200_pll_layout, @@ -107,13 +107,13 @@ static void __init at91sam9rl_pmc_setup(struct device_node *np) if (IS_ERR(hw)) goto err_free; - at91sam9rl_pmc->chws[PMC_PLLACK] = hw; + at91sam9rl_pmc->chws[AT91SAM9RL_PMC_PLLACK] = hw; hw = at91_clk_register_utmi(regmap, NULL, "utmick", "mainck", NULL); if (IS_ERR(hw)) goto err_free; - at91sam9rl_pmc->chws[PMC_UTMI] = hw; + at91sam9rl_pmc->chws[AT91SAM9RL_PMC_UTMI] = hw; parent_names[0] = slck_name; parent_names[1] = "mainck"; @@ -135,7 +135,7 @@ static void __init at91sam9rl_pmc_setup(struct device_node *np) if (IS_ERR(hw)) goto err_free; - at91sam9rl_pmc->chws[PMC_MCK] = hw; + at91sam9rl_pmc->chws[AT91SAM9RL_PMC_MCK] = hw; parent_names[0] = slck_name; parent_names[1] = "mainck"; diff --git a/drivers/clk/at91/at91sam9x5.c b/drivers/clk/at91/at91sam9x5.c index 3b801d12fac0d..501315934965e 100644 --- a/drivers/clk/at91/at91sam9x5.c +++ b/drivers/clk/at91/at91sam9x5.c @@ -3,7 +3,7 @@ #include #include -#include +#include #include "pmc.h" @@ -157,7 +157,7 @@ static void __init at91sam9x5_pmc_setup(struct device_node *np, if (IS_ERR(regmap)) return; - at91sam9x5_pmc = pmc_data_allocate(PMC_PLLACK + 1, + at91sam9x5_pmc = pmc_data_allocate(AT91SAM9X5_PMC_PLLACK + 1, nck(at91sam9x5_systemck), 31, 0, 2); if (!at91sam9x5_pmc) return; @@ -180,7 +180,7 @@ static void __init at91sam9x5_pmc_setup(struct device_node *np, if (IS_ERR(hw)) goto err_free; - at91sam9x5_pmc->chws[PMC_MAIN] = hw; + at91sam9x5_pmc->chws[AT91SAM9X5_PMC_MAIN] = hw; hw = at91_clk_register_pll(regmap, "pllack", "mainck", 0, &at91rm9200_pll_layout, &plla_characteristics); @@ -191,13 +191,13 @@ static void __init at91sam9x5_pmc_setup(struct device_node *np, if (IS_ERR(hw)) goto err_free; - at91sam9x5_pmc->chws[PMC_PLLACK] = hw; + at91sam9x5_pmc->chws[AT91SAM9X5_PMC_PLLACK] = hw; hw = at91_clk_register_utmi(regmap, NULL, "utmick", "mainck", NULL); if (IS_ERR(hw)) goto err_free; - at91sam9x5_pmc->chws[PMC_UTMI] = hw; + at91sam9x5_pmc->chws[AT91SAM9X5_PMC_UTMI] = hw; parent_names[0] = slck_name; parent_names[1] = "mainck"; @@ -218,7 +218,7 @@ static void __init at91sam9x5_pmc_setup(struct device_node *np, if (IS_ERR(hw)) goto err_free; - at91sam9x5_pmc->chws[PMC_MCK] = hw; + at91sam9x5_pmc->chws[AT91SAM9X5_PMC_MCK] = hw; parent_names[0] = "plladivck"; parent_names[1] = "utmick"; diff --git a/drivers/clk/at91/sam9x60.c b/drivers/clk/at91/sam9x60.c index 18baf4a256f47..dbcdb1d2161a9 100644 --- a/drivers/clk/at91/sam9x60.c +++ b/drivers/clk/at91/sam9x60.c @@ -3,7 +3,7 @@ #include #include -#include +#include #include "pmc.h" @@ -216,7 +216,7 @@ static void __init sam9x60_pmc_setup(struct device_node *np) if (IS_ERR(regmap)) return; - sam9x60_pmc = pmc_data_allocate(PMC_PLLACK + 1, + sam9x60_pmc = pmc_data_allocate(SAM9X60_PMC_PLLACK + 1, nck(sam9x60_systemck), nck(sam9x60_periphck), nck(sam9x60_gck), 8); @@ -239,10 +239,10 @@ static void __init sam9x60_pmc_setup(struct device_node *np) if (IS_ERR(hw)) goto err_free; - sam9x60_pmc->chws[PMC_MAIN] = hw; + sam9x60_pmc->chws[SAM9X60_PMC_MAIN] = hw; hw = sam9x60_clk_register_frac_pll(regmap, &pmc_pll_lock, "pllack_fracck", - "mainck", sam9x60_pmc->chws[PMC_MAIN], + "mainck", sam9x60_pmc->chws[SAM9X60_PMC_MAIN], 0, &plla_characteristics, &pll_frac_layout, /* @@ -265,7 +265,7 @@ static void __init sam9x60_pmc_setup(struct device_node *np) if (IS_ERR(hw)) goto err_free; - sam9x60_pmc->chws[PMC_PLLACK] = hw; + sam9x60_pmc->chws[SAM9X60_PMC_PLLACK] = hw; hw = sam9x60_clk_register_frac_pll(regmap, &pmc_pll_lock, "upllck_fracck", "main_osc", main_osc_hw, 1, @@ -283,7 +283,7 @@ static void __init sam9x60_pmc_setup(struct device_node *np) if (IS_ERR(hw)) goto err_free; - sam9x60_pmc->chws[PMC_UTMI] = hw; + sam9x60_pmc->chws[SAM9X60_PMC_UTMI] = hw; parent_names[0] = md_slck_name; parent_names[1] = "mainck"; @@ -301,7 +301,7 @@ static void __init sam9x60_pmc_setup(struct device_node *np) if (IS_ERR(hw)) goto err_free; - sam9x60_pmc->chws[PMC_MCK] = hw; + sam9x60_pmc->chws[SAM9X60_PMC_MCK] = hw; parent_names[0] = "pllack_divck"; parent_names[1] = "upllck_divck"; diff --git a/drivers/clk/at91/sam9x7.c b/drivers/clk/at91/sam9x7.c index 89868a0aeaba9..07eadb712a1e4 100644 --- a/drivers/clk/at91/sam9x7.c +++ b/drivers/clk/at91/sam9x7.c @@ -12,7 +12,7 @@ #include #include -#include +#include #include "pmc.h" @@ -225,7 +225,7 @@ static const struct { .t = PLL_TYPE_DIV, /* This feeds CPU. It should not be disabled */ .f = CLK_IS_CRITICAL | CLK_SET_RATE_GATE, - .eid = PMC_PLLACK, + .eid = SAM9X7_PMC_PLLACK, .c = &plla_characteristics, }, }, @@ -247,7 +247,7 @@ static const struct { .t = PLL_TYPE_DIV, .f = CLK_SET_RATE_GATE | CLK_SET_PARENT_GATE | CLK_SET_RATE_PARENT, - .eid = PMC_UTMI, + .eid = SAM9X7_PMC_UTMI, .c = &upll_characteristics, }, }, @@ -269,7 +269,7 @@ static const struct { .f = CLK_SET_RATE_GATE | CLK_SET_PARENT_GATE | CLK_SET_RATE_PARENT, .c = &audiopll_characteristics, - .eid = PMC_AUDIOPMCPLL, + .eid = SAM9X7_PMC_AUDIOPMCPLL, .t = PLL_TYPE_DIV, }, @@ -280,7 +280,7 @@ static const struct { .f = CLK_SET_RATE_GATE | CLK_SET_PARENT_GATE | CLK_SET_RATE_PARENT, .c = &audiopll_characteristics, - .eid = PMC_AUDIOIOPLL, + .eid = SAM9X7_PMC_AUDIOIOPLL, .t = PLL_TYPE_DIV, }, }, @@ -302,7 +302,7 @@ static const struct { .f = CLK_SET_RATE_GATE | CLK_SET_PARENT_GATE | CLK_SET_RATE_PARENT, .c = &lvdspll_characteristics, - .eid = PMC_LVDSPLL, + .eid = SAM9X7_PMC_LVDSPLL, .t = PLL_TYPE_DIV, }, }, @@ -318,7 +318,7 @@ static const struct { */ .f = CLK_IS_CRITICAL | CLK_SET_RATE_GATE, .c = &plladiv2_characteristics, - .eid = PMC_PLLADIV2, + .eid = SAM9X7_PMC_PLLADIV2, .t = PLL_TYPE_DIV, }, }, @@ -747,7 +747,7 @@ static void __init sam9x7_pmc_setup(struct device_node *np) if (IS_ERR(regmap)) return; - sam9x7_pmc = pmc_data_allocate(PMC_LVDSPLL + 1, + sam9x7_pmc = pmc_data_allocate(SAM9X7_PMC_LVDSPLL + 1, nck(sam9x7_systemck), nck(sam9x7_periphck), nck(sam9x7_gck), 8); @@ -776,7 +776,7 @@ static void __init sam9x7_pmc_setup(struct device_node *np) if (IS_ERR(hw)) goto err_free; - sam9x7_pmc->chws[PMC_MAIN] = hw; + sam9x7_pmc->chws[SAM9X7_PMC_MAIN] = hw; for (i = 0; i < PLL_ID_MAX; i++) { for (j = 0; j < 3; j++) { @@ -788,7 +788,7 @@ static void __init sam9x7_pmc_setup(struct device_node *np) switch (sam9x7_plls[i][j].t) { case PLL_TYPE_FRAC: if (!strcmp(sam9x7_plls[i][j].p, "mainck")) - parent_hw = sam9x7_pmc->chws[PMC_MAIN]; + parent_hw = sam9x7_pmc->chws[SAM9X7_PMC_MAIN]; else if (!strcmp(sam9x7_plls[i][j].p, "main_osc")) parent_hw = main_osc_hw; else @@ -844,7 +844,7 @@ static void __init sam9x7_pmc_setup(struct device_node *np) if (IS_ERR(hw)) goto err_free; - sam9x7_pmc->chws[PMC_MCK] = hw; + sam9x7_pmc->chws[SAM9X7_PMC_MCK] = hw; parent_names[0] = "plla_divpmcck"; parent_names[1] = "upll_divpmcck"; diff --git a/drivers/clk/at91/sama5d2.c b/drivers/clk/at91/sama5d2.c index c16594fce90c9..b7f40c9302a21 100644 --- a/drivers/clk/at91/sama5d2.c +++ b/drivers/clk/at91/sama5d2.c @@ -3,7 +3,7 @@ #include #include -#include +#include #include "pmc.h" @@ -188,7 +188,7 @@ static void __init sama5d2_pmc_setup(struct device_node *np) if (IS_ERR(regmap)) return; - sama5d2_pmc = pmc_data_allocate(PMC_AUDIOPINCK + 1, + sama5d2_pmc = pmc_data_allocate(SAMA5D2_PMC_AUDIOPINCK + 1, nck(sama5d2_systemck), nck(sama5d2_periph32ck), nck(sama5d2_gck), 3); @@ -213,7 +213,7 @@ static void __init sama5d2_pmc_setup(struct device_node *np) if (IS_ERR(hw)) goto err_free; - sama5d2_pmc->chws[PMC_MAIN] = hw; + sama5d2_pmc->chws[SAMA5D2_PMC_MAIN] = hw; hw = at91_clk_register_pll(regmap, "pllack", "mainck", 0, &sama5d3_pll_layout, &plla_characteristics); @@ -224,7 +224,7 @@ static void __init sama5d2_pmc_setup(struct device_node *np) if (IS_ERR(hw)) goto err_free; - sama5d2_pmc->chws[PMC_PLLACK] = hw; + sama5d2_pmc->chws[SAMA5D2_PMC_PLLACK] = hw; hw = at91_clk_register_audio_pll_frac(regmap, "audiopll_fracck", "mainck"); @@ -236,14 +236,14 @@ static void __init sama5d2_pmc_setup(struct device_node *np) if (IS_ERR(hw)) goto err_free; - sama5d2_pmc->chws[PMC_AUDIOPINCK] = hw; + sama5d2_pmc->chws[SAMA5D2_PMC_AUDIOPINCK] = hw; hw = at91_clk_register_audio_pll_pmc(regmap, "audiopll_pmcck", "audiopll_fracck"); if (IS_ERR(hw)) goto err_free; - sama5d2_pmc->chws[PMC_AUDIOPLLCK] = hw; + sama5d2_pmc->chws[SAMA5D2_PMC_AUDIOPLLCK] = hw; regmap_sfr = syscon_regmap_lookup_by_compatible("atmel,sama5d2-sfr"); if (IS_ERR(regmap_sfr)) @@ -253,7 +253,7 @@ static void __init sama5d2_pmc_setup(struct device_node *np) if (IS_ERR(hw)) goto err_free; - sama5d2_pmc->chws[PMC_UTMI] = hw; + sama5d2_pmc->chws[SAMA5D2_PMC_UTMI] = hw; parent_names[0] = slck_name; parent_names[1] = "mainck"; @@ -274,13 +274,13 @@ static void __init sama5d2_pmc_setup(struct device_node *np) if (IS_ERR(hw)) goto err_free; - sama5d2_pmc->chws[PMC_MCK] = hw; + sama5d2_pmc->chws[SAMA5D2_PMC_MCK] = hw; hw = at91_clk_register_h32mx(regmap, "h32mxck", "masterck_div"); if (IS_ERR(hw)) goto err_free; - sama5d2_pmc->chws[PMC_MCK2] = hw; + sama5d2_pmc->chws[SAMA5D2_PMC_MCK2] = hw; parent_names[0] = "plladivck"; parent_names[1] = "utmick"; @@ -376,7 +376,7 @@ static void __init sama5d2_pmc_setup(struct device_node *np) if (IS_ERR(hw)) goto err_free; - sama5d2_pmc->chws[PMC_I2S0_MUX] = hw; + sama5d2_pmc->chws[SAMA5D2_PMC_I2S0_MUX] = hw; parent_names[0] = "i2s1_clk"; parent_names[1] = "i2s1_gclk"; @@ -385,7 +385,7 @@ static void __init sama5d2_pmc_setup(struct device_node *np) if (IS_ERR(hw)) goto err_free; - sama5d2_pmc->chws[PMC_I2S1_MUX] = hw; + sama5d2_pmc->chws[SAMA5D2_PMC_I2S1_MUX] = hw; } of_clk_add_hw_provider(np, of_clk_hw_pmc_get, sama5d2_pmc); diff --git a/drivers/clk/at91/sama5d3.c b/drivers/clk/at91/sama5d3.c index 522ce60314464..4b1e160db09af 100644 --- a/drivers/clk/at91/sama5d3.c +++ b/drivers/clk/at91/sama5d3.c @@ -3,7 +3,7 @@ #include #include -#include +#include #include "pmc.h" @@ -137,7 +137,7 @@ static void __init sama5d3_pmc_setup(struct device_node *np) if (IS_ERR(regmap)) return; - sama5d3_pmc = pmc_data_allocate(PMC_PLLACK + 1, + sama5d3_pmc = pmc_data_allocate(SAMA5D3_PMC_PLLACK + 1, nck(sama5d3_systemck), nck(sama5d3_periphck), 0, 3); if (!sama5d3_pmc) @@ -170,13 +170,13 @@ static void __init sama5d3_pmc_setup(struct device_node *np) if (IS_ERR(hw)) goto err_free; - sama5d3_pmc->chws[PMC_PLLACK] = hw; + sama5d3_pmc->chws[SAMA5D3_PMC_PLLACK] = hw; hw = at91_clk_register_utmi(regmap, NULL, "utmick", "mainck", NULL); if (IS_ERR(hw)) goto err_free; - sama5d3_pmc->chws[PMC_UTMI] = hw; + sama5d3_pmc->chws[SAMA5D3_PMC_UTMI] = hw; parent_names[0] = slck_name; parent_names[1] = "mainck"; @@ -197,7 +197,7 @@ static void __init sama5d3_pmc_setup(struct device_node *np) if (IS_ERR(hw)) goto err_free; - sama5d3_pmc->chws[PMC_MCK] = hw; + sama5d3_pmc->chws[SAMA5D3_PMC_MCK] = hw; parent_names[0] = "plladivck"; parent_names[1] = "utmick"; diff --git a/drivers/clk/at91/sama5d4.c b/drivers/clk/at91/sama5d4.c index 160c0bddb6a3b..d164b5dff7185 100644 --- a/drivers/clk/at91/sama5d4.c +++ b/drivers/clk/at91/sama5d4.c @@ -3,7 +3,7 @@ #include #include -#include +#include #include "pmc.h" @@ -152,7 +152,7 @@ static void __init sama5d4_pmc_setup(struct device_node *np) if (IS_ERR(regmap)) return; - sama5d4_pmc = pmc_data_allocate(PMC_PLLACK + 1, + sama5d4_pmc = pmc_data_allocate(SAMA5D4_PMC_PLLACK + 1, nck(sama5d4_systemck), nck(sama5d4_periph32ck), 0, 3); if (!sama5d4_pmc) @@ -185,13 +185,13 @@ static void __init sama5d4_pmc_setup(struct device_node *np) if (IS_ERR(hw)) goto err_free; - sama5d4_pmc->chws[PMC_PLLACK] = hw; + sama5d4_pmc->chws[SAMA5D4_PMC_PLLACK] = hw; hw = at91_clk_register_utmi(regmap, NULL, "utmick", "mainck", NULL); if (IS_ERR(hw)) goto err_free; - sama5d4_pmc->chws[PMC_UTMI] = hw; + sama5d4_pmc->chws[SAMA5D4_PMC_UTMI] = hw; parent_names[0] = slck_name; parent_names[1] = "mainck"; @@ -212,13 +212,13 @@ static void __init sama5d4_pmc_setup(struct device_node *np) if (IS_ERR(hw)) goto err_free; - sama5d4_pmc->chws[PMC_MCK] = hw; + sama5d4_pmc->chws[SAMA5D4_PMC_MCK] = hw; hw = at91_clk_register_h32mx(regmap, "h32mxck", "masterck_div"); if (IS_ERR(hw)) goto err_free; - sama5d4_pmc->chws[PMC_MCK2] = hw; + sama5d4_pmc->chws[SAMA5D4_PMC_MCK2] = hw; parent_names[0] = "plladivck"; parent_names[1] = "utmick"; diff --git a/drivers/clk/at91/sama7d65.c b/drivers/clk/at91/sama7d65.c index 7dee2b160ffb3..f6f86261ceefd 100644 --- a/drivers/clk/at91/sama7d65.c +++ b/drivers/clk/at91/sama7d65.c @@ -11,7 +11,7 @@ #include #include -#include +#include #include "pmc.h" @@ -225,7 +225,7 @@ static struct sama7d65_pll { .t = PLL_TYPE_DIV, /* This feeds CPU. It should not be disabled. */ .f = CLK_IS_CRITICAL | CLK_SET_RATE_PARENT, - .eid = PMC_CPUPLL, + .eid = SAMA7D65_PMC_CPUPLL, /* * Safe div=15 should be safe even for switching b/w 1GHz and * 90MHz (frac pll might go up to 1.2GHz). @@ -260,7 +260,7 @@ static struct sama7d65_pll { * Therefore it should not be disabled. */ .f = CLK_IS_CRITICAL | CLK_SET_RATE_GATE, - .eid = PMC_SYSPLL, + .eid = SAMA7D65_PMC_SYSPLL, }, }, @@ -328,7 +328,7 @@ static struct sama7d65_pll { .t = PLL_TYPE_DIV, .f = CLK_SET_RATE_GATE | CLK_SET_PARENT_GATE | CLK_SET_RATE_PARENT, - .eid = PMC_BAUDPLL, + .eid = SAMA7D65_PMC_BAUDPLL, }, }, @@ -350,7 +350,7 @@ static struct sama7d65_pll { .t = PLL_TYPE_DIV, .f = CLK_SET_RATE_GATE | CLK_SET_PARENT_GATE | CLK_SET_RATE_PARENT, - .eid = PMC_AUDIOPMCPLL, + .eid = SAMA7D65_PMC_AUDIOPMCPLL, }, [PLL_COMPID_DIV1] = { @@ -361,7 +361,7 @@ static struct sama7d65_pll { .t = PLL_TYPE_DIV, .f = CLK_SET_RATE_GATE | CLK_SET_PARENT_GATE | CLK_SET_RATE_PARENT, - .eid = PMC_AUDIOIOPLL, + .eid = SAMA7D65_PMC_AUDIOIOPLL, }, }, @@ -383,7 +383,7 @@ static struct sama7d65_pll { .t = PLL_TYPE_DIV, .f = CLK_SET_RATE_GATE | CLK_SET_PARENT_GATE | CLK_SET_RATE_PARENT, - .eid = PMC_ETHPLL, + .eid = SAMA7D65_PMC_ETHPLL, }, }, @@ -405,7 +405,7 @@ static struct sama7d65_pll { .t = PLL_TYPE_DIV, .f = CLK_SET_RATE_GATE | CLK_SET_PARENT_GATE | CLK_SET_RATE_PARENT, - .eid = PMC_LVDSPLL, + .eid = SAMA7D65_PMC_LVDSPLL, }, }, @@ -427,7 +427,7 @@ static struct sama7d65_pll { .t = PLL_TYPE_DIV, .f = CLK_SET_RATE_GATE | CLK_SET_PARENT_GATE | CLK_SET_RATE_PARENT, - .eid = PMC_UTMI, + .eid = SAMA7D65_PMC_UTMI, }, }, }; @@ -470,7 +470,7 @@ static struct { .ep_mux_table = { 5, }, .ep_count = 1, .ep_chg_id = INT_MIN, - .eid = PMC_MCK1, + .eid = SAMA7D65_PMC_MCK1, .c = 1, }, { .n = "mck2", @@ -487,7 +487,7 @@ static struct { .ep_mux_table = { 5, 6, }, .ep_count = 2, .ep_chg_id = INT_MIN, - .eid = PMC_MCK3, + .eid = SAMA7D65_PMC_MCK3, .c = 1, }, { .n = "mck4", @@ -504,7 +504,7 @@ static struct { .ep_mux_table = { 5, }, .ep_count = 1, .ep_chg_id = INT_MIN, - .eid = PMC_MCK5, + .eid = SAMA7D65_PMC_MCK5, .c = 1, }, { .n = "mck6", @@ -1153,7 +1153,7 @@ static void __init sama7d65_pmc_setup(struct device_node *np) if (IS_ERR(hw)) goto err_free; - sama7d65_pmc->chws[PMC_MAIN] = hw; + sama7d65_pmc->chws[SAMA7D65_PMC_MAIN] = hw; for (i = 0; i < PLL_ID_MAX; i++) { for (j = 0; j < PLL_COMPID_MAX; j++) { @@ -1166,7 +1166,7 @@ static void __init sama7d65_pmc_setup(struct device_node *np) case PLL_TYPE_FRAC: switch (sama7d65_plls[i][j].p) { case SAMA7D65_PLL_PARENT_MAINCK: - parent_hw = sama7d65_pmc->chws[PMC_MAIN]; + parent_hw = sama7d65_pmc->chws[SAMA7D65_PMC_MAIN]; break; case SAMA7D65_PLL_PARENT_MAIN_XTAL: parent_hw = main_xtal_hw; @@ -1215,12 +1215,12 @@ static void __init sama7d65_pmc_setup(struct device_node *np) if (IS_ERR(hw)) goto err_free; - sama7d65_pmc->chws[PMC_MCK] = hw; + sama7d65_pmc->chws[SAMA7D65_PMC_MCK0] = hw; sama7d65_mckx[PCK_PARENT_HW_MCK0].hw = hw; parent_hws[0] = md_slck_hw; parent_hws[1] = td_slck_hw; - parent_hws[2] = sama7d65_pmc->chws[PMC_MAIN]; + parent_hws[2] = sama7d65_pmc->chws[SAMA7D65_PMC_MAIN]; for (i = PCK_PARENT_HW_MCK1; i < ARRAY_SIZE(sama7d65_mckx); i++) { u8 num_parents = 3 + sama7d65_mckx[i].ep_count; struct clk_hw *tmp_parent_hws[8]; @@ -1269,7 +1269,7 @@ static void __init sama7d65_pmc_setup(struct device_node *np) parent_hws[0] = md_slck_hw; parent_hws[1] = td_slck_hw; - parent_hws[2] = sama7d65_pmc->chws[PMC_MAIN]; + parent_hws[2] = sama7d65_pmc->chws[SAMA7D65_PMC_MAIN]; parent_hws[3] = sama7d65_plls[PLL_ID_SYS][PLL_COMPID_DIV0].hw; parent_hws[4] = sama7d65_plls[PLL_ID_DDR][PLL_COMPID_DIV0].hw; parent_hws[5] = sama7d65_plls[PLL_ID_GPU][PLL_COMPID_DIV0].hw; @@ -1320,8 +1320,8 @@ static void __init sama7d65_pmc_setup(struct device_node *np) parent_hws[0] = md_slck_hw; parent_hws[1] = td_slck_hw; - parent_hws[2] = sama7d65_pmc->chws[PMC_MAIN]; - parent_hws[3] = sama7d65_pmc->chws[PMC_MCK1]; + parent_hws[2] = sama7d65_pmc->chws[SAMA7D65_PMC_MAIN]; + parent_hws[3] = sama7d65_pmc->chws[SAMA7D65_PMC_MCK1]; for (i = 0; i < ARRAY_SIZE(sama7d65_gck); i++) { u8 num_parents = 4 + sama7d65_gck[i].pp_count; struct clk_hw *tmp_parent_hws[8]; diff --git a/drivers/clk/at91/sama7g5.c b/drivers/clk/at91/sama7g5.c index 1340c2b006192..99b4c1d9bdcca 100644 --- a/drivers/clk/at91/sama7g5.c +++ b/drivers/clk/at91/sama7g5.c @@ -12,7 +12,7 @@ #include #include -#include +#include #include "pmc.h" @@ -183,7 +183,7 @@ static struct sama7g5_pll { .t = PLL_TYPE_DIV, /* This feeds CPU. It should not be disabled. */ .f = CLK_IS_CRITICAL | CLK_SET_RATE_PARENT, - .eid = PMC_CPUPLL, + .eid = SAMA7G5_PMC_CPUPLL, /* * Safe div=15 should be safe even for switching b/w 1GHz and * 90MHz (frac pll might go up to 1.2GHz). @@ -218,7 +218,7 @@ static struct sama7g5_pll { * Therefore it should not be disabled. */ .f = CLK_IS_CRITICAL | CLK_SET_RATE_GATE, - .eid = PMC_SYSPLL, + .eid = SAMA7G5_PMC_SYSPLL, }, }, @@ -306,7 +306,7 @@ static struct sama7g5_pll { .t = PLL_TYPE_DIV, .f = CLK_SET_RATE_GATE | CLK_SET_PARENT_GATE | CLK_SET_RATE_PARENT, - .eid = PMC_AUDIOPMCPLL, + .eid = SAMA7G5_PMC_AUDIOPMCPLL, }, [PLL_COMPID_DIV1] = { @@ -317,7 +317,7 @@ static struct sama7g5_pll { .t = PLL_TYPE_DIV, .f = CLK_SET_RATE_GATE | CLK_SET_PARENT_GATE | CLK_SET_RATE_PARENT, - .eid = PMC_AUDIOIOPLL, + .eid = SAMA7G5_PMC_AUDIOIOPLL, }, }, @@ -381,7 +381,7 @@ static struct { .ep_mux_table = { 5, }, .ep_count = 1, .ep_chg_id = INT_MIN, - .eid = PMC_MCK1, + .eid = SAMA7G5_PMC_MCK1, .c = 1, }, { .n = "mck2", @@ -997,7 +997,7 @@ static void __init sama7g5_pmc_setup(struct device_node *np) if (IS_ERR(regmap)) return; - sama7g5_pmc = pmc_data_allocate(PMC_MCK1 + 1, + sama7g5_pmc = pmc_data_allocate(SAMA7G5_PMC_MCK1 + 1, nck(sama7g5_systemck), nck(sama7g5_periphck), nck(sama7g5_gck), 8); @@ -1030,7 +1030,7 @@ static void __init sama7g5_pmc_setup(struct device_node *np) if (IS_ERR(hw)) goto err_free; - sama7g5_pmc->chws[PMC_MAIN] = hw; + sama7g5_pmc->chws[SAMA7G5_PMC_MAIN] = hw; for (i = 0; i < PLL_ID_MAX; i++) { for (j = 0; j < PLL_COMPID_MAX; j++) { @@ -1043,7 +1043,7 @@ static void __init sama7g5_pmc_setup(struct device_node *np) case PLL_TYPE_FRAC: switch (sama7g5_plls[i][j].p) { case SAMA7G5_PLL_PARENT_MAINCK: - parent_hw = sama7g5_pmc->chws[PMC_MAIN]; + parent_hw = sama7g5_pmc->chws[SAMA7G5_PMC_MAIN]; break; case SAMA7G5_PLL_PARENT_MAIN_XTAL: parent_hw = main_xtal_hw; @@ -1092,11 +1092,11 @@ static void __init sama7g5_pmc_setup(struct device_node *np) if (IS_ERR(hw)) goto err_free; - sama7g5_mckx[PCK_PARENT_HW_MCK0].hw = sama7g5_pmc->chws[PMC_MCK] = hw; + sama7g5_mckx[PCK_PARENT_HW_MCK0].hw = sama7g5_pmc->chws[SAMA7G5_PMC_MCK0] = hw; parent_hws[0] = md_slck_hw; parent_hws[1] = td_slck_hw; - parent_hws[2] = sama7g5_pmc->chws[PMC_MAIN]; + parent_hws[2] = sama7g5_pmc->chws[SAMA7G5_PMC_MAIN]; for (i = PCK_PARENT_HW_MCK1; i < ARRAY_SIZE(sama7g5_mckx); i++) { u8 num_parents = 3 + sama7g5_mckx[i].ep_count; struct clk_hw *tmp_parent_hws[8]; @@ -1138,11 +1138,11 @@ static void __init sama7g5_pmc_setup(struct device_node *np) if (IS_ERR(hw)) goto err_free; - sama7g5_pmc->chws[PMC_UTMI] = hw; + sama7g5_pmc->chws[SAMA7G5_PMC_UTMI] = hw; parent_hws[0] = md_slck_hw; parent_hws[1] = td_slck_hw; - parent_hws[2] = sama7g5_pmc->chws[PMC_MAIN]; + parent_hws[2] = sama7g5_pmc->chws[SAMA7G5_PMC_MAIN]; parent_hws[3] = sama7g5_plls[PLL_ID_SYS][PLL_COMPID_DIV0].hw; parent_hws[4] = sama7g5_plls[PLL_ID_DDR][PLL_COMPID_DIV0].hw; parent_hws[5] = sama7g5_plls[PLL_ID_IMG][PLL_COMPID_DIV0].hw; @@ -1192,7 +1192,7 @@ static void __init sama7g5_pmc_setup(struct device_node *np) parent_hws[0] = md_slck_hw; parent_hws[1] = td_slck_hw; - parent_hws[2] = sama7g5_pmc->chws[PMC_MAIN]; + parent_hws[2] = sama7g5_pmc->chws[SAMA7G5_PMC_MAIN]; for (i = 0; i < ARRAY_SIZE(sama7g5_gck); i++) { u8 num_parents = 3 + sama7g5_gck[i].pp_count; struct clk_hw *tmp_parent_hws[8]; -- 2.47.3