aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-5.4/950-0781-clk-bcm-rpi-Remove-the-quirks-for-the-CPU-clock.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0781-clk-bcm-rpi-Remove-the-quirks-for-the-CPU-clock.patch')
-rw-r--r--target/linux/bcm27xx/patches-5.4/950-0781-clk-bcm-rpi-Remove-the-quirks-for-the-CPU-clock.patch207
1 files changed, 0 insertions, 207 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0781-clk-bcm-rpi-Remove-the-quirks-for-the-CPU-clock.patch b/target/linux/bcm27xx/patches-5.4/950-0781-clk-bcm-rpi-Remove-the-quirks-for-the-CPU-clock.patch
deleted file mode 100644
index 0e9bb9c601..0000000000
--- a/target/linux/bcm27xx/patches-5.4/950-0781-clk-bcm-rpi-Remove-the-quirks-for-the-CPU-clock.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-From 30ae66617ee6f340343c8e75c244e370721ed2eb Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Tue, 26 May 2020 15:27:35 +0200
-Subject: [PATCH] clk: bcm: rpi: Remove the quirks for the CPU clock
-
-The CPU clock has had so far a bunch of quirks to expose the clock tree
-properly, but since we reverted to exposing them through the MMIO driver,
-we can remove that code from the firmware driver.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/clk/bcm/clk-raspberrypi.c | 163 ++----------------------------
- 1 file changed, 9 insertions(+), 154 deletions(-)
-
---- a/drivers/clk/bcm/clk-raspberrypi.c
-+++ b/drivers/clk/bcm/clk-raspberrypi.c
-@@ -151,13 +151,6 @@ static unsigned long raspberrypi_fw_get_
- return val;
- }
-
--static unsigned long raspberrypi_fw_pll_get_rate(struct clk_hw *hw,
-- unsigned long parent_rate)
--{
-- return raspberrypi_fw_get_rate(hw, parent_rate) *
-- RPI_FIRMWARE_PLLB_ARM_DIV_RATE;
--}
--
- static int raspberrypi_fw_set_rate(struct clk_hw *hw, unsigned long rate,
- unsigned long parent_rate)
- {
-@@ -176,140 +169,6 @@ static int raspberrypi_fw_set_rate(struc
- return ret;
- }
-
--static int raspberrypi_fw_pll_set_rate(struct clk_hw *hw, unsigned long rate,
-- unsigned long parent_rate)
--{
-- u32 new_rate = rate / RPI_FIRMWARE_PLLB_ARM_DIV_RATE;
--
-- return raspberrypi_fw_set_rate(hw, new_rate, parent_rate);
--}
--
--/*
-- * Sadly there is no firmware rate rounding interface. We borrowed it from
-- * clk-bcm2835.
-- */
--static int raspberrypi_pll_determine_rate(struct clk_hw *hw,
-- struct clk_rate_request *req)
--{
-- u64 div, final_rate;
-- u32 ndiv, fdiv;
--
-- /* We can't use req->rate directly as it would overflow */
-- final_rate = clamp(req->rate, req->min_rate, req->max_rate);
--
-- div = (u64)final_rate << A2W_PLL_FRAC_BITS;
-- do_div(div, req->best_parent_rate);
--
-- ndiv = div >> A2W_PLL_FRAC_BITS;
-- fdiv = div & ((1 << A2W_PLL_FRAC_BITS) - 1);
--
-- final_rate = ((u64)req->best_parent_rate *
-- ((ndiv << A2W_PLL_FRAC_BITS) + fdiv));
--
-- req->rate = final_rate >> A2W_PLL_FRAC_BITS;
--
-- return 0;
--}
--
--static const struct clk_ops raspberrypi_firmware_pll_clk_ops = {
-- .is_prepared = raspberrypi_fw_is_prepared,
-- .recalc_rate = raspberrypi_fw_pll_get_rate,
-- .set_rate = raspberrypi_fw_pll_set_rate,
-- .determine_rate = raspberrypi_pll_determine_rate,
--};
--
--static struct clk_hw *raspberrypi_register_pllb(struct raspberrypi_clk *rpi)
--{
-- struct raspberrypi_clk_data *data;
-- struct clk_init_data init = {};
-- u32 min_rate = 0, max_rate = 0;
-- int ret;
--
-- data = devm_kzalloc(rpi->dev, sizeof(*data), GFP_KERNEL);
-- if (!data)
-- return ERR_PTR(-ENOMEM);
-- data->rpi = rpi;
-- data->id = RPI_FIRMWARE_ARM_CLK_ID;
--
-- /* All of the PLLs derive from the external oscillator. */
-- init.parent_names = (const char *[]){ "osc" };
-- init.num_parents = 1;
-- init.name = "pllb";
-- init.ops = &raspberrypi_firmware_pll_clk_ops;
-- init.flags = CLK_GET_RATE_NOCACHE | CLK_IGNORE_UNUSED;
--
-- /* Get min & max rates set by the firmware */
-- ret = raspberrypi_clock_property(rpi->firmware, data,
-- RPI_FIRMWARE_GET_MIN_CLOCK_RATE,
-- &min_rate);
-- if (ret) {
-- dev_err(rpi->dev, "Failed to get %s min freq: %d\n",
-- init.name, ret);
-- return ERR_PTR(ret);
-- }
--
-- ret = raspberrypi_clock_property(rpi->firmware, data,
-- RPI_FIRMWARE_GET_MAX_CLOCK_RATE,
-- &max_rate);
-- if (ret) {
-- dev_err(rpi->dev, "Failed to get %s max freq: %d\n",
-- init.name, ret);
-- return ERR_PTR(ret);
-- }
--
-- if (!min_rate || !max_rate) {
-- dev_err(rpi->dev, "Unexpected frequency range: min %u, max %u\n",
-- min_rate, max_rate);
-- return ERR_PTR(-EINVAL);
-- }
--
-- dev_info(rpi->dev, "CPU frequency range: min %u, max %u\n",
-- min_rate, max_rate);
--
-- data->hw.init = &init;
--
-- ret = devm_clk_hw_register(rpi->dev, &data->hw);
-- if (!ret)
-- clk_hw_set_rate_range(&data->hw,
-- min_rate * RPI_FIRMWARE_PLLB_ARM_DIV_RATE,
-- max_rate * RPI_FIRMWARE_PLLB_ARM_DIV_RATE);
--
-- return ret;
--}
--
--static struct clk_fixed_factor raspberrypi_clk_pllb_arm = {
-- .mult = 1,
-- .div = 2,
-- .hw.init = &(struct clk_init_data) {
-- .name = "pllb_arm",
-- .parent_names = (const char *[]){ "pllb" },
-- .num_parents = 1,
-- .ops = &clk_fixed_factor_ops,
-- .flags = CLK_SET_RATE_PARENT | CLK_GET_RATE_NOCACHE,
-- },
--};
--
--static struct clk_hw *raspberrypi_register_pllb_arm(struct raspberrypi_clk *rpi)
--{
-- int ret;
--
-- ret = devm_clk_hw_register(rpi->dev, &raspberrypi_clk_pllb_arm.hw);
-- if (ret) {
-- dev_err(rpi->dev, "Failed to initialize pllb_arm\n");
-- return ERR_PTR(ret);
-- }
--
-- ret = devm_clk_hw_register_clkdev(rpi->dev,
-- &raspberrypi_clk_pllb_arm.hw,
-- NULL, "cpu0");
-- if (ret) {
-- dev_err(rpi->dev, "Failed to initialize clkdev\n");
-- return ERR_PTR(ret);
-- }
--
-- return &raspberrypi_clk_pllb_arm.hw;
--}
--
- static int raspberrypi_fw_dumb_determine_rate(struct clk_hw *hw,
- struct clk_rate_request *req)
- {
-@@ -338,19 +197,6 @@ static struct clk_hw *raspberrypi_clk_re
- u32 min_rate, max_rate;
- int ret;
-
-- if (id == RPI_FIRMWARE_ARM_CLK_ID) {
-- struct clk_hw *hw;
--
-- hw = raspberrypi_register_pllb(rpi);
-- if (IS_ERR(hw)) {
-- dev_err(rpi->dev, "Failed to initialize pllb, %ld\n",
-- PTR_ERR(hw));
-- return hw;
-- }
--
-- return raspberrypi_register_pllb_arm(rpi);
-- }
--
- data = devm_kzalloc(rpi->dev, sizeof(*data), GFP_KERNEL);
- if (!data)
- return ERR_PTR(-ENOMEM);
-@@ -389,6 +235,15 @@ static struct clk_hw *raspberrypi_clk_re
-
- clk_hw_set_rate_range(&data->hw, min_rate, max_rate);
-
-+ if (id == RPI_FIRMWARE_ARM_CLK_ID) {
-+ ret = devm_clk_hw_register_clkdev(rpi->dev, &data->hw,
-+ NULL, "cpu0");
-+ if (ret) {
-+ dev_err(rpi->dev, "Failed to initialize clkdev\n");
-+ return ERR_PTR(ret);
-+ }
-+ }
-+
- return &data->hw;
- }
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-23 01:54:08 +0000