github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-01 19:13:47 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Maxime Ripard enables vc4 on BCM2711 (RPi4), which among other things

Browse Source 
adds HDMI functionality (no 4K yet).
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEErOkkGDHCg2EbPcGjlfZmHno8x/4FAl9XtHAACgkQlfZmHno8
 x/44QwgAnx459j3B38BgERtLvygA5P3pBvhgiZwKc2FK4BF3oVmzK3pVhitRkQZb
 pQ/NBIi7uLisu1w5zTsgfgQG5AEgjyl1tUI1/3JFCK+JFlSyUfFzV8coZ93XKddz
 ncF5l7Ek0J7snGjuCla0nD1dOn3Hka38RRzTUk9rs5G15vLnQynvDNPEKXSnAdni
 MgmKu1Rj6hT7E23gjHKTxSBXCR0DDtYCrt1MJRB9I9/DxnuflFUUnpY6a/V8pXEW
 xtcQTCarO/Qyimq/ljgthptbBqSOjW+MNDrGiU47zd+yg1SF/but23pyNvHRRLnS
 vBXNKo9STJN2q83832/nakSiVjO3Ow==
 =h97D
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEm+Rq3+YGJdiR9yuFh9CWnEQHBwQFAl9ajjcACgkQh9CWnEQH
 BwRCfhAAuwH49vsQJSzfmMb7wjYmMlWOqzcWoSafE1vdsPCgTzre712fzwo01IZ8
 vDXsmqOFkbygbU00W3geMOs42UFgxFdjWznQNmBXBTDG1wuR8pHYIcriYAlvac+J
 SEtzYEA7Ql6k6rlz/2ekukVsj+geXId2/0gDVCJ6ZaQbasgNF5We4oAVhf8RH1Jo
 q29lPI5+Nl+XmHtn7dU7q5vNQSDMzKVtcgvLR7l6cEN6evQ2A+CCTklMEHSco/iq
 3ZuhiG/Hn3NX7siO+3vTR8Yn9ecYUZ8ISh1TWYaTh8aulYUONj9VToz3Wg+IiFBQ
 nueFwLFinHf1aRDnvf6926D0ROZ8v+T/MaO9z/u8QrB/Dd8g7OCm7zHfsmSU+O1D
 LIPF+3N4L8x8jYgQOUr7p3xvAybd20/EYLPZmPoNtWrKRYlCCVAbMp3BXg4wlvXU
 A9O3sRxCaUf5yjamBCLN/CZAtC4KJ//uZVBpjP8DZT3srfrWBVbh2wG1iiowB96S
 74JbGvlVci5dtQC7JJ3L9zP5taYAF0bqMyY3xz0bappluYSy9zxLn4ZkaB8sgIM4
 1ccfqLH2otnNab0VcgYJxdTVeR9TqdhG2hEAq+Di1iZNPI62l1ueOxC5IvTJkwmG
 /Y1G1UCaNVgBsRi6zxA0VfRxnVym5Ph0TAb0Ppaa1Es2tU2BwI4=
 =2hWG
 -----END PGP SIGNATURE-----

Merge tag 'tags/bcm2835-dt-next-2020-09-08' into devicetree/next

Maxime Ripard enables vc4 on BCM2711 (RPi4), which among other things
adds HDMI functionality (no 4K yet).

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
This commit is contained in:
Florian Fainelli 2020-09-10 13:35:55 -07:00
commit 1a4a752ee8
2 changed files with 169 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
arch/arm/boot/dts/bcm2711-rpi-4-b.dts
View File

