mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 01:28:59 +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>
59 lines
1.6 KiB
Diff
59 lines
1.6 KiB
Diff
From 6c37f43308f29a59bc67d4ed010f8fbbf076ec79 Mon Sep 17 00:00:00 2001
|
|
From: popcornmix <popcornmix@gmail.com>
|
|
Date: Tue, 3 Sep 2019 20:28:00 +0100
|
|
Subject: [PATCH] clk-bcm2835: Disable v3d clock
|
|
|
|
This is controlled by firmware, see clk-raspberrypi.c
|
|
|
|
Signed-off-by: popcornmix <popcornmix@gmail.com>
|
|
---
|
|
drivers/clk/bcm/clk-bcm2835.c | 30 ++++++++++++------------------
|
|
1 file changed, 12 insertions(+), 18 deletions(-)
|
|
|
|
--- a/drivers/clk/bcm/clk-bcm2835.c
|
|
+++ b/drivers/clk/bcm/clk-bcm2835.c
|
|
@@ -1729,16 +1729,12 @@ static const struct bcm2835_clk_desc clk
|
|
.hold_mask = CM_PLLA_HOLDCORE,
|
|
.fixed_divider = 1,
|
|
.flags = CLK_SET_RATE_PARENT),
|
|
- [BCM2835_PLLA_PER] = REGISTER_PLL_DIV(
|
|
- SOC_ALL,
|
|
- .name = "plla_per",
|
|
- .source_pll = "plla",
|
|
- .cm_reg = CM_PLLA,
|
|
- .a2w_reg = A2W_PLLA_PER,
|
|
- .load_mask = CM_PLLA_LOADPER,
|
|
- .hold_mask = CM_PLLA_HOLDPER,
|
|
- .fixed_divider = 1,
|
|
- .flags = CLK_SET_RATE_PARENT),
|
|
+
|
|
+ /*
|
|
+ * PLLA_PER is used for gpu clocks. Controlled by firmware, see
|
|
+ * clk-raspberrypi.c.
|
|
+ */
|
|
+
|
|
[BCM2835_PLLA_DSI0] = REGISTER_PLL_DIV(
|
|
SOC_ALL,
|
|
.name = "plla_dsi0",
|
|
@@ -2016,14 +2012,12 @@ static const struct bcm2835_clk_desc clk
|
|
.int_bits = 6,
|
|
.frac_bits = 0,
|
|
.tcnt_mux = 3),
|
|
- [BCM2835_CLOCK_V3D] = REGISTER_VPU_CLK(
|
|
- SOC_ALL,
|
|
- .name = "v3d",
|
|
- .ctl_reg = CM_V3DCTL,
|
|
- .div_reg = CM_V3DDIV,
|
|
- .int_bits = 4,
|
|
- .frac_bits = 8,
|
|
- .tcnt_mux = 4),
|
|
+
|
|
+ /*
|
|
+ * CLOCK_V3D is used for v3d clock. Controlled by firmware, see
|
|
+ * clk-raspberrypi.c.
|
|
+ */
|
|
+
|
|
/*
|
|
* VPU clock. This doesn't have an enable bit, since it drives
|
|
* the bus for everything else, and is special so it doesn't need
|