mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 17:18:59 +00:00
7d7aa2fd92
This change makes the names of Broadcom targets consistent by using the common notation based on SoC/CPU ID (which is used internally anyway), bcmXXXX instead of brcmXXXX. This is even used for target TITLE in make menuconfig already, only the short target name used brcm so far. Despite, since subtargets range from bcm2708 to bcm2711, it seems appropriate to use bcm27xx instead of bcm2708 (again, as already done for BOARDNAME). This also renames the packages brcm2708-userland and brcm2708-gpu-fw. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Acked-by: Álvaro Fernández Rojas <noltari@gmail.com>
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 */
|