diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 6699843918facb3b48aaa6e5a05d21b747724774..f786ae433032b35835514d59a1cb0f642d5a115e 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -468,12 +468,4 @@ config ZX2967_THERMAL
 	  the primitive temperature sensor embedded in zx2967 SoCs.
 	  This sensor generates the real time die temperature.
 
-config BCM2835_THERMAL
-	tristate "Thermal sensors on bcm2835 SoC"
-	depends on ARCH_BCM2835 || COMPILE_TEST
-	depends on HAS_IOMEM
-	depends on THERMAL_OF
-	help
-	  Support for thermal sensors on Broadcom bcm2835 SoCs.
-
 endif
diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
index a1e9b8b4e897d9500d6ae027293ad482b1c5c676..e6834061da28c78eeff99d83461fb1b934d75f16 100644
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@ -60,4 +60,3 @@ obj-$(CONFIG_HISI_THERMAL)     += hisi_thermal.o
 obj-$(CONFIG_MTK_THERMAL)	+= mtk_thermal.o
 obj-$(CONFIG_GENERIC_ADC_THERMAL)	+= thermal-generic-adc.o
 obj-$(CONFIG_ZX2967_THERMAL)	+= zx2967_thermal.o
-obj-$(CONFIG_BCM2835_THERMAL)	+= bcm2835_thermal.o
diff --git a/drivers/thermal/broadcom/Kconfig b/drivers/thermal/broadcom/Kconfig
index f0dea8a8e002ed52db705ef3391f2046ec713091..ab08af4654ef18c05d1ab9725dd96fb44f9264bf 100644
--- a/drivers/thermal/broadcom/Kconfig
+++ b/drivers/thermal/broadcom/Kconfig
@@ -1,3 +1,11 @@
+config BCM2835_THERMAL
+	tristate "Thermal sensors on bcm2835 SoC"
+	depends on ARCH_BCM2835 || COMPILE_TEST
+	depends on HAS_IOMEM
+	depends on THERMAL_OF
+	help
+	  Support for thermal sensors on Broadcom bcm2835 SoCs.
+
 config BCM_NS_THERMAL
 	tristate "Northstar thermal driver"
 	depends on ARCH_BCM_IPROC || COMPILE_TEST
diff --git a/drivers/thermal/broadcom/Makefile b/drivers/thermal/broadcom/Makefile
index 059df9a0ed69f5b46032dd0670379ce50bc9bd3f..c6f62e4fd0eede90b0e0607bde00957a7b29df00 100644
--- a/drivers/thermal/broadcom/Makefile
+++ b/drivers/thermal/broadcom/Makefile
@@ -1 +1,2 @@
+obj-$(CONFIG_BCM2835_THERMAL)		+= bcm2835_thermal.o
 obj-$(CONFIG_BCM_NS_THERMAL)		+= ns-thermal.o
diff --git a/drivers/thermal/bcm2835_thermal.c b/drivers/thermal/broadcom/bcm2835_thermal.c
similarity index 100%
rename from drivers/thermal/bcm2835_thermal.c
rename to drivers/thermal/broadcom/bcm2835_thermal.c