@ -68,6 +68,14 @@ sd_vcc_reg: sd_vcc_reg {
};
};
&ddc0 {
status = "okay";
};
&ddc1 {
status = "okay";
};
&firmware {
firmware_clocks: clocks {
compatible = "raspberrypi,firmware-clocks";
@ -163,6 +171,38 @@ &gpio {
"RGMII_TXD3";
};
&hdmi0 {
clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 0>, <&clk_27MHz>;
clock-names = "hdmi", "bvb", "audio", "cec";
status = "okay";
};
&hdmi1 {
clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 1>, <&clk_27MHz>;
clock-names = "hdmi", "bvb", "audio", "cec";
status = "okay";
};
&hvs {
clocks = <&firmware_clocks 4>;
};
&pixelvalve0 {
status = "okay";
};
&pixelvalve1 {
status = "okay";
};
&pixelvalve2 {
status = "okay";
};
&pixelvalve4 {
status = "okay";
};
&pwm1 {
pinctrl-names = "default";
pinctrl-0 = <&pwm1_0_gpio40 &pwm1_1_gpio41>;
@ -231,3 +271,11 @@ &uart1 {
&vchiq {
interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
};
&vc4 {
status = "okay";
};
&vec {
status = "disabled";
};

122
arch/arm/boot/dts/bcm2711.dtsi
View File

@ -12,6 +12,18 @@ / {
interrupt-parent = <&gicv2>;
vc4: gpu {
compatible = "brcm,bcm2711-vc5";
status = "disabled";
};
clk_27MHz: clk-27M {
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <27000000>;
clock-output-names = "27MHz-clock";
};
clk_108MHz: clk-108M {
#clock-cells = <0>;
compatible = "fixed-clock";
@ -238,6 +250,27 @@ i2c6: i2c@7e205c00 {
status = "disabled";
};
pixelvalve0: pixelvalve@7e206000 {
compatible = "brcm,bcm2711-pixelvalve0";
reg = <0x7e206000 0x100>;
interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled";
};
pixelvalve1: pixelvalve@7e207000 {
compatible = "brcm,bcm2711-pixelvalve1";
reg = <0x7e207000 0x100>;
interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled";
};
pixelvalve2: pixelvalve@7e20a000 {
compatible = "brcm,bcm2711-pixelvalve2";
reg = <0x7e20a000 0x100>;
interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled";
};
pwm1: pwm@7e20c800 {
compatible = "brcm,bcm2835-pwm";
reg = <0x7e20c800 0x28>;
@ -248,10 +281,25 @@ pwm1: pwm@7e20c800 {
status = "disabled";
};
hvs@7e400000 {
pixelvalve4: pixelvalve@7e216000 {
compatible = "brcm,bcm2711-pixelvalve4";
reg = <0x7e216000 0x100>;
interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled";
};
hvs: hvs@7e400000 {
compatible = "brcm,bcm2711-hvs";
interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
};
pixelvalve3: pixelvalve@7ec12000 {
compatible = "brcm,bcm2711-pixelvalve3";
reg = <0x7ec12000 0x100>;
interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled";
};
dvp: clock@7ef00000 {
compatible = "brcm,brcm2711-dvp";
reg = <0x7ef00000 0x10>;
@ -259,6 +307,78 @@ dvp: clock@7ef00000 {
#clock-cells = <1>;
#reset-cells = <1>;
};
hdmi0: hdmi@7ef00700 {
compatible = "brcm,bcm2711-hdmi0";
reg = <0x7ef00700 0x300>,
<0x7ef00300 0x200>,
<0x7ef00f00 0x80>,
<0x7ef00f80 0x80>,
<0x7ef01b00 0x200>,
<0x7ef01f00 0x400>,
<0x7ef00200 0x80>,
<0x7ef04300 0x100>,
<0x7ef20000 0x100>;
reg-names = "hdmi",
"dvp",
"phy",
"rm",
"packet",
"metadata",
"csc",
"cec",
"hd";
clock-names = "hdmi", "bvb", "audio", "cec";
resets = <&dvp 0>;
ddc = <&ddc0>;
dmas = <&dma 10>;
dma-names = "audio-rx";
status = "disabled";
};
ddc0: i2c@7ef04500 {
compatible = "brcm,bcm2711-hdmi-i2c";
reg = <0x7ef04500 0x100>, <0x7ef00b00 0x300>;
reg-names = "bsc", "auto-i2c";
clock-frequency = <97500>;
status = "disabled";
};
hdmi1: hdmi@7ef05700 {
compatible = "brcm,bcm2711-hdmi1";
reg = <0x7ef05700 0x300>,
<0x7ef05300 0x200>,
<0x7ef05f00 0x80>,
<0x7ef05f80 0x80>,
<0x7ef06b00 0x200>,
<0x7ef06f00 0x400>,
<0x7ef00280 0x80>,
<0x7ef09300 0x100>,
<0x7ef20000 0x100>;
reg-names = "hdmi",
"dvp",
"phy",
"rm",
"packet",
"metadata",
"csc",
"cec",
"hd";
ddc = <&ddc1>;
clock-names = "hdmi", "bvb", "audio", "cec";
resets = <&dvp 1>;
dmas = <&dma 17>;
dma-names = "audio-rx";
status = "disabled";
};
ddc1: i2c@7ef09500 {
compatible = "brcm,bcm2711-hdmi-i2c";
reg = <0x7ef09500 0x100>, <0x7ef05b00 0x300>;
reg-names = "bsc", "auto-i2c";
clock-frequency = <97500>;
status = "disabled";
};
};
/*