superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This pull request prepares the BCM2835 DTS files for the introduction 

of the new SoC BCM2711.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABCAAGBQJdVaIfAAoJEFXEMs9xUwyNhmAQAKZ3d5N3fkVYrY68pwz6vrP7
 b+lBcigss2OrtBekaPQQuIan3Wxf5+8SsDPBnYJcFqon0maHdb8FBjmrdCSnqFqL
 SnbJKgjHi71kgmsi03zn63yz1gMPGnWhBTms5Cs6B+OqCexnP0o9f19OHjyojaN9
 I1JReYjipFd4/4xWEI1Q3pSbFnlW/Fq/Z6mWMGt8BP7v0xwAb9tBhczoetTx6gu6
 fuArsouZKLlkv2vwhSBSIqXP3OhpA0ztWTfs3w01HBcdMQPfNgGmyhPvielFCi93
 /58B6LiFyTO/UlKZTEX6i8beA/p9XNrqIs6+4ljm/rv/XSN8BHPl7Pn9pRD6tsJ3
 /Sy8umPVKf8zUs9bqM+GRsikTPyxKwXKo2nHaJil4iKSkPQHRXWXYRfgsLdDs9bJ
 etckn5Fe8ge4iB6vLsPzQd/04UGmx+68pM7J7/T0m4RANikXhLWsEunnjUaG+6L1
 UlAIVzIes88i7HdKo0qR7dnJckKmYlvNTYz6vG/2V4DzGNVo01EwonnAf75pI2FX
 I30aEDZM+M+6i7aUwKF26qN35SAr5rRvVSkHpG4oY6VOtzP4qTx0MlNpQ/P1EB9G
 mXJY6TIWY7g+fwTeK2baUYKI5fzRUQ5OQJPYqRjx5LAdF/4c6UOlsr6FyHtFmWdQ
 t6Yf1ANftVQu0pxNb3rp
 =8QpO
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEm+Rq3+YGJdiR9yuFh9CWnEQHBwQFAl1VpmsACgkQh9CWnEQH
 BwTHAQ//a4IOj6bo67jnW4wFZ3LGcMJvG7KxH5jNfovJlympxKN4dqUIwf3EezZO
 qqER8bb894HlFZybQXys+NATgmaRJqCyTubLvpvgRH7bcvWOSX5ekPyy7ZNLr3Ih
 3xYvYr3Q2XG2bgJ6pJf6sOWDThDAi16CHc6HOd5OTi+pa7ZXqFweJp7NaRg62nyq
 1dcfG8W6aBipDUcHibRpiLRmfoImaowEGFCoErAChtvNkS2hvfzCmHH4WkvrD0Bc
 mQD6GDm4T8+tQV7SAqd+npPWAkbx4ZhMrzJlPCx0/mNRCI1dpGxEcA72EsUUGMCs
 t7uiWw/2BkQOvwpBBDSnFBMuVvdg53uESO1FEAnAw6XCfa/4q2CsXBz2b6KTmPCK
 FEmxjnH+S6g2TGLIgELNEupbfSBeZU/4gduhiiZ8qj1uXIJF/nTPBBwIIzPl2sxh
 Rj82KdanS9WeGIBRe74NThCvJGPkJBIp2/+zB2bP+DUICmX6pkXxBLbdpGOPxKPm
 5G+DuQMMQdc3hqnKLAaNUng0+iGQ9CRtG+OzJ2+s+OIa7movNjhuMlaI4X6wdoKr
 lWqqIDjMQhSPfYEV+yfM14WETBZf1daZ4dJdINedceN8x21da/Y2/DniTKKlvVht
 uE3tTcGWFoC2xgBeu2TGTG3+e6kJEgYh6LF5VGtmY/1rkJncW9U=
 =+6lf
 -----END PGP SIGNATURE-----

Merge tag 'tags/bcm2835-dt-next-2019-08-15' into devicetree/next

This pull request prepares the BCM2835 DTS files for the introduction
of the new SoC BCM2711.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
pull/721/head
Florian Fainelli 2019-08-15 11:37:14 -07:00
parent 5f9e832c13 60c833d566
commit f1bace1efd
17 changed files with 144 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
View File

