Skip to content

Commit 73531f6

Browse files
notropopcornmix
authored andcommitted
bcm2835: Switch to firmware driver
defconfig: enable BCM2835_MBOX, RASPBERRYPI_FIRMWARE and BCM_VCIO. Add firmware node and change mailbox node in Device Tree. Signed-off-by: Noralf Trønnes <[email protected]>
1 parent 5454ca6 commit 73531f6

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

arch/arm/boot/dts/bcm2835.dtsi

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,10 @@
6262
};
6363

6464
mailbox: mailbox@7e00b800 {
65-
compatible = "brcm,bcm2708-vcio";
65+
compatible = "brcm,bcm2835-mbox";
6666
reg = <0x7e00b880 0x40>;
6767
interrupts = <0 1>;
68+
#mbox-cells = <0>;
6869
};
6970

7071
gpio: gpio@7e200000 {

arch/arm/configs/bcm2835_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -568,6 +568,7 @@ CONFIG_HW_RANDOM_BCM2835=m
568568
CONFIG_RAW_DRIVER=y
569569
CONFIG_BRCM_CHAR_DRIVERS=y
570570
CONFIG_BCM_VC_CMA=y
571+
CONFIG_BCM_VCIO=y
571572
CONFIG_BCM_VC_SM=y
572573
CONFIG_I2C=y
573574
CONFIG_I2C_CHARDEV=m
@@ -1064,9 +1065,11 @@ CONFIG_FB_FLEX=m
10641065
CONFIG_FB_TFT_FBTFT_DEVICE=m
10651066
CONFIG_MAILBOX=y
10661067
CONFIG_BCM2708_MBOX=y
1068+
CONFIG_BCM2835_MBOX=y
10671069
# CONFIG_IOMMU_SUPPORT is not set
10681070
CONFIG_EXTCON=m
10691071
CONFIG_EXTCON_ARIZONA=m
1072+
CONFIG_RASPBERRYPI_FIRMWARE=y
10701073
CONFIG_EXT2_FS=y
10711074
CONFIG_EXT2_FS_XATTR=y
10721075
CONFIG_EXT2_FS_POSIX_ACL=y

0 commit comments

Comments
 (0)