1 From a3cbeaaee57b7bda4e921bb2cff649fb56c0292d Mon Sep 17 00:00:00 2001
2 From: Stefan Wahren <wahrenst@gmx.net>
3 Date: Tue, 17 Sep 2019 19:31:19 +0200
4 Subject: [PATCH] ARM: dts: bcm283x: Enable HDMI at board level
6 commit 60c833d5664e1b3f71c4471233469790adf505ca upstream.
8 There might be headless setups of the Compute Module without HDMI,
9 so better enable HDMI at board level. Btw this allows moving HDMI
10 base definition into upcoming bcm2835-common.dtsi.
12 Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
13 Reviewed-by: Eric Anholt <eric@anholt.net>
15 arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 2 ++
16 arch/arm/boot/dts/bcm2835-rpi-a.dts | 2 ++
17 arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 2 ++
18 arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 2 ++
19 arch/arm/boot/dts/bcm2835-rpi-b.dts | 2 ++
20 arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts | 2 ++
21 arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 2 ++
22 arch/arm/boot/dts/bcm2835-rpi-zero.dts | 2 ++
23 arch/arm/boot/dts/bcm2835-rpi.dtsi | 5 -----
24 arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 2 ++
25 arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 2 ++
26 arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 2 ++
27 12 files changed, 22 insertions(+), 5 deletions(-)
29 --- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
30 +++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
34 hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
35 + power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
40 --- a/arch/arm/boot/dts/bcm2835-rpi-a.dts
41 +++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts
45 hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;
46 + power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
51 --- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
52 +++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
56 hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
57 + power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
62 --- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
63 +++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
67 hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;
68 + power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
73 --- a/arch/arm/boot/dts/bcm2835-rpi-b.dts
74 +++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts
78 hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;
79 + power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
84 --- a/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts
85 +++ b/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts
89 hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
90 + power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
95 --- a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
96 +++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
100 hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
101 + power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
106 --- a/arch/arm/boot/dts/bcm2835-rpi-zero.dts
107 +++ b/arch/arm/boot/dts/bcm2835-rpi-zero.dts
111 hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
112 + power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
117 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
118 +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
120 power-domains = <&power RPI_POWER_DOMAIN_V3D>;
124 - power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
129 power-domains = <&power RPI_POWER_DOMAIN_VEC>;
131 --- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
132 +++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
136 hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
137 + power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
142 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
143 +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
147 hpd-gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
148 + power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
153 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
154 +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
158 hpd-gpios = <&expgpio 4 GPIO_ACTIVE_LOW>;
159 + power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
163 /* uart0 communicates with the BT module */