kernel: bump 5.4 to 5.4.38
[oweals/openwrt.git] / target / linux / bcm27xx / patches-5.4 / 950-0375-ARM-dts-bcm283x-Move-pixelvalve-to-bcm2835-common.dt.patch
1 From d884dfd722a8207749f5c6c08b69287f0c75a553 Mon Sep 17 00:00:00 2001
2 From: Stefan Wahren <wahrenst@gmx.net>
3 Date: Fri, 27 Dec 2019 16:06:13 +0100
4 Subject: [PATCH] ARM: dts: bcm283x: Move pixelvalve to
5  bcm2835-common.dtsi
6
7 According to Eric Anholt the pixelvalves doesn't exists on BCM2711.
8 So move it to bcm2835-common.dtsi.
9
10 Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
11 ---
12  arch/arm/boot/dts/bcm2835-common.dtsi | 18 ++++++++++++++++++
13  arch/arm/boot/dts/bcm2838.dtsi        | 12 ------------
14  arch/arm/boot/dts/bcm283x.dtsi        | 18 ------------------
15  3 files changed, 18 insertions(+), 30 deletions(-)
16
17 --- a/arch/arm/boot/dts/bcm2835-common.dtsi
18 +++ b/arch/arm/boot/dts/bcm2835-common.dtsi
19 @@ -13,6 +13,18 @@
20                         #interrupt-cells = <2>;
21                 };
22  
23 +               pixelvalve@7e206000 {
24 +                       compatible = "brcm,bcm2835-pixelvalve0";
25 +                       reg = <0x7e206000 0x100>;
26 +                       interrupts = <2 13>; /* pwa0 */
27 +               };
28 +
29 +               pixelvalve@7e207000 {
30 +                       compatible = "brcm,bcm2835-pixelvalve1";
31 +                       reg = <0x7e207000 0x100>;
32 +                       interrupts = <2 14>; /* pwa1 */
33 +               };
34 +
35                 thermal: thermal@7e212000 {
36                         compatible = "brcm,bcm2835-thermal";
37                         reg = <0x7e212000 0x8>;
38 @@ -21,6 +33,12 @@
39                         status = "disabled";
40                 };
41  
42 +               pixelvalve@7e807000 {
43 +                       compatible = "brcm,bcm2835-pixelvalve2";
44 +                       reg = <0x7e807000 0x100>;
45 +                       interrupts = <2 10>; /* pixelvalve */
46 +               };
47 +
48                 v3d: v3d@7ec00000 {
49                         compatible = "brcm,bcm2835-v3d";
50                         reg = <0x7ec00000 0x1000>;
51 --- a/arch/arm/boot/dts/bcm2838.dtsi
52 +++ b/arch/arm/boot/dts/bcm2838.dtsi
53 @@ -188,14 +188,6 @@
54                         status = "disabled";
55                 };
56  
57 -               pixelvalve@7e206000 {
58 -                       interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
59 -               };
60 -
61 -               pixelvalve@7e207000 {
62 -                       interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
63 -               };
64 -
65                 pwm1: pwm@7e20c800 {
66                         compatible = "brcm,bcm2835-pwm";
67                         reg = <0x7e20c800 0x28>;
68 @@ -217,10 +209,6 @@
69                 hvs@7e400000 {
70                         interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
71                 };
72 -
73 -               pixelvalve@7e807000 {
74 -                       interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
75 -               };
76         };
77  
78         arm-pmu {
79 --- a/arch/arm/boot/dts/bcm283x.dtsi
80 +++ b/arch/arm/boot/dts/bcm283x.dtsi
81 @@ -432,18 +432,6 @@
82                         status = "disabled";
83                 };
84  
85 -               pixelvalve@7e206000 {
86 -                       compatible = "brcm,bcm2835-pixelvalve0";
87 -                       reg = <0x7e206000 0x100>;
88 -                       interrupts = <2 13>; /* pwa0 */
89 -               };
90 -
91 -               pixelvalve@7e207000 {
92 -                       compatible = "brcm,bcm2835-pixelvalve1";
93 -                       reg = <0x7e207000 0x100>;
94 -                       interrupts = <2 14>; /* pwa1 */
95 -               };
96 -
97                 dpi: dpi@7e208000 {
98                         compatible = "brcm,bcm2835-dpi";
99                         reg = <0x7e208000 0x8c>;
100 @@ -608,12 +596,6 @@
101                         status = "disabled";
102                 };
103  
104 -               pixelvalve@7e807000 {
105 -                       compatible = "brcm,bcm2835-pixelvalve2";
106 -                       reg = <0x7e807000 0x100>;
107 -                       interrupts = <2 10>; /* pixelvalve */
108 -               };
109 -
110                 hdmi: hdmi@7e902000 {
111                         compatible = "brcm,bcm2835-hdmi";
112                         reg = <0x7e902000 0x600>,