mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 09:39:00 +00:00
c6ddf8d502
Many changes were done in drivers/pinctrl/bcm/pinctrl-bcm2835.c between
5.4.171 and 5.4.179.
The following 3 patches do not apply any more:
* target/linux/bcm27xx/patches-5.4/950-0316-pinctrl-bcm2835-Add-support-for-BCM2711-pull-up-func.patch
This was already integrated in kernel v5.4-rc1, it was never needed.
* target/linux/bcm27xx/patches-5.4/950-0328-Revert-pinctrl-bcm2835-Pass-irqchip-when-adding-gpio.patch
* target/linux/bcm27xx/patches-5.4/950-0362-pinctrl-bcm2835-Change-init-order-for-gpio-hogs.patch
I think these were done to fix the problem which was really fixed in
commit 75278f1aff5e ("pinctrl: bcm2835: Change init order for gpio
hogs") from v5.4.175
target/linux/generic/backport-5.4/716-v5.5-net-sfp-move-fwnode-parsing-into-sfp-bus-layer.patch
Move fwnode_device_is_available to the same position as in kernel 5.10.
target/linux/layerscape/patches-5.4/302-dts-0083-arm64-ls1028a-qds-correct-bus-of-rtc.patch
Applied in commit 65816c1034769e714edb70f59a33bc5472d9e55f ("arm64: dts:
ls1028a-qds: move rtc node to the correct i2c bus")
Compile-tested: lantiq/xrx200, bcm27xx/bcm2710
Run-tested: lantiq/xrx200
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
72 lines
2.3 KiB
Diff
72 lines
2.3 KiB
Diff
From 1ee90bb75979c183e241c14f7c31d72cdb4bcc9b Mon Sep 17 00:00:00 2001
|
|
From: Eric Anholt <eric@anholt.net>
|
|
Date: Thu, 2 May 2019 15:24:04 -0700
|
|
Subject: [PATCH] clk: bcm2835: Allow reparenting leaf clocks while
|
|
they're running.
|
|
|
|
This falls under the same "we can reprogram glitch-free as long as we
|
|
pause generation" rule as updating the div/frac fields. This can be
|
|
used for runtime reclocking of V3D to manage power leakage.
|
|
|
|
Signed-off-by: Eric Anholt <eric@anholt.net>
|
|
---
|
|
drivers/clk/bcm/clk-bcm2835.c | 19 ++++++++++++++++---
|
|
1 file changed, 16 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/clk/bcm/clk-bcm2835.c
|
|
+++ b/drivers/clk/bcm/clk-bcm2835.c
|
|
@@ -1098,8 +1098,10 @@ static int bcm2835_clock_on(struct clk_h
|
|
return 0;
|
|
}
|
|
|
|
-static int bcm2835_clock_set_rate(struct clk_hw *hw,
|
|
- unsigned long rate, unsigned long parent_rate)
|
|
+static int bcm2835_clock_set_rate_and_parent(struct clk_hw *hw,
|
|
+ unsigned long rate,
|
|
+ unsigned long parent_rate,
|
|
+ u8 parent)
|
|
{
|
|
struct bcm2835_clock *clock = bcm2835_clock_from_hw(hw);
|
|
struct bcm2835_cprman *cprman = clock->cprman;
|
|
@@ -1121,6 +1123,11 @@ static int bcm2835_clock_set_rate(struct
|
|
bcm2835_clock_wait_busy(clock);
|
|
}
|
|
|
|
+ if (parent != 0xff) {
|
|
+ ctl &= ~(CM_SRC_MASK << CM_SRC_SHIFT);
|
|
+ ctl |= parent << CM_SRC_SHIFT;
|
|
+ }
|
|
+
|
|
ctl &= ~CM_FRAC;
|
|
ctl |= (div & CM_DIV_FRAC_MASK) ? CM_FRAC : 0;
|
|
cprman_write(cprman, data->ctl_reg, ctl);
|
|
@@ -1132,6 +1139,12 @@ static int bcm2835_clock_set_rate(struct
|
|
return 0;
|
|
}
|
|
|
|
+static int bcm2835_clock_set_rate(struct clk_hw *hw,
|
|
+ unsigned long rate, unsigned long parent_rate)
|
|
+{
|
|
+ return bcm2835_clock_set_rate_and_parent(hw, rate, parent_rate, 0xff);
|
|
+}
|
|
+
|
|
static bool
|
|
bcm2835_clk_is_pllc(struct clk_hw *hw)
|
|
{
|
|
@@ -1315,6 +1328,7 @@ static const struct clk_ops bcm2835_cloc
|
|
.unprepare = bcm2835_clock_off,
|
|
.recalc_rate = bcm2835_clock_get_rate,
|
|
.set_rate = bcm2835_clock_set_rate,
|
|
+ .set_rate_and_parent = bcm2835_clock_set_rate_and_parent,
|
|
.determine_rate = bcm2835_clock_determine_rate,
|
|
.set_parent = bcm2835_clock_set_parent,
|
|
.get_parent = bcm2835_clock_get_parent,
|
|
@@ -1493,7 +1507,6 @@ static struct clk_hw *bcm2835_register_c
|
|
init.ops = &bcm2835_vpu_clock_clk_ops;
|
|
} else {
|
|
init.ops = &bcm2835_clock_clk_ops;
|
|
- init.flags |= CLK_SET_PARENT_GATE;
|
|
|
|
/* If the clock wasn't actually enabled at boot, it's not
|
|
* critical.
|