You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
164 lines
4.2 KiB
Diff
164 lines
4.2 KiB
Diff
From a3cbeaaee57b7bda4e921bb2cff649fb56c0292d Mon Sep 17 00:00:00 2001
|
|
From: Stefan Wahren <wahrenst@gmx.net>
|
|
Date: Tue, 17 Sep 2019 19:31:19 +0200
|
|
Subject: [PATCH] ARM: dts: bcm283x: Enable HDMI at board level
|
|
|
|
commit 60c833d5664e1b3f71c4471233469790adf505ca upstream.
|
|
|
|
There might be headless setups of the Compute Module without HDMI,
|
|
so better enable HDMI at board level. Btw this allows moving HDMI
|
|
base definition into upcoming bcm2835-common.dtsi.
|
|
|
|
Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
|
|
Reviewed-by: Eric Anholt <eric@anholt.net>
|
|
---
|
|
arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 2 ++
|
|
arch/arm/boot/dts/bcm2835-rpi-a.dts | 2 ++
|
|
arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 2 ++
|
|
arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 2 ++
|
|
arch/arm/boot/dts/bcm2835-rpi-b.dts | 2 ++
|
|
arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts | 2 ++
|
|
arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 2 ++
|
|
arch/arm/boot/dts/bcm2835-rpi-zero.dts | 2 ++
|
|
arch/arm/boot/dts/bcm2835-rpi.dtsi | 5 -----
|
|
arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 2 ++
|
|
arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 2 ++
|
|
arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 2 ++
|
|
12 files changed, 22 insertions(+), 5 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
|
|
+++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
|
|
@@ -100,6 +100,8 @@
|
|
|
|
&hdmi {
|
|
hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
|
|
+ power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
|
|
+ status = "okay";
|
|
};
|
|
|
|
&pwm {
|
|
--- a/arch/arm/boot/dts/bcm2835-rpi-a.dts
|
|
+++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts
|
|
@@ -95,6 +95,8 @@
|
|
|
|
&hdmi {
|
|
hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;
|
|
+ power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
|
|
+ status = "okay";
|
|
};
|
|
|
|
&pwm {
|
|
--- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
|
|
+++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
|
|
@@ -102,6 +102,8 @@
|
|
|
|
&hdmi {
|
|
hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
|
|
+ power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
|
|
+ status = "okay";
|
|
};
|
|
|
|
&pwm {
|
|
--- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
|
|
+++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
|
|
@@ -95,6 +95,8 @@
|
|
|
|
&hdmi {
|
|
hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;
|
|
+ power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
|
|
+ status = "okay";
|
|
};
|
|
|
|
&pwm {
|
|
--- a/arch/arm/boot/dts/bcm2835-rpi-b.dts
|
|
+++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts
|
|
@@ -90,6 +90,8 @@
|
|
|
|
&hdmi {
|
|
hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;
|
|
+ power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
|
|
+ status = "okay";
|
|
};
|
|
|
|
&pwm {
|
|
--- a/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts
|
|
+++ b/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts
|
|
@@ -79,6 +79,8 @@
|
|
|
|
&hdmi {
|
|
hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
|
|
+ power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
|
|
+ status = "okay";
|
|
};
|
|
|
|
&sdhost {
|
|
--- a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
|
|
+++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
|
|
@@ -113,6 +113,8 @@
|
|
|
|
&hdmi {
|
|
hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
|
|
+ power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
|
|
+ status = "okay";
|
|
};
|
|
|
|
&sdhci {
|
|
--- a/arch/arm/boot/dts/bcm2835-rpi-zero.dts
|
|
+++ b/arch/arm/boot/dts/bcm2835-rpi-zero.dts
|
|
@@ -103,6 +103,8 @@
|
|
|
|
&hdmi {
|
|
hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
|
|
+ power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
|
|
+ status = "okay";
|
|
};
|
|
|
|
&sdhost {
|
|
--- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
|
|
@@ -92,11 +92,6 @@
|
|
power-domains = <&power RPI_POWER_DOMAIN_V3D>;
|
|
};
|
|
|
|
-&hdmi {
|
|
- power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
|
|
- status = "okay";
|
|
-};
|
|
-
|
|
&vec {
|
|
power-domains = <&power RPI_POWER_DOMAIN_VEC>;
|
|
status = "okay";
|
|
--- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
|
|
+++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
|
|
@@ -40,6 +40,8 @@
|
|
|
|
&hdmi {
|
|
hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
|
|
+ power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
|
|
+ status = "okay";
|
|
};
|
|
|
|
&pwm {
|
|
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
|
|
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
|
|
@@ -54,6 +54,8 @@
|
|
|
|
&hdmi {
|
|
hpd-gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
|
|
+ power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
|
|
+ status = "okay";
|
|
};
|
|
|
|
&pwm {
|
|
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
|
|
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
|
|
@@ -56,6 +56,8 @@
|
|
|
|
&hdmi {
|
|
hpd-gpios = <&expgpio 4 GPIO_ACTIVE_LOW>;
|
|
+ power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
|
|
+ status = "okay";
|
|
};
|
|
|
|
/* uart0 communicates with the BT module */
|