Signed-off-by: Phil Elwell <phil@raspberrypi.org>
---
arch/arm/boot/dts/bcm2838.dtsi | 10 +-
- arch/arm/configs/bcm2711_defconfig | 2 +-
drivers/char/broadcom/Kconfig | 8 +-
drivers/char/broadcom/Makefile | 2 +-
.../broadcom/{argon-mem.c => rpivid-mem.c} | 105 +++++++++---------
reg = <0x0 0x7eb30000 0x10000>;
status = "okay";
};
---- a/arch/arm/configs/bcm2711_defconfig
-+++ b/arch/arm/configs/bcm2711_defconfig
-@@ -650,7 +650,7 @@ CONFIG_BRCM_CHAR_DRIVERS=y
- CONFIG_BCM_VCIO=y
- CONFIG_BCM_VC_SM=y
- CONFIG_BCM2835_DEVGPIOMEM=y
--CONFIG_ARGON_MEM=m
-+CONFIG_RPIVID_MEM=m
- # CONFIG_LEGACY_PTYS is not set
- CONFIG_SERIAL_8250=y
- # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
--- a/drivers/char/broadcom/Kconfig
+++ b/drivers/char/broadcom/Kconfig
@@ -50,10 +50,10 @@ config BCM2835_SMI_DEV