github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-31 11:37:06 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

This tag adds GPIO labels to RPi4 and moves emmc2 to its own bus in

Browse Source 
order for RPi4's firmware to correct its DMA constraints.
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEErOkkGDHCg2EbPcGjlfZmHno8x/4FAl5mpigACgkQlfZmHno8
 x/7yZggAgNhv5vitGo2XfM+uAL051GnzazfzHQaHzD2xPKuUXvXMrKdjGemHiWPD
 v+9xPScalatLMMkILMV2eJe4p7UiV6dPoLsH1NpyBItpUWgsdi7K7OoKagfHgrR7
 EtnNFqaV3POjpL39OsY+M0qsKjqD+jjTlmfr4OYVqdy8GQ3IVWgzFLiLhAQngsxL
 FuaOSIYzLzYwMIraHMswFFtwL+XtIVD+Wis5JxeqQ5rxZXw6pUdo45dw8alPwE0z
 N+U+jIFHSRj9ZiiUfvHmmi5DbmGm+a59f87NmdH1xQWfW3BbfdT0gMD5ZLI5HjPC
 RzTButklvIrfOrp6AwnUhKfJEY+WOg==
 =CZ77
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEm+Rq3+YGJdiR9yuFh9CWnEQHBwQFAl5n110ACgkQh9CWnEQH
 BwT2VxAAvJ4t1e5f1/6S8HBpw5bvEdI6RiY0+Gbeb0SNpRggI6aJCIBLuocY4gyQ
 zwLsd++F+RvadEz2eS0yKMLGt81Tn568PP73CRWKSlq/H646cZwaq0/cUlgtwNJ5
 5N+k1dDySFbsloMhl1Yk5bsLGzCC+BHU57Wz3ajGytNeU05TDRorthylZVjee9+4
 c1ZcCGol52EirGb+fBVhSmCRpt5Ga9Yh0LvXYADbQ9a0xA34YVzcMWWA1tgE+9gQ
 EPt391X521gi1RDwJUUvUPazASH9DGgaroGPGDRaqSwXdIaqTVVgrRGIsJDFDrDX
 Nq8SzX3ah6fY3Ijh8FdrDCzfkTINAF7C9/QZpCzHgppCQp5LC1srOk1iUB0XaPnF
 XIhYlk65xOGg0D8Jcbij2d8JqakvVZBY4WOOxuOSSyc1XoNOOwnWmWoR0h5/tcY0
 cdTxtjiy4TUMAnW3VXCSvK3J5tpYZI+G1VEgcFtS5bsznCfOEb9SvsfdSeNgBDMD
 rSuMob4e54rHatwZQqqA5CXFfMFM/eXgT+dnhJnEkLqUDJAQYOADc44So4tuajLT
 PUZbplSvXyxSTRkhCgKpvDvDT95nuHArpJcCND8sOCS40ndpKEVWecWq/Hkwo4yV
 hpuJZblN44JvOjExeIQZzJNV8XB1Gi9x7pzqmiXe7R1PfnSoOV0=
 =Yuyh
 -----END PGP SIGNATURE-----

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

This tag adds GPIO labels to RPi4 and moves emmc2 to its own bus in
order for RPi4's firmware to correct its DMA constraints.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
This commit is contained in:
Florian Fainelli 2020-03-10 11:07:14 -07:00
commit 381171d9ad
2 changed files with 94 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,7 @@ memory@0 {
};
aliases {
emmc2bus = &emmc2bus;
ethernet0 = &genet;
};
@ -71,6 +72,79 @@ expgpio: gpio {
};
};
&gpio {
/*
* Parts taken from rpi_SCH_4b_4p0_reduced.pdf and
* the official GPU firmware DT blob.
*
* Legend:
* "FOO" = GPIO line named "FOO" on the schematic
* "FOO_N" = GPIO line named "FOO" on schematic, active low
*/
gpio-line-names = "ID_SDA",
"ID_SCL",
"SDA1",
"SCL1",
"GPIO_GCLK",
"GPIO5",
"GPIO6",
"SPI_CE1_N",
"SPI_CE0_N",
"SPI_MISO",
"SPI_MOSI",
"SPI_SCLK",
"GPIO12",
"GPIO13",
/* Serial port */
"TXD1",
"RXD1",
"GPIO16",
"GPIO17",
"GPIO18",
"GPIO19",
"GPIO20",
"GPIO21",
"GPIO22",
"GPIO23",
"GPIO24",
"GPIO25",
"GPIO26",
"GPIO27",
"RGMII_MDIO",
"RGMIO_MDC",
/* Used by BT module */
"CTS0",
"RTS0",
"TXD0",
"RXD0",
/* Used by Wifi */
"SD1_CLK",
"SD1_CMD",
"SD1_DATA0",
"SD1_DATA1",
"SD1_DATA2",
"SD1_DATA3",
/* Shared with SPI flash */
"PWM0_MISO",
"PWM1_MOSI",
"STATUS_LED_G_CLK",
"SPIFLASH_CE_N",
"SDA0",
"SCL0",
"RGMII_RXCLK",
"RGMII_RXCTL",
"RGMII_RXD0",
"RGMII_RXD1",
"RGMII_RXD2",
"RGMII_RXD3",
"RGMII_TXCLK",
"RGMII_TXCTL",
"RGMII_TXD0",
"RGMII_TXD1",
"RGMII_TXD2",
"RGMII_TXD3";
};
&pwm1 {
pinctrl-names = "default";
pinctrl-0 = <&pwm1_0_gpio40 &pwm1_1_gpio41>;

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

@ -241,17 +241,32 @@ pwm1: pwm@7e20c800 {
status = "disabled";
};
hvs@7e400000 {
interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
};
};
/*
* emmc2 has different DMA constraints based on SoC revisions. It was
* moved into its own bus, so as for RPi4's firmware to update them.
* The firmware will find whether the emmc2bus alias is defined, and if
* so, it'll edit the dma-ranges property below accordingly.
*/
emmc2bus: emmc2bus {
compatible = "simple-bus";
#address-cells = <2>;
#size-cells = <1>;
ranges = <0x0 0x7e000000 0x0 0xfe000000 0x01800000>;
dma-ranges = <0x0 0xc0000000 0x0 0x00000000 0x40000000>;
emmc2: emmc2@7e340000 {
compatible = "brcm,bcm2711-emmc2";
reg = <0x7e340000 0x100>;
reg = <0x0 0x7e340000 0x100>;
interrupts = <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clocks BCM2711_CLOCK_EMMC2>;
status = "disabled";
};
hvs@7e400000 {
interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
};
};
arm-pmu {