@ -8,6 +8,11 @@
compatible = "raspberrypi,model-a-plus", "brcm,bcm2835";
model = "Raspberry Pi Model A+";
memory@0 {
device_type = "memory";
reg = <0 0x10000000>;
};
leds {
act {
gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
@ -99,6 +104,8 @@
&hdmi {
hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
status = "okay";
};
&pwm {
@ -107,6 +114,13 @@
status = "okay";
};
&sdhost {
pinctrl-names = "default";
pinctrl-0 = <&sdhost_gpio48>;
bus-width = <4>;
status = "okay";
};
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_gpio14>;

14
arch/arm/boot/dts/bcm2835-rpi-a.dts
View File

@ -8,6 +8,11 @@
compatible = "raspberrypi,model-a", "brcm,bcm2835";
model = "Raspberry Pi Model A";
memory@0 {
device_type = "memory";
reg = <0 0x10000000>;
};
leds {
act {
gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
@ -94,6 +99,8 @@
&hdmi {
hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;
power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
status = "okay";
};
&pwm {
@ -102,6 +109,13 @@
status = "okay";
};
&sdhost {
pinctrl-names = "default";
pinctrl-0 = <&sdhost_gpio48>;
bus-width = <4>;
status = "okay";
};
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_gpio14>;

14
arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
View File

@ -9,6 +9,11 @@
compatible = "raspberrypi,model-b-plus", "brcm,bcm2835";
model = "Raspberry Pi Model B+";
memory@0 {
device_type = "memory";
reg = <0 0x20000000>;
};
leds {
act {
gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
@ -101,6 +106,8 @@
&hdmi {
hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
status = "okay";
};
&pwm {
@ -109,6 +116,13 @@
status = "okay";
};
&sdhost {
pinctrl-names = "default";
pinctrl-0 = <&sdhost_gpio48>;
bus-width = <4>;
status = "okay";
};
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_gpio14>;

14
arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
View File

@ -9,6 +9,11 @@
compatible = "raspberrypi,model-b-rev2", "brcm,bcm2835";
model = "Raspberry Pi Model B rev2";
memory@0 {
device_type = "memory";
reg = <0 0x10000000>;
};
leds {
act {
gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
@ -94,6 +99,8 @@
&hdmi {
hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;
power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
status = "okay";
};
&pwm {
@ -102,6 +109,13 @@
status = "okay";
};
&sdhost {
pinctrl-names = "default";
pinctrl-0 = <&sdhost_gpio48>;
bus-width = <4>;
status = "okay";
};
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_gpio14>;

14
arch/arm/boot/dts/bcm2835-rpi-b.dts
View File

@ -9,6 +9,11 @@
compatible = "raspberrypi,model-b", "brcm,bcm2835";
model = "Raspberry Pi Model B";
memory@0 {
device_type = "memory";
reg = <0 0x10000000>;
};
leds {
act {
gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
@ -89,6 +94,8 @@
&hdmi {
hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;
power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
status = "okay";
};
&pwm {
@ -97,6 +104,13 @@
status = "okay";
};
&sdhost {
pinctrl-names = "default";
pinctrl-0 = <&sdhost_gpio48>;
bus-width = <4>;
status = "okay";
};
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_gpio14>;

9
arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts
View File

@ -79,6 +79,15 @@
&hdmi {
hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
status = "okay";
};
&sdhost {
pinctrl-names = "default";
pinctrl-0 = <&sdhost_gpio48>;
bus-width = <4>;
status = "okay";
};
&uart0 {

5
arch/arm/boot/dts/bcm2835-rpi-cm1.dtsi
View File

@ -10,6 +10,11 @@
};
};
memory@0 {
device_type = "memory";
reg = <0 0x20000000>;
};
reg_3v3: fixed-regulator {
compatible = "regulator-fixed";
regulator-name = "3V3";

14
arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
View File

@ -12,6 +12,11 @@
compatible = "raspberrypi,model-zero-w", "brcm,bcm2835";
model = "Raspberry Pi Zero W";
memory@0 {
device_type = "memory";
reg = <0 0x20000000>;
};
chosen {
/* 8250 auxiliary UART instead of pl011 */
stdout-path = "serial1:115200n8";
@ -100,6 +105,8 @@
&hdmi {
hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
status = "okay";
};
&sdhci {
@ -116,6 +123,13 @@
};
};
&sdhost {
pinctrl-names = "default";
pinctrl-0 = <&sdhost_gpio48>;
bus-width = <4>;
status = "okay";
};
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_gpio32 &uart0_ctsrts_gpio30>;

14
arch/arm/boot/dts/bcm2835-rpi-zero.dts
View File

@ -12,6 +12,11 @@
compatible = "raspberrypi,model-zero", "brcm,bcm2835";
model = "Raspberry Pi Zero";
memory@0 {
device_type = "memory";
reg = <0 0x20000000>;
};
leds {
act {
gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
@ -96,6 +101,15 @@
&hdmi {
hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
status = "okay";
};
&sdhost {
pinctrl-names = "default";
pinctrl-0 = <&sdhost_gpio48>;
bus-width = <4>;
status = "okay";
};
&uart0 {

23
arch/arm/boot/dts/bcm2835-rpi.dtsi
View File

@ -1,11 +1,6 @@
#include <dt-bindings/power/raspberrypi-power.h>
/ {
memory@0 {
device_type = "memory";
reg = <0 0x10000000>;
};
leds {
compatible = "gpio-leds";
@ -68,28 +63,10 @@
status = "okay";
};
&sdhci {
pinctrl-names = "default";
pinctrl-0 = <&emmc_gpio48>;
bus-width = <4>;
};
&sdhost {
pinctrl-names = "default";
pinctrl-0 = <&sdhost_gpio48>;
status = "okay";
bus-width = <4>;
};
&usb {
power-domains = <&power RPI_POWER_DOMAIN_USB>;
};
&hdmi {
power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
status = "okay";
};
&vec {
power-domains = <&power RPI_POWER_DOMAIN_VEC>;
status = "okay";

10
arch/arm/boot/dts/bcm2836-rpi-2-b.dts
View File

@ -10,6 +10,7 @@
model = "Raspberry Pi 2 Model B";
memory@0 {
device_type = "memory";
reg = <0 0x40000000>;
};
@ -105,6 +106,8 @@
&hdmi {
hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
status = "okay";
};
&pwm {
@ -113,6 +116,13 @@
status = "okay";
};
&sdhost {
pinctrl-names = "default";
pinctrl-0 = <&sdhost_gpio48>;
bus-width = <4>;
status = "okay";
};
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_gpio14>;

3
arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts
View File

@ -14,6 +14,7 @@
};
memory@0 {
device_type = "memory";
reg = <0 0x20000000>;
};
@ -117,6 +118,8 @@
&hdmi {
hpd-gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
status = "okay";
};
&pwm {

3
arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
View File

@ -15,6 +15,7 @@
};
memory@0 {
device_type = "memory";
reg = <0 0x40000000>;
};
@ -124,6 +125,8 @@
&hdmi {
hpd-gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
status = "okay";
};
&pwm {

3
arch/arm/boot/dts/bcm2837-rpi-3-b.dts
View File

@ -15,6 +15,7 @@
};
memory@0 {
device_type = "memory";
reg = <0 0x40000000>;
};
@ -125,6 +126,8 @@
&hdmi {
hpd-gpios = <&expgpio 4 GPIO_ACTIVE_LOW>;
power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
status = "okay";
};
/* uart0 communicates with the BT module */

9
arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts
View File

@ -78,6 +78,15 @@
&hdmi {
hpd-gpios = <&expgpio 1 GPIO_ACTIVE_LOW>;
power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
status = "okay";
};
&sdhost {
pinctrl-names = "default";
pinctrl-0 = <&sdhost_gpio48>;
bus-width = <4>;
status = "okay";
};
&uart0 {

1
arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi
View File

@ -5,6 +5,7 @@
/ {
memory@0 {
device_type = "memory";
reg = <0 0x40000000>;
};

6
arch/arm/boot/dts/bcm283x.dtsi
View File

@ -397,7 +397,7 @@
uart0: serial@7e201000 {
compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell";
reg = <0x7e201000 0x1000>;
reg = <0x7e201000 0x200>;
interrupts = <2 25>;
clocks = <&clocks BCM2835_CLOCK_UART>,
<&clocks BCM2835_CLOCK_VPU>;
@ -428,7 +428,7 @@
spi: spi@7e204000 {
compatible = "brcm,bcm2835-spi";
reg = <0x7e204000 0x1000>;
reg = <0x7e204000 0x200>;
interrupts = <2 22>;
clocks = <&clocks BCM2835_CLOCK_VPU>;
dmas = <&dma 6>, <&dma 7>;
@ -440,7 +440,7 @@
i2c0: i2c@7e205000 {
compatible = "brcm,bcm2835-i2c";
reg = <0x7e205000 0x1000>;
reg = <0x7e205000 0x200>;
interrupts = <2 21>;
clocks = <&clocks BCM2835_CLOCK_VPU>;
#address-cells = <1>;