diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
index fbaccfbd0ed3a1..1e5ac31fc8cb6a 100644
--- a/arch/arm/configs/bcm2709_defconfig
+++ b/arch/arm/configs/bcm2709_defconfig
@@ -1294,6 +1294,7 @@ CONFIG_DHT11=m
 CONFIG_HDC100X=m
 CONFIG_HTU21=m
 CONFIG_INV_MPU6050_I2C=m
+CONFIG_APDS9960=m
 CONFIG_TSL4531=m
 CONFIG_VEML6070=m
 CONFIG_BMP280=m
diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
index 0775637872ca75..5f08fcdb02b198 100644
--- a/arch/arm/configs/bcm2711_defconfig
+++ b/arch/arm/configs/bcm2711_defconfig
@@ -1280,6 +1280,7 @@ CONFIG_DHT11=m
 CONFIG_HDC100X=m
 CONFIG_HTU21=m
 CONFIG_INV_MPU6050_I2C=m
+CONFIG_APDS9960=m
 CONFIG_TSL4531=m
 CONFIG_VEML6070=m
 CONFIG_BMP280=m
diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
index b4f93d8fd86f3a..75530fd19685ef 100644
--- a/arch/arm/configs/bcmrpi_defconfig
+++ b/arch/arm/configs/bcmrpi_defconfig
@@ -1304,6 +1304,7 @@ CONFIG_DHT11=m
 CONFIG_HDC100X=m
 CONFIG_HTU21=m
 CONFIG_INV_MPU6050_I2C=m
+CONFIG_APDS9960=m
 CONFIG_TSL4531=m
 CONFIG_VEML6070=m
 CONFIG_BMP280=m
diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
index 4719d38c4b4e55..3878dede1c5152 100644
--- a/arch/arm64/configs/bcm2711_defconfig
+++ b/arch/arm64/configs/bcm2711_defconfig
@@ -1315,6 +1315,7 @@ CONFIG_DHT11=m
 CONFIG_HDC100X=m
 CONFIG_HTU21=m
 CONFIG_INV_MPU6050_I2C=m
+CONFIG_APDS9960=m
 CONFIG_TSL4531=m
 CONFIG_VEML6070=m
 CONFIG_BMP280=m
diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
index ca7668f549bcd4..d87831d79a03dd 100644
--- a/arch/arm64/configs/bcmrpi3_defconfig
+++ b/arch/arm64/configs/bcmrpi3_defconfig
@@ -1094,13 +1094,12 @@ CONFIG_RASPBERRYPI_POWER=y
 CONFIG_EXTCON=m
 CONFIG_EXTCON_ARIZONA=m
 CONFIG_IIO=m
-CONFIG_IIO_BUFFER=y
 CONFIG_IIO_BUFFER_CB=m
-CONFIG_IIO_KFIFO_BUF=m
 CONFIG_MCP320X=m
 CONFIG_MCP3422=m
 CONFIG_DHT11=m
 CONFIG_HTU21=m
+CONFIG_APDS9960=m
 CONFIG_PWM_BCM2835=m
 CONFIG_PWM_PCA9685=m
 CONFIG_EXT4_FS=y