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>
113 lines
2.8 KiB
Diff
113 lines
2.8 KiB
Diff
From d884dfd722a8207749f5c6c08b69287f0c75a553 Mon Sep 17 00:00:00 2001
|
|
From: Stefan Wahren <wahrenst@gmx.net>
|
|
Date: Fri, 27 Dec 2019 16:06:13 +0100
|
|
Subject: [PATCH] ARM: dts: bcm283x: Move pixelvalve to
|
|
bcm2835-common.dtsi
|
|
|
|
According to Eric Anholt the pixelvalves doesn't exists on BCM2711.
|
|
So move it to bcm2835-common.dtsi.
|
|
|
|
Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
|
|
---
|
|
arch/arm/boot/dts/bcm2835-common.dtsi | 18 ++++++++++++++++++
|
|
arch/arm/boot/dts/bcm2838.dtsi | 12 ------------
|
|
arch/arm/boot/dts/bcm283x.dtsi | 18 ------------------
|
|
3 files changed, 18 insertions(+), 30 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/bcm2835-common.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm2835-common.dtsi
|
|
@@ -13,6 +13,18 @@
|
|
#interrupt-cells = <2>;
|
|
};
|
|
|
|
+ pixelvalve@7e206000 {
|
|
+ compatible = "brcm,bcm2835-pixelvalve0";
|
|
+ reg = <0x7e206000 0x100>;
|
|
+ interrupts = <2 13>; /* pwa0 */
|
|
+ };
|
|
+
|
|
+ pixelvalve@7e207000 {
|
|
+ compatible = "brcm,bcm2835-pixelvalve1";
|
|
+ reg = <0x7e207000 0x100>;
|
|
+ interrupts = <2 14>; /* pwa1 */
|
|
+ };
|
|
+
|
|
thermal: thermal@7e212000 {
|
|
compatible = "brcm,bcm2835-thermal";
|
|
reg = <0x7e212000 0x8>;
|
|
@@ -21,6 +33,12 @@
|
|
status = "disabled";
|
|
};
|
|
|
|
+ pixelvalve@7e807000 {
|
|
+ compatible = "brcm,bcm2835-pixelvalve2";
|
|
+ reg = <0x7e807000 0x100>;
|
|
+ interrupts = <2 10>; /* pixelvalve */
|
|
+ };
|
|
+
|
|
v3d: v3d@7ec00000 {
|
|
compatible = "brcm,bcm2835-v3d";
|
|
reg = <0x7ec00000 0x1000>;
|
|
--- a/arch/arm/boot/dts/bcm2838.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm2838.dtsi
|
|
@@ -188,14 +188,6 @@
|
|
status = "disabled";
|
|
};
|
|
|
|
- pixelvalve@7e206000 {
|
|
- interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
|
|
- };
|
|
-
|
|
- pixelvalve@7e207000 {
|
|
- interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
|
|
- };
|
|
-
|
|
pwm1: pwm@7e20c800 {
|
|
compatible = "brcm,bcm2835-pwm";
|
|
reg = <0x7e20c800 0x28>;
|
|
@@ -217,10 +209,6 @@
|
|
hvs@7e400000 {
|
|
interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
|
|
};
|
|
-
|
|
- pixelvalve@7e807000 {
|
|
- interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
|
|
- };
|
|
};
|
|
|
|
arm-pmu {
|
|
--- a/arch/arm/boot/dts/bcm283x.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm283x.dtsi
|
|
@@ -433,18 +433,6 @@
|
|
status = "disabled";
|
|
};
|
|
|
|
- pixelvalve@7e206000 {
|
|
- compatible = "brcm,bcm2835-pixelvalve0";
|
|
- reg = <0x7e206000 0x100>;
|
|
- interrupts = <2 13>; /* pwa0 */
|
|
- };
|
|
-
|
|
- pixelvalve@7e207000 {
|
|
- compatible = "brcm,bcm2835-pixelvalve1";
|
|
- reg = <0x7e207000 0x100>;
|
|
- interrupts = <2 14>; /* pwa1 */
|
|
- };
|
|
-
|
|
dpi: dpi@7e208000 {
|
|
compatible = "brcm,bcm2835-dpi";
|
|
reg = <0x7e208000 0x8c>;
|
|
@@ -609,12 +597,6 @@
|
|
status = "disabled";
|
|
};
|
|
|
|
- pixelvalve@7e807000 {
|
|
- compatible = "brcm,bcm2835-pixelvalve2";
|
|
- reg = <0x7e807000 0x100>;
|
|
- interrupts = <2 10>; /* pixelvalve */
|
|
- };
|
|
-
|
|
hdmi: hdmi@7e902000 {
|
|
compatible = "brcm,bcm2835-hdmi";
|
|
reg = <0x7e902000 0x600>,
|